Browse Source

新增点击商铺关联商铺信息

YaolongHan 4 years ago
parent
commit
41dac938b4

+ 15 - 0
src/components/floorMap/index.vue

@@ -97,6 +97,8 @@
             <a>查看</a>
           </li>
         </ul>
+        <!-- 提示文本 -->
+        <div class="wellTooltip" v-show="isclickShopName">该电井为{{isclickShopName}}商铺提供供电</div>
         <div style="text-align: right; margin-top: 10px">
           <el-button
             v-show="showBtnWell"
@@ -256,6 +258,7 @@ export default {
       statusDisabled: ["已拆除"], //禁止跳转的设备状态
       roomKey: 1,
       shopsList: [], //所有强电井对应的店铺
+      isclickShopName:'', //是否是点击商铺后电井高亮
     };
   },
   props: {
@@ -633,6 +636,7 @@ export default {
               clientY: point.y,
             },
           ];
+          this.isclickShopName = item.name ? item.name + '—'+ item.data.Name :'xxx —'+ item.data.Name ;
           this.handleClickLegendItem(wellItem, event, true);
         });
       } else {
@@ -856,6 +860,7 @@ export default {
                     -1
                   ) {
                     item.highLightFlag = true;
+
                     // item.zOrder = 30;
                     shopsnumItemList.push(item);
                   }
@@ -869,6 +874,7 @@ export default {
     },
     // 清除电井关联商铺的高亮状态
     clearHightLight() {
+      this.isclickShopName = '';
            // 所有电井置为 select = false
       this.topologyParser.imageLegendList.forEach((eqItem) => {
         eqItem.selected = false;
@@ -1192,4 +1198,13 @@ a:hover {
     opacity: 0.5;
   }
 }
+.wellTooltip{
+  background: #FEEAD2;
+  margin-left: 12px;
+  height: 22px;
+  line-height: 22px;
+  display: inline-block;
+  padding: 0px 12px 0 12px;
+  color: #B26206;
+}
 </style>

+ 14 - 13
src/components/menuList.vue

@@ -36,23 +36,19 @@
     <div class="home-right">
       <span
         @click="dumpLegend"
-        v-show="
-          permissions ? permissions.includes('GLSMS_SYMBOL_MANAGE') : false
-        "
+        v-show="permissions ? permissions.includes('GLSMS_SYMBOL_MANAGE') : false"
       >
         <img class="img1" src="../assets/imgs/scj.png" alt />
-        <span class="span1" :style="showStyle?'color:#fff':''">图例库</span>
+        <span class="span1" :style="showStyle ? 'color:#fff' : ''">图例库</span>
       </span>
 
       <span
         @click="toDrafts"
         class="span-out"
-        v-show="
-          permissions ? permissions.includes('GLSMS_PLANARGRAPH_MANAGE') : false
-        "
+        v-show="permissions ? permissions.includes('GLSMS_PLANARGRAPH_MANAGE') : false"
       >
         <img class="img2" src="../assets/imgs/cgx.png" alt />
-        <span class="span2" :style="showStyle?'color:#fff':''">草稿箱</span>
+        <span class="span2" :style="showStyle ? 'color:#fff' : ''">草稿箱</span>
         <span class="span2-num" v-if="draftNum && draftNum <= 99">{{
           draftNum
         }}</span>
@@ -65,7 +61,9 @@
       </span>
       <span>
         <img class="img3" src="../assets/imgs/clock.png" alt />
-        <span class="span3" :style="showStyle?'color:#fff':''">{{ times }}</span>
+        <span class="span3" :style="showStyle ? 'color:#fff' : ''">{{
+          times
+        }}</span>
       </span>
       <div class="checkkout" v-show="showStyleBtn">
         <img
@@ -153,6 +151,9 @@ export default {
     }
   },
   mounted() {
+    setTimeout(()=>{
+         console.log('permissions',this.permissions)
+    },5000)
     this.handleRoute(this.$route);
     // 定时查询草稿箱数量
     this.getDraftNum(); //首次查询
@@ -371,6 +372,7 @@ export default {
     display: flex;
     justify-content: space-between;
     background: linear-gradient(180deg, #103979 0%, #162653 100%);
+    margin-right: 0px;
     .downright {
       position: absolute;
       width: 0;
@@ -407,8 +409,6 @@ export default {
     }
   }
   .btnlist-style {
-
-    flex: 1;
     display: flex;
     align-content: center;
     & > div {
@@ -416,7 +416,7 @@ export default {
       text-align: center;
       background: url("../assets/imgs/btn-rect.png") no-repeat;
       float: left;
-      max-width:142px;
+      max-width: 142px;
       min-width: 100px;
       height: 48px;
       margin: 0 8px;
@@ -432,7 +432,7 @@ export default {
   }
   .home-right {
     float: right;
-    margin-right: 20px;
+    margin-right: 40px;
     line-height: 48px;
     color: #646c73;
     font-size: 14px;
@@ -473,6 +473,7 @@ export default {
 .menu-style {
   background: #0c102c;
   display: flex;
+  justify-content: space-between;
 }
 .checkkout {
   display: flex;

+ 1 - 1
src/views/homepage/Circle.js

@@ -18,7 +18,7 @@ export class SCircle {
         this.circleY = canvas.height / 2;  //中心y坐标
         this.radius = radius; //圆环半径
         this.lineWidth = 5;  //圆形线条的宽度
-        this.fontSize = 40; //字体大小
+        this.fontSize = radius *3/4; //字体大小
         this.baseName = '本月总任务'
     }
 

+ 2 - 2
src/views/homepage/darkColor.vue

@@ -300,7 +300,7 @@ export default {
           : moment().format("YYYY")
       ).then((res) => {
         const TYPE = statisticItem.type; // 类型
-        const circle = new SCircle(`canvas_${TYPE}`, this.canvasCircle * 0.8);
+        const circle = new SCircle(`canvas_${TYPE}`, this.canvasCircle * 0.7);
         let circle_basename = null;
         statisticItem.type == 1
           ? (circle_basename = "本月总任务")
@@ -531,7 +531,7 @@ export default {
               : (circle_basename = "本年总任务");
             const circle = new SCircle(
               `canvas_${TYPE}`,
-              this.canvasCircle * 0.8
+              this.canvasCircle * 0.7
             );
             circle.baseName = circle_basename;
             // 总数