Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/drill/task/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
-        <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+        <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                   @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
@@ -221,7 +221,8 @@ export default {
         orgId: [
           {required: true, message: "机构不能为空", trigger: "blur"}
         ],
-      }
+      },
+      selectedOrgName:null,
     };
   },
   created() {
@@ -275,13 +276,15 @@ export default {
       this.queryParams.checkSub = state;
       this.handleQuery();
     },
-    getDefaultKey(key) {
-      this.queryParams.orgId = key;
+    getDefaultOrg(org) {
+      this.queryParams.orgId = org.id;
+      this.selectedOrgName=org.shortName;
       this.getList();
     },
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
+      this.selectedOrgName=data.shortName;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -372,7 +375,7 @@ export default {
     handleExport(){
       this.download('core/drill/task/export', {
         ...this.queryParams
-      }, this.$store.getters.orgShortName+`_演练登记跟踪_${dayjs().format("YYYYMMDD")}.xlsx`)
+      }, `${this.selectedOrgName}_${this.$tab.getCurrentTabName()}_${dayjs().format("YYYYMMDD")}.xlsx`)
     }
   }
 };

src/views/core/edu/task/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
-        <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+        <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                   @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
@@ -244,7 +244,8 @@ export default {
         orgId: [
           {required: true, message: "机构不能为空", trigger: "blur"}
         ],
-      }
+      },
+      selectedOrgName:null,
     };
   },
   created() {
@@ -299,13 +300,15 @@ export default {
       this.queryParams.checkSub = state;
       this.handleQuery();
     },
-    getDefaultKey(key) {
-      this.queryParams.orgId = key;
+    getDefaultOrg(org) {
+      this.queryParams.orgId = org.id;
+      this.selectedOrgName=org.shortName;
       this.getList();
     },
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
+      this.selectedOrgName=data.shortName;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -363,7 +366,7 @@ export default {
     handleExport() {
       this.download('core/eduTask/export', {
         ...this.queryParams
-      }, this.$store.getters.orgShortName+`_培训任务_${new Date().getTime()}.xlsx`)
+      }, `${this.selectedOrgName}_${this.$tab.getCurrentTabName()}_${dayjs().format("YYYYMMDD")}.xlsx`)
     },
     canPerform(row) {
       console.log("row.status", row.status)

src/views/system/device/index.vue

@@ -583,7 +583,7 @@ export default {
           ...this.queryParams,
         },
         `${
-          this.orgName + "-设备导入-" + this.formatTime(new Date(), "YYYYMMhh")
+          this.orgName + "-设备导入模版-" + this.formatTime(new Date(), "YYYYMMhh")
         }.xlsx`
       );
     },