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

src/views/data/UploadLink.vue

@@ -215,29 +215,7 @@ export default {
           contentTypeName: "雷克萨斯ES",
           mediaTitle: "ES雷克萨斯",
           mediaUrl: "S雷克萨斯",
-        },
-        {
-          informationId: "2021/03/04",
-          publishDate: "雷克萨斯ES上市",
-          carTypeName: "雷克萨斯ES",
-          carPlatformName: "ES雷克萨斯",
-          publishSourceName: "S雷克萨斯",
-          projectTypeName: "东区2",
-          contentTypeName: "雷克萨斯ES",
-          mediaTitle: "ES雷克萨斯",
-          mediaUrl: "S雷克萨斯",
-        },
-        {
-          informationId: "",
-          publishDate: "",
-          carTypeName: "",
-          carPlatformName: "",
-          publishSourceName: "",
-          projectTypeName: "",
-          contentTypeName: "",
-          mediaTitle: "",
-          mediaUrl: "",
-        }, */
+        },*/
       ],
       flag: true,
       operation: [
@@ -278,6 +256,7 @@ export default {
       file: "",
       dictList: [],
       onlineUrl: "http://8.136.230.133:8080",
+      firmsDataCount: null,
     };
   },
   computed: {
@@ -400,6 +379,7 @@ export default {
           if (res.data.code === 200) {
             //this.tableData = [];
             let data = res.data.data;
+            this.firmsDataCount = data.length;
             for (
               let i = 0, j = 0;
               i < this.tableData.length && j < data.length;
@@ -485,7 +465,13 @@ export default {
         fileDes.push(item.name);
       });
       console.log(fileDes);
-      this.submitRequest();
+      let remainCount = this.publishCount - this.firmsDataCount;
+      console.log(remainCount,this.publishCount, this.firmsDataCount)
+      if (remainCount >= this.file.length){
+        this.submitRequest();
+      }else if (remainCount < this.file.length){
+        this.showModal3 = !this.showModal3;
+      }
     },
     // 导入接口
     submitRequest: function () {
@@ -499,7 +485,7 @@ export default {
           if (res.data && res.data.code === 200) {
             console.log("上传成功!");
           } else {
-            alert("上传失败，res.data || res.data.code !== 200");
+            alert("res.data || res.data.code !== 200");
             console.log(res);
           }
         })
@@ -554,10 +540,12 @@ export default {
         url: "/base/mediaPublishManager/selectMediaPublishListByMonth",
         method: "post",
         data: {
-          publishPlatformId: val,
-          publishMonth: d,
+          //publishPlatformId: val,
+          //publishMonth: d,
           //id: val,
           //month: d,
+          publishMonth: d,
+          publishPlatformId: val,
         },
       })
         .then((res) => {
@@ -581,6 +569,7 @@ export default {
           }
         })
         .catch((err) => {
+          this.tableData = [];
           console.log(err);
         });
     },