Browse Source

还原度修改

zhulizhen1111 4 years ago
parent
commit
8544a159e4

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

@@ -173,6 +173,8 @@ export default {
         position: fixed;
         z-index: 3;
         min-width: 1300px;
+        display: flex;
+        justify-content: center;
         .eq-system {
             padding: 12px 20px;
             background: #fff;

+ 2 - 3
src/views/equipment/table/inputDIalog.vue

@@ -4,9 +4,8 @@
             @click='show'
             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' />
+            <img style='margin-right:4px;' src='@/assets/imgs/select.png' />
             <span>筛选</span>
         </div>
         <div
@@ -14,7 +13,7 @@
             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;'
-             :style='`right:${type === 1 ? "40px" : "0"};`'
+            :style='`right:${type === 1 ? "40px" : "0"};`'
         >
             <el-form style=' padding:20px 24px;' v-if='type==1'>
                 <p style='margin:0 0 8px 0'>生产厂商</p>

+ 6 - 6
src/views/equipment/table/lookPageTable.vue

@@ -11,18 +11,18 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
-            <Select @change='getList' v-model='fileType' width='180' tipPlace='top' caption='文件类型 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='floor' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='fileType' width='180' tipPlace='top' caption='文件类型:' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' style='width: 100%'>
+        <el-table :data='tableData' style='width: 100%' :border='true'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='lb' label='分类' width='160'>
+            <el-table-column prop='lb' label='分类' width='160' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='文件名称'>
+            <el-table-column prop='sl' label='文件名称' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='文件类型'>
+            <el-table-column prop='assetnum' label='文件类型' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='assetnum' label='文件大小(M)'>

+ 1 - 1
src/views/equipment/table/otherTable.vue

@@ -52,7 +52,7 @@
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
             </el-table-column>
-            <el-table-column prop='zfje' label='金额(万元)' width='80'>
+            <el-table-column prop='zfje' label='金额(万元)' width='80' align='right'>
                 <template slot-scope='{row}'>{{number_format(row.zfje,2) || '--'}}</template>
             </el-table-column>
             <el-table-column prop='handledate' label='处理日期' width='130'>

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

@@ -86,7 +86,7 @@
                 <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width='80'>
+                <el-table-column prop='cost' label='费用(万元)' width='80' align='right'>
                     <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>

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

@@ -86,7 +86,7 @@
                 <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width='80'>
+                <el-table-column prop='cost' label='费用(万元)' width='80' align='right'>
                     <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>

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

@@ -11,14 +11,15 @@
                 @change='getList'
                 style='width:180px;margin-right:12px'
             ></el-date-picker>
-            <Select width='160' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='160' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' 
+            :placeholder='"请选择"' @change='getList'></Select>
             <Select
                 width='160'
                 tipPlace='top'
-                size='small'
                 v-model='xm'
                 caption='项目 :'
                 :selectdata='xmOption'
+                :placeholder='"请选择"'
                 style='margin:0 12px'
                 @change='getList'
             ></Select>
@@ -30,6 +31,7 @@
                 size='small'
                 v-model='sxjd'
                 caption='当前阶段 :'
+                :placeholder='"请选择"'
                 :selectdata='sxjdOption'
                 style='margin:0 12px'
                 @change='getList'
@@ -89,7 +91,7 @@
             <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='90'>
                 <template slot-scope='{row}'>{{row.status || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80'>
+            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80' align='right'>
                 <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
             </el-table-column>
             <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width='100'>

+ 3 - 2
src/views/legendLibrary/addForm.vue

@@ -41,7 +41,7 @@
             </div>
             <div v-show='ruleForm.Type=="Zone" || ruleForm.Type=="Image" || ruleForm.Type =="Line"'>
                 <div style='color:#646C73'>展示预览</div>
-                <div class='input-right' ref='graph' style='width:200px;height:114px;'>
+                <div class='input-right' ref='graph' style='width:218px;height:114px;'>
                     <canvas id='canvas' :width='canvasWidth' :height='canvasHeight'></canvas>
                 </div>
             </div>
@@ -124,6 +124,7 @@
                     v-if='ruleForm.Type!="Line"'
                     tipPlace='top'
                     width='200'
+                    style='margin-left:10px'
                     :notNull='true'
                     :returnParentNode='false'
                     :isShowAllChoice='true'
@@ -636,7 +637,7 @@ export default {
                 margin-right: 102px;
             }
             .form4-span3 {
-                margin-left: 75px;
+                margin-left: 96px;
             }
         }
     }

+ 7 - 4
src/views/legendLibrary/addLegend.vue

@@ -156,7 +156,7 @@ export default {
             this.$emit('addSuccess')
             this.cancal()
         },
-        isCreateOrUpdate(){
+        isCreateOrUpdate() {
             if (this.title == '添加图例库') {
                 this.$refs.add.create()
                 this.$emit('addSuccess')
@@ -173,7 +173,7 @@ export default {
             } else {
                 if (this.info.Type != 'None') {
                     this.$refs.add.saveImg()
-                }else{
+                } else {
                     this.isCreateOrUpdate()
                 }
                 this.dialogVisible = false
@@ -220,19 +220,22 @@ export default {
 <style lang='less' scoped>
 .add-legend {
     /deep/ .el-dialog {
-        width: 840px;
+        width: 890px;
         height: 509px;
         border-radius: 8px;
         .el-dialog__header {
             border-bottom: 1px solid #e4e5e7;
         }
+        .el-dialog__body {
+            padding-top: 16px !important;
+        }
         .el-dialog__title {
             font-size: 16px;
         }
     }
     /deep/ .el-dialog__footer {
         position: absolute;
-        bottom: 20px;
+        bottom: 0;
         right: 20px;
     }
 }

+ 3 - 0
src/views/legendLibrary/index.vue

@@ -660,6 +660,9 @@ export default {
     background: #fff;
     border: 1px solid #ccc;
 }
+.p-transfer-select{
+    height: 44px !important;
+}
 .p-tree-node-check,
 .p-tree-node-check .p-tree-node-title {
     vertical-align: top !important;