Sfoglia il codice sorgente

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

YaolongHan 4 anni fa
parent
commit
094db09a83

File diff suppressed because it is too large
+ 666 - 730
src/views/Device/FilterModal.vue


+ 8 - 8
src/views/equipment/table/eqDetaileDialog.vue

@@ -60,7 +60,7 @@
         </div>
         <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
+            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='300'>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
             <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
@@ -75,25 +75,25 @@
             <el-table-column prop='sb_status' label='设备状态' width='80' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='80'>
+            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='250'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='80'>
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='160'>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
             <el-table-column prop='floor' sortable label='楼层' width='70' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>
+            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='170'>
                 <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='150'>
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='250'>
                 <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable min-width='150'>
+            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable min-width='250'>
                 <template slot-scope='{row}'>{{row.fws || '--'}}</template>
             </el-table-column>
-            <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='150'>
+            <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='250'>
                 <template slot-scope='{row}'>{{'--'}}</template>
             </el-table-column>
         </el-table>
@@ -102,7 +102,7 @@
                 background
                 layout='prev, pager, next'
                 :total='total'
-                :current-page.sync="sonpage"
+                :current-page.sync='sonpage'
                 :page-size='size'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'

+ 4 - 4
src/views/equipment/table/eqListTable.vue

@@ -46,16 +46,16 @@
         <div ref='tableBox' style='height: calc(100% - 115px);'>
             <el-table :data='tableData' :max-height='tableMaxHeight' style='width: 100%' :border='true' @row-click='rowHandle'>
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-                <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable min-width='300'>
+                <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable min-width='260'>
                     <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sl' label='数量' width='60'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='品牌' min-width='300'>
+                <el-table-column prop='brand' label='品牌' min-width='260'>
                     <template slot-scope='{row}'>{{row.brand || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable min-width='300'>
+                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable min-width='260'>
                     <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='floorcode' label='楼层' width='60' show-overflow-tooltip resizable>
@@ -64,7 +64,7 @@
                 <!-- <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
                 </el-table-column>-->
-                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
+                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='260'>
                     <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
                 </el-table-column>
             </el-table>

+ 4 - 4
src/views/equipment/table/standTable.vue

@@ -46,23 +46,23 @@
         <div ref='tableBox' style='height: calc(100% - 115px);'>
             <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='rowHandle'>
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-                <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='300'>
+                <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='260'>
                     <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
                 </el-table-column>
                 <!-- sbjc -->
                 <el-table-column prop='sl' label='数量' width='60'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='品牌' width='300'>
+                <el-table-column prop='brand' label='品牌' width='260'>
                     <template slot-scope='{row}'>{{row.brand || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable min-width='300'>
+                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable min-width='260'>
                     <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='floor' label='楼层' width='60' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
+                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='260'>
                     <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
                 </el-table-column>
             </el-table>

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

@@ -102,7 +102,7 @@
                 <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.status || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='zfje' label='结算金额(元)' show-overflow-tooltip resizable width='105'>
+                <el-table-column prop='zfje' label='结算金额(元)' show-overflow-tooltip resizable width='105' 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'>

+ 4 - 4
src/views/room/room3.vue

@@ -11,22 +11,22 @@
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-                <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='300'>
+                <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='260'>
                     <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='数量' :show-overflow-tooltip='true' width='60'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='品牌' :show-overflow-tooltip='true' min-width='300'>
+                <el-table-column prop label='品牌' :show-overflow-tooltip='true' min-width='260'>
                     <template slot-scope='{row}'>{{row.brand||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='型号' :show-overflow-tooltip='true' min-width='300'>
+                <el-table-column prop label='型号' :show-overflow-tooltip='true' min-width='260'>
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='60'>
                     <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='300'>
+                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='260'>
                     <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>
                 </el-table-column>
             </el-table>