界面优化

src/views/check/distribute.vue

@@ -38,7 +38,7 @@
           >
         </el-col>
       </el-row>
-      <el-table :data="tableData" height="400px">
+      <el-table :data="tableData" height="400px" size="small">
         <el-table-column type="index" label="序号" width="80"></el-table-column>
         <el-table-column prop="orgName" label="机构名称"></el-table-column>
         <el-table-column prop="status" label="计划状态" width="150px">
@@ -58,9 +58,9 @@
       </el-table>
     </div>
 
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="onHide">关闭</el-button>
+    <div slot="footer" class="dialog-footer">     
       <el-button type="primary" @click="onSubmit">确定</el-button>
+      <el-button @click="onHide">关闭</el-button>
     </div>
  </DialogCom>
 </template>

src/views/resumption/plan/distribute.vue

@@ -38,7 +38,7 @@
           >
         </el-col>
       </el-row>
-      <el-table :data="tableData" height="400px">
+      <el-table :data="tableData" height="400px" size="small">
         <el-table-column type="index" label="序号" width="80"></el-table-column>
         <el-table-column prop="orgName" label="机构名称"></el-table-column>
         <el-table-column prop="status" label="计划状态" width="150px">
@@ -58,9 +58,9 @@
       </el-table>
     </div>
 
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="onHide">关闭</el-button>
+    <div slot="footer" class="dialog-footer">      
       <el-button type="primary" @click="onSubmit">确定</el-button>
+      <el-button @click="onHide">关闭</el-button>
     </div>
   </DialogCom>
 </template>
@@ -138,7 +138,7 @@ export default {
 .el-dialog-div {
   overflow: auto;
 }
-.dialog-footer{
-  margin-top:20px;
+.dialog-footer {
+  margin-top: 20px;
 }
 </style>

src/views/resumption/taskManager/index.vue

@@ -150,7 +150,7 @@
               header-align="center"
               prop="roleName"
               label="履职人员"
-              min-width="120"
+              width="150"
               v-if="columns[3].visible"
             >
             </el-table-column>
@@ -170,7 +170,7 @@
               header-align="center"
               prop="planStartTime"
               label="任务时间"
-              width="200px"
+              width="270px"
               v-if="columns[5].visible"
             >
               <template slot-scope="r">
@@ -184,7 +184,7 @@
               align="center"
               prop="abnormalDataNums"
               label="隐患数量"
-              min-width="80"
+              width="90"
               v-if="columns[6].visible"
             >
               <template slot-scope="r">
@@ -369,7 +369,7 @@ export default {
       this.queryParams.orgId = node.id;
       this.selectedOrgName = node.shortName;
       this.getList();
-      this.loadRoles(key);
+      this.loadRoles(node.id);
       this.loadPlanList();
     },
     //单选框状态改变

src/views/safetycheck/taskManager/components/register.vue

@@ -37,7 +37,7 @@
         <span v-else>{{ taskInfo.checkTeam }}</span>
       </el-descriptions-item>
       <el-descriptions-item label="检查状态"
-        >{{ getLabel(dict.type.safety_check_status,taskInfo.status) }}
+        >{{ getLabel(dict.type.safety_check_status, taskInfo.status) }}
       </el-descriptions-item>
     </el-descriptions>
     <el-row class="el-row-button">
@@ -51,9 +51,8 @@
           >新增检查内容</el-button
         >
       </el-col>
-      
     </el-row>
-    
+
     <div class="content">
       <div class="area_content" v-for="area in taskInfo.checkList">
         <div>
@@ -65,7 +64,7 @@
             <div class="safetycheck_point" v-for="point in item.pointList">
               <div>
                 <div class="pointName">
-                  <div style="display:flex;flex-direction:row">
+                  <div style="display: flex; flex-direction: row">
                     <i class="circle" />
                     <pre>{{ point.pointName }}</pre>
                   </div>
@@ -163,17 +162,17 @@
     </div>
 
     <div class="dialog-footer">
-      <el-button @click="onClose">关闭</el-button>
+      <el-button type="primary" @click="onSubmit()" v-if="showSaveBtn"
+        >提交</el-button
+      >
+      <el-button @click="onSave" v-if="showSaveBtn">保存</el-button>
       <el-button
         @click="onGrant"
         v-if="showGrantBtn"
         v-hasPermi="['core:safetycheck:grant']"
         >授权</el-button
       >
-      <el-button @click="onSave" v-if="showSaveBtn">保存</el-button>
-      <el-button type="primary" @click="onSubmit()" v-if="showSaveBtn"
-        >提交</el-button
-      >
+      <el-button @click="onClose">关闭</el-button>
     </div>
     <SelectPoint
       ref="SelectPoint"
@@ -209,7 +208,7 @@ export default {
       mode: null,
     };
   },
-  dicts: ["rectification_deadline", "sys_user_is_lock","safety_check_status"],
+  dicts: ["rectification_deadline", "sys_user_is_lock", "safety_check_status"],
   components: { SelectPoint, imgUpload, UserSelector },
   computed: {
     ...mapGetters(["orgId", "roleList", "userId"]),
@@ -414,9 +413,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.el-row-button{
-    margin-top:20px;
-  }
+.el-row-button {
+  margin-top: 20px;
+}
 .content {
   max-height: calc(100% - 300px);
   overflow-y: auto;
@@ -475,7 +474,7 @@ export default {
 
 .pointName pre {
   margin-left: 10px;
-  width:calc(100% - 15px)
+  width: calc(100% - 15px);
 }
 .dialog-footer {
   width: 100%;
@@ -495,6 +494,6 @@ export default {
   background-color: #b8bdc0;
   border: none;
   margin-bottom: 3px;
-  margin-top:6px;
+  margin-top: 6px;
 }
 </style>