Merge branch 'dev' of https://git.oa00.com/SWS/carInsightSystem into dev

src/views/EventDEC/incidentSpreadSituation/index.vue

@@ -9,7 +9,7 @@
 <template>
     <div class="iss-outter">
         <v-label-div title="事件传播态势">
-            <a-select v-model="form.sTimeType" :size="$vuiSize" style="width: 7rem; margin-left: 2.2rem; margin-right: 0.5rem"  @change="handleChange">
+            <a-select v-model="form.sTimeType" :size="$vuiSize" style="width: 7rem; margin-left: 2.2rem; margin-right: 0.5rem" @change="handleChange">
                 <a-select-option :style="{ color: '#fff' }" v-for="item in selDatas" :value="item.key" :key="item.key">
                     {{ item.value }}
                 </a-select-option>
@@ -26,24 +26,24 @@ import createOpt from "./opt";
 import { getSourcetypeTime } from "@/api/EventdEC";
 export default {
     name: "incidentSpreadSituation",
+    props: {
+        id: {
+            type: String,
+            default: "",
+        },
+    },
     data() {
         return {
-            props: {
-                id: {
-                    type: String,
-                    default: "",
-                },
-            },
             opt: {},
             selDatas: [
                 {
                     key: 34,
-                    value: '小时'
+                    value: "小时",
                 },
                 {
                     key: 20,
-                    value: '天'
+                    value: "天",
-                }
+                },
             ],
             form: {
                 token: "",
@@ -56,7 +56,6 @@ export default {
         this.form.token = this.getToken;
         this.form.sRele = this.id;
         this.getDdta();
-       
     },
     methods: {
         getDdta() {
@@ -78,7 +77,7 @@ export default {
         },
         // 选择时间
         handleChange() {
-           this.getDdta();
+            this.getDdta();
         },
     },
 };

src/views/EventDEC/kmdED/index.vue

@@ -58,7 +58,6 @@ export default {
             return newArray;
         },
         getData() {
-            this.load = true;
             let obj = Object.assign({}, this.form);
             getWebsite(obj).then((res) => {
                 let data = res.data;
@@ -70,7 +69,6 @@ export default {
                 let groupedArray = this.group(vals, 5);
                 this.d1 = groupedArray[0];
                 this.d2 = groupedArray[1];
-                this.load = false;
             });
         },
     },

src/views/EventDEC/mediaInterpretationED/index.vue

@@ -79,7 +79,9 @@ export default {
             bigNumberTransform: bigNumberTransform,
             opt: {},
             load: false,
-            sum: "",
+            total: 0,
+            sum: 0,
+            volume: 0,
             form: {
                 token: "",
                 sRele: "",
@@ -141,7 +143,6 @@ export default {
                 });
                 let o = { nodes, edges };
                 this.opt = createOpt(o);
-                // this.countObj = Object.assign(this.countObj, data);
             });
         },
     },

src/views/EventDEC/mediaInterpretationEc/index.vue

@@ -44,17 +44,11 @@ export default {
             load: false,
             opt: {},
             type: 0,
-            props: {
-                id: {
-                    type: String,
-                    default: "",
-                },
-            },
             form: {
                 token: "",
                 sRele: "",
-
             },
+            count: 0,
             config: {},
         };
     },