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

src/views/check/task/index.vue

@@ -311,14 +311,14 @@
                 <el-button
                   type="text"
                   @click="showDetail(r.row)"
-                  v-hasPermi="['resumption:taskManager:query']"
+                  v-hasPermi="['core:task:query']"
                   >详情</el-button
                 >
                 <el-button
                   type="text"
                   @click="showscanRecord(r.row)"
                   v-if="r.row.status == 2 || r.row.status == 3"
-                  v-hasPermi="['resumption:taskManager:query']"
+                  v-hasPermi="['core:task:query']"
                   >扫描记录</el-button
                 >
                 <el-button

src/views/core/reportForms/safetyInspectReport.vue

@@ -51,7 +51,7 @@
           </el-row>
           <el-table
             border
-            height="600"
+            height="800"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
        
@@ -203,8 +203,8 @@
           this.loading = true;
           listReport(this.queryParams).then(response => {
          this.orgName=response.orgName;
-            this.checkList = response.data.rows;
-            this.total = response.data.total;
+            this.checkList = response.data;
+            // this.total = response.data.total;
             this.loading = false;
           });
         },

src/views/monitor/job/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="任务名称" prop="jobName">
         <el-input
           v-model="queryParams.jobName"

src/views/resumption/taskManager/index.vue

@@ -193,7 +193,7 @@
               align="center"
               prop="abnormalDataNums"
               label="隐患问题数"
-              width="100"
+              width="110"
               v-if="columns[6].visible"
             >
               <template slot-scope="r">

src/views/system/menu/index.vue

@@ -99,6 +99,7 @@
 
 
     <el-table
+      size="small"
       v-if="refreshTable"
       height="700px"
       v-loading="loading"