zhangyun 3 лет назад
Родитель
Сommit
f40fe236fe

+ 5 - 0
pingpu_vue/src/page/cbd/cbdDataPhotos.vue

@@ -3495,4 +3495,9 @@ export default {
     text-align: right;
   }
 }
+.expertDiagnosis_referral_units_not{
+  width: 100%;
+  display: flex;
+  justify-content: space-around;
+}
 </style>

+ 3 - 2
pingpu_vue/src/page/crop/evildata.vue

@@ -449,7 +449,7 @@ export default {
                 this.adddialogVisible = false;
               } else {
                 if (document.getElementsByClassName("el-message").length == 0) {
-                  this.$message.error("添加失败");
+                  this.$message.error(res.data.message);
                 }
               }
             });
@@ -472,7 +472,7 @@ export default {
                 this.adddialogVisible = false;
               } else {
                 if (document.getElementsByClassName("el-message").length == 0) {
-                  this.$message.error("修改失败");
+                  this.$message.error(res.data.message);
                 }
               }
             });
@@ -908,6 +908,7 @@ export default {
   }
 }
 .wormdisinfobox {
+  overflow: hidden;
   .wormdis_item {
     display: flex;
     margin-bottom: 16px;

+ 71 - 68
pingpu_vue/src/page/gis/gisshow.vue

@@ -70,39 +70,39 @@
         </div>
       </div>
     </div>
-    <div class="equibox">
-      <div class="equi_classify">
-        <div
-          :class="
-            basetype == 0
-              ? 'equi_classify_item equi_classify_item_avt'
-              : 'equi_classify_item'
-          "
-          @click="
-            basetype = 0;
-            basetype2 = 0;
-          "
-        >
-          <img src="../../../static/images/gisshow/all.png" alt="" />
-          <p>全部设备&nbsp;&nbsp;({{ equipmentlistnum }})</p>
-        </div>
-        <div
-          v-for="(item, index) in equipmentlist"
-          :class="
-            basetype == item.type_id
-              ? 'equi_classify_item equi_classify_item_avt'
-              : 'equi_classify_item'
-          "
-          :key="index"
-          @click="basetype = item.type_id"
-        >
-          <img
-            :src="'../../../static/images/map/' + item.type_id + '.png'"
-            alt=""
-          />
-          <p>{{ item.type_name }}&nbsp;&nbsp;({{ item.type_count }})</p>
-        </div>
+    <div class="equi_classify">
+      <div
+        :class="
+          basetype == 0
+            ? 'equi_classify_item equi_classify_item_avt'
+            : 'equi_classify_item'
+        "
+        @click="
+          basetype = 0;
+          basetype2 = 0;
+        "
+      >
+        <img src="../../../static/images/gisshow/all.png" alt="" />
+        <p>全部设备&nbsp;&nbsp;({{ equipmentlistnum }})</p>
+      </div>
+      <div
+        v-for="(item, index) in equipmentlist"
+        :class="
+          basetype == item.type_id
+            ? 'equi_classify_item equi_classify_item_avt'
+            : 'equi_classify_item'
+        "
+        :key="index"
+        @click="basetype = item.type_id"
+      >
+        <img
+          :src="'../../../static/images/map/' + item.type_id + '.png'"
+          alt=""
+        />
+        <p>{{ item.type_name }}&nbsp;&nbsp;({{ item.type_count }})</p>
       </div>
+    </div>
+    <div class="equibox">
       <div class="onlinebox">
         <div
           :class="
@@ -456,7 +456,7 @@ export default {
       devicenameoff: false,
       devilist: [],
       selfacindex: 0,
-      textlist:[]
+      textlist: [],
     };
   },
   //监听属性 类似于data概念
@@ -650,7 +650,7 @@ export default {
           //   this.faclist = data;
           console.log(data);
           this.facpolylist = [];
-          this.textlist = []
+          this.textlist = [];
           var ploritem = "";
           for (var i = 0; i < data.length; i++) {
             var polygonArr = JSON.parse(data[i].coordinates);
@@ -699,9 +699,9 @@ export default {
               },
               position: this.getPointsCenter(JSON.parse(data[i].coordinates)),
             });
-            console.log(this.getPointsCenter(JSON.parse(data[i].coordinates)))
+            console.log(this.getPointsCenter(JSON.parse(data[i].coordinates)));
             text.setMap(this.map);
-            this.textlist.push(text)
+            this.textlist.push(text);
             ploritem.on("click", (e) => {
               // console.log(e.target._opts.data)
               this.baselistitem_id = e.target._opts.data;
@@ -724,7 +724,7 @@ export default {
         if (points[i] == "") {
           continue;
         }
-        let point = points[i]
+        let point = points[i];
         var lat, lng, x, y, z;
         lat = (parseFloat(point[1]) * Math.PI) / 180;
         lng = (parseFloat(point[0]) * Math.PI) / 180;
@@ -742,7 +742,7 @@ export default {
       var tmp_lng = Math.atan2(Y, X);
       var tmp_lat = Math.atan2(Z, Math.sqrt(X * X + Y * Y));
 
-      return [(tmp_lng * 180) / Math.PI,(tmp_lat * 180) / Math.PI];
+      return [(tmp_lng * 180) / Math.PI, (tmp_lat * 180) / Math.PI];
     },
     getdevlist() {
       for (var i = 0; i < this.equipmentpolylist.length; i++) {
@@ -1098,43 +1098,46 @@ export default {
       }
     }
   }
-  .equibox {
+  .equi_classify {
     position: absolute;
     top: 2.5%;
     left: 15px;
-    .equi_classify {
+    display: flex;
+    background-color: #fff;
+    padding: 10px 10px;
+    border-radius: 5px;
+    .equi_classify_item {
+      font-size: 14px;
+      border-right: 1px solid rgba(216, 216, 216, 1);
+      padding: 0px 20px;
       display: flex;
-      background-color: #fff;
-      padding: 10px 10px;
-      border-radius: 5px;
-      .equi_classify_item {
-        font-size: 14px;
-        border-right: 1px solid rgba(216, 216, 216, 1);
-        padding: 0px 20px;
-        display: flex;
-        color: #262626;
-        cursor: pointer;
-        img {
-          width: 20px;
-          width: 20px;
-          margin-right: 7px;
-        }
-      }
-      .equi_classify_item:first-child {
-        img {
-          width: 15px;
-          width: 15px;
-          margin-top: 2px;
-          margin-right: 7px;
-        }
-      }
-      .equi_classify_item:last-child {
-        border-right: 0px;
+      color: #262626;
+      cursor: pointer;
+      img {
+        width: 20px;
+        width: 20px;
+        margin-right: 7px;
       }
-      .equi_classify_item_avt {
-        color: #4f71ff;
+    }
+    .equi_classify_item:first-child {
+      img {
+        width: 15px;
+        width: 15px;
+        margin-top: 2px;
+        margin-right: 7px;
       }
     }
+    .equi_classify_item:last-child {
+      border-right: 0px;
+    }
+    .equi_classify_item_avt {
+      color: #4f71ff;
+    }
+  }
+  .equibox {
+    position: absolute;
+    top: 7.5%;
+    left: 15px;
     .onlinebox {
       margin-top: 15px;
       background-color: #fff;