Преглед на файлове

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

shaun-sheep преди 4 години
родител
ревизия
c75b748e34

BIN
src/assets/imgs/select.png


+ 1 - 1
src/components/floorList.vue

@@ -50,7 +50,7 @@ export default {
             this.$cookie.set('floorNow', item, 3)
             this.floorId = this.$cookie.get('floorNow') || item
             console.log(index)
-            this.$emit('emitFloor', index + 1)
+            this.$emit('emitFloor', [index + 1, item])
         },
         removeTop(num) {
             this.num = num

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

@@ -98,8 +98,10 @@ export default {
             this.smsxt = item.smsxt
         },
         emitFloor(item) {
-            this.floorInfo.floorId = item
-            this.$refs.floorMap.init(item)
+            console.log(item)
+            this.floorInfo.floorId = item[0]
+            this.$refs.floorMap.init(item[0])
+            this.floorInfo.floorName = item[1]
         },
         dialogVisible(eve) {
             console.log(eve)

+ 12 - 19
src/views/equipment/table/eqDetaileDialog.vue

@@ -4,22 +4,12 @@
     <div class='gdqd-dialog'>
         <div class='top'></div>
         <div class='gdqd-dialog-top'>
-            <el-input placeholder='搜索设备简称、编号' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='搜索品牌、型号' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='搜索生产厂商' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='搜索安装位置' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='搜索服务商' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <Select width='120' v-model='floor' tipPlace='top' caption='楼层:' size='small' :selectdata='floorSelect'></Select>
-            <Select v-model='sbglgs' width='180' tipPlace='top' style='margin-top:12px;' caption='管理归属' size='small' :selectdata='sbglgsOption'></Select>
-            <Select
-                width='146'
-                style='margin-left:12px;margin-top:12px;'
-                v-model='status'
-                tipPlace='top'
-                caption='设备状态'
-                size='small'
-                :selectdata='statusOption'
-            ></Select>
+            <Select width='120' style='margin-right:12px;' v-model='floor' tipPlace='top' caption='楼层:' size='small' :selectdata='floorSelect'></Select>
+            <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属' size='small' :selectdata='sbglgsOption'></Select>
+            <Select width='146' style='margin: 0 12px;' v-model='status' tipPlace='top' caption='设备状态' size='small' :selectdata='statusOption'></Select>
+            <el-input placeholder='搜索品牌、型号' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
+            <el-input placeholder='搜索生产厂商' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
+            <input-dialog :keyword='keyword' @confirm='confirm'></input-dialog>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
@@ -75,6 +65,7 @@ import Select from '@/components/Select/Select.vue'
 import { mapGetters } from 'vuex'
 import { queryAsset } from '@/api/equipmentList.js'
 import { querySelect, queryTab } from '@/api/public.js'
+import inputDialog from './inputDIalog'
 export default {
     data() {
         return {
@@ -85,7 +76,6 @@ export default {
                 { id: 'test3', name: '下级分项' },
                 { id: 'test4', name: '滑动平均滑动平均' }
             ],
-            input: '',
             page: 1,
             size: 10,
             total: 1,
@@ -98,7 +88,8 @@ export default {
         }
     },
     components: {
-        Select
+        Select,
+        inputDialog
     },
     computed: {
         ...mapGetters(['floorSelect'])
@@ -109,6 +100,8 @@ export default {
         this.tabFind()
     },
     methods: {
+        //多余输入框监听
+        confirm() {},
         //下拉框查询
         tabFind() {
             let postParams = [
@@ -218,9 +211,9 @@ export default {
 <style lang="less" scoped>
 .gdqd-dialog {
     padding: 16px 24px 40px;
+    height: 610px;
     .gdqd-dialog-top {
         display: flex;
-        flex-wrap: wrap;
         margin-bottom: 12px;
     }
     td {

+ 53 - 0
src/views/equipment/table/inputDIalog.vue

@@ -0,0 +1,53 @@
+<template>
+    <div class='input-dialog'>
+        <div @click='show' style='color: #c3c7cb;cursor: pointer;position:absolute;top:75px;right:32px;'>
+            <img src='@/assets/imgs/select.png' />
+            筛选
+        </div>
+        <div
+            v-if='dialogFormVisible'
+            style='width:280px;height:450px;background:rgba(255,255,255,1);
+            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;top:110px;right:25px;'
+        >
+            <el-form style=' padding: 20px 24px;'>
+                <p style='margin:16px 0 8px 0'>安装位置</p>
+                <el-input placeholder='搜索安装位置' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
+                <p style='margin:16px 0 8px 0'>服务商</p>
+                <el-input placeholder='搜索服务商' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
+            </el-form>
+            <div style='position:absolute;bottom:40px;right:47px;z-index:9999'>
+                <el-button @click='dialogFormVisible = false' size='small'>取 消</el-button>
+                <el-button type='primary' @click='confirm' size='small'>确 定</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            dialogFormVisible: false,
+            form: {},
+            formLabelWidth: '232px'
+        }
+    },
+    props: ['keyword'],
+    methods: {
+        show() {
+            this.dialogFormVisible = !this.dialogFormVisible
+        },
+        confirm() {
+            this.dialogFormVisible = false
+            this.$emit('confirm', this.keyword)
+        }
+    },
+    mounted() {}
+}
+</script>
+
+<style lang="less" scoped>
+.input-diadlog {
+}
+</style>

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

@@ -54,7 +54,8 @@ export default {
             tableData: [{ index: 1 }],
             total: 0,
             currentPage: 1,
-            size: 11
+            size: 11,
+            keyword: ''
         }
     },
     props: ['major'],

+ 4 - 15
src/views/equipment/table/otherTable.vue

@@ -49,7 +49,7 @@
     </div>
 </template>
 <script>
-import { queryEquipmentList, queryWbsms } from '@/api/equipmentList.js'
+import { queryQtsx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 export default {
     data() {
@@ -79,19 +79,6 @@ export default {
             this.getList()
         },
         getList() {
-            // let postParams = {}
-            // let data = {
-            //     page: this.currentPage,
-            //     size: this.size,
-            //     plazaId: this.$store.state.plazaId,
-            //    major: this.major,
-
-            // }
-            // queryEquipmentList({ data, postParams }).then(res => {
-            //     console.log(res)
-            //     this.tableData = res.data.data
-            //     this.total = res.data.count
-            // })
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
@@ -102,7 +89,8 @@ export default {
                     size: this.size
                 }
             }
-            queryWbsms(getParams).then(res => {
+            queryQtsx({ getParams }).then(res => {
+                console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
@@ -117,6 +105,7 @@ export default {
         }
     },
     mounted() {
+        console.log(this.smsxt)
         // this.getList()
     }
 }

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

@@ -39,32 +39,32 @@
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' width='160' show-overflow-tooltip resizable>
+            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbjbm || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' width='240' show-overflow-tooltip resizable>
+            <el-table-column prop='matters' label='重要事项记录' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='description' label='描述' width='200' show-overflow-tooltip resizable>
+            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.description || '--'}}</template>
             </el-table-column>
             <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换' width='120'>
+                <el-table-column prop='ischangepj' label='是/否更换'>
                     <template slot-scope='{row}'>{{row.ischangepj || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='120' show-overflow-tooltip resizable>
+                <el-table-column prop='model' label='配件名称型号' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sl' label='数量'>
                     <template slot-scope='{row}'>{{row.sl || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width='120'>
+                <el-table-column prop='cost' label='费用(万元)'>
                     <template slot-scope='{row}'>{{row.cost || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='source' label='费用出处' width='120' show-overflow-tooltip resizable>
+                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.source || '--'}}</template>
                 </el-table-column>
             </el-table-column>

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

@@ -39,32 +39,32 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' width='160' show-overflow-tooltip resizable>
+            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbjbm || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' width='240' show-overflow-tooltip resizable>
+            <el-table-column prop='matters' label='重要事项记录' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='description' label='描述' width='200' show-overflow-tooltip resizable>
+            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.description || '--'}}</template>
             </el-table-column>
             <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换' width='120'>
+                <el-table-column prop='ischangepj' label='是/否更换'>
                     <template slot-scope='{row}'>{{row.ischangepj || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='120' show-overflow-tooltip resizable>
+                <el-table-column prop='model' label='配件名称型号' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sl' label='数量'>
                     <template slot-scope='{row}'>{{row.sl || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width='120'>
+                <el-table-column prop='cost' label='费用(万元)'>
                     <template slot-scope='{row}'>{{row.cost || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='source' label='费用出处' width='120' show-overflow-tooltip resizable>
+                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.source || '--'}}</template>
                 </el-table-column>
             </el-table-column>

+ 60 - 42
src/views/equipment/table/zwTable.vue

@@ -3,9 +3,9 @@
     <div class='zw-list'>
         <div class='eq-list-top'>
             <el-date-picker size='small' v-model='nd' type='year' placeholder='请选择年度' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
-            <Select width='146' tipPlace='top' caption='类别:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <Select width='120' tipPlace='top' caption='项目 :' :selectdata='floorSelect' style='margin:0 12px' @change='getList'></Select>
-            <Select width='180' tipPlace='top' caption='当前阶段' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='146' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='120' tipPlace='top' v-model='xm' caption='项目 :' :selectdata='xmOption' style='margin:0 12px' @change='getList'></Select>
+            <Select width='180' tipPlace='top' v-model='sxjd' caption='当前阶段' :selectdata='sxjdOption' :placeholder='"请选择"' @change='getList'></Select>
             <el-date-picker
                 size='small'
                 v-model='lxsjwcsj'
@@ -19,7 +19,7 @@
                 width='180'
                 tipPlace='top'
                 caption='验收结果'
-                :selectdata='dataSelect2'
+                :selectdata='statusOption'
                 :placeholder='"请选择"'
                 style='margin-right:12px'
             >@change='getList'></Select>
@@ -33,11 +33,11 @@
             ></el-input>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='nd' label='年度' width='160' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号'></el-table-column>
+            <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.nd || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='qs' label='期数' width='160' show-overflow-tooltip resizable>
+            <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.qs || '--'}}</template>
             </el-table-column>
             <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable>
@@ -49,10 +49,10 @@
             <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sl || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable width='200'>
+            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.ssfasm || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable width='140'>
+            <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
             </el-table-column>
             <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable>
@@ -67,7 +67,7 @@
             <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.zfje || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='xlcfwz' label='资料存放位置' width='180' show-overflow-tooltip resizable>
+            <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -93,12 +93,6 @@ export default {
     components: { Select },
     data() {
         return {
-            dataSelect2: [
-                { id: 'test1', name: '选择项' },
-                { id: 'test2', name: '单平米' },
-                { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
-            ],
             tableData: [],
             total: 0,
             currentPage: 1,
@@ -106,7 +100,14 @@ export default {
             lxsjwcsj: '',
             size: 10,
             keyword: '',
-            nd: ''
+            nd: '',
+            lb: '',
+            sxjd: '',
+            xm: '',
+            statusOption: [],
+            sxjdOption: [],
+            xmOption: [],
+            lbOption: []
         }
     },
     computed: {
@@ -122,11 +123,8 @@ export default {
         tabFind() {
             let postParams = [
                 {
-                    columnName: { nd: 'nd', lb: 'lb', xm: 'xm', sxjd: 'sxjd' },
-                    params: {
-                        // tab_code: this.param
-                    },
-                    tableName: 'glsms_asset' //视图名称
+                    columnName: { lb: 'lb', xm: 'xm', sxjd: 'sxjd', status: 'status' },
+                    tableName: 'v_glsms_zw' //视图名称
                 }
             ]
             let major
@@ -140,40 +138,60 @@ export default {
                 major = '电梯'
             } else if (this.major.slice(0, 2) == 'RQ') {
                 major = '燃气'
+            } else if (this.major.slice(0, 2) == 'RD') {
+                major = '弱电'
+            } else if (this.major.slice(0, 2) == 'NT') {
+                major = '暖通'
+            } else if (this.major.slice(0, 2) == 'TJ') {
+                major = '土建'
             } else {
                 major = this.major
             }
             let data = {
                 major: major,
-                plazaId: this.$store.state.plazaId
+                plazaId: '1000287'
+                // plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
                 console.log(res)
-                if (Object.key(res.data.data).length > 0) {
-                    let sb_status = res.data.data.glsms_asset.sb_status
-                    let sbglgs = res.data.data.glsms_asset.sbglgs
-                    this.sbglgsOption = []
-                    this.statusOption = []
-                    sb_status.forEach(el => {
-                        this.statusOption.push({
-                            name: el.value,
-                            id: el.key
-                        })
+                let lb = res.data.data.v_glsms_zw.lb
+                let xm = res.data.data.v_glsms_zw.xm
+                let sxjd = res.data.data.v_glsms_zw.sxjd
+                let status = res.data.data.v_glsms_zw.status
+                this.lbOption = []
+                this.xmOption = []
+                this.sxjdOption = []
+                this.statusOption = []
+                sxjd.forEach(el => {
+                    this.sxjdOption.push({
+                        name: el.value,
+                        id: el.key
                     })
-                    sbglgs.forEach(el => {
-                        this.sbglgsOption.push({
-                            name: el.value,
-                            id: el.key
-                        })
+                })
+                xm.forEach(el => {
+                    this.xmOption.push({
+                        name: el.value,
+                        id: el.key
                     })
-                }
+                })
+                lb.forEach(el => {
+                    this.lbOption.push({
+                        name: el.value,
+                        id: el.key
+                    })
+                })
+                status.forEach(el => {
+                    this.statusOption.push({
+                        name: el.value,
+                        id: el.key
+                    })
+                })
             })
         },
         getList() {
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
-                    // tab: this.major,
                     // plazaId: this.$store.state.plazaId,
                     plazaId: '1000287',
                     page: this.currentPage,
@@ -189,13 +207,13 @@ export default {
     watch: {
         smsxt(newV, oldV) {
             if (newV !== oldV) {
-                // this.tabFind()
+                this.tabFind()
                 this.getList()
             }
         }
     },
     mounted() {
-        // this.tabFind()
+        this.tabFind()
         this.getList()
     }
 }