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

src/views/check/index.vue

@@ -21,140 +21,145 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="70px"
+          label-width="90px"
         >
-          <el-form-item prop="checkType" label="任务类型">
-            <el-select
-              prop="checkType"
-              label="任务类型"
-              v-model="queryParams.checkType"
-              placeholder="请选择任务类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.check_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="execOrgType" label="检查机构类型" v-if="false">
-            <el-select
-              prop="execOrgType"
-              label="检查机构类型"
-              v-model="queryParams.execOrgType"
-              placeholder="请选择检查机构类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_org_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="checkOrgType" label="受检机构类型" v-if="false">
-            <el-select
-              prop="checkOrgType"
-              label="受检机构类型"
-              v-model="queryParams.checkOrgType"
-              placeholder="请选择受检机构类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_org_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
+          <el-row>
+            <el-form-item prop="checkType" label="任务类型">
+              <el-select
+                prop="checkType"
+                label="任务类型"
+                v-model="queryParams.checkType"
+                placeholder="请选择任务类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.check_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="execOrgType" label="检查机构类型" v-if="false">
+              <el-select
+                prop="execOrgType"
+                label="检查机构类型"
+                v-model="queryParams.execOrgType"
+                placeholder="请选择检查机构类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_org_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="checkOrgType" label="受检机构类型" v-if="false">
+              <el-select
+                prop="checkOrgType"
+                label="受检机构类型"
+                v-model="queryParams.checkOrgType"
+                placeholder="请选择受检机构类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_org_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
 
-          <el-form-item prop="checkRole" label="检查人员">
-            <el-select
-              @visible-change="getRolesByOrg"
-              prop="checkRole"
-              label="检查人员"
-              v-model="queryParams.checkRole"
-              placeholder="请选择用户角色"
-              clearable
-            >
-              <el-option
-                v-for="dict in resumptionRoles"
-                :key="dict.index"
-                :label="dict.roleName"
-                :value="dict.id"
+            <el-form-item prop="checkRole" label="检查人员">
+              <el-select
+                @visible-change="getRolesByOrg"
+                prop="checkRole"
+                label="检查人员"
+                v-model="queryParams.checkRole"
+                placeholder="请选择用户角色"
+                clearable
+              >
+                <el-option
+                  v-for="dict in resumptionRoles"
+                  :key="dict.index"
+                  :label="dict.roleName"
+                  :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="planCycle" label="任务周期">
+              <el-select
+                prop="planCycle"
+                label="任务周期"
+                v-model="queryParams.planCycle"
+                placeholder="请选择任务周期"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.check_cycle"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item prop="planStatus" label="任务状态">
+              <el-select
+                prop="planStatus"
+                label="任务状态"
+                v-model="queryParams.planStatus"
+                placeholder="请选择任务状态"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.check_status"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="planName" label="任务名称">
+              <el-input
+                v-model="queryParams.planName"
+                :maxlength="50"
+                name="planName"
+                placeholder="请输入关键字"
+                clearable
               />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planCycle" label="任务周期">
-            <el-select
-              prop="planCycle"
-              label="任务周期"
-              v-model="queryParams.planCycle"
-              placeholder="请选择任务周期"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.check_cycle"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="getList"
+                >搜索</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planStatus" label="任务状态">
-            <el-select
-              prop="planStatus"
-              label="任务状态"
-              v-model="queryParams.planStatus"
-              placeholder="请选择任务状态"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.check_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
+              ><el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd()"
+                v-hasPermi="['core:checkplan:add']"
+                >新增任务</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planName" label="任务名称">
-            <el-input
-              v-model="queryParams.planName"
-              :maxlength="50"
-              name="planName"
-              placeholder="请输入关键字"
-              clearable
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            ><el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['core:checkplan:add']"
-              >新增任务</el-button
-            >
-          </el-form-item>
+            </el-form-item>
+          </el-row>
         </el-form>
 
-        <!--    按纽    -->
+        <!-- 按纽   
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5"> </el-col>
           <right-toolbar
@@ -162,7 +167,7 @@
             @queryTable="getList"
             :columns="columns"
           ></right-toolbar>
-        </el-row>
+        </el-row> -->
 
         <el-table
           border
@@ -175,6 +180,7 @@
           :tree-props="{ children: 'children' }"
         >
           <el-table-column
+            align="center"
             type="index"
             label="序号"
             width="80px"
@@ -243,6 +249,7 @@
           </el-table-column>
 
           <el-table-column
+            align="center"
             prop="count"
             label="任务次数"
             v-if="columns[6].visible"

src/views/check/task/index.vue

@@ -139,32 +139,18 @@
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
                 >重置</el-button
               >
-              <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
                 >临时登记</el-button
               >
             </el-form-item>
           </el-row>
         </el-form>
         <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="exportExcel()"
-              v-hasPermi="['resumption:taskManager:export']"
-              >导出</el-button
-            >
-          </el-col> -->
-
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
+       
         <el-table
           border
           height="600"
@@ -173,6 +159,7 @@
           :data="pageData"
         >
           <el-table-column
+            align="center"
             type="index"
             fixed
             min-width="50"
@@ -216,8 +203,8 @@
               <span>
                 <!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
                 <!-- <label :style="statusColor(r.row.status, false)"> -->
-                  <label >
-                 {{
+                <label>
+                  {{
                     getLabel(dict.type.safety_check_status, r.row.status)
                   }}</label
                 >
@@ -263,36 +250,26 @@
             </template></el-table-column
           >
 
-  
-
           <el-table-column
             prop="submitBy"
             label="检查人"
             min-width="100"
             v-if="false"
           ></el-table-column>
-          <el-table-column 
-            label="检查时间"
-            min-width="120"
-            v-if="false"
-          >
+          <el-table-column label="检查时间" min-width="120" v-if="false">
             <template slot-scope="r">{{
               r.row.submitTime | dateTime
             }}</template>
           </el-table-column>
           <el-table-column
+            align="center"
             prop="exceptionCount"
             label="隐患问题数"
             min-width="80"
             v-if="columns[9].visible"
           >
           </el-table-column>
-          <el-table-column
-            prop="des"
-            label="备注"
-            min-width="80"
-            v-if="false"
-          >
+          <el-table-column prop="des" label="备注" min-width="80" v-if="false">
           </el-table-column>
           <el-table-column label="操作" fixed="right" min-width="200">
             <template slot-scope="r">
@@ -315,7 +292,7 @@
                 type="text"
                 @click="showscanRecord(r.row)"
                 v-hasPermi="['resumption:taskManager:query']"
-                >检查登记簿</el-button
+                >扫描记录</el-button
               >
               <el-button
                 type="text"
@@ -338,7 +315,10 @@
     <!-- 详情 -->
     <dialog-detail ref="detaildialog"></dialog-detail>
     <dialog-scan-record ref="scanrecorddialog"></dialog-scan-record>
-    <dialog-temporary-task  ref="dialogtemporarytask" @success="getList"></dialog-temporary-task>
+    <dialog-temporary-task
+      ref="dialogtemporarytask"
+      @success="getList"
+    ></dialog-temporary-task>
   </div>
 </template>
 
@@ -354,7 +334,7 @@ import { getLabel } from "@/views/commonOption.js";
 import OrgTreeSelect from "@/components/orgTreeSelect";
 import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
-import DialogTemporaryTask from "@/views/safetycheck/taskManager/components/dialog.temporarytask.vue"
+import DialogTemporaryTask from "@/views/safetycheck/taskManager/components/dialog.temporarytask.vue";
 export default {
   name: "checkTaskList",
   dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
@@ -364,7 +344,7 @@ export default {
     DataRangePicker,
     OrgTreeSelect,
     OrgTree,
-    DialogTemporaryTask
+    DialogTemporaryTask,
   },
   data() {
     return {
@@ -388,7 +368,7 @@ export default {
         planStartTime: null,
         title: null,
         checkOrgIds: null,
-        range:[],
+        range: [],
       },
       selectedOrgName: null,
       pageData: [],
@@ -498,12 +478,12 @@ export default {
     },
     resetQuery() {
       this.queryParams.checkOrgIds = [];
-      this.queryParams.range=[];
+      this.queryParams.range = [];
       this.resetForm("queryParams");
       this.getList();
     },
-    handleAdd(){
-this.$refs["dialogtemporarytask"].show();
+    handleAdd() {
+      this.$refs["dialogtemporarytask"].show();
     },
     async getList() {
       console.log(this.queryParams, "this.queryParams");

src/views/resumption/plan/index.vue

@@ -21,107 +21,113 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="70px"
+          label-width="90px"
         >
-          <el-form-item prop="planType" label="任务类型">
-            <el-select
-              prop="planType"
-              label="任务类型"
-              v-model="queryParams.planType"
-              placeholder="请选择任务类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.resumption_plan_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="resumptionRole" label="履职人员">
-            <el-select
-              @visible-change="getRolesByOrg"
-              prop="resumptionRole"
-              label="履职人员"
-              v-model="queryParams.resumptionRole"
-              placeholder="请选择用户角色"
-              clearable
-            >
-              <el-option
-                v-for="dict in resumptionRoles"
-                :key="dict.index"
-                :label="dict.roleName"
-                :value="dict.id"
-              />
-            </el-select>
-          </el-form-item>
+          <el-row>
+            <el-form-item prop="planType" label="任务类型">
+              <el-select
+                prop="planType"
+                label="任务类型"
+                v-model="queryParams.planType"
+                placeholder="请选择任务类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.resumption_plan_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="resumptionRole" label="履职人员">
+              <el-select
+                @visible-change="getRolesByOrg"
+                prop="resumptionRole"
+                label="履职人员"
+                v-model="queryParams.resumptionRole"
+                placeholder="请选择用户角色"
+                clearable
+              >
+                <el-option
+                  v-for="dict in resumptionRoles"
+                  :key="dict.index"
+                  :label="dict.roleName"
+                  :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
 
-          <el-form-item prop="planCycle" label="任务周期">
-            <el-select
-              prop="planCycle"
-              label="任务周期"
-              v-model="queryParams.planCycle"
-              placeholder="请选择任务周期"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.resumption_plan_cycle"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+            <el-form-item prop="planCycle" label="任务周期">
+              <el-select
+                prop="planCycle"
+                label="任务周期"
+                v-model="queryParams.planCycle"
+                placeholder="请选择任务周期"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.resumption_plan_cycle"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item prop="planStatus" label="任务状态">
+              <el-select
+                prop="planStatus"
+                label="任务状态"
+                v-model="queryParams.planStatus"
+                placeholder="请选择任务状态"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.resumption_plan_status"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+              <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
+            </el-form-item>
+            <el-form-item prop="planName" label="任务名称">
+              <el-input
+                v-model="queryParams.planName"
+                :maxlength="50"
+                name="planName"
+                placeholder="请输入任务名称"
+                clearable
+              />
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="getList"
+                >搜索</el-button
+              >
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planStatus" label="任务状态">
-            <el-select
-              prop="planStatus"
-              label="任务状态"
-              v-model="queryParams.planStatus"
-              placeholder="请选择任务状态"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.resumption_plan_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd()"
+                v-hasPermi="['system:user:add']"
+                >新增任务</el-button
               >
-              </el-option>
-            </el-select>
-            <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
-          </el-form-item>
-          <el-form-item prop="planName" label="任务名称">
-            <el-input
-              v-model="queryParams.planName"
-              :maxlength="50"
-              name="planName"
-              placeholder="请输入任务名称"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['system:user:add']"
-              >新增任务</el-button
-            >
-          </el-form-item>
-          <el-row :gutter="10" class="mb8">
+            </el-form-item>
+          </el-row>
+          <!-- <el-row :gutter="10" class="mb8">
             <el-col :span="1.5"> </el-col>
 
             <right-toolbar
@@ -129,7 +135,7 @@
               @queryTable="getList"
               :columns="columns"
             ></right-toolbar>
-          </el-row>
+          </el-row> -->
         </el-form>
 
         <!--    按纽    -->
@@ -144,6 +150,7 @@
           row-key="id"
         >
           <el-table-column
+            align="center"
             fixed
             type="index"
             label="序号"
@@ -226,6 +233,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            align="center"
             prop="count"
             label="任务次数"
             v-if="columns[7].visible"