界面优化

src/views/check/index.vue

@@ -143,44 +143,43 @@
                   />
                 </el-form-item>
               </el-row>
-              <el-row>
-              </el-row>
+              <el-row> </el-row>
             </el-form>
-        <el-row :gutter="10" >
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-            >搜索</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <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-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['core:checkplan:add']"
-            >新增任务</el-button
-            >
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="getList"
+                  >搜索</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <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-plus"
+                  size="mini"
+                  @click="handleAdd()"
+                  v-hasPermi="['core:checkplan:add']"
+                  >新增任务</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
           </div>
           <el-table
             border
@@ -193,16 +192,16 @@
             :tree-props="{ children: 'children' }"
           >
             <el-table-column
-              align="center"
               type="index"
               label="序号"
+              align="center"
               width="80px"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
               prop="planName"
               label="任务名称"
-              width="180"
+              width="250px"
               :show-overflow-tooltip="true"
               v-if="columns[1].visible"
             ></el-table-column>
@@ -210,7 +209,8 @@
             <el-table-column
               prop="checkType"
               label="任务类型"
-              :show-overflow-tooltip="true"
+              align="center"
+              width="180px"
               v-if="columns[2].visible"
             >
               <template slot-scope="r"
@@ -220,25 +220,37 @@
             <el-table-column
               prop="planCreateOrgName"
               label="创建机构"
-              :show-overflow-tooltip="true"
+              align="center"
+              width="180px"
               v-if="columns[3].visible"
             >
             </el-table-column>
             <el-table-column
               prop="planOfOrgName"
               label="行社名称"
-              :show-overflow-tooltip="true"
+              align="center"
+              width="180px"
               v-if="columns[4].visible"
             >
             </el-table-column>
 
-            <el-table-column prop="execOrgType" :show-overflow-tooltip="true" label="检查主体">
+            <el-table-column
+              prop="execOrgType"
+              align="center"
+              width="180px"
+              label="检查主体"
+            >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
               </template>
             </el-table-column>
 
-            <el-table-column prop="checkOrgType" :show-overflow-tooltip="true" label="受检机构" width="120px">
+            <el-table-column
+              prop="checkOrgType"
+              align="center"
+              width="180px"
+              label="受检机构"
+            >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
               </template>
@@ -246,7 +258,8 @@
 
             <el-table-column
               prop="roleNames"
-              :show-overflow-tooltip="true"
+              align="center"
+              width="180px"
               label="检查人员"
               v-if="columns[6].visible"
             >
@@ -259,6 +272,8 @@
             <el-table-column
               prop="planCycle"
               label="任务周期"
+              align="center"
+              width="180px"
               v-if="columns[6].visible"
             >
               <template slot-scope="r"
@@ -267,15 +282,18 @@
             </el-table-column>
 
             <el-table-column
-              align="center"
               prop="count"
               label="任务次数"
+              align="center"
+              width="180px"
               v-if="columns[6].visible"
             ></el-table-column>
 
             <el-table-column
               prop="planStatus"
               label="任务状态"
+              align="center"
+              width="180px"
               v-if="columns[6].visible"
             >
               <template slot-scope="r"
@@ -302,7 +320,12 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" width="200">
+            <el-table-column
+              label="操作"
+              width="200"
+              fixed="right"
+              align="center"
+            >
               <template slot-scope="r">
                 <el-button
                   v-if="eqOrg(r.row)"

src/views/check/task/index.vue

@@ -13,76 +13,75 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <div class="main-right-box">
-        <div class="main-search-box">
-        <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="queryParams"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="100px"
-        >
-          <el-form-item label="任务名称" prop="title">
-            <el-input
-              style="width: 200px"
-              v-model="queryParams.title"
-              placeholder="请输入任务名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-              :maxlength="50"
-              @input="inputTitle"
-            />
-          </el-form-item>
-          <el-form-item label="检查人员" prop="roleId">
-            <el-select
-              v-model="queryParams.roleId"
-              placeholder="请选择用户角色"
-              clearable
+          <div class="main-search-box">
+            <!--    搜索条件    -->
+            <el-form
+              :model="queryParams"
+              ref="queryParams"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
             >
-              <el-option
-                v-for="item in selectRoleOptions"
-                :key="item.id"
-                :label="item.roleName"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="受检机构" prop="orgName">
-            <!-- <el-input
+              <el-form-item label="任务名称" prop="title">
+                <el-input
+                  style="width: 200px"
+                  v-model="queryParams.title"
+                  placeholder="请输入任务名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :maxlength="50"
+                  @input="inputTitle"
+                />
+              </el-form-item>
+              <el-form-item label="检查人员" prop="roleId">
+                <el-select
+                  v-model="queryParams.roleId"
+                  placeholder="请选择用户角色"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in selectRoleOptions"
+                    :key="item.id"
+                    :label="item.roleName"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="受检机构" prop="orgName">
+                <!-- <el-input
               v-model="queryParams.orgName"
               placeholder="请输入受检机构"
               clearable
               @keyup.enter.native="handleQuery"
               :maxlength="50" @input="inputRestriction"
             /> -->
-            <div style="width: 200px; height: 30px">
-              <org-tree-select
-                size="mini"
-                v-model="queryParams.checkOrgIds"
-                ref="checkorgTreeSelect"
-                :disable="true"
-                @change="getList"
-              >
-              </org-tree-select>
-            </div>
-          </el-form-item>
-          <el-form-item label="任务进度" prop="status">
-            <el-select
-              style="width: 200px"
-              v-model="queryParams.status"
-              placeHolder="请选择任务进度"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.safety_check_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item label="检查周期" prop="executeCycle">
+                <div style="width: 200px; height: 30px">
+                  <org-tree-select
+                    size="mini"
+                    v-model="queryParams.checkOrgIds"
+                    ref="checkorgTreeSelect"
+                    :disable="true"
+                    @change="getList"
+                  >
+                  </org-tree-select>
+                </div>
+              </el-form-item>
+              <el-form-item label="任务进度" prop="status">
+                <el-select
+                  style="width: 200px"
+                  v-model="queryParams.status"
+                  placeHolder="请选择任务进度"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.type.safety_check_status"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- <el-form-item label="检查周期" prop="executeCycle">
             <el-select
               v-model="queryParams.executeCycle"
               placeHolder="请选择检查周期"
@@ -97,7 +96,7 @@
             </el-select>
           </el-form-item> -->
 
-          <!-- <el-form-item
+              <!-- <el-form-item
             class="searchTitle"
             label="开始日期"
             prop="planStartTime"
@@ -113,165 +112,195 @@
             >
             </el-date-picker>
           </el-form-item> -->
-          <el-form-item
-            class="searchTitle"
-            label="任务时间"
-            prop="planStartTime"
-          >
-            <DataRangePicker
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              :default-time="['00:00:00', '23:59:59']"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              v-model="queryParams.range"
-              :picker-options="pickerOptions"
-            >
-            </DataRangePicker>
-          </el-form-item>
-          <el-row>
-            <el-form-item style="margin-left: 35px">
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="getList"
-                >搜索</el-button
+              <el-form-item
+                class="searchTitle"
+                label="任务时间"
+                prop="planStartTime"
               >
-              <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:safetycheck:tempregister']"
-                >临时登记</el-button
-              >
-            </el-form-item>
-          </el-row>
-        </el-form>
-        <!--    按纽    -->
-      </div>
-        <el-table
-          border
-          height="700"
-          size="small"
-          v-loading="loading"
-          :data="pageData"
-        >
-          <el-table-column
-            align="center"
-            type="index"
-            fixed
-            min-width="50"
-            label="序号"
-            v-if="columns[0].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="title"
-            label="任务名称"
-            min-width="120"
-            v-if="columns[1].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="checkOrgName"
-            label="检查主体"
-            min-width="140"
-            v-if="columns[5].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="roleName"
-            label="检查人员"
-            min-width="150"
-            v-if="columns[6].visible"
-          >
-            <template slot-scope="r">
-              {{
-                r.row.roles ? r.row.roles.map((r) => r.roleName).join("||") : ""
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="status"
-            label="任务进度"
-            width="100px"
-            v-if="columns[10].visible"
-          >
-            <template slot-scope="r">
-              <span>
-                <!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
-                <!-- <label :style="statusColor(r.row.status, false)"> -->
-                <label>
-                  {{
-                    getLabel(dict.type.safety_check_status, r.row.status)
-                  }}</label
+                <DataRangePicker
+                  type="daterange"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  :default-time="['00:00:00', '23:59:59']"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  v-model="queryParams.range"
+                  :picker-options="pickerOptions"
                 >
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="orgName"
-            label="受检机构"
-            min-width="140"
-            v-if="columns[4].visible"
+                </DataRangePicker>
+              </el-form-item>
+              <el-row>
+                <el-form-item style="margin-left: 35px">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="getList"
+                    >搜索</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    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:safetycheck:tempregister']"
+                    >临时登记</el-button
+                  >
+                </el-form-item>
+              </el-row>
+            </el-form>
+            <!--    按纽    -->
+          </div>
+          <el-table
+            border
+            height="596"
+            size="small"
+            v-loading="loading"
+            :data="pageData"
           >
-          </el-table-column>
+            <el-table-column
+              type="index"
+              fixed
+              align="center"
+              width="80px"
+              label="序号"
+              v-if="columns[0].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="title"
+              label="任务名称"
+              width="250px"
+              :show-overflow-tooltip="true"
+              v-if="columns[1].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="checkOrgName"
+              label="检查主体"
+              align="center"
+              width="180px"
+              v-if="columns[5].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="roleName"
+              label="检查人员"
+              align="center"
+              width="180px"
+              v-if="columns[6].visible"
+            >
+              <template slot-scope="r">
+                {{
+                  r.row.roles
+                    ? r.row.roles.map((r) => r.roleName).join("||")
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="status"
+              label="任务进度"
+              align="center"
+              width="180px"
+              v-if="columns[10].visible"
+            >
+              <template slot-scope="r">
+                <span>
+                  <!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
+                  <!-- <label :style="statusColor(r.row.status, false)"> -->
+                  <label>
+                    {{
+                      getLabel(dict.type.safety_check_status, r.row.status)
+                    }}</label
+                  >
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="orgName"
+              label="受检机构"
+              align="center"
+              width="180px"
+              v-if="columns[4].visible"
+            >
+            </el-table-column>
 
-          <el-table-column
-            prop="planStartTime"
-            label="任务时间"
-            min-width="200"
-            v-if="columns[2].visible"
-            ><template slot-scope="r">
-              {{
-                r.row.planStartTime
-                  ? dayjs(r.row.planStartTime).format("YYYY年-MM月-DD日")
-                  : ""
-              }}~{{
-                r.row.planEndTime
-                  ? dayjs(r.row.planEndTime).format("YYYY年-MM月-DD日")
-                  : ""
-              }}
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="planEndTime"
-            label="截止日期"
-            min-width="100"
-            v-if="false"
-            ><template slot-scope="r">
-              {{
-                r.row.planEndTime
-                  ? dayjs(r.row.planEndTime).format("YYYY-MM-DD")
-                  : ""
-              }}
-            </template></el-table-column
-          >
+            <el-table-column
+              prop="planStartTime"
+              label="任务时间"
+              align="center"
+              width="300px"
+              v-if="columns[2].visible"
+              ><template slot-scope="r">
+                {{
+                  r.row.planStartTime
+                    ? dayjs(r.row.planStartTime).format("YYYY年-MM月-DD日")
+                    : ""
+                }}~{{
+                  r.row.planEndTime
+                    ? dayjs(r.row.planEndTime).format("YYYY年-MM月-DD日")
+                    : ""
+                }}
+              </template></el-table-column
+            >
+            <el-table-column
+              prop="planEndTime"
+              label="截止日期"
+              align="center"
+              width="180px"
+              v-if="false"
+              ><template slot-scope="r">
+                {{
+                  r.row.planEndTime
+                    ? dayjs(r.row.planEndTime).format("YYYY-MM-DD")
+                    : ""
+                }}
+              </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">
-            <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>
-          <el-table-column label="操作" fixed="right" min-width="200">
-            <template slot-scope="r">
-              <!-- <el-button v-if="
+            <el-table-column
+              prop="submitBy"
+              label="检查人"
+              align="center"
+              width="180px"
+              v-if="false"
+            ></el-table-column>
+            <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="隐患问题数"
+              width="180px"
+              v-if="columns[9].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="des"
+              label="备注"
+              align="center"
+              width="180px"
+              v-if="false"
+            >
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              fixed="right"
+              align="center"
+              width="180px"
+            >
+              <template slot-scope="r">
+                <!-- <el-button v-if="
                             r.row.status == 'WAIT' &&
                             queryParams.type == 'QUARTER'
                         " type="text" @click="onEdit(r.row.id)">检查</el-button>
@@ -280,41 +309,40 @@
                             r.row.status != 'NOT' &&
                             r.row.status != 'WAIT'
                         " type="text" @click="onEdit(r.row.id, { isRead: true })">查看</el-button> -->
-              <el-button
-                type="text"
-                @click="showDetail(r.row)"
-                v-hasPermi="['resumption:taskManager:query']"
-                >详情</el-button
-              >
-              <el-button
-                type="text"
-                @click="showscanRecord(r.row)"
-                v-hasPermi="['resumption:taskManager:query']"
-                >扫描记录</el-button
-              >
-              <el-button
-                type="text"
-                @click="showRegister(r.row)"
-                v-if="showRegisterBtn(r.row)"
-                >任务登记</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+                <el-button
+                  type="text"
+                  @click="showDetail(r.row)"
+                  v-hasPermi="['resumption:taskManager:query']"
+                  >详情</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="showscanRecord(r.row)"
+                  v-hasPermi="['resumption:taskManager:query']"
+                  >扫描记录</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="showRegister(r.row)"
+                  v-if="showRegisterBtn(r.row)"
+                  >任务登记</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
         </div>
       </el-col>
     </el-row>
     <!-- 详情 -->
     <dialog-detail ref="detaildialog"></dialog-detail>
     <dialog-scan-record ref="scanrecorddialog"></dialog-scan-record>
-
   </div>
 </template>
 
@@ -339,7 +367,6 @@ export default {
     DataRangePicker,
     OrgTreeSelect,
     OrgTree,
-    
   },
   data() {
     return {
@@ -477,7 +504,7 @@ export default {
       this.resetForm("queryParams");
       this.getList();
     },
-    handleAdd(){
+    handleAdd() {
       let path = "/safetycheck/tempregister/add";
       this.$router.push(path);
     },

src/views/resumption/plan/index.vue

@@ -117,6 +117,7 @@
                     >搜索</el-button
                   >
                   <el-button
+                    type="primary"
                     icon="el-icon-refresh"
                     size="mini"
                     @click="resetQuery"
@@ -147,7 +148,7 @@
 
           <el-table
             border
-            height="700"
+            height="596"
             size="small"
             v-loading="loading"
             :data="pageData"
@@ -155,22 +156,24 @@
             row-key="id"
           >
             <el-table-column
-              align="center"
               fixed
               type="index"
-              label="序号"
-              width="80"
+              align="center"
+              width="80px"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
               prop="planName"
               label="任务名称"
+              width="250px"
+              :show-overflow-tooltip="true"
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
               prop="planType"
               label="任务类型"
-              width="120"
+              align="center"
+              width="180px"
               v-if="columns[2].visible"
             >
               <template slot-scope="r"
@@ -182,7 +185,8 @@
             <el-table-column
               prop="planCreateOrgName"
               label="创建机构"
-              width="120"
+              align="center"
+              width="180px"
               v-if="columns[3].visible"
             >
               <!-- <template slot-scope="r"
@@ -192,14 +196,16 @@
             <el-table-column
               prop="planOfOrgName"
               label="行社名称"
-              width="120"
+              align="center"
+              width="180px"
               v-if="columns[4].visible"
             ></el-table-column>
 
             <el-table-column
               prop="execOrgType"
               label="机构类型"
-              width="100px"
+              align="center"
+              width="180px"
               v-if="columns[5].visible"
             >
               <template slot-scope="r"
@@ -210,12 +216,15 @@
             <el-table-column
               prop="roleNames"
               label="履职人员"
+              align="center"
+              width="180px"
               v-if="columns[6].visible"
             ></el-table-column>
             <el-table-column
               prop="planCycle"
               label="任务周期"
-              width="80px"
+              align="center"
+              width="180px"
               v-if="columns[7].visible"
             >
               <template slot-scope="r"
@@ -231,7 +240,8 @@
             <el-table-column
               prop="planExec"
               label="任务时间"
-              width="80px"
+              align="center"
+              width="180px"
               v-if="columns[8].visible"
             >
               <template slot-scope="r"
@@ -241,15 +251,17 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
               prop="count"
               label="任务次数"
+              align="center"
+              width="180px"
               v-if="columns[7].visible"
             ></el-table-column>
             <el-table-column
               prop="planStatus"
               label="任务状态"
-              width="80px"
+              align="center"
+              width="180px"
               v-if="columns[10].visible"
             >
               <template slot-scope="r"
@@ -264,7 +276,8 @@
             <el-table-column
               prop="updateName"
               label="修改人"
-              width="100px"
+              align="center"
+              width="180px"
               v-if="false"
             ></el-table-column>