tijiao

src/api/index.js

@@ -19,8 +19,8 @@ const service = axios.create({
 	// baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换
 	// baseURL: 'http://www.tougao.com/', //测试本地 记得切换
 	// baseURL: 'http://192.168.110.110/tougao/public/index.php/',
-	// baseURL: '/api', //本地
-	baseURL: '/', //正式
+	baseURL: '/api', //本地
+	// baseURL: '/', //正式
 
 });
 

src/components/page/ReferenceEditor.vue

@@ -422,7 +422,9 @@
                     <el-table-column label="Status" align="center" width="55" v-if="parseVisible">
                         <template slot-scope="scope">
                            
-                           <i class="el-icon-loading" style="font-size: 24px;color: #606266;"></i><i class="el-icon-success" style="font-size: 24px;color: #2ac95c;"></i>
+                           <i class="el-icon-loading" style="font-size: 24px;color: #606266;" v-if="scope.row.is_deal==2"></i>
+                           
+                           <i class="el-icon-success" style="font-size: 24px;color: #2ac95c;" v-if="scope.row.is_deal==1"></i>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -564,11 +566,16 @@ export default {
    
       var progress = 0;
    
-    //   await axios
-    //     .get('获取进度条接口地址')
-    //     .then(async (res) => {
+      this.$api
+                        .post(
+        'api/Preaccept/getReferState',{ article_id: this.$route.query.id})
+        .then(async (res) => {
+            if(res.status==1){
+                progress = Number(res.data.processed_total);
+                this.Tempredable=res.data.refer;
+            }
          //percent是后端返回的进度
-          progress = Number(this.progressPercent+1);
+          
           if (progress == this.Tempredable.length) {
      
             this.isUpload = false;
@@ -578,7 +585,7 @@ export default {
         
             this.$forceUpdate();
           }
-        // });
+        });
     
       return progress;
     },
@@ -671,49 +678,50 @@ export default {
         showHelp() {
             this.helpVisible = true;
         },
-        handleparse() {
-            // this.linVisible = false;
-            // setTimeout(() => {
-                this.getParseData();
-            // }, 1000);
-        },
+        // handleparse() {
+        //     // this.linVisible = false;
+        //     // setTimeout(() => {
+        //         this.getParseData();
+        //     // }, 1000);
+        // },
         // 获取解析数据
         getParseData() {
+           
+         
+
+
+                this.parseVisible = true;
+                this.isUpload=true
+          
+          
+            
+        },
+        // 导入文本域
+        handleparse() {
             const loading = this.$loading({
                 lock: true,
                 text: 'Loading...',
                 spinner: 'el-icon-loading',
                 background: 'rgba(0, 0, 0, 0.7)'
             });
-            setTimeout(() => {loading.close()
-                this.parseVisible = true;
-                this.isUpload=true
-            }, 2000);
-          
-            
-        },
-        // 导入文本域
-        importText() {
-            this.linVisible = false;
-            this.importIoading = true;
             //console.log(this.form.referFile,'referFile')
             this.$api
-                .post('api/Preaccept/addRefersByExcel', {
+                .post('api/Preaccept/addRefersByExcelNew', {
                     article_id: this.$route.query.id,
                     referFile: this.form.referFile
                 })
                 .then((res) => {
+                    loading.close()
                     if (res.code == 0) {
-                        this.$message.success('Import succeeded');
-                        this.linVisible = false;
-                        this.Tempredable = [];
-                        this.importIoading = false;
-                        // 有可以可用的文献数据，刷新当前页面
-                        // location.reload() // 刷新本页面
-                        this.getRefData();
+                        
+                       
+                        this.getParseData();
+                    }else{  loading.close()
+                        this.$message.error(res.msg);
                     }
                 })
                 .catch((err) => {
+                    loading.close()
                     console.log(err);
                 });
         },

vue.config.js

@@ -76,8 +76,8 @@ module.exports = {
 				// target: 'http://192.168.110.110/tougao/public/index.php/',
 				// target: 'http://api.tmrjournals.com/public/index.php/',//正式
 				// target: 'http://zmzm.tougao.dev.com/',//晓玲
-				target: 'https://submission.tmrjournals.com/',//正式
-				// target: 'http://tougaotest.tmrjournals.com/public/index.php/',//测试环境
+				// target: 'https://submission.tmrjournals.com/',//正式
+				target: 'http://tougaotest.tmrjournals.com/public/index.php/',//测试环境
 				changeOrigin: true,
 				pathRewrite: {
 					'^/api': ''