Merge branch 'develop_jzl'

gassafety-web/jsconfig.json

+{
+  "compilerOptions": {
+    "target": "ES6",
+    "jsx": "react",
+    "baseUrl": "./",
+    "paths": {
+      "components/*": ["src/components/*"],
+      "assets/*": ["src/assets/*"],
+      "@/*": ["src/*"]
+    }
+  },
+  "exclude": ["node_modules", "dist"],
+  "include": ["src/**/*"]
+}

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -128,7 +128,7 @@
       </div>
       <!-- 只能动态传入内嵌盒子的高 -->
       <div class="scroll" :style="{ height: `${boxHeight}px` }">
-        <el-input
+        <!-- <el-input
           v-model="keyWord"
           placeholder="点击输入设备名称"
           id="tipinput"
@@ -139,13 +139,13 @@
               <i class="iconfont icon-search"></i>
             </div>
           </template>
-        </el-input>
+        </el-input> -->
         <!-- <el-button class="search-but" @click="search()">搜索</el-button> -->
-        <el-button class="refresh-but" @click="refreshMap()">
+        <!-- <el-button class="refresh-but" @click="refreshMap()">
           <i class="iconfont icon-reset"></i>
-        </el-button>
+        </el-button> -->
         <div class="leftBar-wrapper">
-          燃气公司
+          <!-- 燃气公司 -->
 
           <div class="comp-wrapper">
             <div
@@ -173,16 +173,19 @@
               @click.stop="leftBarChange(item)"
             >
               <!-- @click="arrowRightChange(item)" -->
-
-              <span class="upPic"> 上图 </span>
+              <!-- 对钩旁边的文字 -->
+              <!-- <span class="upPic"> 上图 </span> -->
               <div class="left">
                 <i class="iconfont" :class="item.icon"></i>
               </div>
               <div class="right">
                 {{ item.label }}
               </div>
+              <!-- 有多少设备 -->
+              <div class="diviceNum">({{allList[index].length}})个设备</div>
+              <!-- 对钩 -->
               <i class="el-icon-check bingo"></i>
-              <i class="ju"></i>
+              <!-- <i class="ju"></i> -->
               <i
                 class="arrow-right el-icon-arrow-right"
                 :class="{ active: arrowRightNum.indexOf(item.value) >= 0 }"
@@ -376,8 +379,9 @@ export default {
       radio1: "",
       // 1新建，2编辑，3删除,点按钮变色
       targetNum: 0,
-      // 左边的bar的active判定
+      // 左边的bar的active判定 被选中显示的设备
       leftBarNum: [1, 2, 3, 4, 7, 8, 9, 10],
+      // leftBarNum: [],
       // 右转箭头的样式active判定
       arrowRightNum: [],
       // 新建里的值
@@ -385,7 +389,7 @@ export default {
       createValue: 0,
       createLabel: "新增",
       //所有燃气公司
-      comp: ["公司A", "公司B", "公司C"],
+      comp: ["公司A", "公司B", "公司C", "公司C", "123"],
       // 公司被选中状态
       compChangeArr: [],
 
@@ -1907,19 +1911,31 @@ input[type="radio"] {
   // 燃气公司选项
   .comp-wrapper {
     display: flex;
+    flex-wrap: wrap;
     color: #fff;
-    padding-left: 35px;
+    padding-left: 25px;
+    // justify-content: space-between;
     padding-bottom: 10px;
     .comp {
+      width: 96px;
+      height: 42px;
+      font-size: 14px;
+      background-image: url(../../../assets/images/comp/compSelect.png);
+      text-align: center;
+      line-height: 38px;
       margin-right: 10px;
       cursor: pointer;
       padding: 2px 4px;
       border-radius: 5px;
+      // 第三个不展示
+      &:nth-child(2n + 3) {
+        margin-right: 0px;
+      }
       &:hover {
         background-color: #053b6a94;
       }
       &.active {
-        background-color: #053b6a;
+        background-image: url(../../../assets/images/comp/compSelected.png);
         color: #31eaea !important;
       }
     }
@@ -2039,6 +2055,7 @@ input[type="radio"] {
           border-top: 1px solid rgba(5, 59, 106, 0);
         }
       }
+
       // box浮动上去的颜色
       &:hover {
         box-sizing: border-box;
@@ -2054,6 +2071,13 @@ input[type="radio"] {
         .right {
           color: #31eaeaab !important;
         }
+        > i {
+          display: block !important;
+          color: #31eaeaab !important;
+        }
+        .diviceNum {
+          color: #31eaeaab;
+        }
       }
       .upPic {
         display: inline-block;
@@ -2079,7 +2103,8 @@ input[type="radio"] {
         z-index: 2;
         position: absolute;
         // line-height: 48px;
-        left: 45px;
+        left: 20px;
+        display: none;
         top: 16px;
         color: #fff;
       }
@@ -2111,11 +2136,14 @@ input[type="radio"] {
           color: #31eaea !important;
         }
         > i {
-          // color: #31eaea;
-          color: #053b6a;
+          // color: #053b6a;
+          color: #31eaea;
+          display: block;
           font-weight: 600;
         }
-
+        .diviceNum {
+          color: #31eaea;
+        }
         &:hover {
           box-sizing: border-box;
           background-color: #053b6a94;
@@ -2126,7 +2154,7 @@ input[type="radio"] {
           }
           .left,
           .right {
-            color: #31eaeaab !important;
+            color: #31eaea !important;
           }
         }
       }
@@ -2144,6 +2172,12 @@ input[type="radio"] {
         font-size: 16px;
         margin-left: 4px;
       }
+      .diviceNum {
+        color: #fff;
+        position: absolute;
+        left: 160px;
+        top: 12px;
+      }
     }
     .goback {
       display: flex;