shaun-sheep 4 년 전
부모
커밋
ceefa58d8c

+ 2 - 2
package.json

@@ -9,10 +9,10 @@
     },
     "dependencies": {
         "@saga-web/base": "2.1.22",
-        "@saga-web/big": "1.0.66",
+        "@saga-web/big": "1.0.67",
         "@saga-web/draw": "2.1.100",
         "@saga-web/feng-map": "1.0.19",
-        "@saga-web/graph": "2.1.101",
+        "@saga-web/graph": "2.1.102",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 6 - 3
public/systemConf.js

@@ -21,11 +21,14 @@
  */
 var __systemConf = {
     // 系统编码
-    systemCode: 'wandaBmGuide',
+    systemCode: "wandaBmGuide",
     conf: {
         // 阿里云
-        editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
-        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
+        // editerUrl: "http://60.205.177.43:80/wandaEditer/", // 编辑器地址
+        // wandaBmGuideUrl: "http://60.205.177.43:80/wandaBmGuide/", //管理书地址
+        // http://glsms.wanda-dev.cn/ 测试服
+        editerUrl: "http://glsms.wanda-dev.cn/wandaEditer/", // 编辑器地址
+        wandaBmGuideUrl: "http://glsms.wanda-dev.cn/wandaBmGuide/", //管理书地址
     },
 }
 window.__systemConf = __systemConf

+ 184 - 184
src/assets/css/rotation.css

@@ -1,260 +1,260 @@
 .overview {
-    background: #f2f5f7;
-    padding: 16px 20px 20px 20px;
-    height: calc(100% - 48px);
-    width: 100%;
+  background: #f2f5f7;
+  padding: 16px 20px 20px 20px;
+  height: calc(100% - 48px);
+  width: 100%;
 }
 .overview .view-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 .overview .view-title nav {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
 .overview .view-title nav span:nth-of-type(1) {
-    width: 3px;
-    height: 16px;
-    background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
-    border-radius: 2px;
-    margin-right: 4px;
-    display: inline-block;
+  width: 3px;
+  height: 16px;
+  background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
+  border-radius: 2px;
+  margin-right: 4px;
+  display: inline-block;
 }
 .overview .view-title nav span:nth-of-type(2) {
-    height: 24px;
-    font-size: 16px;
-    font-family: MicrosoftYaHeiSemibold;
-    font-weight: bold;
-    color: #1f2429;
+  height: 24px;
+  font-size: 16px;
+  font-family: MicrosoftYaHeiSemibold;
+  font-weight: bold;
+  color: #1f2429;
 }
 .overview .view-title .view-button {
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    line-height: 22px;
-    width: 106px;
-    height: 32px;
-    background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
-    font-size: 14px;
-    color: #ffffff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-    border-radius: 4px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  line-height: 22px;
+  width: 106px;
+  height: 32px;
+  background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
+  font-size: 14px;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  border-radius: 4px;
 }
 .overview .view-title .view-button img {
-    display: inline-block;
-    height: 16px;
-    width: 16px;
-    margin-right: 6px;
+  display: inline-block;
+  height: 16px;
+  width: 16px;
+  margin-right: 6px;
 }
 .overview .view-box {
-    height: calc(100% - 32px);
-    display: flex;
-    justify-content: space-between;
+  height: calc(100% - 32px);
+  display: flex;
+  justify-content: space-between;
 }
 .overview .view-box .view-left {
-    width: 58.5%;
-    margin-right: 10px;
-    display: flex;
-    flex-direction: column;
+  width: 58.5%;
+  margin-right: 10px;
+  display: flex;
+  flex-direction: column;
 }
 .overview .view-box .view-left .lb-left {
-    width: 100%;
-    height: 66%;
-    flex: 1;
-    margin-top: 12px;
-    margin-bottom: 10px;
-    position: relative;
-    border: 1px solid #ccc;
-    border-radius: 4px;
+  width: 100%;
+  height: 66%;
+  flex: 1;
+  margin-top: 12px;
+  margin-bottom: 10px;
+  position: relative;
+  border: 1px solid #ccc;
+  border-radius: 4px;
 }
 .overview .view-box .view-left .lb-left img {
-    width: 100%;
+  width: 100%;
 }
 .overview .view-box .view-left .lb-left .lb-icon {
-    z-index: 99;
-    position: absolute;
-    top: 0;
-    right: 0px;
-    width: 32px;
-    height: 32px;
-    background: rgba(0, 0, 0, 0.6);
-    border-radius: 0px 4px 0px 4px;
-    cursor: pointer;
+  z-index: 99;
+  position: absolute;
+  top: 0;
+  right: 0px;
+  width: 32px;
+  height: 32px;
+  background: rgba(0, 0, 0, 0.6);
+  border-radius: 0px 4px 0px 4px;
+  cursor: pointer;
 }
 .overview .view-box .view-left .lb-left .lb-img {
-    z-index: 101;
-    width: 16px;
-    height: 16px;
-    position: absolute;
-    top: 8px;
-    right: 10px;
-    cursor: pointer;
+  z-index: 101;
+  width: 16px;
+  height: 16px;
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  cursor: pointer;
 }
 .overview .view-box .view-left .lb-bottom {
-    height: 34%;
-    background: #ffffff;
-    padding: 12px 16px;
+  height: 34%;
+  background: #ffffff;
+  padding: 12px 16px;
 }
 .overview .view-box .view-left .lb-bottom nav {
-    width: 161px;
-    height: 32px;
-    display: flex;
-    align-items: center;
-    background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
-    margin-bottom: 12px;
-    border-radius: 4px;
+  width: 161px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
+  margin-bottom: 12px;
+  border-radius: 4px;
 }
 .overview .view-box .view-left .lb-bottom nav span:nth-of-type(1) {
-    width: 2px;
-    height: 16px;
-    background: #025baa;
-    margin-right: 6px;
-    display: inline-block;
+  width: 2px;
+  height: 16px;
+  background: #025baa;
+  margin-right: 6px;
+  display: inline-block;
 }
 .overview .view-box .view-left .lb-bottom nav span:nth-of-type(2) {
-    width: 107px;
-    height: 22px;
-    font-size: 14px;
-    font-family: MicrosoftYaHeiSemibold;
-    font-weight: bold;
-    color: #025baa;
+  width: 107px;
+  height: 22px;
+  font-size: 14px;
+  font-family: MicrosoftYaHeiSemibold;
+  font-weight: bold;
+  color: #025baa;
 }
 .overview .view-box .view-left .lb-bottom .place-p1 {
-    height: 24px;
-    font-size: 16px;
-    font-family: MicrosoftYaHeiSemibold;
-    color: #1f2429;
-    line-height: 21px;
-    margin-bottom: 8px;
+  height: 24px;
+  font-size: 16px;
+  font-family: MicrosoftYaHeiSemibold;
+  color: #1f2429;
+  line-height: 21px;
+  margin-bottom: 8px;
 }
 .overview .view-box .view-left .lb-bottom .place-p1 img {
-    width: 16px;
-    height: 16px;
-    margin-right: 3px;
-    margin-top: -3px;
+  width: 16px;
+  height: 16px;
+  margin-right: 3px;
+  margin-top: -3px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 {
-    margin: 16px 0;
-    height: 22px;
-    font-size: 14px;
-    font-family: MicrosoftYaHei;
-    color: #1f2429;
-    line-height: 19px;
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    margin-top: 0px;
+  margin: 16px 0;
+  height: 22px;
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #1f2429;
+  line-height: 19px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+  margin-top: 0px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 img {
-    width: 16px;
-    height: 16px;
-    margin-right: 3px;
+  width: 16px;
+  height: 16px;
+  margin-right: 3px;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom {
-    display: flex;
+  display: flex;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box {
-    width: 50%;
-    display: flex;
+  width: 50%;
+  display: flex;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-left {
-    display: flex;
-    align-items: center;
-    flex-direction: column;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-left span {
-    display: inline-block;
-    width: 56px;
-    margin-right: 8px;
-    font-size: 12px;
-    font-family: MicrosoftYaHei;
-    color: #646c73;
-    line-height: 22px;
+  display: inline-block;
+  width: 56px;
+  margin-right: 8px;
+  font-size: 12px;
+  font-family: MicrosoftYaHei;
+  color: #646c73;
+  line-height: 22px;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-right {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-right span {
-    display: inline-block;
-    font-size: 12px;
-    font-family: MicrosoftYaHei;
-    color: #1f2429;
-    line-height: 22px;
+  display: inline-block;
+  font-size: 12px;
+  font-family: MicrosoftYaHei;
+  color: #1f2429;
+  line-height: 22px;
 }
 .overview .view-box .view-right {
-    flex: 1;
+  flex: 1;
 }
 .overview .view-box .view-right .view-right-box {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 }
 .overview .view-box .view-right .view-right-box .lb-right {
-    flex: 1;
-    height: 47%;
-    margin-top: 12px;
-    margin-bottom: 10px;
-    position: relative;
-    border: 1px solid #ccc;
-    border-radius: 4px;
+  flex: 1;
+  height: 47%;
+  margin-top: 12px;
+  margin-bottom: 10px;
+  position: relative;
+  border: 1px solid #ccc;
+  border-radius: 4px;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-icon {
-    z-index: 99;
-    position: absolute;
-    top: 0;
-    right: 0px;
-    width: 32px;
-    height: 32px;
-    background: rgba(0, 0, 0, 0.6);
-    border-radius: 0px 4px 0px 4px;
-    cursor: pointer;
+  z-index: 99;
+  position: absolute;
+  top: 0;
+  right: 0px;
+  width: 32px;
+  height: 32px;
+  background: rgba(0, 0, 0, 0.6);
+  border-radius: 0px 4px 0px 4px;
+  cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-img {
-    z-index: 101;
-    width: 16px;
-    height: 16px;
-    position: absolute;
-    top: 8px;
-    right: 10px;
-    cursor: pointer;
+  z-index: 101;
+  width: 16px;
+  height: 16px;
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom {
-    height: 53%;
-    background: #ffffff;
-    padding: 12px 16px;
-    overflow: hidden;
+  height: 53%;
+  background: #ffffff;
+  padding: 12px 16px;
+  overflow: hidden;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav {
-    width: 161px;
-    height: 32px;
-    display: flex;
-    align-items: center;
-    background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
-    margin-bottom: 12px;
-    border-radius: 4px;
+  width: 161px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
+  margin-bottom: 12px;
+  border-radius: 4px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav span:nth-of-type(1) {
-    width: 2px;
-    height: 16px;
-    background: #025baa;
-    margin-right: 6px;
-    display: inline-block;
+  width: 2px;
+  height: 16px;
+  background: #025baa;
+  margin-right: 6px;
+  display: inline-block;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav span:nth-of-type(2) {
-    width: 107px;
-    height: 22px;
-    font-size: 14px;
-    font-family: MicrosoftYaHeiSemibold;
-    font-weight: bold;
-    color: #025baa;
+  width: 107px;
+  height: 22px;
+  font-size: 14px;
+  font-family: MicrosoftYaHeiSemibold;
+  font-weight: bold;
+  color: #025baa;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom .view-right-bottom {
-    overflow: auto;
+  overflow: auto;
 }
 @media only screen and (min-width: 768px) and (max-width: 1366px) {
 }

+ 2 - 2
src/assets/css/rotation.less

@@ -91,7 +91,7 @@
                     height: 16px;
                     position: absolute;
                     top: 8px;
-                    right: 10px;
+                    right: 8px;
                     cursor: pointer;
                 }
             }
@@ -221,7 +221,7 @@
                         height: 16px;
                         position: absolute;
                         top: 8px;
-                        right: 10px;
+                        right: 8px;
                         cursor: pointer;
                     }
                 }

+ 18 - 4
src/components/404.vue

@@ -3,7 +3,7 @@
         <div class='not-img'>
             <img src='@/assets/imgs/dlsb.png' alt />
         </div>
-        <div class='not-text' v-if='isPermissions'>
+        <div class='not-text' v-if='permissions && permissions.includes("GLSMS_VIEW")'>
             <span>您的权限不足……</span>
             <span>建议您联系管理员开通管理说明书相关权限</span>
         </div>
@@ -11,16 +11,30 @@
             <span>您的访问出错了!</span>
             <span>建议您稍后再试,或直接联系管理员解决</span>
         </div>
-        <div class='not-button'>
+        <div class='not-button' @click='goLogin'>
             <span>关闭页面</span>
         </div>
     </div>
 </template>
 <script>
+import { mapGetters } from 'vuex'
 export default {
     data() {
-        return {
-            isPermissions: true //是否有访问权限
+        return {}
+    },
+    computed: {
+        ...mapGetters(['permissions'])
+    },
+    mounted() {},
+    methods: {
+        goLogin() {
+            let ssoServer = 'http://oauth.wanda-dev.cn'
+            this.$store.commit('SETSSOTOKEN', null)
+            let systemcode = 'CAD156',
+                signal = new Date().getTime(),
+                version = '1.0.0'
+            window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+            window.open(`${window.location.href}`, true)
         }
     }
 }

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

@@ -136,7 +136,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['plazaId', 'fmapID', 'floorSelect', 'isMessage'])
+        ...mapGetters(['plazaId', 'fmapID', 'floorSelect', 'isMessage', 'ssoToken'])
     },
     props: {
         floors: {
@@ -287,7 +287,7 @@ export default {
                 { editerUrl } = conf
             let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
             let seq = this.$cookie.get('currentFloorId')
-            let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}`
+            let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}&token=${this.ssoToken}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url, true)
         },
@@ -358,13 +358,15 @@ export default {
                 if (res.Result == 'success') {
                     //console.log('更新图例', res)
                     this.$message({
-                        message: '编辑图例成功',
+                        message: '操作成功',
                         type: 'success'
                     })
                     this.queryEditNum(this.editSwitch)
+                    this.show2 = false
+                    this.show = true
                 } else {
                     this.$message({
-                        message: '编辑图例失败',
+                        message: '操作失败',
                         type: 'error'
                     })
                 }
@@ -378,10 +380,10 @@ export default {
                 this.queryEdit(val)
                 this.isShow2()
             } else {
-                this.isShow2()
-                this.queryEditNum(true)
+                this.show2 = false
+                // this.isShow2()
+                // this.queryEditNum(true)
             }
-            this.show2 = true
         },
         addFloor() {
             this.isFloor = true
@@ -472,7 +474,7 @@ export default {
     .legend-tab {
         position: absolute;
         top: 0;
-        right: 44px;
+        right: 47px;
         .legend-table {
             padding: 16px;
             height: 546px;

+ 23 - 20
src/components/editLengend.vue

@@ -109,7 +109,7 @@
             </div>
             <div class='legendFoot'>
                 <el-button size='mini' @click='cancel'>取消</el-button>
-                <el-button size='mini' v-if='editNum.length==0' disabled type='primary'>保存</el-button>
+                <el-button size='mini' v-if='editNum.length==0' type='primary' disabled style='opacity: 0.5'>保存</el-button>
                 <el-button size='mini' v-else @click='save' type='primary'>保存</el-button>
             </div>
         </div>
@@ -147,22 +147,23 @@ export default {
             this.$emit('handleSwich2', val)
         },
         save() {
-            this.$confirm('图例中的数据发生变化, 是否需要保存?', {
-                confirmButtonText: '保存',
-                cancelButtonText: '放弃修改',
-                type: 'warning'
-            })
-                .then(() => {
-                    this.$emit('saveNum', this.editNum)
-                })
-                .catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已放弃修改'
-                    })
-                    this.editNum = []
-                    this.$emit('saveNum', this.editNum)
-                })
+            this.$emit('saveNum', this.editNum)
+            // this.$confirm('图例中的数据发生变化, 是否需要保存?', {
+            //     confirmButtonText: '保存',
+            //     cancelButtonText: '放弃修改',
+            //     type: 'warning'
+            // })
+            //     .then(() => {
+            //         this.$emit('saveNum', this.editNum)
+            //     })
+            //     .catch(() => {
+            //         this.$message({
+            //             type: 'info',
+            //             message: '已放弃修改'
+            //         })
+            //         this.editNum = []
+            //         this.$emit('saveNum', this.editNum)
+            //     })
         },
         init() {
             this.tbData1 = []
@@ -198,7 +199,7 @@ export default {
     .legend-tab2 {
         position: absolute;
         top: -44px;
-        right: 44px;
+        right: 47px;
         width: 385px;
         // width: 420px;
         height: 535px;
@@ -237,8 +238,10 @@ export default {
         line-height: 20px;
         margin: 0 auto;
         img {
-            width: 100%;
-            height: 100%;
+            display: block;
+            max-width: 100%;
+            max-height: 100%;
+            margin: 0 auto;
         }
     }
     .legendFoot {

+ 5 - 0
src/components/floorMap/canvasFun.vue

@@ -151,6 +151,7 @@ export default {
     .el-slider__button {
         width: 13px;
         height: 13px;
+        border: 2px solid #025baa;
     }
     .el-slider__runway {
         height: 3px;
@@ -167,5 +168,9 @@ export default {
         border-top-left-radius: 1px;
         border-bottom-left-radius: 1px;
     }
+    .action-box .el-slider__runway {
+        background-color: #e8e8e8 !important;
+        background: #e8e8e8 !important;
+    }
 }
 </style>

+ 1 - 1
src/components/legendremarks.vue

@@ -148,7 +148,7 @@ export default {
     cursor: pointer;
 }
 .edit_container {
-    margin: 10px 0 0;
+    margin: 0px;
     .p1 {
         position: absolute;
         bottom: 65px;

+ 6 - 5
src/components/menuList.vue

@@ -5,7 +5,8 @@
             <div class='downright'></div>
             <div class='home-box'>
                 <img src='@/assets/imgs/logo.png' alt />
-                <span v-if="plazas">{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span>
+                <span>大连高新万达广场</span>
+                <!-- <span v-if='plazas'>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span> -->
             </div>
         </div>
         <div>
@@ -174,7 +175,7 @@ export default {
         dumpLegend() {
             const { conf } = window.__systemConf,
                 { wandaBmGuideUrl } = conf
-            window.open(`${wandaBmGuideUrl}home/legendLibrary`, true)
+            window.open(`${wandaBmGuideUrl}home/legendLibrary?token=${this.$store.state.ssoToken}`, true)
         }
     }
 }
@@ -241,16 +242,16 @@ export default {
             text-align: center;
             //background: url('../assets/images/topbar1.png') no-repeat;
             float: left;
-            width: 80px;
+            width: 88px;
             height: 48px;
-            margin: 0 10px;
+            margin: 0 8px;
             cursor: pointer;
             transition: all 0.2s;
         }
         .is-active {
             color: #025baa;
             font-weight: bolder;
-            border-bottom: 2px solid #025baa;
+            border-bottom: 2px solid #025baa;  
             background: linear-gradient(180deg, rgba(2, 91, 170, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
         }
     }

+ 4 - 2
src/components/viewLengend.vue

@@ -153,8 +153,10 @@ export default {
         line-height: 20px;
         margin: 0 auto;
         img {
-            width: 100%;
-            height: 100%;
+            display: block;
+            max-width: 100%;
+            max-height: 100%;
+            margin: 0 auto;
         }
     }
 }

+ 1 - 1
src/lib/items/SFHFQZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';

+ 1 - 1
src/lib/items/SSCPZZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';

+ 1 - 1
src/lib/items/SZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';

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

@@ -173,6 +173,8 @@ export default {
         position: fixed;
         z-index: 3;
         min-width: 1300px;
+        display: flex;
+        justify-content: center;
         .eq-system {
             padding: 12px 20px;
             background: #fff;

+ 2 - 3
src/views/equipment/table/inputDIalog.vue

@@ -4,9 +4,8 @@
             @click='show'
             style='color: #1F2429;cursor: pointer;position:absolute;z-index:9999;'
             :style='`right:${type === 1 ? "48px" : "12px"};top:${type === 1 ? "102px" : "0px"};`'
-            
         >
-            <img src='@/assets/imgs/select.png' />
+            <img style='margin-right:4px;' src='@/assets/imgs/select.png' />
             <span>筛选</span>
         </div>
         <div
@@ -14,7 +13,7 @@
             style='width:280px;height:250px;background:rgba(255,255,255,1);margin-top:40px;
             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;'
-             :style='`right:${type === 1 ? "40px" : "0"};`'
+            :style='`right:${type === 1 ? "40px" : "0"};`'
         >
             <el-form style=' padding:20px 24px;' v-if='type==1'>
                 <p style='margin:0 0 8px 0'>生产厂商</p>

+ 6 - 6
src/views/equipment/table/lookPageTable.vue

@@ -11,18 +11,18 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
-            <Select @change='getList' v-model='fileType' width='180' tipPlace='top' caption='文件类型 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='floor' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='fileType' width='180' tipPlace='top' caption='文件类型:' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' style='width: 100%'>
+        <el-table :data='tableData' style='width: 100%' :border='true'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='lb' label='分类' width='160'>
+            <el-table-column prop='lb' label='分类' width='160' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='文件名称'>
+            <el-table-column prop='sl' label='文件名称' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='文件类型'>
+            <el-table-column prop='assetnum' label='文件类型' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='assetnum' label='文件大小(M)'>

+ 1 - 1
src/views/equipment/table/otherTable.vue

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

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

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

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

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

+ 5 - 3
src/views/equipment/table/zwTable.vue

@@ -11,14 +11,15 @@
                 @change='getList'
                 style='width:180px;margin-right:12px'
             ></el-date-picker>
-            <Select width='160' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='160' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' 
+            :placeholder='"请选择"' @change='getList'></Select>
             <Select
                 width='160'
                 tipPlace='top'
-                size='small'
                 v-model='xm'
                 caption='项目 :'
                 :selectdata='xmOption'
+                :placeholder='"请选择"'
                 style='margin:0 12px'
                 @change='getList'
             ></Select>
@@ -30,6 +31,7 @@
                 size='small'
                 v-model='sxjd'
                 caption='当前阶段 :'
+                :placeholder='"请选择"'
                 :selectdata='sxjdOption'
                 style='margin:0 12px'
                 @change='getList'
@@ -89,7 +91,7 @@
             <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='90'>
                 <template slot-scope='{row}'>{{row.status || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80'>
+            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80' align='right'>
                 <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
             </el-table-column>
             <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width='100'>

+ 5 - 4
src/views/floorFunc/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class='floorFunc-box'>
-        <div class='eq-title'>
+        <div class='lcgn-title'>
             <span class='span1'>{{floorInfo.code}}</span>
         </div>
         <!-- 图例 -->
@@ -56,11 +56,12 @@ export default {
     background: rgba(242, 245, 247, 1);
     height: calc(100vh - 48px);
     flex: 1;
-    .eq-title {
+    .lcgn-title {
         position: fixed;
         z-index: 2;
-        top: 92px;
-        left: 242px;
+        display: block;
+        top: 120px;
+        left: 146px;
         width: 140px;
         height: 32px;
         background: linear-gradient(270deg, rgba(199, 217, 234, 0) 0%, rgba(199, 217, 234, 1) 100%);

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

@@ -41,7 +41,7 @@
             </div>
             <div v-show='ruleForm.Type=="Zone" || ruleForm.Type=="Image" || ruleForm.Type =="Line"'>
                 <div style='color:#646C73'>展示预览</div>
-                <div class='input-right' ref='graph' style='width:200px;height:114px;'>
+                <div class='input-right' ref='graph' style='width:218px;height:114px;'>
                     <canvas id='canvas' :width='canvasWidth' :height='canvasHeight'></canvas>
                 </div>
             </div>
@@ -124,6 +124,7 @@
                     v-if='ruleForm.Type!="Line"'
                     tipPlace='top'
                     width='200'
+                    style='margin-left:10px'
                     :notNull='true'
                     :returnParentNode='false'
                     :isShowAllChoice='true'
@@ -636,7 +637,7 @@ export default {
                 margin-right: 102px;
             }
             .form4-span3 {
-                margin-left: 75px;
+                margin-left: 96px;
             }
         }
     }

+ 5 - 2
src/views/legendLibrary/addLegend.vue

@@ -223,19 +223,22 @@ export default {
 <style lang='less' scoped>
 .add-legend {
     /deep/ .el-dialog {
-        width: 840px;
+        width: 890px;
         height: 509px;
         border-radius: 8px;
         .el-dialog__header {
             border-bottom: 1px solid #e4e5e7;
         }
+        .el-dialog__body {
+            padding-top: 16px !important;
+        }
         .el-dialog__title {
             font-size: 16px;
         }
     }
     /deep/ .el-dialog__footer {
         position: absolute;
-        bottom: 20px;
+        bottom: 0;
         right: 20px;
     }
 }

+ 3 - 0
src/views/legendLibrary/index.vue

@@ -660,6 +660,9 @@ export default {
     background: #fff;
     border: 1px solid #ccc;
 }
+.p-transfer-select{
+    height: 44px !important;
+}
 .p-tree-node-check,
 .p-tree-node-check .p-tree-node-title {
     vertical-align: top !important;

+ 1 - 1
src/views/other/index.vue

@@ -239,7 +239,7 @@ export default {
             width: 1035px;
             height: 544px;
             margin: 0 auto;
-            margin-top: 93px;
+            margin-top: 200px;
             img {
                 max-width: 100%;
                 max-height: 100%;

+ 1 - 1
src/views/other/zhsxOther.vue

@@ -83,7 +83,7 @@ export default {
             position: absolute;
             width: 16px;
             height: 16px;
-            left: 274px;
+            left: 260px;
             top: 3px;
             img {
                 width: 100%;

+ 2 - 7
src/views/other/zhsxOtherTable1.vue

@@ -25,7 +25,7 @@
                 style='margin-right:12px'
                 v-if='department.length>0'
                 :selectdata='department'
-                :placeholder='""'
+                :placeholder='"请选择"'
             ></Select>
             <el-input clearable placeholder='搜索记录事项' @change='getZhjl' size='small' prefix-icon='el-icon-search' v-model='ssjlsx' style='width:200px'></el-input>
         </div>
@@ -65,12 +65,7 @@
                         </div>
                         <div class='fileOpen' slot='reference'>{{row.glsmsZhsxfj.length}}</div>
                     </el-popover>
-                    <div v-else>
-                        <div>
-                            <p style='color: rgba(0, 145, 255, 1);' v-for='(item,index) in row.glsmsZhsxfj' :key='index'>{{item.description}}</p>
-                        </div>
-                        <div class='fileOpen' slot='reference'>{{'--'}}</div>
-                    </div>
+                    <div v-else>{{'--'}}</div>
                 </template>
             </el-table-column>
         </el-table>

+ 3 - 6
src/views/other/zhsxOtherTable2.vue

@@ -13,10 +13,9 @@
             <Select
                 width='200'
                 tipPlace='top'
-                caption='状态'
+                caption='状态'
                 size='small'
                 v-model='ztdsf'
-                style='margin-right:12px'
                 v-if='status2.length>0'
                 :selectdata='status2'
                 :placeholder='"请选择"'
@@ -26,11 +25,10 @@
                 @change='dsfjc'
                 width='200'
                 tipPlace='top'
-                caption='部门'
+                caption='部门'
                 v-if='zgbm.length>0'
                 size='small'
                 v-model='bmdsf'
-                style='margin-right:12px'
                 :selectdata='zgbm'
                 :placeholder='"请选择"'
             ></Select>
@@ -38,9 +36,8 @@
                 @change='dsfjc'
                 width='200'
                 tipPlace='top'
-                caption='检测结论'
+                caption='检测结论'
                 size='small'
-                style='margin-right:12px'
                 v-if='conclusion.length>0'
                 :selectdata='conclusion'
                 :placeholder='"请选择"'

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

@@ -10,7 +10,7 @@
                 <span></span>
                 <span>项目基本信息</span>
             </nav>
-            <div class='view-button'>
+            <div class='view-button' @click='findxmzl'>
                 <img src='../../assets/imgs/wd.png' alt />
                 项目资料
             </div>
@@ -192,7 +192,8 @@ export default {
             pic1: [], //区位图
             pic2: [], //鸟瞰图
             build: {}, //左下信息
-            constructions: [] //右下数组
+            constructions: [], //右下数组
+            shuzihuayijiao: ''
         }
     },
     methods: {
@@ -203,6 +204,11 @@ export default {
                 this.$refs.picModal.showModal(this.pic2)
             }
         },
+        findxmzl() {
+            if (this.shuzihuayijiao) {
+                window.open(`${this.shuzihuayijiao}`, true)
+            }
+        },
         query() {
             let params = {
                 getParams: {
@@ -213,10 +219,11 @@ export default {
             queryFact(params).then(res => {
                 if (res.result == 'success') {
                     this.loading = false
-                    this.pic1 = res.pic1
-                    this.pic2 = res.pic2
-                    this.build = res.build
-                    this.constructions = res.constructions
+                    this.pic1 = res.pic1 ? res.pic1 : []
+                    this.pic2 = res.pic2 ? res.pic2 : []
+                    this.build = res.build ? res.build : {}
+                    this.constructions = res.constructions ? res.constructions : []
+                    this.shuzihuayijiao = res.shuzihuayijiao ? res.shuzihuayijiao : ''
                 }
             })
         },

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

@@ -17,7 +17,7 @@
                 style='margin-right:12px'
                 v-if='sbglgs.length>=0'
                 tipPlace='top'
-                caption='管理归属'
+                caption='管理归属'
                 @change='changeSbglgsStr'
                 size='small'
                 :selectdata='sbglgs'
@@ -27,7 +27,7 @@
                 style='margin-right:12px'
                 v-if='sb_status.length>=0'
                 tipPlace='top'
-                caption='设备状态'
+                caption='设备状态'
                 size='small'
                 @change='changeSb_status'
                 v-model='statusStr'

+ 1 - 1
src/views/room/index.vue

@@ -279,7 +279,7 @@
                                 width='220'
                                 tipPlace='top'
                                 v-model='statuSelect5'
-                                caption='任务状态'
+                                caption='任务状态'
                                 v-if='status.length>0'
                                 :selectdata='status'
                                 :placeholder='"请选择"'