Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

src/views/core/reportForms/intrusionTestReport.vue

@@ -248,6 +248,7 @@
         resetQuery() {
           this.resetForm("queryForm");
           this.handleQuery();
+          this.getDeptTree();
         },
         // 多选框选中数据
         handleSelectionChange(selection) {

src/views/core/reportForms/monitorAccessReport.vue

@@ -270,6 +270,7 @@
         resetQuery() {
           this.resetForm("queryForm");
           this.handleQuery();
+          this.getDeptTree();
         },
         // 多选框选中数据
         handleSelectionChange(selection) {

src/views/core/reportForms/resumptionReport.vue

@@ -272,6 +272,7 @@
         resetQuery() {
           this.resetForm("queryForm");
           this.handleQuery();
+          this.getDeptTree();
         },
         // 多选框选中数据
         handleSelectionChange(selection) {

src/views/core/reportForms/safetyInspectReport.vue

@@ -270,6 +270,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
+      this.getDeptTree();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/core/reportForms/selfInspectReport.vue

@@ -263,6 +263,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
+      this.getDeptTree();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/core/reportForms/serviceBankReport.vue

@@ -254,6 +254,7 @@
         resetQuery() {
           this.resetForm("queryForm");
           this.handleQuery();
+          this.getDeptTree();
         },
         // 多选框选中数据
         handleSelectionChange(selection) {

src/views/core/reportForms/standbyPowerReport.vue

@@ -284,6 +284,7 @@
         resetQuery() {
           this.resetForm("queryForm");
           this.handleQuery();
+          this.getDeptTree();
         },
         // 多选框选中数据
         handleSelectionChange(selection) {

src/views/evaluateTable/index.vue

@@ -30,7 +30,7 @@
                   noResultsText="没有搜索结果"
                 />
               </el-form-item>
-              <el-form-item label="外包评价名称1:" label-width="50">
+              <el-form-item label="外包评价名称:" label-width="50">
                 <el-select v-model="queryParams.planId" @change="changeHandler">
                   <el-option
                     v-for="item in options"
@@ -159,6 +159,7 @@ export default {
     getDeptTree() {
       deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
+        this.queryParams.orgId=response.data[0].id;
       });
     },
     /** 获取所有计划列表 */

src/views/system/dept/index.vue

@@ -119,6 +119,16 @@
                 >导出物防建设达标情况明细</el-button
                 >
               </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleExportSecurityWork"
+                  v-hasPermi="['system:dept:exportSecurityWork']"
+                >导出安全保卫工作情况统计</el-button
+                >
+              </el-col>
               <right-toolbar
                 :showSearch.sync="showSearch"
                 @queryTable="getList"
@@ -645,6 +655,15 @@ export default {
         `机构信息管理-物防建设达标情况明细表_${new Date().getTime()}.xlsx`
       );
     },
+    handleExportSecurityWork() {
+      this.download(
+        "system/dept/exportSecurityWork",
+        {
+          ...this.queryParams,
+        },
+        `机构信息管理-安全保卫工作情况统计表_${new Date().getTime()}.xlsx`
+      );
+    },
     /** 转换机构数据结构 */
     // normalizer(node) {
     //   if (node.children && !node.children.length) {