Merge branch 'lining' of http://61.161.152.110:10101/r/electronic-map into yx

package.json

@@ -7,8 +7,7 @@
     "servebig": "node --max-old-space-size=6000  ./node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
+    "lint": "vue-cli-service lint"
-    "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
   },
   "dependencies": {
     "@antv/x6": "^1.24.4",

src/views/MalfunctionWarning/supervised.vue

@@ -11,7 +11,6 @@
               clearable
               placeholder="请选择"
               popper-class="select"
-              @clear="clear()"
             >
               <el-option
                 v-for="item in algorithm"
@@ -23,7 +22,7 @@
             </el-select>
           </div>
         </div>
-        <div v-for="(item, index) in chooseAlgorithm.parameters" :key="index">
+        <!-- <div v-for="(item, index) in chooseAlgorithm.parameters" :key="index">
           {{ item.name }}:
           <input
             v-model="item.value"
@@ -31,7 +30,7 @@
             @focus="inputChange(item)"
             @blur="inputChange(item)"
           />
-        </div>
+        </div> -->
       </div>
     </div>
     <div class="actions mg-b-8">
@@ -215,7 +214,7 @@ export default {
       accuracyList: {},
       barList: [],
       algorithm: [], //算法
-      chooseAlgorithm: {},
+      chooseAlgorithm: '',
       timeValue: [],
       showBarList: [],
       moudleList: [],
@@ -326,7 +325,8 @@ export default {
           if (res) {
             that.algorithm = res;
             that.value1 = res[0];
-            that.chooseAlgorithm = res[0];
+            that.chooseAlgorithm = res[0].name;
+            console.log(that.chooseAlgorithm);
           }
         },
       });
@@ -445,6 +445,16 @@ export default {
     handleClose() {
       this.barList = this.ceshiList.bar.slice(0, 5);
     },
+    algorithmChange(val) {
+      console.log(222222);
+      this.chooseAlgorithm = this.algorithm.filter(
+        (item) => item.name === val
+      )[0].name;
+      console.log(this.chooseAlgorithm);
+    },
+    // clear() {
+    //   this.chooseAlgorithm = '';
+    // },
     Compare(property) {
       return function (a, b) {
         var value1 = a[property];

src/views/SandTable/SandTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="sand-table">
+  <div class="sand-table" id="sandTable">
     <img :src="require('@assets/png/3dback.png')" class="i3dback" />
     <!-- <img :src="require('@assets/png/3dcloud.png')" class="i3dcloud" /> -->
     <StBack></StBack>
@@ -1137,7 +1137,8 @@ export default {
 </script>
 
 <style lang="less">
-.sand-table {
+
+ .sand-table {
   width: 100%;
   height: 91.667vh;
   position: relative;
@@ -1381,7 +1382,7 @@ export default {
     background: #b3bdc0;
   }
 
-  .el-dialog__body {
+  #sandTable .el-dialog__body {
     max-height: 600px;
     overflow-y: scroll;
   }

src/views/planPower/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="draught-fan-list">
+  <div class="draught-fan-list" id="draughtFan">
     <div class="query mg-b-8">
       <div class="query-items">
         <div class="query-item">
@@ -527,7 +527,7 @@ export default {
 }
 
 .curDialog {
-  .el-dialog__body {
+  #draughtFan .el-dialog__body {
     max-height: 600px;
     overflow-y: scroll;
   }

src/views/sampleDatabase/analysis/pieCharts.vue

@@ -20,7 +20,6 @@ export default {
   },
   data() {
     return {
-      xindex: [],
     };
   },
   computed: {
@@ -29,7 +28,6 @@ export default {
     },
   },
   mounted() {
-    this.deal();
     this.$nextTick(() => {
       this.initChart();
     });
@@ -40,11 +38,6 @@ export default {
     });
   },
   methods: {
-    deal() {
-      for (let index = 0; index < 35; index++) {
-        this.xindex.push(index);
-      }
-    },
     initChart() {
       let seriesData = [];
       this.warningTimeList.forEach((item) => {
@@ -75,7 +68,7 @@ export default {
           {
             name: "报警次数",
             type: "pie",
-            radius: ["30%", "60%"],
+            radius: ["30%", "55%"],
             avoidLabelOverlap: false,
             itemStyle: {
               borderRadius: 10,
@@ -115,13 +108,6 @@ export default {
       };
       option && myChart.setOption(option);
     },
-    Compare(property) {
-      return function (a, b) {
-        var value1 = a[property];
-        var value2 = b[property];
-        return value1 - value2;
-      };
-    },
   },
   watch: {
     warningTimeList: {