Selaa lähdekoodia

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

zhulizhen1111 4 vuotta sitten
vanhempi
commit
ab387917ea

+ 4 - 4
package.json

@@ -8,11 +8,11 @@
         "lint": "vue-cli-service lint"
     },
     "dependencies": {
-        "@saga-web/base": "2.1.20",
-        "@saga-web/big": "1.0.43",
-        "@saga-web/draw": "2.1.96",
+        "@saga-web/base": "2.1.22",
+        "@saga-web/big": "1.0.48",
+        "@saga-web/draw": "2.1.98",
         "@saga-web/feng-map": "1.0.11",
-        "@saga-web/graph": "2.1.86",
+        "@saga-web/graph": "2.1.91",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 1 - 1
public/systemConf.js

@@ -28,4 +28,4 @@ var __systemConf = {
         wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
     },
 }
-window.__systemConf = __systemConf
+window.__systemConf = __systemConf

+ 57 - 17
src/api/legendLibrary.js

@@ -1,10 +1,14 @@
 import httputils from "@/api/httputils"
 // 图例库-查询
-export function queryLegend({ postParams }) {
+export function queryLegend({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graphElement/query`, postParams)
 }
 // 图例库-新增
-export function createLegend({ postParams }) {
+export function createLegend({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graphElement/create`, postParams)
 }
 // 图例库-新增
@@ -14,62 +18,98 @@ export function createLegend({ postParams }) {
 //     return httputils.postJson(`/serve/topology-wanda/graphElement/create`, postParams)
 // }
 //图例库-更新
-export function updateLegend({ postParams }) {
+export function updateLegend({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graphElement/update`, postParams)
 }
 //图例库-作废
-export function deleteLegend({ postParams }) {
+export function deleteLegend({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graphElement/deleteByFlag`, postParams)
 }
 //图例库-系统tree查询
-export function getLegendTree({ getParams }) {
+export function getLegendTree({
+    getParams
+}) {
     return httputils.getJson(`/serve/topology-wanda/graphCategory/queryByGroup`, getParams)
 }
 
 //图例库-系统tree相关表格查询
-export function queryRelation({ data, postParams }) {
+export function queryRelation({
+    data,
+    postParams
+}) {
     return httputils.fetchJson(`/serve/topology-wanda/graphRelation/query`, data, postParams)
 }
 //图例库-更新关系图
-export function updateRelation({ postParams }) {
+export function updateRelation({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graphRelation/update`, postParams)
 }
 //图例库-系统tree相关表格删除
-export function deleteRelation({ postParams }) {
+export function deleteRelation({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graphRelation/delete`, postParams)
 }
 //图例库-上传图片
-export function uploadImg({ postParams }) {
+export function uploadImg({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/Picture/create`, postParams)
 }
 //图例库-穿梭框的搜索
-export function getTransfer({ getParams }) {
+export function getTransfer({
+    getParams
+}) {
     return httputils.getJson(`/serve/topology-wanda/graphElement/search`, getParams)
 }
 //图例库typeId
-export function queryTypeId({ postParams }) {
+export function queryTypeId({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graphElement/type/query`, postParams)
 }
 // 搜索图铺位可视化类型信息
-export function getVisualization({ getParams }) {
+export function getVisualization({
+    getParams
+}) {
     return httputils.getJson(`/serve/topology-wanda/graphElement/type/search`, getParams)
 }
 // 图例分层展示
-export function groupByCategory({ getParams }) {
+export function groupByCategory({
+    getParams
+}) {
     // return httputils.getJson(`/serve/topology-wanda/graphRelation/groupByCategory`, getParams)
     return httputils.getJson(`/serve/topology-wanda/graphElement/groupByInfoSystem`, getParams)
 }
 // 图例搜索
-export function graphElementSearch({ postParams }) {
+export function graphElementSearch({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graphElement/search`, postParams)
 }
+// 更新图例关系信息
+export function graphElementUpdate({
+    postParams
+}) {
+    return httputils.postJson(`/serve/topology-wanda/graphRelation/update`, postParams)
+
+}
 
 // 业下设备分类和位置分类树形结构
-export function queryDeviceAndPOsition({ postParams }) {
+export function queryDeviceAndPOsition({
+    postParams
+}) {
     return httputils.postJson(`/data/data/t_system_wzfl/query`, postParams)
 }
 
 //图形查询
-export function queryPics({ postParams }) {
+export function queryPics({
+    postParams
+}) {
     return httputils.postJson(`/serve/topology-wanda/graph/query`, postParams)
-}
+}

+ 6 - 3
src/components/Legend/src/legend.vue

@@ -289,7 +289,10 @@ export default {
             })
         },
         saveNum(val) {
-            if (val) {
+            if (val.length > 0) {
+                val.forEach(element => {
+                    element.Modify = element.IsModify
+                })
                 this.queryEdit(val)
                 this.isShow2()
             } else {
@@ -297,7 +300,6 @@ export default {
             }
         },
         addFloor() {
-            console.log(111111)
             this.isFloor = true
         },
         // 新增楼层取消
@@ -343,7 +345,8 @@ export default {
         .legend-table {
             padding: 16px;
             height: 546px;
-            width: 420px;
+            width: 385px;
+            // width: 420px;
             overflow: auto;
             overflow: hidden;
             overflow-y: auto;

+ 10 - 7
src/components/editLengend.vue

@@ -15,16 +15,17 @@
                         height='430px'
                         :data='editTable'
                         tooltip-effect='dark'
+                        width='100%'
                         @selection-change='handleSelectionChange'
                     >
-                        <el-table-column prop label='项目' :show-overflow-tooltip='true' width='100'>
+                        <el-table-column prop label='项目' :show-overflow-tooltip='true'>
                             <template slot-scope='{row}'>{{row.Name||'--'}}</template>
                         </el-table-column>
                         <el-table-column prop label='数量'>
                             <template slot-scope='{row}'>
                                 <div v-if='row.IsModify'>
                                     <div v-if='row.Num!=row.RealNum ' class='redData'>
-                                        <el-tooltip class='item' effect='dark' :content='`当前图例 ${row.Num} 与平面图中的不一致,平面图中为xx`' placement='top'>
+                                        <el-tooltip class='item' effect='dark' :content='`当前图例 ${row.Name} 与平面图中的不一致,平面图中为xx`' placement='top'>
                                             <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
                                         </el-tooltip>
                                     </div>
@@ -42,7 +43,7 @@
                                         v-if='!row.IsModify'
                                         class='item'
                                         effect='dark'
-                                        :content='`当前图例 ${row.Num},从平面图中直接获取,如需编辑请修改平面图`'
+                                        :content='`当前图例 ${row.Name},从平面图中直接获取,如需编辑请修改平面图`'
                                         placement='top'
                                     >
                                         <div class='dataTwo'>{{row.Num}}</div>
@@ -50,7 +51,7 @@
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop label='单位' width='60'>
+                        <el-table-column prop label='单位'>
                             <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
                         </el-table-column>
                         <el-table-column prop label='图例'>
@@ -192,9 +193,11 @@ export default {
         position: absolute;
         top: -44px;
         right: 44px;
+        width: 385px;
+        // width: 420px;
         height: 535px;
-        min-width: 350px;
-        width: auto;
+        // min-width: 350px;
+        // width: auto;
         background: rgba(255, 255, 255, 1);
         box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
         border-radius: 2px;
@@ -205,7 +208,7 @@ export default {
             .legend-table2 {
                 padding: 16px 10px;
                 height: 430px;
-                width: 345px;
+                width: 100%;
             }
         }
     }

+ 1 - 1
src/components/viewLengend.vue

@@ -52,7 +52,7 @@
                 <el-table-column prop='Unit' label='单位' width='70'>
                     <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='Url' label='图例'>
+                <el-table-column prop='Url' label='图例' width='55'>
                     <template slot-scope='{row}'>
                         <div v-if='row.Url' class='Url-img'>
                             <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />

+ 2 - 1
src/views/legendLibrary/addForm.vue

@@ -208,7 +208,8 @@ export default {
             })
         },
         handleRemove(file, fileList) {
-            // //console.log(file, fileList, 'file')
+            console.log(file, fileList, 'file')
+            this.ruleForm.Url = ''
         },
         getFile(file) {
             // let imgSrc = document.querySelector('.input-right>img')

+ 22 - 8
src/views/legendLibrary/index.vue

@@ -4,7 +4,7 @@
             <img class='img-menu' src='@/assets/imgs/menu.png' alt />
             <el-divider direction='vertical'></el-divider>
             <img class='img-logo' src='@/assets/imgs/logo_tu.png' alt />
-            <span style='color:#1F2329'>万达管理说明书</span>
+            <span class='nav-span1'>万达管理说明书</span>
             <span class='circular'></span>
             <!-- <span style='color:#1F2329'>图例库管理</span>
             <i class='el-icon-caret-bottom'></i>-->
@@ -99,16 +99,15 @@
             </div>
             <el-table :data='tableData' :key='key' :border='true' style='width: 100%'>
                 <el-table-column prop='Name' label='图例名称'>
-                    <template slot-scope='{row}'>{{row.Name || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.Name }}</template>
                 </el-table-column>
                 <el-table-column prop='style' label='图例样式'>
                     <template slot-scope='{row}'>
-                        <img v-if='row.Url' class='img' :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
-                        <span v-else>{{'--'}}</span>
+                        <img class='img' :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
                     </template>
                 </el-table-column>
                 <el-table-column prop='Unit' label='单位'>
-                    <template slot-scope='{row}'>{{row.Unit || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.Unit}}</template>
                 </el-table-column>
                 <el-table-column prop='position' label='对应广场说明书的位置'>
                     <template slot-scope='{row}'>
@@ -139,7 +138,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column v-if='state==0' prop='DeleteTime' label='作废时间' width='180'>
-                    <template v-if='state==0' slot-scope='{row}'>{{row.DeleteTime || '--'}}</template>
+                    <template v-if='state==0' slot-scope='{row}'>{{row.DeleteTime}}</template>
                 </el-table-column>
             </el-table>
             <div class='foot'>
@@ -427,30 +426,45 @@ export default {
         width: 100%;
         background: #fff;
         margin-left: 17px;
+        display: flex;
+        align-items: center;
         .img-menu {
             margin-right: 9px;
         }
         .img-logo {
             margin: 0 9px;
         }
+        .nav-span1 {
+            height: 26px;
+            font-size: 14px;
+            font-family: MicrosoftYaHei;
+            color: rgba(31, 35, 41, 1);
+            line-height: 26px;
+        }
         .circular {
             display: inline-block;
             width: 4px;
             height: 4px;
             background: rgba(195, 198, 203, 1);
             border-radius: 50%;
-            margin: 0 8px 3px 8px;
+            margin: 0 8px 0px 8px;
         }
     }
+    /deep/ .p-drop {
+        height: 48px;
+    }
     /deep/ .p-drop .p-drop-title .p-drop-triangle {
         margin-top: -5px;
     }
     .legend-library-top {
-        height: 48px;
+        height: 45px;
         background: rgba(247, 249, 250, 1);
         text-align: center;
         line-height: 48px;
         color: #1f2329;
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: rgba(31, 36, 41, 1);
         .library-btn {
             float: right;
             margin-right: 16px;

+ 19 - 8
src/views/legendRules/index.vue

@@ -67,7 +67,7 @@
 </template>
 <script>
 import addLegend from '../legendLibrary/addLegend'
-import { getLegendTree, queryRelation, deleteRelation } from '@/api/legendLibrary.js'
+import { getLegendTree, queryRelation, deleteRelation, graphElementUpdate } from '@/api/legendLibrary.js'
 export default {
     components: { addLegend },
     data() {
@@ -135,10 +135,6 @@ export default {
         }
     },
     methods: {
-        /**
-         * 点击工具栏按钮回调方法
-         * @param {Object} Obj {tool:{icon:'icon组件名称',name:'按钮名称',type:'icon组件type'},item:当前行数据}
-         */
         buttonClickHandle(obj) {
             let index = Number(obj.item.index.split('-')[1])
             let _this = this
@@ -160,6 +156,8 @@ export default {
                     let upDate = _this.tableData[index - 1]
                     _this.tableData.splice(index - 1, 1)
                     _this.tableData.splice(index, 0, upDate)
+                    let ids = _this.tableData.map(({ Id }) => Id)
+                    _this.upDateGraphy(ids)
                 }
             }
 
@@ -170,16 +168,29 @@ export default {
                     let downDate = _this.tableData[index + 1]
                     _this.tableData.splice(index + 1, 1)
                     _this.tableData.splice(index, 0, downDate)
+                    let ids = _this.tableData.map(({ Id }) => Id)
+                    _this.upDateGraphy(ids)
                 }
             }
         },
+        // 更新图例关系信息
+        upDateGraphy(ids) {
+            let posParams = {
+                GraphCategoryId: this.GraphCategoryId[0],
+                GraphElementIds: ids,
+                Move: true
+            }
+
+            graphElementUpdate({ posParams }).then(res => {
+                this.getData()
+            })
+        },
 
         handleNodeClick(data, e) {
             this.GraphCategoryId = [e.node.eventKey]
             this.getData()
         },
         deleteClick(row) {
-            console.log(row)
             let postParams = [
                 {
                     GraphCategoryId: this.GraphCategoryId[0],
@@ -268,8 +279,8 @@ export default {
         flex: 1;
         display: flex;
         .legend-rules-left {
-            width: 288px;
-            padding: 26px;
+            // width: 288px;
+            // padding: 26px;
         }
         .legend-rules-right {
             padding: 16px;

+ 6 - 6
src/views/room/detail.vue

@@ -111,13 +111,13 @@
             :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='50'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' :show-overflow-tooltip='true' resizable>
+            <el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
                 <template slot-scope='{row}'>{{row.sbjc||'--'}}</template>
             </el-table-column>
             <el-table-column prop='sbbh' label='设备编号' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sbbh||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' :show-overflow-tooltip='true'>
+            <el-table-column prop='sl' label='数量' width='70' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sl||'--'}}</template>
             </el-table-column>
             <el-table-column prop='sbglgs' label='管理归属' :show-overflow-tooltip='true'>
@@ -132,16 +132,16 @@
             <el-table-column prop='sbxh' label='型号' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层' :show-overflow-tooltip='true'>
+            <el-table-column prop='floor' label='楼层' width='70' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.floor||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='wzqy' label='安装位置' :show-overflow-tooltip='true'>
+            <el-table-column prop='wzqy' label='安装位置' min-width='150' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.wzqy||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' :show-overflow-tooltip='true'>
+            <el-table-column prop='manufacturer' label='生产厂商' min-width='150' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='fws' label='服务商' :show-overflow-tooltip='true'>
+            <el-table-column prop='fws' label='服务商' min-width='150' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.fws||'--'}}</template>
             </el-table-column>
         </el-table>

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

@@ -10,10 +10,10 @@
                 :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='50'></el-table-column>
-                <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable>
+                <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.classqc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='数量' :show-overflow-tooltip='true'>
+                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='70'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='品牌' :show-overflow-tooltip='true'>
@@ -22,10 +22,10 @@
                 <el-table-column prop label='型号' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='楼层' :show-overflow-tooltip='true'>
+                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='70'>
                     <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商'>
+                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='150'>
                     <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>
                 </el-table-column>
             </el-table>

+ 2 - 2
src/views/room/room4.vue

@@ -9,7 +9,7 @@
                 :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='50'></el-table-column>
-                <el-table-column prop label='设备名称' show-overflow-tooltip resizable>
+                <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='设备编号' show-overflow-tooltip resizable>
@@ -18,7 +18,7 @@
                 <el-table-column prop label='重要事项记录' width='130' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='描述' show-overflow-tooltip resizable>
+                <el-table-column prop label='描述' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.description||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='更换配件信息' align='center' show-overflow-tooltip resizable>

+ 4 - 4
src/views/room/room5.vue

@@ -9,13 +9,13 @@
                 :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='50'></el-table-column>
-                <el-table-column prop label='设备名称' show-overflow-tooltip resizable>
+                <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='设备编号' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='核心维保事项记录' :show-overflow-tooltip='true' min-width='130'>
+                <el-table-column prop label='核心维保事项记录' :show-overflow-tooltip='true' min-width='150'>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='现场照片' :show-overflow-tooltip='true'>
@@ -32,7 +32,7 @@
                             <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'>
+                    <el-table-column prop label='维保任务名称' :show-overflow-tooltip='true' min-width='150'>
                         <template slot-scope='{row}'>{{row.wbrwmc || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='任务状态' :show-overflow-tooltip='true'>
@@ -55,7 +55,7 @@
                     <el-table-column prop label='异常工单编号' :show-overflow-tooltip='true' min-width='110'>
                         <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='描述' :show-overflow-tooltip='true'>
+                    <el-table-column prop label='描述' :show-overflow-tooltip='true' min-width='150'>
                         <template slot-scope='{row}'>{{row.description||'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='130'>