luowei 1 рік тому
батько
коміт
a8cb8e7c76

+ 1 - 0
src/views/evaluateTable/index.vue

@@ -195,6 +195,7 @@ export default {
         let { code, data, msg } = res;
         if (code == 200) {
           this.targetList = data.list || [];
+          this.fullTableTitle=res.tittle;
           this.average=data.average||0
           if (this.targetList) {
             this.obj = Object.keys(this.targetList[0]);

+ 5 - 2
src/views/system/bind/index.vue

@@ -407,11 +407,14 @@ export default {
       getAreaByOrg(val).then((response) => {
         this.roleOptions = response.data;
         this.form.areaId = null;
-      });
-      getAreaCheckInfoByOrgId(val).then((response) => {
+        if(response.code==200){
+          getAreaCheckInfoByOrgId(val).then((response) => {
         this.form.checkId = null;
         this.checkList = response.data;
       });
+        }
+      });
+
     },
     getDefaultKey(key) {
       this.queryParams.orgId = key;

+ 23 - 4
src/views/system/dept/index.vue

@@ -104,9 +104,19 @@
                   type="primary"
                   icon="el-icon-upload2"
                   size="mini"
-                  @click="handleExportSecurity"
+                  @click="handleExportTotal"
                   v-hasPermi="['system:dept:exportConstruction']"
-                >导出全省农信系统物防建设达标情况</el-button
+                >导出物防建设达标情况汇总</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleExportDetails"
+                  v-hasPermi="['system:dept:exportConstructionDetails']"
+                >导出物防建设达标情况明细</el-button
                 >
               </el-col>
               <right-toolbar
@@ -616,13 +626,22 @@ export default {
       });
     },
 
-    handleExportSecurity() {
+    handleExportTotal() {
       this.download(
         "system/dept/exportConstruction",
         {
           ...this.queryParams,
         },
-        `机构信息管理-物防建设达标情况统计_${new Date().getTime()}.xlsx`
+        `机构信息管理-物防建设达标情况汇总表_${new Date().getTime()}.xlsx`
+      );
+    },
+    handleExportDetails() {
+      this.download(
+        "system/dept/exportConstructionDetails",
+        {
+          ...this.queryParams,
+        },
+        `机构信息管理-物防建设达标情况明细表_${new Date().getTime()}.xlsx`
       );
     },
     /** 转换机构数据结构 */

+ 1 - 1
src/views/system/user/index.vue

@@ -1057,7 +1057,7 @@ export default {
         {
           ...this.queryParams,
         },
-        `人员信息管理-管理人员_${new Date().getTime()}.xlsx`
+        `人员信息管理-安保部门从业人员_${new Date().getTime()}.xlsx`
       );
     },