lrf402788946 4 år sedan
förälder
incheckning
b44fb5a7b1

+ 1 - 1
src/views/location/detail.vue

@@ -46,7 +46,7 @@ export default {
       },
       {
         value: '2',
-        label: '拓展计划地点',
+        label: '拓展训练地点',
       },
       {
         value: '3',

+ 3 - 1
src/views/statistics/detail.vue

@@ -314,6 +314,7 @@ export default {
       // direction=>导出表头的方向;
       // questionnaireid=>要导出的问卷id;
       // selectModel=>选择的字段,不过需要特殊处理下,因为选择完是中文,需要将对应的object找出来,传给服务端,这样便于服务端聚合数据
+      let msg = this.$message({ message: '正在导出,请稍后......', duration: 0 });
       const direction = _.cloneDeep(this.direction);
       const questionnaireid = _.cloneDeep(this.querys.questionnaireid);
       let sml = _.cloneDeep(this.selectModel);
@@ -323,8 +324,9 @@ export default {
         if (res) modelList.push(res);
       }
       const data = { range, direction, questionnaireid, modelList };
+      msg.close();
       const res = await this.export(data);
-      if (this.$checkRes(res)) {
+      if (this.$checkRes(res, '导出成功', res.errmsg || '导出失败')) {
         window.open(res.data);
       }
     },

+ 1 - 1
src/views/task/index.vue

@@ -156,7 +156,7 @@ export default {
     },
     // 导出作业
     async toExport(range) {
-      let msg = this.$message('正在导出,请稍后....');
+      let msg = this.$message({ message: '正在导出,请稍后......', duration: 0 });
       let data = { range };
       if (this.subid) data.subid = this.subid;
       const res = await this.export(data);

+ 1 - 1
src/views/train-plan/parts/term-class-from.vue

@@ -61,7 +61,7 @@ export default {
         },
         {
           value: '2',
-          label: '拓展计划地点',
+          label: '拓展训练地点',
         },
         {
           value: '3',