init

.gitignore

-.DS_Store
-node_modules
-/dist
-/kpi
 
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
+### IntelliJ IDEA ###
 .idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
+.svn
+*.iws
 *.iml
-*.zip
-*.rar
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+dist/
+kpi/
+/nbdist/
+/.nb-gradle/
+node_modules/ 
\ No newline at end of file

src/views/app/ToMMT.vue

@@ -5,7 +5,7 @@
       <div class="divb">
         <p>打开前请先安装最新版手机经分APP</p>
         <p>
-          <a href="https://emm.cmccbigdata.com:8443/emm/about">点击安装</a>
+          <a href="http://172.168.20.37:8888/emm/about">点击安装</a>
         </p>
         <br>
         <div class="button">

src/views/app/gridMarketing.vue

@@ -15,10 +15,7 @@
                 <div class="clearfix"></div>
             </div>
 
-            <div v-show="tabActive === 1 && showTime" class="time" ref="timeRef">
-                {{showTime}}
-
-            </div>
+            <div v-show="tabActive === 1 && showTime" class="time" ref="timeRef">{{showTime}}</div>
             <div v-if="showUpperLevel" @click="changeUpperLevel" class="upper-level">上一级</div>
             <ModelArea
                     :userInfo="userInfo"
@@ -58,15 +55,6 @@
                 <span @click="clickTab(2)"
                       :class="{active : tabActive === 2 }"
                       class="month">月通报</span>
-                <div @click.prevent.stop="boreShow "
-                     class="bore"
-                >
-                    <span class="caliber">口径</span>
-                    <span class="question"> ? </span>
-                    <Popup @hide="hidePop"
-                           v-if="popObjMouth.visable"
-                           :obj="popObjMouth"></Popup>
-                </div>
             </div>
             <div ref="kpiRef" class="kpis">
                 <div class="kpi" :style="{width: kpiWidth}">
@@ -157,7 +145,6 @@
     import SelectArea from "com/app/add/selectArea.vue";
     import selectDate from "com/app/add/selectDate.vue";
     import commonMixin from "mixins/common/common.js";
-    import Popup from "com/app/common/popup.vue";
 
     const REAL_TIME = 1,
         MONTH = 2;
@@ -166,8 +153,7 @@
             ModelArea,
             ModelDate,
             SelectArea,
-            selectDate,
-            Popup
+            selectDate
         },
         mixins: [commonMixin],
         computed: {
@@ -265,19 +251,7 @@
                 kpiListOrigin: [],
                 currentKpiCode: "",
                 changeUpperLevelIng: false,
-                changeCacheFlag: false,
-                popObjMouth: {
-                    //口径的数据
-                    title: "",
-                    ind_unit: "元",
-                    remark: "",
-                    top: "0.5rem",
-                    right: "-0.2rem",
-                    topRight: "0.15rem",
-                    visable: false,
-                    type: 1,
-                    activeIndex: '' // 当前激活
-                },
+                changeCacheFlag: false
             };
         },
         filters: {
@@ -291,19 +265,6 @@
             }
         },
         methods: {
-            hidePop(type) {
-                this.popObjMouth.visable = false;
-                this.popObjMouth.remark = "";
-            },
-            boreShow() {
-                // console.log(this.activeKpiItem)
-                this.popObjMouth.remark = this.activeKpiItem.remarks;
-                if (this.popObjMouth.remark) {
-                    this.popObjMouth.visable = true;
-                } else {
-                    Toast("该指标下没有口径说明 ！");
-                }
-            },
             changeUpperLevel() {
                 this.changeUpperLevelIng = true;
                 let length = this.cacheList.length;
@@ -907,6 +868,7 @@
 
     .time {
         height: 0.4rem;
+        // padding: 0.1rem 0;
         padding-left: 2.5rem;
         font-size: 0.26rem;
         color: #fff;
@@ -957,7 +919,6 @@
         font-size: 0.28rem;
         text-align: center;
         /*padding-left: 1.8rem;*/
-        position: relative;
 
         .day,
         .month {
@@ -976,27 +937,6 @@
             background-color: #2b90fa;
             color: #fff;
         }
-
-
-        .bore {
-            position: absolute;
-            top: 0.3rem;
-            right: .35rem;
-            height: 0.5rem;
-            color: #999;
-
-            .question {
-                display: inline-block;
-                width: 0.2rem;
-                height: 0.2rem;
-                overflow: hidden;
-                line-height: 0.2rem;
-                border-radius: 50%;
-                color: #999;
-                text-align: center;
-                border: 1px solid #999;
-            }
-        }
     }
 
     .bg {
@@ -1191,6 +1131,5 @@
         .stars {
             width: 0.4rem;
         }
-
     }
 </style>

src/views/app/index.vue

@@ -125,7 +125,7 @@
 <script>
 import { Indicator, Toast } from 'mint-ui';
 import { formatDateTime, formatDateTimeReg } from "libs/common/common";
-import ModelArea from "com/app/index/area.vue";
+import ModelArea from "com/app/gridMarketing/area.vue";
 import ModelDate from "com/app/appUsage/appModelDate.vue";
 import CategoryPicker from "com/app/index/categoryPicker.vue";
 // import Broadcast from "com/app/index/broadcast.vue";

src/views/app/index1.vue

@@ -155,7 +155,7 @@
 <script>
     import {Indicator, Toast} from 'mint-ui';
     import {formatDateTime, formatDateTimeReg, getTextWidth} from "libs/common/common";
-    import ModelArea from "com/app/index/area.vue";
+    import ModelArea from "com/app/gridMarketing/area.vue";
     import ModelDate from "com/app/appUsage/appModelDate.vue";
     import CategoryPicker from "com/app/index/categoryPicker.vue";
     import Popup from "com/app/common/popup.vue";

src/views/app/specialAreaCity.vue

@@ -59,10 +59,10 @@ export default {
           newHref += i + '=' + query[i] + '&';
         }
       }
-      // let newHref = 'https://emm.cmccbigdata.com:8443/cscm/pages/home?'
+      // let newHref = 'http://172.168.20.37:8888/cscm/pages/home?'
 
       console.log('newHref :', newHref)
-      // https://emm.cmccbigdata.com:8443/cscm/pages/home?id=OCxusheng1&phone=13873110056&level=1&areaId=731&aid=18411&area=A_%E9%95%BF%E6%B2%99&xid=633f47589186780e4d534ef743915005&token=b43eb37f48ec38054507cb0695a3787f&ua=pc&
+      // http://172.168.20.37:8888/cscm/pages/home?id=OCxusheng1&phone=13873110056&level=1&areaId=731&aid=18411&area=A_%E9%95%BF%E6%B2%99&xid=633f47589186780e4d534ef743915005&token=b43eb37f48ec38054507cb0695a3787f&ua=pc&
       if (query.ua === 'android') {
         emm.openWebView(newHref)
       } else if (query.ua === 'ios') {
@@ -77,7 +77,7 @@ export default {
       if (data === null) return
       for (let i = 0; i < data.length; i++) {
         const d = data[i];
-        d.imgUrl = 'https://emm.cmccbigdata.com:8443/work/' + d.imagePath
+        d.imgUrl = 'http://172.168.20.37:8888/work/' + d.imagePath
       }
       this.list = data
       if (!this.list.length) {

src/views/app/workbench.vue

@@ -269,6 +269,8 @@ export default {
       }
     },
     applicationClick(applicationItem, url, index) {
+      // applicationItem.pack = String(applicationItem.pack).replace("https://emm.cmccbigdata.com:8443", "http://172.168.20.37:8888");  
+      // applicationItem.pack = applicationItem.pack.replace("file/order", "file/order1"); 
       let href = applicationItem.pack + '?'
       const query = this.$route.query
       for (let i in query) {
@@ -323,8 +325,8 @@ export default {
       // this.applicationList = data.applications
       this.applicationList = data
       this.applicationList.forEach(e => {
-        // https://emm.cmccbigdata.com:8443/file/1530357218832.png
-        e.icon = "https://emm.cmccbigdata.com:8443/file/" + e.icon
+        // http://172.168.20.37:8888/file/1530357218832.png
+        e.icon = "http://172.168.20.37:8888/file/" + e.icon
       });
     },
     async getAdvertList() {
@@ -336,8 +338,8 @@ export default {
       // console.log('data advertList:', data)
       for (let i = 0; i < data.length; i++) {
         const d = data[i];
-        if (d.filePath) d.filePath = 'https://emm.cmccbigdata.com:8443/work/' + d.filePath
-        d.imagePath = 'https://emm.cmccbigdata.com:8443/work/' + d.imagePath
+        if (d.filePath) d.filePath = 'http://172.168.20.37:8888/work/' + d.filePath
+        d.imagePath = 'http://172.168.20.37:8888/work/' + d.imagePath
       }
       data.sort((a, b) => {
         return a.pos - b.pos
@@ -367,7 +369,7 @@ export default {
         doc.imgUrl = require("../../assets/app/workbench/pdf.png")
         // doc.createdTime = this.formatTime(doc.createdTime)
         doc.createdTime = doc.createdTime.slice(0, 10)
-        doc.filePath = 'https://emm.cmccbigdata.com:8443/work/' + doc.filePath
+        doc.filePath = 'http://172.168.20.37:8888/work/' + doc.filePath
       }
       data.sort((a, b) => {
         return b.id - a.id