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

src/utils/format.js

@@ -24,7 +24,8 @@ const number_format = (number, decimals, dec_point, thousands_sep) => {
         s = "",
         toFixedFix = function(n, prec) {
             var k = Math.pow(10, prec)
-            return "" + Math.ceil(n * k) / k
+            // TODO: 四舍五入 还是进位
+            return "" + Math.round(n * k) / k
         }
 
     s = (prec ? toFixedFix(n, prec) : "" + Math.round(n)).split(".")

src/utils/plugins/components.js

@@ -743,6 +743,12 @@ var system = [
                     ],
                 },
                 {
+                    label: '主要材料清单',
+                    id: 'TJQD',
+                    children: [],
+                    param: { tab_code: '' },
+                },
+                {
                     label: '维保事项',
                     id: 'TJWB',
                     children: [

src/views/equipment/eqDialog.vue

@@ -17,7 +17,7 @@
                     <rotation :key='`rotaion_${rotationKey}`' type='3' v-if='rotationImg.length>0' :size='sizePic' :rotationImg='rotationImg'></rotation>
                 </div>
                 <!-- 土建装饰主要材料清单 -->
-                <!-- <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table> -->
+                <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table>
                 <!-- 主要设备清单 标准设备表格 -->
                 <!-- 内部设备清单 -->
                 <standTable
@@ -236,7 +236,7 @@ export default {
     methods: {
         //打开弹窗
         showModal(item) {
-            // console.log(item)
+            console.log(item)
             this.visible = true
             this.dialogInfo = item
             if (Object.keys(this.dialogInfo).length > 0 && this.dialogInfo.children.length > 0) {

src/views/equipment/table/otherTable.vue

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

src/views/equipment/table/tjTable.vue

@@ -62,7 +62,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 13,
+            size: 10,
             lb: '',
             brand: ''
         }

src/views/equipment/table/wbTable.vue

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

src/views/equipment/table/wxTable.vue

@@ -3,7 +3,7 @@
     <div class='wx-list'>
         <div class='eq-list-top'>
             <el-input
-                placeholder='搜索设备名称或内码'
+                placeholder='搜索名称或内码'
                 size='small'
                 @keyup.enter.native='pageChanged(1)'
                 @blur='pageChanged(1)'
@@ -67,11 +67,12 @@
         <div ref='tableBox'>
             <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
                 <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='460'>
-                    <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
+                <!-- TODO: 设备/位置名称,内码修改ß -->
+                <el-table-column prop='sbmc' label='设备名称/位置名称' show-overflow-tooltip resizable min-width='460'>
+                    <template slot-scope='{row}'>{{row.sbmc || row.wzjc || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
-                    <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+                <el-table-column prop='assetnum' label='设备内码/位置内码' show-overflow-tooltip resizable width='140'>
+                    <template slot-scope='{row}'>{{row.assetnum || row.location || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='matters' label='事项类型' width='180' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters || '--'}}</template>
@@ -90,7 +91,7 @@
                         <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                     </el-table-column>
                     <el-table-column prop='cost' label='费用(万元)' width='80' align='right' show-overflow-tooltip resizable>
-                        <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
+                        <template slot-scope='{row}'>{{row.cost || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>
                         <template slot-scope='{row}'>{{row.source || '--'}}</template>
@@ -243,7 +244,8 @@ export default {
             //输入框搜索
             getParams.data.keyword = ''
             if (this.sbjc) {
-                getParams.data.keyword += `${this.sbjc}:sbmc,assetnum;`
+                // TODO: 位置名称,位置内码
+                getParams.data.keyword += `${this.sbjc}:sbmc,assetnum,wzjc,location;`
             }
             if (this.matters) {
                 getParams.data.keyword += `${this.matters}:description,matters;`

src/views/equipment/table/zwTable.vue

@@ -96,7 +96,7 @@
                     <template slot-scope='{row}'>{{row.status || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='zfje' label='结算金额（元）' show-overflow-tooltip resizable width='105'>
-                    <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
+                    <template slot-scope='{row}'>{{row.zfje || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width='100'>
                     <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>

src/views/other/gcfzDialog.vue

@@ -68,7 +68,7 @@ export default {
         },
         changeEmit(val) {
             console.log(val)
-            if (val.floors && val.floors != '全部') {
+            if (val.floors) {
                 this.floors = val.floors
             }
             if (val.searVal) {
@@ -88,7 +88,7 @@ export default {
                 page: this.page,
                 size: this.size,
             }
-            if (this.floors) {
+            if (this.floors !== '全部') {
                 getParams.floor = this.floors
             }
             if (this.searVal) {

src/views/other/zhsxOtherTable2.vue

@@ -138,7 +138,14 @@ export default {
             return (this.page - 1) * this.size + index + 1
         },
         // 第三方
-        dsfjc() {
+        /**
+         *@param { boolean } resetPage 是否重置页码,分页时不重置页码, 下拉菜单会传数组,下方判断时用 !== false
+         */
+        dsfjc(resetPage) {
+            // console.log(resetPage)
+            if (resetPage !== false) {
+                this.page = 1
+            }
             let getParams = {
                 plazaId: this.$store.state.plazaId,
                 page: this.page,
@@ -167,7 +174,7 @@ export default {
         },
         pageChanged(page) {
             this.page = page
-            this.dsfjc()
+            this.dsfjc(false)
         },
         //第三方任务
         innerTable(row) {

src/views/room/detail.vue

@@ -218,6 +218,7 @@ export default {
             deep: true,
             handler: function (newV, oldV) {
                 if (newV != oldV) {
+                    this.initPage()
                     this.queryDetail()
                     this.query()
                 }
@@ -225,6 +226,38 @@ export default {
         },
     },
     methods: {
+        /**
+         * 初始化页面数据
+         */
+        initPage() {
+            this.dialogFormVisible = false
+            this.sb_status = []
+            this.sbglgs = []
+            this.input = ''
+            this.floorStr = ''
+            this.sbglgsStr = '全部'
+            this.statusStr = '全部'
+            this.loadingDetail = true
+            this.totalDetail = 0
+            this.pageDetail = 1
+            this.sizeDetail = 10
+            this.detailData = []
+            this.keyword = ''
+            this.form = {
+                wbsxjlInput5: '',
+                rwbhInput5: '',
+                ycgdbhInput5: '',
+                ssmsInput5: '',
+            }
+            this.mcbhChange = ''
+            this.ssppbh = ''
+            this.allArr = [
+                {
+                    id: '全部',
+                    name: '全部',
+                },
+            ]
+        },
         innerTable(row) {
             console.log(row)
             if (row.assetuid) {
@@ -234,6 +267,9 @@ export default {
         indexMethod(index) {
             return (this.page - 1) * this.size + index + 1
         },
+        /**
+         * 显示筛选条件
+         */
         show() {
             this.dialogFormVisible = !this.dialogFormVisible
         },
@@ -288,9 +324,9 @@ export default {
 
             if (this.form.wbsxjlInput5) {
                 if (data.keyword) {
-                    data.keyword = `${data.keyword + ';' + this.form.wbsxjlInput5}:wzqy`
+                    data.keyword = `${data.keyword + ';' + this.form.wbsxjlInput5}:wzjc`
                 } else {
-                    data.keyword = `${this.form.wbsxjlInput5}:wzqy`
+                    data.keyword = `${this.form.wbsxjlInput5}:wzjc`
                 }
             }
             if (this.form.rwbhInput5) {
@@ -316,9 +352,9 @@ export default {
             }
             if (this.mcbhChange) {
                 if (data.keyword) {
-                    data.keyword = `${data.keyword + ';' + this.mcbhChange}:type_name,sbbh`
+                    data.keyword = `${data.keyword + ';' + this.mcbhChange}:type_name,assetnum`
                 } else {
-                    data.keyword = `${this.mcbhChange}:type_name,sbbh`
+                    data.keyword = `${this.mcbhChange}:type_name,assetnum`
                 }
             }
             if (this.ssppbh) {
@@ -352,11 +388,11 @@ export default {
             }
             querySelect({ data, postParams }).then((res) => {
                 //console.log('管理归属', res)
+                let sb_status = [],
+                    arr = [],
+                    arr1 = [],
+                    sbglgs = []
                 if (res.data.data) {
-                    let sb_status = [],
-                        arr = [],
-                        arr1 = [],
-                        sbglgs = []
                     this.sb_status = []
                     this.sbglgs = []
                     sb_status = res.data.data.sms_asset ? res.data.data.sms_asset.sb_status : []
@@ -386,6 +422,7 @@ export default {
             })
         },
         confirm() {
+            this.dialogFormVisible = false
             this.queryDetail()
         },
     },

vue.config.js

@@ -4,8 +4,8 @@ module.exports = {
         port: 8090,
         proxy: {
             '/data': {
-                target: "http://60.205.177.43",
-                // target: 'http://10.199.143.126',
+                target: "http://60.205.177.43", //阿里云
+                // target: 'http://10.199.143.126', //生产环境
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,
@@ -34,8 +34,8 @@ module.exports = {
             // 图例库服务
             "/serve": {
                 // target: 'http://192.168.200.87:8088',
-            //    target: 'http://10.199.143.129:8080',
-                target: 'http://60.205.177.43:8080',
+                target: 'http://60.205.177.43:8080', //阿里云
+            //    target: 'http://10.199.143.129:8080',    //生产环境
                 changeOrigin: true,
                 pathRewrite: {
                     "^/serve": "",