Merge branch 'dev'

* dev:
  cxw-010203
  zx

src/request/index.js

@@ -24,6 +24,7 @@ function filterRequestData(obj) {
 //创建axios的实例
 const httpService = axios.create({
     baseURL: 'http://cloud.sws010.com',// TODO:具体的配置可以根据项目情况而来
+    // withCredentials: true
     // timeout: 5000
 })
 
@@ -32,7 +33,8 @@ httpService.interceptors.request.use(config => {
     // 请求成功处理
     // if(localStorage.getItem('token')){//判断浏览器中的cookie中是否存在项目的token
     //     config.headers.token = localStorage.getItem('token')
-    // }
+    // }\
+    config.withCredentials = true;
     const rqParams = filterRequestData(config.params);
     const rqData = filterRequestData(config.data);
     // post 'Content-Type' === 'application/x-www-form-urlencoded'

src/views/EventDEC/incidentSpreadSituation/index.vue

@@ -9,11 +9,11 @@
 <template>
     <div class="iss-outter" v-loading="load">
         <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>
-            </a-select>
+            </a-select> -->
         </v-label-div>
         <div class="iss-inner">
             <v-echarts :opt="opt" @clickMark="clickMark"></v-echarts>

src/views/EventDEC/tailAnalysisED/index.vue

@@ -10,11 +10,11 @@
     <div class="taed-outter" v-loading="load">
         <div class="taed-inner">
             <v-label-div title="传播态势" :showLine="false" :eStyle="{'border-style': 'none'}">
-                <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>
-                </a-select>
+                </a-select> -->
             </v-label-div>
             <div class="taed-d1">
                 <v-echarts :opt="opt"></v-echarts>

src/views/EventDEC/tonalCommunicationPosture/index.vue

@@ -9,11 +9,11 @@
 <template>
     <div class="tcp-outter" v-loading="load">
         <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>
-            </a-select>
+            </a-select> -->
         </v-label-div>
         <div class="tcp-inner">
             <v-echarts :opt="opt"></v-echarts>