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

# Conflicts:
#	src/views/EventDEC/esprocess/index.vue

src/views/EventDEC/esprocess/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-19 19:45:01
- * @LastEditTime: 2021-11-04 16:10:57
+ * @LastEditTime: 2021-11-17 10:17:53
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/esprocess/index.vue
@@ -102,19 +102,19 @@
 import { getEventSpreadProcess0528 } from "@/api/EventdEC";
 export default {
     name: "esprocess",
+    props: {
+        id: {
+            type: String,
+            default: ""
+        }
+    },
     data() {
         return {
             form: {
-                token: "",
                 sRele: "",
+                token: "",
                 sTimeType: "",
             },
-            props: {
-                id: {
-                    type: String,
-                    default: "",
-                },
-            },
             list: [],
             m1: require("../../../assets/images/EventInsight/img_ct.png"),
             m2: require("../../../assets/images/EventInsight/img_lt.png"),
@@ -129,8 +129,9 @@ export default {
         getDdta() {
             let obj = Object.assign({}, this.form);
             getEventSpreadProcess0528(obj).then((res) => {
-                let data = res.data || [];
+                let data = res.data;
                 this.list = data;
+                this.load = false;
             });
         },
         goback() {

src/views/EventDEC/incidentSpreadSituation/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-19 19:05:36
- * @LastEditTime: 2021-11-16 17:20:04
+ * @LastEditTime: 2021-11-17 10:03:16
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/incidentSpreadSituation/index.vue
@@ -23,7 +23,6 @@
 
 <script>
 import createOpt from "./opt";
-import { getOneTime } from "@/api/comm";
 import { getSourcetypeTime } from "@/api/EventdEC";
 export default {
     name: "incidentSpreadSituation",
@@ -36,35 +35,30 @@ export default {
                 },
             },
             opt: {},
-            selDatas: [],
+            selDatas: [
+                {
+                    key: 34,
+                    value: '小时'
+                },
+                {
+                    key: 20,
+                    value: '天'
+                }
+            ],
             form: {
                 token: "",
                 sRele: "",
-                sTimeType: "",
+                sTimeType: 34,
             },
         };
     },
     created() {
         this.form.token = this.getToken;
         this.form.sRele = this.id;
-        this.getSelect().then(() => {
-             this.getDdta();
-        });
+        this.getDdta();
        
     },
     methods: {
-        // 获取选择时间的数据
-        getSelect() {
-            return new Promise((resolve, reject) => {
-                getOneTime().then((res) => {
-                    this.selDatas = res.data;
-                    this.form.sTimeType = this.selDatas[0].key
-                    resolve(res)
-                }).catch(() => {
-                    reject(false)
-                });
-            });
-        },
         getDdta() {
             let obj = Object.assign({}, this.form);
             this.load = true;

src/views/EventDEC/pnwcWord/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-20 11:56:12
- * @LastEditTime: 2021-10-20 12:03:07
+ * @LastEditTime: 2021-11-17 10:18:38
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/pnwcWord/index.vue
@@ -18,8 +18,7 @@
 </template>
 
 <script>
-import createWordCloud from "@/utils/gol/bubbleWord";
-import { getPositive1, getNegative1 } from "@/api/TailInsightdetails";
+// import createWordCloud from "@/utils/gol/bubbleWord";
 export default {
     name: "pnwcWord",
     props: ["brand", "model"],
@@ -55,24 +54,24 @@ export default {
                 this.getData2();
             }
         },
-        getData1() {
-            this.load = true;
-            let obj = Object.assign({}, this.form);
-            getPositive1(obj).then((res) => {
-                let data = res.data;
-                this.opt = createWordCloud(data);
-                this.load = false;
-            });
-        },
-        getData2() {
-            this.load = true;
-            let obj = Object.assign({}, this.form);
-            getNegative1(obj).then((res) => {
-                let data = res.data;
-                this.opt = createWordCloud(data);
-                this.load = false;
-            });
-        },
+        // getData1() {
+        //     this.load = true;
+        //     let obj = Object.assign({}, this.form);
+        //     getPositive1(obj).then((res) => {
+        //         let data = res.data;
+        //         this.opt = createWordCloud(data);
+        //         this.load = false;
+        //     });
+        // },
+        // getData2() {
+        //     this.load = true;
+        //     let obj = Object.assign({}, this.form);
+        //     getNegative1(obj).then((res) => {
+        //         let data = res.data;
+        //         this.opt = createWordCloud(data);
+        //         this.load = false;
+        //     });
+        // },
     },
 };
 </script>

src/views/EventDEC/tonalCommunicationPosture/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-19 19:35:25
- * @LastEditTime: 2021-11-16 17:22:48
+ * @LastEditTime: 2021-11-17 10:17:40
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/tonalCommunicationPosture/index.vue
@@ -23,7 +23,6 @@
 
 <script>
 import createOpt from "./opt"
-import { getOneTime } from "@/api/comm";
 import { getAffectionsTime } from "@/api/EventdEC";
 export default {
     name: "tonalCommunicationPosture",
@@ -37,35 +36,28 @@ export default {
             },
             opt: {},
             selDatas: [
-                
+                {
+                    key: 34,
+                    value: '小时'
+                },
+                {
+                    key: 20,
+                    value: '天'
+                }
             ],
             form: {
                 token: "",
                 sRele: "",
-
+                sTimeType: 34,
             },
         };
     },
     created() {
         this.form.token = this.getToken;
         this.form.sRele = this.id;
-        this.getSelect().then(() => {
-            this.getDdta();
-        })   
+        this.getDdta();
     },
     methods: {
-        // 获取选择时间的数据
-        getSelect() {
-            return new Promise((resolve, reject) => {
-                getOneTime().then((res) => {
-                    this.selDatas = res.data;
-                    this.form.sTimeType = this.selDatas[0].key
-                    resolve(res)
-                }).catch(() => {
-                    reject(false)
-                });
-            });
-        },
         getDdta() {
             let obj = Object.assign({},this.form);
             this.load = true;