界面优化

src/assets/styles/ruoyi.scss

@@ -73,6 +73,11 @@
 	overflow-x: hidden;
 	max-height: 70vh;
 	padding: 10px 20px 0;
+	
+}
+
+.el-dialog__body{
+	font-size:16px !important;
 }
 
 .el-table {

src/views/question/list/index.vue

@@ -154,7 +154,7 @@
               label="发现时间"
               align="center"
               prop="submitTime"
-              width="160px"
+              width="170px"
               v-if="columns[6].visible"
             >
               <template slot-scope="scope">

src/views/resumption/protection/dialog.history.vue

@@ -3,7 +3,7 @@
     <DialogCom
       title="布撤防历史"
       :visible.sync="isShow"
-      width="600px"
+      width="700px"
       @close="close"
     >
       <div class="page-body">
@@ -34,15 +34,32 @@
             </DataRangePicker>
           </div>
           <el-table :data="tableData" border style="width: 100%">
-            <el-table-column type="index" label="序号" width="60"></el-table-column>
-            <el-table-column prop="statusText" label="报警控制器状态"
+            <el-table-column
+              type="index"
+              label="序号"
+              width="60"
+              header-align="center"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="statusText"
+              label="报警控制器状态"
+              header-align="center"
+              align="center"
               ><template slot-scope="r">
                 {{ getLabel(statusDict, r.row.status) }}
               </template></el-table-column
             >
-            <el-table-column prop="updateTime" label="布撤防登记时间">
+            <el-table-column
+              prop="updateTime"
+              label="布撤防登记时间"
+              header-align="center"
+              align="center"
+            >
             </el-table-column>
             <el-table-column
+              header-align="center"
+              align="center"
               prop="statusUpdatorName"
               label="登记人"
             ></el-table-column>
@@ -59,7 +76,7 @@
         </div>
       </div>
 
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="margin-top:20px">
         <el-button @click="onHide">关闭</el-button>
         <!--<el-button type="primary" @click="onSubmit">确定</el-button> -->
       </div>

src/views/resumption/protection/index.vue

@@ -128,6 +128,7 @@
             </el-row>
           </div>
           <el-table
+            size="small"
             border
             v-loading="loading"
             :data="pageData"

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

@@ -72,7 +72,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <div>
+    <div style="margin-left: 42px">
       <span style="margin-right: 20px">检查区域</span>
       <el-button type="primary" size="mini" @click="onAddPoint()"
         >选择检查内容</el-button
@@ -198,9 +198,9 @@ export default {
         rectificationDeadline: [{ required: true, message: "请选择整改期限" }],
       },
       baseInfoRules: {
-        taskName: [{ required: true, message: "请输入检查名称" }],
-        checkOrgId: [{ required: true, message: "请选择检查机构" }],
-        checkRoleId: [{ required: true, message: "请选择检查角色" }],
+        taskName: [{ required: true, message: "请输入任务名称" }],
+        checkOrgId: [{ required: true, message: "请选择检查主体" }],
+        checkRoleId: [{ required: true, message: "请选择检查人员" }],
         beCheckedOrgId: [{ required: true, message: "请选择受检机构" }],
         planStartTime: [{ required: true, message: "请选择检查日期" }],
       },
@@ -222,14 +222,14 @@ export default {
         return;
       }
 
-      this.info.checkRoleId=null;
+      this.info.checkRoleId = null;
       getNamesByOrgId(node.id).then((r) => {
         this.roleOptions = r.data;
         this.prevCheckOrgType = node.type;
       });
     },
     onBecheckOrgSelect(node) {
-      this.info.beCheckOrgType=node.type;
+      this.info.beCheckOrgType = node.type;
     },
     onAddPoint() {
       if (!this.info.beCheckedOrgId) {
@@ -345,7 +345,9 @@ export default {
       }
       if (isOk) {
         this.info.isSubmit = 1;
-        api.tempSubmit(this.info).then((r) => {
+        let data = { ...this.info };
+        data.checkRoles = [{ id: this.info.checkRoleId }];
+        api.tempSubmit(data).then((r) => {
           this.$message.info("提交成功");
         });
       }
@@ -361,7 +363,7 @@ export default {
   margin-top: 20px;
 }
 .area_content {
-  border: #B8BDC0 1px solid;
+  border: #b8bdc0 1px solid;
   display: flex;
   flex-direction: row;
 }
@@ -371,12 +373,12 @@ export default {
 }
 
 .content > .area_content:last-child {
-  border-bottom: #B8BDC0 1px solid;
+  border-bottom: #b8bdc0 1px solid;
 }
 
 .area_content > div:nth-child(1) {
   background-color: #e6e6e6;
-  border-right: #B8BDC0 1px solid;
+  border-right: #b8bdc0 1px solid;
   padding-top: auto;
   width: 15%;
   display: flex;
@@ -409,7 +411,7 @@ export default {
 .dialog-footer {
   width: 100%;
   text-align: right;
-  border-top: #B8BDC0 1px solid;
+  border-top: #b8bdc0 1px solid;
   padding-top: 10px;
   padding-right: 30px;
   position: absolute;
@@ -421,7 +423,7 @@ export default {
   width: 5px;
   height: 5px;
   border-radius: 5px;
-  background-color: #B8BDC0;
+  background-color: #b8bdc0;
   border: none;
   margin-bottom: 3px;
 }

src/views/tool/build/index.vue

@@ -468,7 +468,7 @@ export default {
 
 .custom-tree-node{
   width: 100%;
-  font-size: 14px;
+  // font-size: 14px;
   .node-operation{
     float: right;
   }