coys há 2 anos atrás
pai
commit
5582ae11ca

+ 1 - 1
src/views/menu/monitoringCall/index.vue

@@ -274,7 +274,7 @@ export default {
             callBack()
           } else {
             this.finished = false
-            this.taskList.unshift(...rows)
+            this.taskList=rows||[]
             if(rows.length == 0){
               this.taskList=[]
             }

+ 1 - 1
src/views/menu/rehearsalTask/index.vue

@@ -349,7 +349,7 @@ export default {
             callback()
           } else {
             this.finished = false
-            this.taskList.unshift(...rows)
+            this.taskList=rows||[]
             if(rows.length == 0){
               this.taskList=[]
             }

+ 1 - 1
src/views/menu/rehearsalTask/learning.vue

@@ -230,7 +230,7 @@ export default {
             callback()
           } else {
             this.finished = false
-            this.taskList.unshift(...rows)
+            this.taskList=rows||[]
             if(rows.length == 0){
               this.taskList=[]
             }

+ 1 - 1
src/views/menu/rehearsalTask/optimal.vue

@@ -306,7 +306,7 @@ export default {
             callback()
           } else {
             this.finished = false
-            this.taskList.unshift(...rows)
+            this.taskList=rows||[]
             if(rows.length == 0){
               this.taskList=[]
             }

+ 1 - 1
src/views/menu/resumptionEvaluate/index.vue

@@ -237,7 +237,7 @@ export default {
             callback()
           } else {
             this.finished = false
-            this.taskList.unshift(...rows)
+            this.taskList=rows||[]
             if(rows.length == 0){
               this.taskList=[]
             }

+ 4 - 4
src/views/menu/training/index.vue

@@ -187,7 +187,7 @@ export default {
       showDate: false, //月份显示隐藏
       fieldValue: '全部', //状态名称
       statusValue: ' ', //状态值
-      columns: ['全部', '待记录', '待提交', '待签名', '已逾期', '已完成'], //状态数组
+      columns: ['全部', '待培训', '待提交', '待签名', '已逾期', '已完成'], //状态数组
       typeColumns: ['全部', '每月安全培训教育', '专项安全培训教育'], //类型数组
       currentDate: newDateMonth(), //月份值
       conditionShow: false //机构弹框显示隐藏
@@ -256,7 +256,7 @@ export default {
       let date = new Date().getTime()
       let startDate = Date.parse(new Date(list.startDate))
       let endDate = Date.parse(new Date(list.endDate))
-      //任务处于待记录状态,且任务在规定完成时间范围内,登录人所在机构和与任务培训机构一致才显示
+      //任务处于待培训状态,且任务在规定完成时间范围内,登录人所在机构和与任务培训机构一致才显示
 
       if ((list.startDate && list.endDate) && (list.status == 0 || list.status == 4)) {
         
@@ -339,7 +339,7 @@ export default {
             callback()
           } else {
             this.finished = false
-            this.taskList.unshift(...rows)
+            this.taskList=rows||[]
             if(rows.length == 0){
               this.taskList=[]
             }
@@ -369,7 +369,7 @@ export default {
       this.fieldValue = value
 
       switch (value) {
-        case '待记录':
+        case '待培训':
           this.statusValue = '0'
 
           break

+ 2 - 2
vue.config.js

@@ -110,9 +110,9 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        // target: "http://10.87.10.55:8080",
+        target: "http://10.87.10.55:8080",
         // target: "http://10.87.10.91:8080",
-        target: "http://10.87.11.173:8080",
+        // target: "http://10.87.11.173:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{