guoxiaohuan 4 lat temu
rodzic
commit
53b567cc39

+ 5 - 0
src/assets/css/rotation.css

@@ -122,6 +122,11 @@
   line-height: 21px;
   margin-bottom: 8px;
 }
+.overview .view-box .view-left .lb-bottom .place-p1 img {
+  width: 16px;
+  height: 16px;
+  margin-right: 3px;
+}
 .overview .view-box .view-left .lb-bottom .place-p2 {
   margin: 16px 0;
   height: 22px;

+ 5 - 0
src/assets/css/rotation.less

@@ -117,6 +117,11 @@
                     color: rgba(31, 36, 41, 1);
                     line-height: 21px;
                     margin-bottom: 8px;
+                    img {
+                        width: 16px;
+                        height: 16px;
+                        margin-right: 3px;
+                    }
                 }
                 .place-p2 {
                     margin: 16px 0;

+ 15 - 10
src/components/Legend/src/legend.vue

@@ -102,28 +102,32 @@ export default {
         queryMarks() {
             let params = {
                 postParams: {
-                    graphId: '1',
+                    categoryId: 'NTXT',
                     projectId: '1'
                 }
             }
             queryRead(params).then(res => {
                 console.log('备注', res.data.Data[0].Note)
-                // 打开底图备注编辑重新查询
-                // 有备注->判断底图->判断要展示的文字是否备注中的吻合->加/不加
-                // 无备注->判断平面图->是否展示默认文案
                 if (res.data.Data[0].Note) {
                     let note = res.data.Data[0].Note
-                    if (note.search(this.text1) != 1) {
+                    if (note.search(this.text1) != -1 && note.search(this.text2) != -1) {
                         this.remarksText = `${note}`
-                    } else {
+                    } else if (note.search(this.text1) != -1) {
+                        this.remarksText = `${this.text2}${note}`
+                    } else if (note.search(this.text2) != -1) {
                         this.remarksText = `${this.text1}${note}`
-                    }
-                    if (note.search(this.text2) != -1) {
-                        this.remarksText = `${note}`
                     } else {
-                        this.remarksText = `${this.text2}${note}`
+                        this.remarksText = `${this.text1}${this.text2}${note}`
                     }
+                    // if (note.search(this.text2) != -1) {
+                    //     this.remarksText = `${note}`
+                    // } else {
+                    //     this.remarksText = `${this.text2}${note}`
+                    // }
+                } else {
+                    this.remarksText = `${this.text1}${this.text2}`
                 }
+                console.log(this.remarksText)
             })
         },
         dump() {},
@@ -175,6 +179,7 @@ export default {
                     }
                 })
             })
+            this.queryMarks()
         },
         // 查询编辑状态图例
         queryEditNum(flag) {

+ 15 - 9
src/components/PicLarge/src/picLarge.vue

@@ -4,7 +4,7 @@
 *@info:大图预览
 */
 <template>
-    <el-dialog title='图片预览' width='1080px' :visible.sync='dialogVisible' :close-on-click-modal='false'>
+    <el-dialog title='图片预览' width='1080px' :visible.sync='dialogVisible' :close-on-click-modal='false' append-to-body>
         <div class='pic-list'>
             <div class='pic-left'>
                 <ul v-for='(item,index) in imgUrl' :key='index'>
@@ -29,14 +29,7 @@ export default {
     data() {
         return {
             dialogVisible: false,
-            imgUrl: [
-                { url: require('@/assets/images/matter_pop3.png'), name: '图片名称1.png' },
-                { url: require('@/assets/images/survey_map.png'), name: '图片名称1.png' },
-                { url: require('@/assets/images/matter_pop3.png'), name: '图片名称1.png' },
-                { url: require('@/assets/images/survey_overlook.png'), name: '图片名称1.png' },
-                { url: require('@/assets/images/survey_project_btn.png'), name: '图片名称1.png' }
-            ],
-            ImgUrl: require('../../../assets/images/matter_pop3.png')
+            ImgUrl: ''
         }
     },
     methods: {
@@ -46,6 +39,19 @@ export default {
         getIndex(imgUrl) {
             this.ImgUrl = imgUrl
         }
+    },
+    computed: {
+        __imgUrl() {
+            return this.imgUrl
+        }
+    },
+    watch: {
+        __imgUrl: {
+            handler(newV, oldV) {
+                newV.length && (this.ImgUrl = this.imgUrl[0].url)
+            },
+            deep: true
+        }
     }
 }
 </script>

+ 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: false,
+            loading: true,
             view: null,
             isQuerying: false // 限制重复查询
         }

+ 1 - 1
src/main.js

@@ -64,7 +64,7 @@ import Pui from 'meri-design';
 import 'meri-design/dist/index.css';
 Vue.use(Pui);
 //////////模拟传入参数
-var username = 'aiyu6';
+var username = 'yangxiaoyong3';
 /////////////////
 // 在跳入路由之前要请求获取权限信息
 router.beforeEach(function (to, from, next) { return __awaiter(void 0, void 0, void 0, function () {

+ 4 - 5
src/main.ts

@@ -25,13 +25,12 @@ import Legend from '@/components/Legend'
 Vue.use(Legend)
 import cookies from 'vue-cookie'
 Vue.use(cookies)
-import Pui from 'meri-design';
-import 'meri-design/dist/index.css';
-Vue.use(Pui);
-
+import Pui from 'meri-design'
+import 'meri-design/dist/index.css'
+Vue.use(Pui)
 
 //////////模拟传入参数
-const username = 'aiyu6'
+const username = 'yangxiaoyong3'
 /////////////////
 // 在跳入路由之前要请求获取权限信息
 router.beforeEach(async (to, from, next) => {

+ 3 - 1
src/store/index.js

@@ -10,7 +10,8 @@ export default new Vuex.Store({
         userInfo: {
             employeename: '', //用户名称:艾宇;
             orgCode: '',
-            username: 'aiyu6', //账户名称
+            username: 'yangxiaoyong3', //账户名称
+            projectName: '',
         },
         plazaId: '1000423',
         floorsArr: [], //楼层数组
@@ -32,6 +33,7 @@ export default new Vuex.Store({
             state.userInfo.employeename = palyload.employeename
             state.userInfo.orgCode = palyload.orgCode
             state.userInfo.username = palyload.username
+            // state.userInfo.projectName = palyload.plazas
         },
         SETFLOORS(state, data) {
             state.floorsArr = data

+ 4 - 3
src/views/other/index.vue

@@ -80,10 +80,11 @@ export default {
         queryPicter() {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
-                data: { tyepcode: 7, floor: this.picFloor, plazaId: this.$store.state.plazaId },
-                params: {}
+                module: '1002',
+                floor: this.picFloor,
+                plazaId: this.$store.state.plazaId
             }
-            queryPic(getParams).then(res => {
+            queryPic({ getParams }).then(res => {
                 console.log('库房管理图', res)
                 this.picFloorImg = res.data
             })

+ 6 - 1
src/views/overview/index.vue

@@ -27,7 +27,12 @@
                         <span></span>
                         <span>建筑综合信息</span>
                     </nav>
-                    <p class='place-p1'>{{build.length>0?formatter('项目名称',build):'--'}}</p>
+                    <p class='place-p1'>
+                        <span>
+                            <img src='@/assets/imgs/jz.png' alt />
+                            {{build.length>0?formatter('项目名称',build):'--'}}
+                        </span>
+                    </p>
                     <p class='place-p2'>
                         <span>
                             <img src='@/assets/imgs/didian.png' alt />

+ 4 - 7
src/views/room/index.vue

@@ -494,6 +494,7 @@ export default {
             let getParams = {
                 typename: '位置布置图',
                 location: '1198',
+                module: '1002',
                 floor: this.picFloor,
                 plazaId: this.$store.state.plazaId
             }
@@ -597,9 +598,9 @@ export default {
         // 维修
         Index3() {
             let getParams = {
-                location: '1961',
-                plazaId: '1001145',
-                // plazaId: this.$store.state.plazaId,
+                location: '1015',
+                // plazaId: '1001145',
+                plazaId: this.$store.state.plazaId,
                 page: this.page3,
                 size: this.size3,
                 orderBy: 'sjjssj,0;location,1'
@@ -913,10 +914,6 @@ export default {
             color: rgba(31, 36, 41, 1);
             border: 1px solid rgba(195, 199, 203, 1);
         }
-        .el-tabs,
-        .el-tabs__content {
-            height: 800px;
-        }
         .el-tabs__active-bar {
             background-color: transparent !important;
         }

+ 25 - 3
src/views/room/room5.vue

@@ -19,11 +19,18 @@
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='现场照片' :show-overflow-tooltip='true'>
-                    <template slot-scope='{row}'>{{row.pics ||'--'}}</template>
+                    <template slot-scope='{row}'>
+                        <div
+                            style='cursor:pointer;color: #0091ff;'
+                            @click='clickPic(row.glsmsImage)'
+                        >{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
+                    </template>
                 </el-table-column>
                 <el-table-column prop label='维保任务' align='center'>
                     <el-table-column prop label='任务编号' :show-overflow-tooltip='true'>
-                        <template slot-scope='{row}'>{{row.wb_gzglid||'--'}}</template>
+                        <template slot-scope='{row}'>
+                            <div style='cursor:pointer;color: #0091ff;'>{{row.wb_gzglid||'--'}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column prop label='维保任务名称' :show-overflow-tooltip='true' min-width='100'>
                         <template slot-scope='{row}'>{{row.wbrwmc || '--'}}</template>
@@ -70,6 +77,7 @@
                 @next-click='pageChanged'
                 @current-change='pageChanged'
             ></el-pagination>
+            <pic-large :imgUrl='imgUrl' ref='picLargeOpen'></pic-large>
         </div>
     </div>
 </template>
@@ -83,7 +91,8 @@ export default {
         return {
             value1: '',
             searVal: '',
-            dateVal: ''
+            dateVal: '',
+            imgUrl: []
         }
     },
     components: { Select },
@@ -95,6 +104,19 @@ export default {
         },
         formatter(date) {
             return moment.unix(date / 1000).format('YYYY.MM.DD')
+        },
+        clickPic(row) {
+            this.imgUrl = []
+            if (row) {
+                row.forEach(el => {
+                    let obj = {
+                        name: el.DESCRIPTION,
+                        url: el.URLNAME
+                    }
+                    this.imgUrl.push(obj)
+                })
+            }
+            this.$refs.picLargeOpen.open(this.imgUrl)
         }
     }
 }