Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/Lexus-media

src/views/account/AccountIndex.vue

@@ -84,8 +84,8 @@ export default {
       currentPage: 1,
       sum: 0,
       pageSize: 20,
-      onlineUrl: "http://8.136.230.133:8080",
-      platIndex: 0,
+      onlineUrl: "http://8.140.188.129:8080", //'http://8.140.188.129:8080'线上 //http://8.136.230.133:8080 //测试
+      platformId: "",
     };
   },
   computed: {
@@ -99,6 +99,9 @@ export default {
     changePage: function (page) {
       this.currentPage = page;
       let req = {
+        queryParams: this.inputValue,
+        localArea: this.areaValue,
+        platformId: this.platformId,
         page: this.currentPage,
         rows: this.pageSize,
       };
@@ -121,6 +124,9 @@ export default {
           break;
       }
       let req = {
+        queryParams: this.inputValue,
+        localArea: this.areaValue,
+        platformId: this.platformId,
         page: this.currentPage,
         rows: this.pageSize,
       };
@@ -129,35 +135,34 @@ export default {
     search: function () {
       //通过经销商或DLR CODE查询
       console.log(this.inputValue);
+      this.currentPage = 1;
       let req = {
         queryParams: this.inputValue,
+        localArea: this.areaValue,
+        platformId: this.platformId,
         page: this.currentPage,
         rows: this.pageSize,
       };
       this.getDealerListRequest(req);
     },
     platChange: function (e) {
-      this.platIndex = e.target.options.selectedIndex;
-    },
-    submit: function () {
-      console.log(this.platIndex);
-      let index = this.platIndex;
-      let req = {}
-      if (index > 0) {
-        let platformId = this.platesList[index - 1]["id"];
-        req = {
-          localArea: this.areaValue,
-          platformId,
-          page: this.currentPage,
-          rows: this.pageSize,
-        };
+      let platIndex = e.target.options.selectedIndex;
+      // 排除“请选择”
+      if (platIndex > 0) {
+        this.platformId = this.platesList[platIndex - 1]["id"];
+        console.log(this.platesList[platIndex - 1]["dictName"]);
       } else {
-        req = {
-          localArea: this.areaValue,
-          page: this.currentPage,
-          rows: this.pageSize,
-        }
+        this.platformId = "";
       }
+    },
+    submit: function () {
+      let req = {
+        queryParams: this.inputValue,
+        localArea: this.areaValue,
+        platformId: this.platformId,
+        page: this.currentPage,
+        rows: this.pageSize,
+      };
       this.getDealerListRequest(req);
     },
     editData: function (i, isAttesta, fansNum, accountCode) {
@@ -170,6 +175,9 @@ export default {
       };
       this.updateMediaAccountInfo(req).then(() => {
         let dataObj = {
+          queryParams: this.inputValue,
+          localArea: this.areaValue,
+          platformId: this.platformId,
           page: this.currentPage,
           rows: this.pageSize,
         };

src/views/data/InforList.vue

@@ -201,7 +201,7 @@ export default {
         height: "30px",
         overflow: "hidden",
       },
-      onlineUrl: "http://8.136.230.133:8080",
+      onlineUrl: "http://8.140.188.129:8080", //'http://8.140.188.129:8080'线上 //http://8.136.230.133:8080 //测试
       userId: 254,
       endDate: "",
     };

src/views/data/UploadLink.vue

@@ -284,7 +284,8 @@ export default {
       },
       file: "",
       dictList: [],
-      onlineUrl: "http://8.136.230.133:8080",
+      onlineUrl: "http://8.140.188.129:8080", //'http://8.140.188.129:8080'线上 //http://8.136.230.133:8080 //测试
+      //firmsDataCount: null,
       userId: 254,
       //截止日期
       endTime: "",

src/views/data/UploadLink/sonUploadLink.vue

@@ -230,7 +230,7 @@ export default {
       },
       file: "",
       dictList: [],
-      onlineUrl: "http://8.136.230.133:8080",
+      onlineUrl: "http://8.140.188.129:8080", //'http://8.140.188.129:8080'线上 //http://8.136.230.133:8080 //测试
       firmsDataCount: null,
       userId: 254,
     };

src/views/data/UploadLinks.vue

@@ -70,7 +70,7 @@ export default {
       areaValue: "",
       startTime: "",
       endTime: "",
-      onlineUrl: "http://8.136.230.133:8080",
+      onlineUrl: "http://8.140.188.129:8080", //'http://8.140.188.129:8080'线上 //http://8.136.230.133:8080 //测试
     };
   },
   computed: {
@@ -90,12 +90,18 @@ export default {
         localArea: this.areaValue,
         startTime: this.startTime,
         endTime: this.endTime,
+        page: this.currentPage,
+        rows: this.pageSize,
       };
       this.firmsLinkUpload(data);
     },
     changePage: function (page) {
       this.currentPage = page;
       let req = {
+        queryParams: this.inputValue,
+        localArea: this.areaValue,
+        startTime: this.startTime,
+        endTime: this.endTime,
         page: this.currentPage,
         rows: this.pageSize,
       };
@@ -118,6 +124,10 @@ export default {
           break;
       }
       let req = {
+        queryParams: this.inputValue,
+        localArea: this.areaValue,
+        startTime: this.startTime,
+        endTime: this.endTime,
         page: this.currentPage,
         rows: this.pageSize,
       };

src/views/data/UploadRecord.vue

@@ -59,7 +59,7 @@ export default {
       pageSize: 20,
       tableData: [],
       asc: false,
-      onlineUrl: "http://8.136.230.133:8080",
+      onlineUrl: "http://8.140.188.129:8080", //'http://8.140.188.129:8080'线上 //http://8.136.230.133:8080 //测试
     };
   },
   computed: {

src/views/data/components/InfoListItemDetail.vue

@@ -96,7 +96,7 @@ export default {
     return {
       status: false,
       dataObj: {},
-      onlineUrl: "http://8.136.230.133:8080",
+      onlineUrl: "http://8.140.188.129:8080", //'http://8.140.188.129:8080'线上 //http://8.136.230.133:8080 //测试
       informationId: this.$route.query.informationId || "",
       nowIndex: this.$route.query.nowIndex || "",
 

src/views/data/components/UploadRecordDetail.vue

@@ -32,8 +32,8 @@
           </div>
         </div>
         <div class="detail">
-          <p style="width: 65px">资料描述：</p>
-          <p>{{ detailData.fileDiscription }}</p>
+          <div style="width: 15%">资料描述：</div>
+          <p style="width: 85%">{{ detailData.fileDiscription }}</p>
         </div>
         <div class="files">
           <p style="width: 65px">附件：</p>
@@ -123,7 +123,7 @@ export default {
       page: (this.$route.query && this.$route.query.page) || 20,
       detailData: {},
       areaList: [],
-      onlineUrl: "http://8.136.230.133:8080",
+      onlineUrl: "http://8.140.188.129:8080", //'http://8.140.188.129:8080'线上 //http://8.136.230.133:8080 //测试
     };
   },
   computed: {
@@ -147,7 +147,9 @@ export default {
       this.isShowTable = false;
     },
     seletByArea: function () {
+      let id = this.detailData["id"];
       let req = {
+        informationId: id,
         localArea: this.optionValue,
         page: this.currentPage,
         rows: this.pageSize,
@@ -160,6 +162,7 @@ export default {
       let id = this.detailData["id"];
       let req = {
         informationId: id,
+        localArea: this.optionValue,
         page: this.currentPage,
         rows: this.pageSize,
       };
@@ -184,6 +187,7 @@ export default {
       let id = this.detailData["id"];
       let req = {
         informationId: id,
+        localArea: this.optionValue,
         page: this.currentPage,
         rows: this.pageSize,
       };
@@ -320,8 +324,13 @@ export default {
       padding: 20px 30px 0;
       .detail {
         width: 100%;
-        min-height: 50px;
         display: flex;
+        div{
+          font-size: 12px;
+        }
+        p{
+        min-height: 50px;
+        }
       }
       .multiDetail {
         // display: flex;
@@ -346,6 +355,7 @@ export default {
       }
       .files {
         display: flex;
+        margin-top: 20px;
         .filesName {
           p {
             color: #0056a0;

vue.config.js

@@ -3,7 +3,8 @@ module.exports = {
     devServer: {
         proxy: {
             '/api':{
-                 target:"http://8.136.230.133:8080",//这里设置你要访问的域名（或IP+端口）
+                 //target:"http://8.136.230.133:8080",//这里设置你要访问的域名（或IP+端口）   //测试
+                target:"http://8.140.188.129:8080",//这里设置你要访问的域名（或IP+端口） //线上
                 //target:"http://192.168.2.122:8080",//这里设置你要访问的域名（或IP+端口）
                 changeOrigin:true,
                 pathRewrite:{