فهرست منبع

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

yunxing 4 سال پیش
والد
کامیت
935695eca1

+ 1 - 0
src/api/httputils.js

@@ -24,6 +24,7 @@ axiosservice.interceptors.request.use(
         if (token) {
             config.headers = {
                 'sso-token': token,
+                'isPreview': false //默认false,当预览开启的时候是true
             }
         }
         return config

+ 5 - 1
src/components/Rotation/src/rotation.vue

@@ -36,14 +36,18 @@ export default {
     width: 100%;
     height: 100%;
     overflow: hidden;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     .rotationCon {
         height: 100%;
+        display: flex;
     }
     img {
         max-width: 100%;
         max-height: 100%;
         display: block;
-        margin: auto;  
+        margin: auto;
     }
 }
 </style>

+ 2 - 2
src/views/equipment/eqDialog.vue

@@ -14,9 +14,9 @@
                 />
             </div>
             <!-- 没有tab的页面 -->
-            <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='margin:16px 0 0 24px'>
+            <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='margin:16px 0 0 24px;height:90%'>
                 <!-- 原理图 -->
-                <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:90%;overflow:hidden'>
+                <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:90%;overflow:hidden;height:100%'>
                     <rotation :rotationImg='rotationImg'></rotation>
                 </div>
                 <!-- 土建系统主要材料清单 -->

+ 1 - 1
src/views/equipment/index.vue

@@ -225,7 +225,7 @@ export default {
                 margin-right: 10px;
             }
             .hanzi {
-                padding: 10px 6px;
+                padding: 10px 0 10px 6px;
                 width: 200px;
                 display: inline-block;
                 &:hover {

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

@@ -48,7 +48,7 @@
             <input-dialog :type='1' @confirm='confirm'></input-dialog>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
-            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <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">
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
@@ -141,6 +141,10 @@ export default {
         this.tabFind()
     },
     methods: {
+        //序号的方法
+        indexMethod(index) {
+            return (this.page - 1) * this.size + index + 1
+        },
         //多余输入框监听
         confirm(fws, manufacturer) {
             //console.log(fws, manufacturer, '------')

+ 15 - 3
src/views/equipment/table/eqListTable.vue

@@ -20,7 +20,16 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' @cancel='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select
+                @change='getList'
+                @cancel='getList'
+                v-model='floor'
+                style='margin-right:12px;'
+                width='120'
+                tipPlace='top'
+                caption='楼层 :'
+                :selectdata='floorSelect'
+            ></Select>
             <el-input
                 placeholder='搜索生产厂商'
                 clearable
@@ -32,7 +41,7 @@
             ></el-input>
         </div>
         <el-table :data='tableData' style='width: 100%' :border='true' @row-click='rowHandle'>
-            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='250'>
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
@@ -99,6 +108,9 @@ export default {
     },
     props: ['param', 'major'],
     methods: {
+        indexMethod(index) {
+            return (this.currentPage - 1) * this.size + index + 1
+        },
         rowHandle(row) {
             //console.log(row)
             this.innerVisible = true
@@ -119,7 +131,7 @@ export default {
                 major: this.major
             }
             //下拉
-            if (this.floor) {             
+            if (this.floor) {
                 postParams.gname = this.floor
             }
             //输入框搜索

+ 5 - 1
src/views/equipment/table/lookPageTable.vue

@@ -15,7 +15,7 @@
             <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='文件类型 :' :selectdata='floorSelect'></Select>
         </div>
         <el-table :data='tableData' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
+            <el-table-column type='index' label='序号' width='60' :index="indexMethod"></el-table-column>
             <el-table-column prop='lb' label='分类' width='160'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
@@ -68,6 +68,10 @@ export default {
         ...mapGetters(['floorSelect'])
     },
     methods: {
+        //序号的方法
+        indexMethod(index) {
+            return (this.currentPage - 1) * this.size + index +1
+        },
         pageChanged(page, size) {
             this.currentPage = page
             this.getList()

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

@@ -37,7 +37,7 @@
             ></Select>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column type='index' label='序号' width='60' :index="indexMethod"></el-table-column>
             <el-table-column prop='lb' label='其他事项详情' show-overflow-tooltip resizable>
                 <el-table-column prop='zlwfwe' label='记录事项' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.jlsx || '--'}}</template>
@@ -107,6 +107,10 @@ export default {
         ...mapGetters(['floorSelect'])
     },
     methods: {
+        //序号的方法
+        indexMethod(index) {
+            return (this.currentPage - 1) * this.size + index +1
+        },
         pageChanged(page) {
             this.currentPage = page
             this.getList()

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

@@ -41,7 +41,7 @@
             ></el-input>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%' @row-click='rowHandle'>
-            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop label='设备名称' show-overflow-tooltip resizable width='300'>
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
@@ -89,7 +89,6 @@ export default {
     data() {
         return {
             innerVisible: false,
-            pageSize: 10,
             tableData: [],
             total: 0,
             currentPage: 1,
@@ -107,6 +106,9 @@ export default {
         ...mapGetters(['floorSelect'])
     },
     methods: {
+        indexMethod(index) {
+            return (this.currentPage-1) * this.size + index +1
+        },
         rowHandle(row) {
             console.log(row)
             this.innerVisible = true

+ 5 - 1
src/views/equipment/table/tjTable.vue

@@ -14,7 +14,7 @@
             <el-input clearable placeholder='搜索品牌' size='small' @blur='getList' prefix-icon='el-icon-search' v-model='brand' style='width:192px'></el-input>
         </div>
         <el-table :data='tableData' style='width: 100%' :border='true'>
-            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column type='index' label='序号' width='60' :index="indexMethod"></el-table-column>
             <el-table-column prop='category' label='类别'  show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.category || '--'}}</template>
             </el-table-column>
@@ -61,6 +61,10 @@ export default {
         ...mapGetters(['floorSelect'])
     },
     methods: {
+        //序号的方法
+        indexMethod(index) {
+            return (this.currentPage - 1) * this.size + index +1
+        },
         pageChanged(page, size) {
             this.currentPage = page
             this.getList()

+ 7 - 3
src/views/equipment/table/wbTable.vue

@@ -63,7 +63,7 @@
             <input-dialog :type='2' @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>
+            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
@@ -87,10 +87,10 @@
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
                 <el-table-column prop='cost' label='费用(万元)' width='80'>
-                    <template slot-scope='{row}'>{{row.cost || '--'}}</template>
+                    <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='80'>
-                    <template slot-scope='{row}'>{{number_format(row.source,2) || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.source|| '--'}}</template>
                 </el-table-column>
             </el-table-column>
             <el-table-column prop='brand' label='现场照片' width='70'>
@@ -164,6 +164,10 @@ export default {
         ...mapGetters(['floorSelect'])
     },
     methods: {
+        //序号的方法
+        indexMethod(index) {
+            return (this.currentPage - 1) * this.size + index + 1
+        },
         //多余输入框监听
         confirm(gzglid) {
             this.gzglid = gzglid

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

@@ -63,7 +63,7 @@
             <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>
+            <el-table-column type='index' label='序号' width='60' :index="indexMethod"></el-table-column>
             <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
@@ -164,6 +164,10 @@ export default {
     },
     props: ['smsxt', 'major', 'diff', 'tabLabel'],
     methods: {
+        //序号的方法
+        indexMethod(index) {
+            return (this.currentPage - 1) * this.size + index + 1
+        },
         //多余输入框监听
         confirm(wonum) {
             this.wonum = wonum

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

@@ -61,7 +61,7 @@
             <input-dialog v-if='statusOption.length>0' :statusOption='statusOption' :type='4' @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>
+            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.nd || '--'}}</template>
             </el-table-column>
@@ -148,6 +148,10 @@ export default {
     },
     props: ['smsxt', 'major', 'diff', 'tabLabel'],
     methods: {
+        //序号的方法
+        indexMethod(index) {
+            return (this.currentPage - 1) * this.size + index +1
+        },
         //多余输入框监听
         confirm(status, yssjwcsj) {
             this.yssjwcsj = yssjwcsj

+ 8 - 3
src/views/room/index.vue

@@ -534,6 +534,13 @@ export default {
             queryPic({ getParams }).then(res => {
                 //console.log('机房布置图', res)
                 this.tableImg = res.data ? res.data : []
+                //判断有没有图片,有图片默认显示按钮是第一个tab,没有图片显示的是第二个tab
+                if (this.tableImg.length > 0) {
+                    this.activeName = '1'
+                } else {
+                    this.activeName = '2'
+                    this.Index1()
+                }
             })
         },
         // 明细表
@@ -845,9 +852,7 @@ export default {
             }
         }
     },
-    mounted() {
-        // this.Index()
-    }
+    mounted() {}
 }
 </script>
 <style lang="less" scoped>

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

@@ -9,7 +9,7 @@
                 style='width: 100%'
                 :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'></el-table-column>
+                <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='150'>
                     <template slot-scope='{row}'>{{row.classqc||'--'}}</template>
                 </el-table-column>
@@ -62,6 +62,9 @@ export default {
 
     components: { Select, Detail },
     methods: {
+        indexMethod(index) {
+            return (this.page-1) * this.size + index+1
+        },
         modalClose() {
             this.innerVisible = false
         },