zx

src/lycomponents/iHeaderMa/index.vue

@@ -24,7 +24,7 @@
             </a-dropdown>
             <span class="iH-left-s1">菜单</span>
 
-            <a-select :default-value="1" :size="$vuiSize" class="selHead" v-model="selVal" @change="handlerSelect">
+            <a-select :default-value="1" :size="$vuiSize" class="selHead" v-model="selVal" v-if="timeShow" @change="handlerSelect">
                 <a-select-option :style="{ color: '#fff' }" v-for="item in selDatas" :value="item.key" :key="item.key">
                     {{ item.key }}
                 </a-select-option>
@@ -69,6 +69,7 @@ export default {
             sClock: "",
             week: "",
             intDt: null,
+            timeShow: true,
             form: {
                 sTimeType: 4,
                 sStartTime: "",
@@ -79,6 +80,18 @@ export default {
             ],
         };
     },
+    //  watch: {
+    //     $route: {
+    //         handler(val) {
+    //             if (val.path === "/mcIndex") {
+    //                 this.timeShow = false;
+    //             } else {
+    //                 this.timeShow = true;
+    //             }
+    //         },
+    //         immediate: true,
+    //     },
+    // },
     created() {
         this.getSelect()
     },
@@ -115,6 +128,7 @@ export default {
           this.form.sStartTime = obj.starttime;
           this.form.sEndTime = obj.endtime;
           this.setCtime(this.form);
+          this.setChangeSTime(1);
           this.reload();
         },
         // 点击个人中心

src/mixins/index.js

@@ -127,10 +127,10 @@ export default {
                 }
             },
             computed: {
-                ...mapGetters(['getZoom', 'getLoading','getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getCtime2', 'getHeaderType', 'getBrand', 'getModel','getSComparison','getBComparison', 'getMComparison', 'getEComparison','getLevelBtn','getMenu'])
+                ...mapGetters(['getZoom', 'getLoading','getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getCtime2', 'getHeaderType', 'getBrand', 'getModel','getSComparison','getBComparison', 'getMComparison', 'getEComparison','getLevelBtn','getMenu', 'getChangeSTime'])
             },
             methods: {
-                ...mapActions(["setZoom", 'setLoading', 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setCtime2', 'setHeaderType', 'setBrand', 'setModel', 'setSComparison','setBComparison', 'setMComparison', 'setEComparison','setLevelBtn','setMenu']),
+                ...mapActions(["setZoom", 'setLoading', 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setCtime2', 'setHeaderType', 'setBrand', 'setModel', 'setSComparison','setBComparison', 'setMComparison', 'setEComparison','setLevelBtn','setMenu', 'setChangeSTime']),
                 // 获取当前日期时间
                 getDatetime() {
                     let now = new Date();

src/store/actions.js

@@ -57,6 +57,9 @@ const actions = {
     },
     setMenu: ({commit}, log) => {
         commit('setMenu', log) 
-    }
+    },
+    setChangeSTime: ({commit}, log) => {
+        commit('setChangeSTime', log) 
+    },
 }
 export default actions

src/store/getters.js

@@ -46,6 +46,9 @@ const getters = {
     getSComparison(state) {
         return state.sComparison 
     },
+    getChangeSTime(state) {
+        return state.changeSTime 
+    },
     getMComparison(state) {
         return state.mComparison 
     },

src/store/mutations.js

@@ -71,6 +71,9 @@ const mutations = {
         let str = JSON.stringify(log);
         sessionStorage.setItem('sComparison', str);
     },
+    setChangeSTime: (state, log) => {
+        state.changeSTime = log;   
+    },
     setMComparison: (state, log) => {
         state.mComparison = log;
         let str = JSON.stringify(log);

src/store/state.js

@@ -21,6 +21,7 @@ const state = {
     model: JSON.parse(sessionStorage.getItem('model')) || {},
     bComparison: JSON.parse(sessionStorage.getItem('bComparison')) || [],
     sComparison: JSON.parse(sessionStorage.getItem('sComparison')) || [],
+    changeSTime: 1,
     mComparison: JSON.parse(sessionStorage.getItem('mComparison')) || [],
     eComparison: JSON.parse(sessionStorage.getItem('eComparison')) || [],
     levelBtn: JSON.parse(sessionStorage.getItem('levelBtn')) || [],

src/views/BrandInsight/titsopo/index.vue

@@ -65,9 +65,41 @@ export default {
         },
         // 前往数据表格
         goIDE() {
+            if(!this.btnPrm('btn_brand_datalist')) {
+                return
+            }
+            let startTime = "";
+            let endTime = moment(new Date()).format("YYYY-MM-DD HH:mm:ss");
+            let cTime2 = this.getCtime2;
+            let sTimeType = 34;
+            switch (cTime2.sTimeType) {
+                case 34:
+                    sTimeType = 34
+                    break;
+                case 23:
+                    sTimeType = 23
+                    break;
+                case 3:
+                    sTimeType = 3
+                    break;
+                case 20:
+                    sTimeType = 20
+                    break;
+                case 4:
+                    sTimeType = 4;
+                    startTime = cTime2.sStartTime;
+                    endTime = cTime2.sEndTime;
+                    break;
+                default:
+                    sTimeType = 34
+                    break;
+            }
             this.$router.push({            
                 path: "/industryDataExport",
                 query: {
+                    startTime,
+                    endTime,
+                    sTimeType,
                     token: this.getToken,
                     action: "getList",
                     sType: "BrandData",

src/views/MarketingComparison/marketingComparison.vue

@@ -47,6 +47,7 @@ export default {
     methods: {
         handlerChangeModel(arr) {
             this.setSComparison(arr);
+            this.setChangeSTime(0);
             this.reload()
         }
     }

src/views/MarketingComparison/mcBeginCompare.vue

@@ -41,6 +41,7 @@ export default {
             form: {
                 token: ""
             },
+            //
             chooseArr: [null, null, null, null, null, null],
             models: [
             ],
@@ -83,17 +84,19 @@ export default {
            let filterArr = arr.filter(ele => {
               return ele.brand && ele.model
            });
-           if(filterArr.length < 2) {
+           let str = JSON.stringify(filterArr);
+           let arr1 = JSON.parse(str);
+           if(arr1.length < 2) {
                 this.$message.warning('至少2个车型进行对比');
                 return;
            }
-           for(let i = 0; i < filterArr.length; i++) {
-               if(!filterArr[i].startTime || !filterArr[i].endTime) {
+           for(let i = 0; i < arr1.length; i++) {
+               if(!arr1[i].startTime || !arr1[i].endTime) {
                    this.$message.warning('请选择时间');
                    return;
                }
            }
-           this.setSComparison(filterArr);
+           this.setSComparison(arr1);
            this.reload()
         }
        

src/views/MarketingComparison/mcChooseModel/index.vue

@@ -12,32 +12,64 @@
       <v-btn @click="goback">返回营销分析</v-btn>
     </v-label-div>
     <div class="mccm-inner">
-            <template v-for="(item,index) in list">
-                <div :key="index" style="display: flex;justify-content: flex-start;">
+      <template v-for="(item, index) in list">
+        <div :key="index" style="display: flex; justify-content: flex-start">
           <div class="mccm-item" style="margin-left: 1rem">
             <div class="mc-t">
-                            <div class="m-t-d1">{{item.brand|doStr(4)}}</div>
-                            <span class="m-t-s1">{{item.model|doStr(10)}}</span>
+              <div class="m-t-d1">{{ item.brand | doStr(4) }}</div>
+              <span class="m-t-s1">{{ item.model | doStr(10) }}</span>
             </div>
             <div>
-                            <a-form-model :label-col="labelCol" :wrapper-col="wrapperCol" style="width: 100%">
+              <a-form-model
+                :label-col="labelCol"
+                :wrapper-col="wrapperCol"
+                style="width: 100%"
+              >
                 <a-form-model-item label="开始时间">
-                                    <a-date-picker v-model="item.startTime" show-time type="date" placeholder="开始时间" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" @change="handlerTime(item)" />
+                  <a-date-picker
+                    v-model="item.startTime"
+                    show-time
+                    type="date"
+                    placeholder="开始时间"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                    style="width: 100%"
+                    @change="handlerTime(item)"
+                  />
                 </a-form-model-item>
                 <a-form-model-item label="结束时间">
-                                    <a-date-picker v-model="item.endTime" show-time type="date" placeholder="结束时间" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" @change="handlerTime(item)" />
+                  <a-date-picker
+                    v-model="item.endTime"
+                    show-time
+                    type="date"
+                    placeholder="结束时间"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                    style="width: 100%"
+                    @change="handlerTime(item)"
+                  />
                 </a-form-model-item>
               </a-form-model>
             </div>
-                        <div class="m-t-btn" @click="handlerDel(index)" v-if="item.isDel">删除</div>
-                        <div class="m-t-btn" @click="handlerChoose(index)" v-else>切换车型</div>
+            <div class="m-t-btn" @click="handlerDel(index)" v-if="item.isDel">
+              删除
             </div>
-                    <img v-if="index < list.length -1" class="mccm-vs" src="../../../assets/images/comm/img_vs.png">
+            <div class="m-t-btn" @click="handlerChoose(index)" v-else>
+              切换车型
+            </div>
+          </div>
+          <img
+            v-if="index < list.length - 1"
+            class="mccm-vs"
+            src="../../../assets/images/comm/img_vs.png"
+          />
         </div>
       </template>
-
     </div>
-        <iSwitchModel :brand="brand" :model="model" :visible.sync="modelShow" @change="handlerBrand"></iSwitchModel>
+    <iSwitchModel
+      :brand="brand"
+      :model="model"
+      :visible.sync="modelShow"
+      @change="handlerBrand"
+    ></iSwitchModel>
   </div>
 </template>
 
@@ -129,6 +161,13 @@ export default {
   },
   created() {
     this.brand = this.getBrand.brandname || "奥迪";
+    if (this.getChangeSTime) {
+      this.list.forEach((e) => {
+        e.startTime = this.getCtime.sStartTime;
+        e.endTime = this.getCtime.sEndTime;
+      });
+    }
+
     this.modelData();
   },
   methods: {
@@ -184,12 +223,12 @@ export default {
       let t1 = item.startTime ? moment(item.startTime).valueOf() : 0;
       let t2 = item.endTime ? moment(item.endTime).valueOf() : 0;
       let current = new Date().getTime();
-             if(t1 > current) {
+      if (t1 > current) {
         item.startTime = "";
         this.$message.warning("开始时间不能大于当前时间");
         return;
       }
-             if(t2 > current) {
+      if (t2 > current) {
         item.endTime = "";
         this.$message.warning("结束时间不能大于当前时间");
         return;
@@ -207,8 +246,6 @@ export default {
         }
       }
     },
-        
-        
   },
 };
 </script>