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

src/views/core/reportForms/safetyInspectReport.vue

@@ -26,6 +26,13 @@
             />
           </el-form-item>
 
+          <el-form-item label="机构类型" prop="orgType">
+              <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择机构类型" @change="changeSelect">
+                <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
+                           :value="`${dict.value}`"></el-option>
+              </el-select>
+            </el-form-item>
+
 <el-form-item label="年份" prop="year">
     <el-date-picker
       value-format='yyyy'
@@ -60,14 +67,18 @@
                 <span v-text="getPageIndex(scope.$index)"> </span>
               </template>
             </el-table-column>
-
+            <el-table-column label="地区" align="center" prop="city" />
             <el-table-column label="单位名称" align="center" prop="orgName" />
-            <el-table-column label="网点数量" align="left" prop="networkNumber"/>
-            <el-table-column label="应检查次数" align="center" prop="planInspectNumber"/>
-            <el-table-column label="已检查次数" align="center" prop="realityInspectNumber"/>
-            <el-table-column label="检查率" align="center" prop="inspectRate"/>
-            <el-table-column label="隐患问题数" align="center" prop="pitfallNumber"/>
+            <el-table-column label="被查机构数量" align="left" prop="planInspectOrg"/>
+            <el-table-column label="已查机构数量" align="left" prop="realityInspectOrg"/>
+            <el-table-column label="检查覆盖率" align="left" prop="inspectCoverRate"/>
 
+            <el-table-column label="应检次数" align="center" prop="planInspectNumber"/>
+            <el-table-column label="已检次数" align="center" prop="realityInspectNumber"/>
+            <el-table-column label="检查完成率" align="center" prop="inspectRate"/>
+            <el-table-column label="隐患数量" align="center" prop="pitfallNumber"/>
+            <el-table-column label="已整改数量" align="center" prop="rectificationNumber"/>
+            <el-table-column label="整改完成率" align="center" prop="rectificationRate"/>
           </el-table>
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                       :limit.sync="queryParams.pageSize"

src/views/system/device/index.vue

@@ -252,7 +252,7 @@
             <el-form-item label="设备名称" prop="deviceName">
               <el-input
                 v-model="form.deviceName"
-                placeholder="请进行设备命名"
+                placeholder="请输入设备名称"
                 maxlength="50"
               />
             </el-form-item>
@@ -497,6 +497,7 @@ export default {
   created() {
     this.getDeptTree();
     //this.getList();
+    this.searchChangeSelectDevice(1);
   },
 
   watch: {