修复内网缺陷

src/components/userSelector/index.vue

@@ -38,10 +38,10 @@
             <!-- 搜索 -->
             <template slot="searchs">
               <el-form-item  prop="ruleId" label="用户账号">
-                <el-input v-model="search.username"></el-input>
+                <el-input v-model="search.username" clearable></el-input>
               </el-form-item>
               <el-form-item prop="name" label="用户姓名">
-                <el-input v-model="search.name"></el-input>
+                <el-input v-model="search.name" clearable></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button

src/views/resumption/ruleManager/index.vue

@@ -314,4 +314,8 @@ export default {
     width: 60px !important;
   }
 }
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 0;
+  padding-left: 47px;
+}
 </style>

src/views/safetycheck/ruleManager/index.vue

@@ -27,7 +27,7 @@
           v-show="showSearch && rule"
           label-width="100px"
         >
-          <el-form-item prop="itemName" label="检查项">
+          <el-form-item prop="itemName" label="检查项" class="search_itemname">
             <el-input
               v-model="queryParams.itemName"
               placeholder="请输入内容"
@@ -43,7 +43,10 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item>
+        </el-form>
+        <!--    按纽    -->
+        <el-row :gutter="10" class="mb8"  v-show="showSearch && rule">
+          <el-col :span="1.5">
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -55,13 +58,9 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
               >重置</el-button
             >
-          </el-form-item>
-        </el-form>
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
             <el-button
               type="primary"
+              size="mini"
               @click="onAddItem()"
               :disabled="rule ? false : true"
               v-hasPermi="['safetycheck:ruleManager:add']"
@@ -76,6 +75,7 @@
             <el-button
               type="warning"
               @click="dakai"
+              size="mini"
               :disabled="rule ? false : true"
               >{{ expandAll ? "收起所有行" : "展开所有行" }}</el-button
             >
@@ -113,10 +113,6 @@
                   v-if="columns[4].visible"
                 >
                 </el-table-column>
-                <!-- <el-table-column prop="dataTypeName" label="数据类型">
-                </el-table-column>
-                <el-table-column prop="degreeRiskName" label="风险等级">
-                </el-table-column> -->
               </el-table>
             </template>
           </el-table-column>
@@ -129,8 +125,6 @@
           </el-table-column>
           <el-table-column prop="name" label="检查项" v-if="columns[1].visible">
           </el-table-column>
-          <!-- <el-table-column prop="itemDesc" label="标准及要求">
-          </el-table-column> -->
           <el-table-column
             prop="pointNums"
             label="检查内容数量"
@@ -379,71 +373,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.show-ellipsis {
-  display: block;
-  width: 180px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.search {
-  display: flex;
-  flex-wrap: wrap;
-  & > div {
-    width: 25%;
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    & > span:first-child {
-      display: inline-block;
-      min-width: 70px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(2),
-    &:nth-child(3) {
-      margin-left: 15px;
-    }
-    &:nth-child(3) > span {
-      display: inline-block;
-      min-width: 100px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(1) > span {
-      display: inline-block;
-      min-width: 100px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(1) {
-    }
-  }
-}
-.box {
-  border: 1px solid #eee;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  padding: 10px;
-  min-height: 120px;
-  & > p {
-    font-size: 16px;
-    font-weight: bold;
-    margin-bottom: 15px;
+.search_itemname {
+  ::v-deep .el-form-item__label {
+    width: 60px !important;
   }
 }
-.item {
-  margin-bottom: 14px;
-}
 ::v-deep .el-table__expanded-cell[class*="cell"] {
   padding: 0;
   padding-left: 47px;
 }
-::v-deep .formbox {
-  display: flex;
-  flex-wrap: wrap;
-  .el-form-item {
-    width: 50%;
-  }
-}
 </style>

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

@@ -31,24 +31,29 @@
           style="width: 80%; margin-top: -8px"
           placeHolder="请输入检查组成员"
           v-model="taskInfo.checkTeam"
+          maxlength="255"
           v-if="isRegister"
         ></el-input>
         <span v-else>{{ taskInfo.checkTeam }}</span>
       </el-descriptions-item>
       <el-descriptions-item label="检查状态"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
+        >{{ getLabel(dict.type.safety_check_status,taskInfo.status) }}
       </el-descriptions-item>
     </el-descriptions>
-    <div>
-      <span style="margin-right: 20px">巡检区域</span>
-      <el-button
-        type="primary"
-        size="mini"
-        @click="onAddPoint()"
-        v-if="isRegister"
-        >新增检查内容</el-button
-      >
-    </div>
+    <el-row class="el-row-button">
+      <el-col>
+        <span style="margin-right: 20px">巡检区域</span>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="onAddPoint()"
+          v-if="isRegister"
+          >新增检查内容</el-button
+        >
+      </el-col>
+      
+    </el-row>
+    
     <div class="content">
       <div class="area_content" v-for="area in taskInfo.checkList">
         <div>
@@ -204,7 +209,7 @@ export default {
       mode: null,
     };
   },
-  dicts: ["rectification_deadline", "sys_user_is_lock"],
+  dicts: ["rectification_deadline", "sys_user_is_lock","safety_check_status"],
   components: { SelectPoint, imgUpload, UserSelector },
   computed: {
     ...mapGetters(["orgId", "roleList", "userId"]),
@@ -409,6 +414,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.el-row-button{
+    margin-top:20px;
+  }
 .content {
   max-height: calc(100% - 300px);
   overflow-y: auto;