zx

src/lycomponents/iHeaderBrand/index.vue

@@ -30,7 +30,7 @@
                 </a-select-option>
             </a-select>
 
-            <a-range-picker show-time v-model="selTime" :disabled-date="disabledDate" style="margin-left: 0.8rem" @calendarChange="calendarPriceRangeChange" :size="$vuiSize" valueFormat="YYYY-MM-DD HH:mm:ss" v-if="form.sTimeType == selVal && timeShow" @ok="handlerChangeTime">
+            <a-range-picker show-time v-model="selTime" :disabled-date="disabledDate" style="margin-left: 0.5rem" @calendarChange="calendarPriceRangeChange" :size="$vuiSize" valueFormat="YYYY-MM-DD HH:mm:ss" v-if="form.sTimeType == selVal && timeShow" @ok="handlerChangeTime">
                 <a-icon slot="suffixIcon" type="calendar" />
             </a-range-picker>
 

src/views/EventDEC/mediaInterpretationED/index.vue

@@ -174,18 +174,18 @@ export default {
                 flex-wrap: wrap;
                 .pv-item {
                     width: 285px;
-                    height: 72px;
+                    height: 64px;
                     display: flex;
                     justify-content: flex-start;
                     align-items: center;
                     position: relative;
-                    margin-right: 16px;
-                    margin-top: 16px;
+                    margin-right: 24px;
+                    margin-top: 12px;
                     .dm {
                         position: absolute;
-                        width: 74px;
-                        height: 74px;
-                        border-radius: 74px;
+                        width: 68px;
+                        height: 68px;
+                        border-radius: 68px;
                         border: 1px solid #ccc;
                         left: 0px;
                         top: 0px;

src/views/EventDEC/mediaInterpretationEc/index.vue

@@ -95,7 +95,7 @@ export default {
                 let data = res.data || [];
                 let arr = [];
                 data.forEach((ele) => {
-                    let a = [ele.title, ele.count+'家媒体报道'];
+                    let a = [ele.title, '共有 '+ele.count+' 家媒体报道'];
                     arr.push(a);
                 });
                 this.config = {
@@ -103,7 +103,7 @@ export default {
                     oddRowBGC: "#173b6d",
                     evenRowBGC: "rgba(69, 149, 244, 0)",
                     rowNum: 8,
-                    columnWidth: [500],
+                    columnWidth: [630],
                     header: ["标题", "媒体报道数量"],
                     data: arr,
                 };

src/views/EventDEC/wbUserEDE/index.vue

@@ -17,8 +17,21 @@
                     <v-echarts :opt="opt1"></v-echarts>
                 </div>
                 <div class="dd2">
-                    <vue-scroll>
-                        <v-label-ctx v-for="(item,index) in lArr" :key="index" :label="item.key" :cont="item.value" :percentage="(item.value/tot*100).toFixed(2)+'%'" :color="colors[index]" :eStyle="{ height: '8.6rem' }"></v-label-ctx>
+                    <vue-scroll v-if="lArr.length<=3">
+                        <v-label-ctx v-for="(item,index) in lArr" 
+                        :key="index" :label="item.key" 
+                        :cont="item.value" 
+                        :percentage="(item.value/tot*100).toFixed(2)+'%'" 
+                        :color="colors[index]" :eStyle="{ height: '8.6rem' }">
+                        </v-label-ctx>
+                    </vue-scroll>
+                    <vue-scroll v-if="lArr.length>3">
+                        <v-label-ctx v-for="(item,index) in lArr" 
+                        :key="index" :label="item.key" 
+                        :cont="item.value" 
+                        :percentage="(item.value/tot*100).toFixed(2)+'%'" 
+                        :color="colors[index]" :eStyle="{ height: '5.16rem' }">
+                        </v-label-ctx>
                     </vue-scroll>
                 </div>
             </div>

src/views/Index/barometer/opt.js

@@ -105,11 +105,19 @@ export default function createOpt(dx = [], ds = []) {
             axisLabel: {
                 formatter: (value) => {
                     let rex = "00:00:00";
-                    let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    let isCont = false;
+                    let str = value;
+                    for(let i = 0;i<dx.length-1;i++){
+                        //连续两条带小时
+                        if(dx[i].indexOf(rex) === -1 && dx[i+1].indexOf(rex) === -1){
+                            isCont = true;
+                            break;
+                        }
+                    }
+                    if(isCont == true) {
                         str = value.substring(10, 16)
                     } else {
-                        str = value.substring(0, 10)
+                        str = value.substring(5, 10)
                     }
                     return str;
                 }

src/views/IndustryDataExport/tableEvent.js

@@ -116,7 +116,11 @@ export default {
     // 导出弹框
     handlerExport() {
         this.getToExcelField(this.form.sType, this.form.token).then(() => {
-            this.execlForm.sFileName = this.form.sBrand + '洞察-' + this.getDatetimeSs();
+            if(this.secIds.length===0 || this.secIds.length===1){
+                this.execlForm.sFileName = '事件洞察-' + this.getDatetimeSs();
+            } else {
+                this.execlForm.sFileName = this.form.sBrand + '-' + this.form.sSeriesName + '事件洞察-' + this.getDatetimeSs();
+            }
             this.execlForm.sCheckedIds = this.tableAll ? '' : this.secIds.toString();
             this.execlForm.iNum = this.tableAll ? this.totalNum : this.secIds.length;
             this.modalObj.visible = true;

src/views/MarketingComparison/mcChooseModel/index.vue

@@ -11,10 +11,10 @@
     <v-label-div title="切换车型">
       <v-btn @click="goback">返回营销分析</v-btn>
     </v-label-div>
-    <div class="mccm-inner">
+    <div class="mccm-inner" style="margin-left:1.7rem">
       <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="mccm-item">
             <div class="mc-t">
               <div class="m-t-d1">{{ item.brand | doStr(4) }}</div>
               <span class="m-t-s1">{{ item.model | doStr(10) }}</span>
@@ -34,7 +34,7 @@
                     valueFormat="YYYY-MM-DD HH:mm:ss"
                     style="width: 100%"
                     @change="handlerTime(item)"
-                  />
+                  ><a-icon slot="suffixIcon" type="{null}" /></a-date-picker>
                 </a-form-model-item>
                 <a-form-model-item label="结束时间">
                   <a-date-picker
@@ -45,7 +45,7 @@
                     valueFormat="YYYY-MM-DD HH:mm:ss"
                     style="width: 100%"
                     @change="handlerTime(item)"
-                  />
+                  ><a-icon slot="suffixIcon" type="{null}" /></a-date-picker>
                 </a-form-model-item>
               </a-form-model>
             </div>
@@ -261,7 +261,7 @@ export default {
     display: flex;
     justify-content: flex-start;
     .mccm-item {
-      width: 230px;
+      width: 240px;
       height: 200px;
       background: linear-gradient(180deg, #003a62 0%, #001c43 100%);
       border: 2px solid #0e5193;

src/views/ModelInsight/ml-tts/index.vue

@@ -57,9 +57,38 @@ export default {
     methods: {
         // 前往数据表格
         goIDE() {
+            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/ModelTailDetails/MTDrearWingInformationList/index.vue

@@ -140,7 +140,7 @@ export default {
 <style lang="less" scoped>
 .rwl-outter {
     width: 100%;
-    height: 632px;
+    //height: 632px;
     border: 2px solid #0f2a4d;
     margin-top: 16px;
     .rwl-inner {

src/views/ModelWeiboDetails/MWDweiboCharacters/index.vue

@@ -59,6 +59,7 @@ export default {
       form: {
         sBrand: "",
         token: "",
+        sSeriesName: ""
       },
       RegionWeiBo: [],
       attestation: [],
@@ -94,6 +95,7 @@ export default {
   created() {
     this.form.token = this.getToken;
     this.form.sBrand = this.getBrand.brandname || this.brand;
+    this.form.sSeriesName = this.getModel.name;
     this.getData();
   },
   methods: {

src/views/TailInsightDetails/rearWingInformationList/index.vue

@@ -176,7 +176,7 @@ export default {
 <style lang="less" scoped>
 .rwl-outter {
     width: 100%;
-    height: 632px;
+    //height: 632px;
     border: 2px solid #0f2a4d;
     margin-top: 16px;
     .rwl-inner {

src/views/WeiboDetails/weiboTonalDistribution/index.vue

@@ -9,6 +9,7 @@
 <template>
   <div class="wtd-outter" v-loading="load">
     <v-label-div title="调性分布"> </v-label-div>
+    <vue-scroll>
     <div class="wtd-inner">
       <div class="wtd-item" v-for="(item,index) in sourceData"
         :key="index">
@@ -17,13 +18,14 @@
         <v-percent color="#b78e11" :percentage="item.negative" reverse></v-percent>
       </div>
     </div>
+    </vue-scroll>
   </div>
 </template>
 
 <script>
 import { getBoauthenAffectionsWeiBo0528 } from "@/api/WeiboDetails";
 export default {
-  name: "wtd-outter",
+  name: "weiboTonalDistribution",
   data() {
     return {
       load: false,