Просмотр исходного кода

设施环境紫外灯消毒调整;布局样式调整

luoaoxuan 1 год назад
Родитель
Сommit
e18a60dd9a

+ 2 - 2
src/views/component/facility/facilityData.vue

@@ -7,8 +7,8 @@
         <el-row type="flex">
             <el-col style="margin:0 0 5px 0">
                 <div class="button">
-                    <el-button v-if="!isCul" type="danger" size="mini" icon="el-icon-close" @click="goRemove">删除</el-button>
-                    <el-button v-if="!isCul" type="success" size="mini" icon="el-icon-plus" @click="goAdd">添加</el-button>
+                    <el-button v-if="!isCul" type="danger" size="mini" icon="ibps-icon-close" @click="goRemove">删除</el-button>
+                    <el-button v-if="!isCul" type="success" size="mini" icon="ibps-icon-plus" @click="goAdd">添加</el-button>
                 </div>
             </el-col>
         </el-row>

+ 8 - 5
src/views/component/formTemplate/index.vue

@@ -74,8 +74,8 @@
                     <el-row>
                         <el-col :span="24" style="margin:0 0 5px 0">
                             <div class="button">
-                                <el-button type="danger" size="mini" icon="el-icon-close" @click="goSubRemove">删除</el-button>
-                                <el-button type="success" size="mini" icon="el-icon-plus" @click="goSubAdd">添加</el-button>
+                                <el-button type="danger" size="mini" icon="ibps-icon-close" @click="goSubRemove">删除</el-button>
+                                <el-button type="success" size="mini" icon="ibps-icon-plus" @click="goSubAdd">添加</el-button>
                             </div>
                         </el-col>
                     </el-row>
@@ -200,7 +200,7 @@ export default {
             title: '表单模板配置',
             toolbars: [
                 { key: 'save', label: '保存' },
-                { key: 'cancel', label: '退出', type: 'danger' }
+                { key: 'cancel', label: '退出', type: 'danger', icon: 'ibps-icon-close' }
             ],
             initWidth: '1280px',
             isEdit: false,
@@ -422,10 +422,13 @@ export default {
     div{
         z-index: 99999999;
         position: absolute;
-        right:22px;
+        right:8vw;
     }
     .dialogtitle{
-        font-weight: 900;
+        font-size: 22px;
+        font-family: SimHei;
+        font-weight: bold;
+        color: #222;
     }
 }
 .container {

+ 6 - 3
src/views/component/shiftHandover/earlyHandover.vue

@@ -363,7 +363,7 @@ export default {
                 { key: 'gunRegister', label: '扫码枪签到', hidden: () => { return !this.isEdit || this.isFinished } },
                 { key: 'registerInfo', label: '签到信息', hidden: () => { return !this.isEdit } },
                 { key: 'submit', label: '提交', icon: 'el-icon-finished', hidden: () => { return !this.isEdit || this.isFinished } },
-                { key: 'cancel', label: '退出', type: 'danger' }
+                { key: 'cancel', label: '退出', type: 'danger',icon:'ibps-icon-close' }
             ],
             initWidth: '1280px',
             isEdit: false,
@@ -841,10 +841,13 @@ export default {
     div{
         z-index: 99999999;
         position: absolute;
-        right:20px;
+        right:8vw;
     }
     .dialogtitle{
-        font-weight: 900;
+        font-size: 22px;
+        font-family: SimHei;
+        font-weight: bold;
+        color: #222;
     }
 }
 .container {

+ 1 - 1
src/views/platform/risk/riskDetail.vue

@@ -240,7 +240,7 @@
             <span slot="footer" class="dialog-footer">
                 <el-button v-if="!readonly" type="primary" size="mini" icon="el-icon-takeaway-box" @click="save">保 存</el-button>
                 <el-button v-if="!readonly" type="primary" size="mini" icon="el-icon-finished" @click="submit">提 交</el-button>
-                <el-button size="mini" icon="el-icon-close" type="danger" @click="close">退 出</el-button>
+                <el-button size="mini" icon="ibps-icon-close" type="danger" @click="close">退 出</el-button>
             </span>
         </el-dialog>
     </div>

+ 6 - 3
src/views/platform/risk/riskV2.vue

@@ -286,7 +286,7 @@ export default {
                 // { key: 'sendMsg', label: '提醒评估人', icon: 'el-icon-bell', hidden: () => { return !this.isZuZhang || !this.isEdit || this.isFinished } },
                 { key: 'peizhifengxian', label: '更新风险库', type: 'info', icon: 'el-icon-setting', hidden: () => { return !this.isZuZhang || !this.isEdit } },
                 { key: 'submit', label: '提交', icon: 'el-icon-finished', hidden: () => { return !this.isZuZhang || !this.isEdit || this.isFinished } },
-                { key: 'cancel', label: '退出', type: 'danger' }
+                { key: 'cancel', label: '退出', type: 'danger', icon: 'ibps-icon-close' }
             ],
             infoFxssbData: {
                 nian_du_: '',
@@ -868,10 +868,13 @@ export default {
     justify-content: center;
     div{
         position: absolute;
-        right:20px;
+        right:8vw;
     }
     .dialogtitle{
-        font-weight: 900;
+        font-size: 22px;
+        font-family: SimHei;
+        font-weight: bold;
+        color: #222;
     }
 }
 </style>

+ 13 - 8
src/views/system/fasc/facilityEnvConfig.vue

@@ -19,7 +19,7 @@
         <div class="container">
             <div class="main">
                 <div class="form">
-                    <el-form ref="form" :model="form" label-width="120px" :rules="rules" :hide-required-asterisk="true">
+                    <el-form ref="form" :model="form" label-width="74px" :rules="rules" :hide-required-asterisk="true">
                         <el-row>
                             <el-col :span="12">
                                 <el-form-item label="类型:" prop="lei_xing_">
@@ -228,7 +228,7 @@
                                 <el-button size="mini" type="primary" icon="el-icon-search" @click="goSearch">查询</el-button>
                             </div>
                             <div class="search-item" style="width:60px">
-                                <el-button type="success" size="mini" icon="el-icon-plus" @click="openDialog">添加</el-button>
+                                <el-button type="success" size="mini" icon="ibps-icon-plus" @click="openDialog">添加</el-button>
                             </div>
                             <div class="search-item" style="width:60px">
                                 <el-upload
@@ -250,7 +250,7 @@
                                 <el-button type="info" size="mini" icon="el-icon-setting" @click="settingData">使用默认数据</el-button>
                             </div>
                             <div class="search-item" style="width:60px">
-                                <el-button type="danger" size="mini" icon="el-icon-close" @click="removeItem">删除</el-button>
+                                <el-button type="danger" size="mini" icon="ibps-icon-close" @click="removeItem">删除</el-button>
                             </div>
                         </div>
                     </div>
@@ -408,7 +408,7 @@ export default {
             dialogVisible: true,
             subDialogVisible: false,
             title: '设施环境配置表',
-            toolbars: [{ key: 'save', label: '保存' }, { key: 'cancel', label: '退出', type: 'danger' }],
+            toolbars: [{ key: 'save', label: '保存' }, { key: 'cancel', label: '退出', type: 'danger', icon: 'ibps-icon-close' }],
             dayCheck: [],
             weekCheck: '',
             monthCheck: '',
@@ -1218,7 +1218,8 @@ export default {
                         bian_zhi_bu_men_: item.bu_men_,
                         bian_zhi_ren_: this.userId,
                         zi_wai_deng_ming_: item.devicename1_,
-                        she_shi_id_: item.zi_wai_deng_wai_j
+                        she_shi_id_: item.zi_wai_deng_wai_j,
+                        gang_wei_: item.jian_ce_gang_wei_
                     }))
                 } : null
 
@@ -1231,7 +1232,8 @@ export default {
                         },
                         param: {
                             bian_zhi_bu_men_: item.bu_men_,
-                            zi_wai_deng_ming_: item.devicename1_
+                            zi_wai_deng_ming_: item.devicename1_,
+                            gang_wei_: item.jian_ce_gang_wei_
                         }
                     }))
                 } : null
@@ -1452,10 +1454,13 @@ export default {
     justify-content: center;
     div{
         position: absolute;
-        right:20px;
+        right:8vw;
     }
     .dialogtitle{
-        font-weight: 900;
+        font-size: 22px;
+        font-family: SimHei;
+        font-weight: bold;
+        color: #222;
     }
 }
 .container {