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

src/views/core/drill/task/dialog.info.vue

@@ -65,6 +65,7 @@
           </el-descriptions-item>
           <el-descriptions-item
             labelClassName="gx_info_label"
+            span="2"
             label="预设案由"
           >
             <!-- {{ formData.presetCase }} -->
@@ -72,6 +73,7 @@
           </el-descriptions-item>
           <el-descriptions-item
             labelClassName="gx_info_label"
+            span="2"
             label="演练情况"
           >
             {{ formData.drillSituation }}
@@ -92,7 +94,7 @@
                   formData.categoryText
                 }}
               </el-form-item>
-            </el-col> 
+            </el-col>
             <el-col :span="12">
               <el-form-item prop="type" label="任务进度">{{
                   getLabel(dict.type.drill_task_status, formData.status,"未知")
@@ -166,7 +168,7 @@
               </el-form-item>
             </el-col>
 
-          
+
             <el-col :span="12">
               <el-form-item prop="dueCount" label="参与人员">{{
                   formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
@@ -181,13 +183,13 @@
                 }}
               </el-form-item>
             </el-col>
-           
+
             <el-col :span="12">
               <el-form-item prop="imageList" label="演练图片">
                 <ImageListPreview v-model="formData.imageList"></ImageListPreview>
               </el-form-item>
             </el-col>
-         
+
             <el-col :span="12">
               <el-form-item prop="imageList" label="参演人员签名图片">
                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>

src/views/core/reportForms/intrusionTestReport.vue

@@ -29,6 +29,9 @@
             <el-col span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+                         v-hasPermi="['core:resumptionReport:export']">导出
+              </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>

src/views/core/reportForms/monitorAccessReport.vue

@@ -220,7 +220,7 @@
         handleExport() {
       this.download('core/monitorAccessReport/export', {
         ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-监控调阅报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】'+'-监控调阅统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
 
         getList() {
@@ -229,7 +229,7 @@
           listReport(this.queryParams).then(response => {
             this.checkList = response.data;
             this.title=response.title;
-            // this.total = response.data.total;
+             this.orgName = response.orgName;
             this.loading = false;
           });
         },

src/views/core/reportForms/safetyInspectReport.vue

@@ -220,7 +220,7 @@ export default {
     handleExport() {
       this.download('core/safetyInspectReport/export', {
         ...this.queryParams
-      }, `${'【' + this.orgName + '】' + '-检查统计报表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
+      }, `${'【' + this.orgName + '】' + '-行社全面检查统计报表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
     },
 
 

src/views/core/reportForms/selfInspectReport.vue

@@ -213,7 +213,7 @@ export default {
     handleExport() {
       this.download('core/safetyInspectReport/export', {
         ...this.queryParams
-      }, `${'【' + this.orgName + '】' + '-检查统计报表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
+      }, `${'【' + this.orgName + '】' + '-网点负责人统计报表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
     },
 
 

src/views/core/reportForms/standbyPowerReport.vue

@@ -26,6 +26,11 @@
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-col>
+            <el-col :span="1.5">
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+                         v-hasPermi="['core:resumptionReport:export']">导出
+              </el-button>
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
         </div>

src/views/question/reform/dialog.vue

@@ -372,6 +372,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.margin-top{
+    margin-bottom: -21px;
+  }
 .form {
   padding-top: 20px;
 }