Bladeren bron

style update

zhulizhen1111 4 jaren geleden
bovenliggende
commit
2af567a814

+ 11 - 0
src/views/equipment/eqDialog.vue

@@ -9,6 +9,7 @@
                     v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"'
                     src='../../assets/imgs/zy1.png'
                     @click='visibalBox'
+                    style='margin-top:-4px;'
                     alt
                 />
             </div>
@@ -257,8 +258,11 @@ export default {
     .title-name {
         font-size: 16px;
         padding-right: 6px;
+        padding-left: 24px;
         color: #000;
         font-weight: bold;
+        color: #646a73;
+        font-weight: normal;
     }
 }
 .top {
@@ -312,6 +316,13 @@ export default {
         color: rgba(31, 36, 41, 1);
         border: 1px solid rgba(195, 199, 203, 1);
     }
+
+    /deep/ .el-tabs__item:last-child {
+        border-radius: 0px 4px 4px 0px;
+    }
+    /deep/ .el-tabs__item:nth-child(2) {
+        border-radius: 4px 0px 0px 4px;
+    }
     .el-tab-pane {
         height: 100% !important;
     }

+ 3 - 2
src/views/equipment/index.vue

@@ -159,6 +159,7 @@ export default {
     display: flex;
     flex: 1;
     overflow: hidden;
+    color: #1f2429;
     .eq-top {
         margin-left: 260px;
         padding-top: 24px;
@@ -203,13 +204,13 @@ export default {
             .circle {
                 width: 6px;
                 height: 6px;
-                background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+                background: linear-gradient(180deg, rgba(54, 156, 247, 0.6) 0%, rgba(2, 91, 170, 0.6) 100%);
                 border-radius: 50%;
                 display: inline-block;
                 margin-right: 10px;
             }
             .hanzi {
-                padding: 10px 2px;
+                padding: 10px 6px;
                 width: 200px;
                 display: inline-block;
                 &:hover {

+ 1 - 0
src/views/equipment/table/eqDetaileDialog.vue

@@ -136,6 +136,7 @@ export default {
     },
     props: ['row', 'major'],
     mounted() {
+        this.floor = this.$cookie.get('floorMapId')
         this.queryTableList()
         this.tabFind()
     },

+ 1 - 0
src/views/equipment/table/eqListTable.vue

@@ -156,6 +156,7 @@ export default {
         }
     },
     mounted() {
+        this.floor = this.$cookie.get('floorMapId')
         this.getList()
         console.log(this.param)
     }

+ 13 - 11
src/views/equipment/table/inputDIalog.vue

@@ -2,23 +2,25 @@
     <div class='input-dialog'>
         <div
             @click='show'
-            style='color: #c3c7cb;cursor: pointer;position:absolute;right:32px;z-index:9999'
-            :class='`top:${type === 1 ? "40px" : "0"};`'
+            style='color: #1F2429;cursor: pointer;position:absolute;z-index:9999;'
+            :style='`right:${type === 1 ? "48px" : "12px"};top:${type === 1 ? "102px" : "0px"};`'
+            
         >
             <img src='@/assets/imgs/select.png' />
-            筛选
+            <span>筛选</span>
         </div>
         <div
             v-if='dialogFormVisible'
             style='width:280px;height:250px;background:rgba(255,255,255,1);margin-top:40px;
             box-shadow:0px 2px 10px 0px rgba(31,35,41,0.1);border:1px solid rgba(228,229,231,1);z-index:9999;
-            position:absolute;right:0px;'
+            position:absolute;'
+             :style='`right:${type === 1 ? "40px" : "0"};`'
         >
             <el-form style=' padding:20px 24px;' v-if='type==1'>
                 <p style='margin:0 0 8px 0'>生产厂商</p>
                 <el-input
                     placeholder='搜索生产厂商'
-                    style='width:192px;margin-right:12px'
+                    style='width:232px;margin-right:12px'
                     size='small'
                     clearable
                     prefix-icon='el-icon-search'
@@ -28,7 +30,7 @@
                 <el-input
                     placeholder='搜索服务商'
                     clearable
-                    style='width:192px;margin-right:12px'
+                    style='width:232px;margin-right:12px'
                     size='small'
                     prefix-icon='el-icon-search'
                     v-model='inputForm.fws'
@@ -36,20 +38,20 @@
             </el-form>
             <el-form style=' padding: 20px 24px;' v-if='type==2'>
                 <p style='margin:0 0 8px 0'>任务编号</p>
-                <el-input placeholder='搜索任务编号' clearable size='small' prefix-icon='el-icon-search' v-model='inputForm.gzglid' style='width:192px;'></el-input>
+                <el-input placeholder='搜索任务编号' clearable size='small' prefix-icon='el-icon-search' v-model='inputForm.gzglid' style='width:232px;'></el-input>
             </el-form>
             <el-form style=' padding: 20px 24px;' v-if='type==3'>
                 <p style='margin:0 0 8px 0'>工单编号</p>
-                <el-input placeholder='搜索工单编号' clearable size='small' prefix-icon='el-icon-search' v-model='inputForm.wonum' style='width:192px;'></el-input>
+                <el-input placeholder='搜索工单编号' clearable size='small' prefix-icon='el-icon-search' v-model='inputForm.wonum' style='width:232px;'></el-input>
             </el-form>
             <el-form style=' padding: 20px 24px;' v-if='type==4'>
                 <p style='margin:0 0 8px 0'>验收结果</p>
-                <el-select v-model='inputForm.status' placeholder='请选择' size='small' style='width:220px'>
+                <el-select v-model='inputForm.status' placeholder='请选择' size='small' style='width:232px'>
                     <el-option v-for='item in statusOption' :key='item.id' :label='item.name' :value='item.id'></el-option>
                 </el-select>
                 <p style='margin:16px 0 8px 0'>验收日期</p>
                 <el-date-picker
-                    style='width:220px'
+                    style='width:232px'
                     v-model='inputForm.yssjwcsj'
                     value-format='yyyyMMdd'
                     type='daterange'
@@ -59,7 +61,7 @@
                     end-placeholder
                 ></el-date-picker>
             </el-form>
-            <div style='position:absolute;bottom:20px;right:47px;z-index:9999'>
+            <div style='position:absolute;bottom:24px;right:24px;z-index:9999'>
                 <el-button @click='dialogFormVisible = false' size='small'>取 消</el-button>
                 <el-button type='primary' @click='confirm' size='small'>确 定</el-button>
             </div>

+ 5 - 4
src/views/equipment/table/recordDialog.vue

@@ -1,9 +1,9 @@
 <template>
     <!-- 记录事项 -->
     <div class='detail-dialog'>
-        <el-dialog :title='`${major}${tabName}记录事项`' width='70%' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
-            <div class='bottom-table' style='height:520px'>
-                <el-table :data='tableData' height='500' :border='true' style='width: 100%;margin-bottom:12px;' :span-method='objectSpanMethod'>
+        <el-dialog :title='`${major}${tabName}记录事项`' width='80%' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
+            <div class='bottom-table' style='height:600px'>
+                <el-table :data='tableData' height='560' :border='true' style='width: 100%;margin-bottom:12px;' :span-method='objectSpanMethod'>
                     <el-table-column label='位置' prop width='120' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.smswz || '--'}}</template>
                     </el-table-column>
@@ -109,7 +109,8 @@ export default {
     .el-dialog__wrapper {
         overflow: hidden !important;
     }
-    .el-dialog {
+   /deep/.el-dialog {
+        margin-top: 7vh !important;
         overflow-y: scroll !important;
     }
 }

+ 1 - 0
src/views/equipment/table/standTable.vue

@@ -175,6 +175,7 @@ export default {
         }
     },
     mounted() {
+        this.floor = this.$cookie.get('floorMapId')
         this.getList()
     }
 }

+ 2 - 1
src/views/equipment/table/wbTable.vue

@@ -95,7 +95,8 @@
             </el-table-column>
             <el-table-column prop='brand' label='现场照片' width='70'>
                 <template slot-scope='{row}'>
-                    <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
+                    <div v-if='row.glsmsImage' style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage.length+'张'}}</div>
+                    <div v-else>{{'---'}}</div>
                 </template>
             </el-table-column>
             <el-table-column prop='reportdate' label='填报时间' width='130'>

+ 3 - 1
src/views/equipment/table/wxTable.vue

@@ -60,6 +60,7 @@
                     end-placeholder
                 ></el-date-picker>
             </div>
+            <input-dialog :type='3' @confirm='confirm'></input-dialog>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='60'></el-table-column>
@@ -94,7 +95,8 @@
             </el-table-column>
             <el-table-column prop='brand' label='现场照片' width='80'>
                 <template slot-scope='{row}'>
-                    <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
+                    <div v-if='row.glsmsImage' style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage.length+'张'}}</div>
+                    <div v-else>{{'---'}}</div>
                 </template>
             </el-table-column>
             <el-table-column prop='reportdate' label='填报时间' width='130'>

+ 3 - 3
src/views/equipment/table/zwTable.vue

@@ -11,9 +11,9 @@
                 @change='getList'
                 style='width:180px;margin-right:12px'
             ></el-date-picker>
-            <Select width='146' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='180' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' :placeholder='"请选择"' @change='getList'></Select>
             <Select
-                width='120'
+                width='180'
                 tipPlace='top'
                 size='small'
                 v-model='xm'
@@ -26,7 +26,7 @@
                 placeholder='搜索实施方案说明'
                 prefix-icon='el-icon-search'
                 size='small'
-                style='width:192px;margin-right:12px'
+                style='width:192px'
                 v-model='ssfasm'
                 clearable
                 @blur='getList'