zhulizhen %!s(int64=4) %!d(string=hai) anos
pai
achega
84deec3b84

+ 1 - 1
src/components/floorMap/index.vue

@@ -29,7 +29,7 @@ export default {
             fmapID: '1000423_120', // 2020-6-18 磊哥发 1000423 大连高新万达
             canvasWidth: 1100,
             canvasHeight: 800,
-            loading: true,
+            loading: false,
             view: null,
             isQuerying: false // 限制重复查询
         }

+ 2 - 2
src/utils/format.js

@@ -3,7 +3,7 @@ const formatTime = (time) => {
     return time > 10 ? time : "0" + time
 }
 const formatter = (date) => {
-    return moment.unix(date / 1000).format("YYYY/MM/DD")
+    return moment.unix(date / 1000).format("YYYY.MM.DD")
 }
 const number_format = (number, decimals, dec_point, thousands_sep) => {
     /*
@@ -19,7 +19,7 @@ const number_format = (number, decimals, dec_point, thousands_sep) => {
         sep = typeof thousands_sep === "undefined" ? "," : thousands_sep,
         dec = typeof dec_point === "undefined" ? "." : dec_point,
         s = "",
-        toFixedFix = function(n, prec) {
+        toFixedFix = function (n, prec) {
             var k = Math.pow(10, prec)
             return "" + Math.ceil(n * k) / k
         }

+ 68 - 70
src/views/equipment/eqDialog.vue

@@ -1,63 +1,61 @@
 <template>
     <!-- 设备设施的三级路由的tabs -->
     <div class='dialog-container'>
-        <Modal :show='visible' :title='`${systemName}-${dialogInfo.label}`' mode='full' @close='modalClose' @confirm='modalConfirm'>
-            <template #content>
-                <!-- 除了清单和原理页面,别的都有记录事项detailDialog页面 -->
-                <div slot='title' class='header-title' v-if='Object.keys(dialogInfo).length>0'>
-                    <!-- <span class='title-name'>{{systemName}}-{{dialogInfo.label}}</span> -->
-                    <img
-                        v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"'
-                        src='../../assets/imgs/zy1.png'
-                        @click='visibalBox'
-                        alt
-                    />
+        <el-dialog :visible.sync='visible' :fullscreen='true'>
+            <!-- 除了清单和原理页面,别的都有记录事项detailDialog页面 -->
+            <div slot='title' class='header-title' v-if='Object.keys(dialogInfo).length>0'>
+                <span class='title-name'>{{systemName}}-{{dialogInfo.label}}</span>
+                <img
+                    v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"'
+                    src='../../assets/imgs/zy1.png'
+                    @click='visibalBox'
+                    alt
+                />
+            </div>
+            <!-- 没有tab的页面 -->
+            <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='margin:16px 24px 0 24px'>
+                <!-- 原理图 -->
+                <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
+                    <rotation :rotationImg='rotationImg'></rotation>
                 </div>
-                <!-- 没有tab的页面 -->
-                <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='margin:16px 24px 0 24px'>
-                    <!-- 原理图 -->
-                    <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
-                        <rotation :rotationImg='rotationImg'></rotation>
-                    </div>
-                    <!-- 土建系统主要材料清单 -->
-                    <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table>
-                    <!-- 主要设备清单 标准设备表格 -->
-                    <standTable v-else-if='dialogInfo.id.slice(2,4)=="QD"' :param='param' :major='dialogInfo.id'></standTable>
-                    <!-- 电井商铺范围清单 -->
-                    <djsp-table v-else-if='dialogInfo.id.slice(0,4)=="GJSP"'></djsp-table>
-                    <!-- 查看图纸 -->
-                    <look-page v-else-if='dialogInfo.id.slice(2,4)=="TZ"' param major></look-page>
-                </div>
-                <!-- 有tab的页面 -->
-                <div v-else style='margin:16px 24px 0 24px;'>
-                    <el-tabs v-model='activeName' @tab-click='handleClick' v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length>0'>
-                        <el-tab-pane
-                            v-for='(value,index) in dialogInfo.children'
-                            :key='"u"+index'
-                            :label='`${value.label}`'
-                            :name='`${value.param.tab_code}`'
-                            @click='tabClick(value)'
-                        >
-                            <!-- 有tab的原理图 -->
-                            <div v-if='value.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
-                                <rotation :rotationImg='rotationImg'></rotation>
-                            </div>
-                            <!-- 主要设备清单 标准设备表格加tab -->
-                            <tableList v-else-if='value.id.slice(0,4)=="RDQD"' :param='param' ref='list1' major='弱电'></tableList>
-                            <tableList v-else-if='value.id.slice(0,4)=="NTQD"' :param='param' ref='list2' major='暖通'></tableList>
-                            <!-- 维保表格 -->
-                            <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :major='dialogInfo.id'></wb-table>
-                            <!-- 维修的表格 -->
-                            <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :major='dialogInfo.id'></wx-table>
-                            <!-- 专维 -->
-                            <zw-table v-else-if='value.id.slice(2,4)=="ZW"' :smsxt='smsxt' :major='dialogInfo.id'></zw-table>
-                            <!-- 其他 -->
-                            <other-table v-else-if='value.id.slice(2,4)=="QT"' :smsxt='smsxt' :major='dialogInfo.id'></other-table>
-                        </el-tab-pane>
-                    </el-tabs>
-                </div>
-            </template>
-        </Modal>
+                <!-- 土建系统主要材料清单 -->
+                <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table>
+                <!-- 主要设备清单 标准设备表格 -->
+                <standTable v-else-if='dialogInfo.id.slice(2,4)=="QD"' :param='param' :major='dialogInfo.id'></standTable>
+                <!-- 电井商铺范围清单 -->
+                <djsp-table v-else-if='dialogInfo.id.slice(0,4)=="GJSP"'></djsp-table>
+                <!-- 查看图纸 -->
+                <look-page v-else-if='dialogInfo.id.slice(2,4)=="TZ"' param major></look-page>
+            </div>
+            <!-- 有tab的页面 -->
+            <div v-else style='margin:16px 24px 0 24px;'>
+                <el-tabs v-model='activeName' @tab-click='handleClick' v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length>0'>
+                    <el-tab-pane
+                        v-for='(value,index) in dialogInfo.children'
+                        :key='"u"+index'
+                        :label='`${value.label}`'
+                        :name='`${value.param.tab_code}`'
+                        @click='tabClick(value)'
+                    >
+                        <!-- 有tab的原理图 -->
+                        <div v-if='value.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
+                            <rotation :rotationImg='rotationImg'></rotation>
+                        </div>
+                        <!-- 主要设备清单 标准设备表格加tab -->
+                        <tableList v-else-if='value.id.slice(0,4)=="RDQD"' :param='param' ref='list1' major='弱电'></tableList>
+                        <tableList v-else-if='value.id.slice(0,4)=="NTQD"' :param='param' ref='list2' major='暖通'></tableList>
+                        <!-- 维保表格 -->
+                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :major='dialogInfo.id'></wb-table>
+                        <!-- 维修的表格 -->
+                        <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :major='dialogInfo.id'></wx-table>
+                        <!-- 专维 -->
+                        <zw-table v-else-if='value.id.slice(2,4)=="ZW"' :smsxt='smsxt' :major='dialogInfo.id'></zw-table>
+                        <!-- 其他 -->
+                        <other-table v-else-if='value.id.slice(2,4)=="QT"' :smsxt='smsxt' :major='dialogInfo.id'></other-table>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+        </el-dialog>
         <!--记录表格 -->
         <record-dialog ref='Dialog'></record-dialog>
     </div>
@@ -118,7 +116,7 @@ export default {
             this.param = this.activeName
         },
         //点击tab函数
-        handleClick(tab, event) {
+        handleClick(tab) {
             console.log(tab.index)
             if (this.param) {
                 this.param = tab.name
@@ -130,7 +128,9 @@ export default {
             if (this.dialogInfo.children.length > 0) {
                 this.typecode = this.dialogInfo.children[`${tab.index}`].param.type_code
             }
-            this.initImage(this.typecode)
+            if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL') {
+                this.initImage(this.typecode)
+            }
         },
         tabClick(value) {
             console.log(value, '-----.')
@@ -159,13 +159,19 @@ export default {
             }
             let postParams = []
             if (this.dialogInfo.children.length == 0) {
-                postParams[0].params.tyepcode = this.dialogInfo.param.type_code
-                postParams[0].tableName = 'v_glsms_confrguring'
+                postParams.push({
+                    params: {
+                        tyepcode: this.dialogInfo.param.type_code
+                    },
+                    tableName: 'glsms_proimgup'
+                })
             } else {
                 this.dialogInfo.children.forEach(el => {
                     postParams.push({
-                        'params.tyepcode': el.param.type_code,
-                        tableName: 'v_glsms_confrguring'
+                        params: {
+                            tyepcode: el.param.type_code
+                        },
+                        tableName: 'glsms_proimgup'
                     })
                 })
             }
@@ -185,11 +191,6 @@ export default {
         color: #000;
         font-weight: bold;
     }
-    .header-title {
-        position: absolute;
-        top: 15px;
-        left: 220px;
-    }
 }
 .top {
     width: 1366px;
@@ -249,8 +250,5 @@ export default {
         color: #025baa;
         border-color: #025baa;
     }
-    .p-modal-content {
-        overflow-y: hidden;
-    }
 }
 </style>

+ 111 - 28
src/views/equipment/table/otherTable.vue

@@ -2,18 +2,50 @@
 <template>
     <div class='qt-list'>
         <div class='eq-list-top'>
-            <el-date-picker size='small' v-model='yssjwcsj' type='date' placeholder='选择处理日期:' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
-            <Select width='146' tipPlace='top' caption='处置结果:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <el-input placeholder='搜索位置' style='width:192px;margin-left:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
-            <el-input placeholder='搜索内容' style='width:192px;margin-left: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'
+                @blur='getList'
+            ></el-input>
+
+            <div class='picker-box'>
+                <span class='picker-span'>选择处理日期:</span>
+                <el-date-picker
+                    style='width:190px'
+                    v-model='handledate'
+                    value-format='yyyyMMdd'
+                    type='daterange'
+                    @change='getList'
+                    size='mini'
+                    range-separator='-'
+                    start-placeholder
+                    end-placeholder
+                ></el-date-picker>
+            </div>
+
+            <Select
+                width='180'
+                tipPlace='top'
+                caption='处置结果:'
+                v-model='handleresults'
+                :selectdata='handleOption'
+                :placeholder='"请选择"'
+                @change='getList'
+            ></Select>
         </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='lb' label='其他事项详情' show-overflow-tooltip resizable>
-                <el-table-column prop='wzjc' label='位置' show-overflow-tooltip resizable>
+                <el-table-column prop='zlwfwe' label='记录事项' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.jlsx || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='位置' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.description || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='unit' label='内容' show-overflow-tooltip resizable>
+                <el-table-column prop='content' label='内容' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.content || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sl' label='数量'>
@@ -23,24 +55,24 @@
             <el-table-column prop='zfje' label='金额(万元)'>
                 <template slot-scope='{row}'>{{number_format(row.zfje,2) || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='city' label='处理日期'>
+            <el-table-column prop='handledate' label='处理日期'>
                 <template slot-scope='{row}'>{{row.handledate?formatter(row.handledate): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='address' label='处置结果' show-overflow-tooltip resizable>
+            <el-table-column prop='handleresults' label='处置结果' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.handleresults || '--'}}</template>
             </el-table-column>
             <el-table-column prop='zlwfwz ' label='资料存放位置' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.zlwfwz || '--'}}</template>
             </el-table-column>
             <el-table-column prop='recordtime' label='记录日期'>
-                <template slot-scope='{row}'>{{row.recordtime?formatter(row.recordtime): '--'}}</template>
+                <template slot-scope='{row}'>{{row.createdate?formatter(row.createdate): '--'}}</template>
             </el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
                 background
                 layout='prev, pager, next'
-                :total='total/pageSize'
+                :total='total'
                 :page-size='size'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
@@ -57,21 +89,16 @@ import { querySelect } from '@/api/public.js'
 export default {
     data() {
         return {
-            pageSize: 10,
             tableData: [],
             total: 0,
             formatter,
             number_format,
             currentPage: 1,
             size: 10,
-            yssjwcsj: '',
-            dataSelect2: [
-                { id: 'test1', name: '选择项' },
-                { id: 'test2', name: '单平米' },
-                { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
-            ],
-            keyword: ''
+            keyword: '',
+            handleresults: '',
+            handledate: '',
+            handleOption: []
         }
     },
     props: ['major', 'smsxt'],
@@ -79,7 +106,7 @@ export default {
         ...mapGetters(['floorSelect'])
     },
     methods: {
-        pageChanged(page, size) {
+        pageChanged(page) {
             this.currentPage = page
             this.getList()
         },
@@ -93,6 +120,23 @@ export default {
                     size: this.size
                 }
             }
+            //输入框
+            getParams.data.keyword = ''
+            if (this.keyword) {
+                getParams.data.keyword += `${this.keyword}:jlsx,location,content;`
+            }
+            if (getParams.data.keyword == '') {
+                delete getParams.data.keyword
+            }
+            //时间
+            if (this.handledate) {
+                getParams.data.handledateStartDate = this.handledate[0] + '000000'
+                getParams.data.handledateEndDate = this.handledate[1] + '000000'
+            }
+            //下拉
+            if (this.handleresults) {
+                getParams.data.handleresults = this.handleresults
+            }
             queryQtsx(getParams).then(res => {
                 console.log(res)
                 this.tableData = res.data ? res.data : []
@@ -103,8 +147,8 @@ export default {
         tabFind() {
             let postParams = [
                 {
-                    columnName: { lb: 'lb', xm: 'xm', sxjd: 'sxjd', status: 'status' },
-                    tableName: 'v_glsms_zw' //视图名称
+                    columnName: { handleresults: 'handleresults' },
+                    tableName: 'v_glsms_qtsx' //视图名称
                 }
             ]
             let major
@@ -133,10 +177,10 @@ export default {
             }
             querySelect({ data, postParams }).then(res => {
                 console.log(res)
-                let lb = res.data.data.v_glsms_zw.lb
-                this.lbOption = []
-                lb.forEach(el => {
-                    this.lbOption.push({
+                let handleresults = res.data.data.v_glsms_zw.handleresults
+                this.handleOption = []
+                handleresults.forEach(el => {
+                    this.handleOption.push({
                         name: el.value,
                         id: el.key
                     })
@@ -147,13 +191,13 @@ export default {
     watch: {
         smsxt(newV, oldV) {
             if (newV !== oldV) {
-                // this.tabFind()
+                this.tabFind()
                 this.getList()
             }
         }
     },
     mounted() {
-        // this.tabFind()
+        this.tabFind()
         console.log(this.smsxt)
         this.getList()
     }
@@ -164,6 +208,21 @@ export default {
     .eq-list-top {
         display: flex;
         margin-bottom: 12px;
+        .picker-box {
+            display: flex;
+            align-items: center;
+            background: #fff;
+            padding: 0 6px;
+            border: 1px solid #dcdfe6;
+            border-radius: 4px;
+            height: 32px;
+            box-sizing: border-box;
+            margin-right: 12px;
+            .picker-span {
+                margin-right: 6px;
+                color: rgba(0, 0, 0, 0.65);
+            }
+        }
     }
     td {
         overflow: hidden;
@@ -177,4 +236,28 @@ export default {
         margin-top: 28px;
     }
 }
+</style>
+<style lang="less" >
+.qt-list {
+    .picker-box {
+        .el-input__inner {
+            border: none;
+        }
+        .el-range-editor.el-input__inner {
+            padding: 3px 0px;
+        }
+        .el-icon-date {
+            display: none;
+        }
+        .el-range__close-icon {
+            position: absolute;
+            right: 0px;
+            top: 2px;
+        }
+        .el-range-editor--mini .el-range-input {
+            font-size: 14px;
+            color: rgb(31, 36, 41);
+        }
+    }
+}
 </style>