ZC

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -107,7 +107,9 @@
                     <img src="@/assets/ZDimages/subject/icon_bj_dqy.png" v-if="item.funNum == 'fenchen'">
                     <img src="@/assets/ZDimages/subject/icon_bj_qq.png" v-if="item.funNum == 'H2'">
                     <div>
-                      <p>{{item.describe}}</p>
+                      <el-tooltip class="item" effect="dark" :content="item.describe" placement="bottom">
+                        <p>{{item.describe|ellipsis}}</p>
+                      </el-tooltip>
                       <p>{{item.formatVal}}</p>
                     </div>
                   </div>
@@ -258,6 +260,15 @@
   import infoPage from "./infoPage.vue";
   import { getHxpAlarmRecordNoAuthList,getEnablelist } from "@/api/medicUniversity-3_1/index";
     export default {
+      filters:{
+        ellipsis(value){
+          if (!value) return '';
+          if (value.length > 6) {
+            return value.slice(0,6) + '...'
+          }
+          return value
+        }
+      },
       name: "subject",
       components: {
         addSubject,

src/views/hierarchicalControl/hierarchicalControl/gradeManage/addPage.vue

@@ -8,17 +8,17 @@
             <p class="reset-button-one" @click="backPage">返回</p>
           </div>
           <div class="info-max-box">
-            <el-form-item label="管控名称" prop="name" label-width="80px">
+            <el-form-item label="管控名称" prop="name" label-width="80px" style="margin-bottom:20px;">
               <el-input
                 style="width:180px;"
                 maxlength="15"
                 v-model="form.name"
-                placeholder="请输入名称"
+                placeholder="请输入管控名称"
                 clearable
                 size="small"
               />
             </el-form-item>
-            <el-form-item label="学院" prop="deptId" label-width="80px">
+            <el-form-item label="学院" prop="deptId" label-width="80px" style="margin-bottom:20px;">
               <el-select v-model="form.deptId" placeholder="请选择学院" clearable style="width:180px;" @change="deptChange">
                 <el-option
                   v-for="dict in deptList"
@@ -28,7 +28,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="实验室类型" prop="moldId" label-width="100px">
+            <el-form-item label="实验室类型" prop="moldId" label-width="100px" style="margin-bottom:20px;">
               <el-select v-model="form.moldId" placeholder="请选择实验室类型" clearable style="width:180px;">
                 <el-option
                   v-for="dict in labMoldList"
@@ -38,7 +38,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="安全分类" prop="typeId" label-width="80px">
+            <el-form-item label="安全分类" prop="typeId" label-width="80px" style="margin-bottom:20px;">
               <el-select v-model="form.typeId" placeholder="请选择安全分类" clearable style="width:180px;">
                 <el-option
                   v-for="dict in typeList"
@@ -48,7 +48,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="安全分级" prop="level" label-width="80px">
+            <el-form-item label="安全分级" prop="level" label-width="80px" style="margin-bottom:20px;">
               <el-select v-model="form.level" placeholder="请选择安全分级" clearable style="width:180px;">
                 <el-option
                   v-for="dict in levelList"
@@ -58,7 +58,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="状态" prop="status" label-width="80px">
+            <el-form-item label="状态" prop="status" label-width="80px" style="margin-bottom:20px;">
               <el-switch
                 class="switch captcha-img"
                 :active-value="1"
@@ -71,19 +71,6 @@
               >
               </el-switch>
             </el-form-item>
-            <!--<el-form-item label="学院" prop="deptName" label-width="120px">-->
-              <!--<el-input-->
-                <!--style="width:218px;"-->
-                <!--maxlength="10"-->
-                <!--v-model="form.deptName"-->
-                <!--placeholder="请输入学院"-->
-                <!--clearable-->
-                <!--size="small"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="适配实验室" prop="subs" label-width="120px">-->
-              <!--<p class="subjectButton" @click="subjectTypeClick">{{form.subs[0]?'已选择'+form.subs.length+'间实验室':'选择实验室'}}</p>-->
-            <!--</el-form-item>-->
           </div>
         </div>
         <div class="bottom-max-box" v-for="(item,index) in form.ruleList" :key="index">
@@ -92,7 +79,7 @@
           </div>
           <div class="list-info-max-box">
             <div class="list-info-top-box">
-              <el-form-item label="规则名称" :prop="'ruleList.'+ index +'.name'" :rules="rules.name" label-width="80px" class="list-info-top-item">
+              <el-form-item label="规则名称" :prop="'ruleList.'+ index +'.name'" :rules="rules.ruleName" label-width="100px" class="list-info-top-item">
                 <el-input
                   maxlength="15"
                   style="width:240px;"
@@ -102,10 +89,10 @@
                   size="small"
                 />
               </el-form-item>
-              <el-form-item label="规则描述" :prop="'ruleList.'+ index +'.remark'" :rules="rules.remark" label-width="120px" class="list-info-top-item">
+              <el-form-item label="规则描述" :prop="'ruleList.'+ index +'.remark'" :rules="rules.remark" label-width="100px" class="list-info-top-item">
                 <el-input
                   maxlength="30"
-                  style="width:950px;"
+                  style="width:240px;"
                   v-model="item.remark"
                   placeholder="请输入规则描述"
                   clearable
@@ -118,7 +105,7 @@
                  style="position: relative;border-bottom:1px dashed #dedede;"
                  v-for="(minItem,minIndex) in item.ruleUserList" :key="minIndex">
               <div style="margin-bottom:20px;">
-                <el-form-item label="确认周期" :prop="'ruleList.'+ index +'.ruleUserList.'+ minIndex +'.cycle'" :rules="rules.cycle" class="info-for-min-box" label-width="80px">
+                <el-form-item label="确认周期" :prop="'ruleList.'+ index +'.ruleUserList.'+ minIndex +'.cycle'" :rules="rules.cycle" class="info-for-min-box" label-width="100px">
                   <el-select v-model="minItem.cycle" placeholder="请选择确认周期" clearable @change="(e)=>cycleChange(item,minIndex,e,)" style="width:240px;">
                     <el-option
                       v-for="dict in minItem.cycleList"
@@ -128,7 +115,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="确认人员" :prop="'ruleList.'+ index +'.ruleUserList.'+ minIndex +'.type'" :rules="rules.type" class="info-for-min-box" label-width="120px">
+                <el-form-item label="确认人员" :prop="'ruleList.'+ index +'.ruleUserList.'+ minIndex +'.type'" :rules="rules.type" class="info-for-min-box" label-width="100px">
                   <el-select v-model="minItem.type" placeholder="请选择人员类型" clearable @change="(e)=>userTypeClick(e,minItem)" style="width:240px;">
                     <el-option label="实验室负责人" :value="1" />
                     <el-option label="实验室准入人员" :value="4" />
@@ -136,7 +123,7 @@
                     <el-option label="选择人员" :value="3" />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="选择人员" v-if="minItem.type == 3" :prop="'ruleList.'+ index +'.ruleUserList.'+ minIndex +'.userIds'" :rules="rules.userIds" label-width="120px" class="info-for-min-box">
+                <el-form-item label="选择人员" v-if="minItem.type == 3" :prop="'ruleList.'+ index +'.ruleUserList.'+ minIndex +'.userIds'" :rules="rules.userIds" label-width="100px" class="info-for-min-box">
                   <p class="subjectButton" @click="userClick(index,minIndex)">{{minItem.userIds[0]?'已选择'+minItem.userList.length+'人':'选择人员'}}</p>
                 </el-form-item>
               </div>
@@ -286,8 +273,12 @@
         // 表单校验
         rules: {
           name: [
-            { required: true, message: "请输入名称", trigger: "blur" },
-            { required: true, message: "请输入名称", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入管控名称", trigger: "blur" },
+            { required: true, message: "请输入管控名称", validator: this.spaceJudgment, trigger: "blur" }
+          ],
+          ruleName:[
+            { required: true, message: "请输入规则名称", trigger: "blur" },
+            { required: true, message: "请输入规则名称", validator: this.spaceJudgment, trigger: "blur" }
           ],
           deptId: [
             { required: true, message: "请选择学院", trigger: "blur" }
@@ -300,7 +291,7 @@
             { required: true, message: "请输入规则描述", validator: this.spaceJudgment, trigger: "blur" }
           ],
           type: [
-            { required: true, message: "请选择人员类型", trigger: "blur" }
+            { required: true, message: "请选择确认人员", trigger: "blur" }
           ],
           isAll: [
             { required: true, message: "请选择执行方式", trigger: "blur" }
@@ -729,6 +720,7 @@
           padding:30px 0;
           margin:0 20px;
           display: flex;
+          flex-wrap: wrap;
           .subjectButton{
             cursor:pointer;
             display: inline-block;
@@ -780,6 +772,7 @@
             border-bottom:1px solid #dedede;
             .list-info-top-item{
               display: inline-block;
+              margin-bottom: 20px;
             }
             .list-info-top-del{
               display: inline-block;

src/views/hierarchicalControl/hierarchicalControl/gradeManage/index.vue

@@ -3,51 +3,6 @@
   <div class="gradeManage">
     <div class="gradeManage-page" v-if="pageType == 1">
       <advanced-search :searchData="searchData"></advanced-search>
-      <!--<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">-->
-        <!--<el-form-item label="关键字" prop="searchValue" label-width="70px">-->
-          <!--<el-input-->
-            <!--maxlength="10"-->
-            <!--v-model="queryParams.searchValue"-->
-            <!--placeholder="名称/学院"-->
-            <!--clearable-->
-            <!--size="small"-->
-          <!--/>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="状态" prop="status" label-width="50px">-->
-          <!--<el-select v-model="queryParams.status" placeholder="请选择安全分类" clearable>-->
-            <!--<el-option key="全部" label="全部" value=""></el-option>-->
-            <!--<el-option key="开启" label="开启" value="1"></el-option>-->
-            <!--<el-option key="关闭" label="关闭" value="0"></el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="安全分类" prop="typeId" label-width="80px">-->
-          <!--<el-select v-model="queryParams.typeId" placeholder="请选择安全分类" clearable>-->
-            <!--<el-option-->
-              <!--v-for="dict in typeList"-->
-              <!--:key="dict.typeName"-->
-              <!--:label="dict.typeName"-->
-              <!--:value="dict.id"-->
-            <!--&gt;</el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="安全分级" prop="level" label-width="80px">-->
-          <!--<el-select v-model="queryParams.level" placeholder="请选择安全分级" clearable>-->
-            <!--<el-option-->
-              <!--v-for="dict in levelList"-->
-              <!--:key="dict.id"-->
-              <!--:label="dict.classifiedName"-->
-              <!--:value="dict.id"-->
-            <!--&gt;</el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item style="float: right;">-->
-          <!--<p class="inquire-button-one" style="width:120px;" @click="clickPageType(2)" v-hasPermi="['laboratory:gradeManage:add']">新增</p>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item>-->
-          <!--<p class="inquire-button-one" @click="handleQuery">查询</p>-->
-          <!--<p class="reset-button-one" @click="resetQuery">重置</p>-->
-        <!--</el-form-item>-->
-      <!--</el-form>-->
       <el-table v-loading="loading" border :data="gradeManageList" @selection-change="handleSelectionChange">
         <!--<el-table-column type="selection" width="55" align="center" />-->
         <el-table-column label="管控名称" align="left" prop="name" show-overflow-tooltip/>