解决冲突

package-lock.json

@@ -2478,6 +2478,11 @@
         "resolve": "^1.12.0"
       }
     },
+    "babel-helper-vue-jsx-merge-props": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+    },
     "babel-loader": {
       "version": "8.2.2",
       "resolved": "https://registry.npm.taobao.org/babel-loader/download/babel-loader-8.2.2.tgz?cache=0&sync_timestamp=1606424869752&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.2.tgz",

package.json

@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "core-js": "^3.6.5",
     "qs": "^6.10.1",
     "vue": "^2.6.11",

src/App.vue

@@ -90,7 +90,6 @@ export default {
   }
 };
 </script>
-
 <style lang="less">
 * {
   padding: 0;

src/main.js

@@ -1,12 +1,10 @@
-import Vue from 'vue'
-import App from './App.vue'
-import router from './router'
-import axiosApi from './request/api'
-
-Vue.config.productionTip = false
-Vue.prototype.$http = axiosApi
-
-new Vue({
-  router,
-  render: h => h(App)
-}).$mount('#app')
+import Vue from 'vue'
+import App from './App.vue'
+import router from './router'
+import axiosApi from './request/api'
+Vue.config.productionTip = false
+Vue.prototype.$http = axiosApi
+new Vue({
+  router,
+  render: h => h(App)
+}).$mount('#app')

src/request/api.js

@@ -14,7 +14,6 @@ axios.interceptors.request.use((config) => {
     }
     if (config.url === '/firmsUpload') { //针对上传文件的接口 data不做转义 否则会造成传值为空
         config.data = baseData
-        console.log(baseData)
     }
     return config;
 }, (err) => {

src/views/account/AccountIndex.vue

@@ -76,10 +76,10 @@ export default {
       plateValue: "",
       tableData: [],
       getDateList: [
-        { num: "1", id: "123", dlr: 'L0201', area: '北区', distributor: '北京博瑞',plate:'微信公众号', account: '雷克萨斯北京博瑞4S店', isAttest: 0, fans: 118529},
-        { num: "1", id: "123", dlr: 'L0201', area: '北区', distributor: '北京博瑞',plate:'微信公众号', account: '雷克萨斯北京博瑞4S店', isAttest: 0, fans: 118529},
-        { num: "1", id: "123", dlr: 'L0201', area: '北区', distributor: '北京博瑞',plate:'微信公众号', account: '雷克萨斯北京博瑞4S店', isAttest: 0, fans: 118529},
-        { num: "1", id: "123", dlr: 'L0201', area: '北区', distributor: '北京博瑞',plate:'微信公众号', account: '雷克萨斯北京博瑞4S店', isAttest: 1, fans: 118529}
+        // { num: "1", id: "123", dlr: 'L0201', area: '北区', distributor: '北京博瑞',plate:'微信公众号', account: '雷克萨斯北京博瑞4S店', isAttest: 0, fans: 118529},
+        // { num: "1", id: "123", dlr: 'L0201', area: '北区', distributor: '北京博瑞',plate:'微信公众号', account: '雷克萨斯北京博瑞4S店', isAttest: 0, fans: 118529},
+        // { num: "1", id: "123", dlr: 'L0201', area: '北区', distributor: '北京博瑞',plate:'微信公众号', account: '雷克萨斯北京博瑞4S店', isAttest: 0, fans: 118529},
+        // { num: "1", id: "123", dlr: 'L0201', area: '北区', distributor: '北京博瑞',plate:'微信公众号', account: '雷克萨斯北京博瑞4S店', isAttest: 1, fans: 118529}
       ],
       functionData: [],
     };
@@ -116,6 +116,21 @@ export default {
     submit: function () {
       console.log(this.plateValue);
       console.log(this.areaValue);
+        this.$http({
+            method: 'post',
+            url: '/sys/agent/selectAgentInfoPage',
+            data: {
+                queryParams:this.areaValue
+            },
+        }).then((res) => {
+            if(res.data.code === 200) {
+                this.getDateList = res.data.data;
+            }else {
+                console.log('message', res.data.message);
+            }
+        }).catch((err) => {
+            console.log(err);
+        })
     },
     getData: function () {
       this.tableData = [];
@@ -143,12 +158,13 @@ export default {
     getDealerListRequest(){//获取经销商列表
       this.$http({
         method: 'post',
-        url: '/sys/agent/selectAgentInfoPage',
+        url: '/sys/mediaAccount/selectMediaAccountPage',
         data: {
         },
       }).then((res) => {
           if(res.data.code === 200) {
             this.getDateList = res.data.data;
+           // alert('success!')
           }else {
             console.log('message', res.data.message);
           }

src/views/data/UploadInfor.vue

@@ -102,17 +102,17 @@
         </div>
       </div>
     </form>
-    <div class="count">
+    <div class="count" v-show="scope === '0'">
       <Count :sum="sum" />
     </div>
-    <div class="table">
+    <div class="table" v-show="scope === '0'">
       <UpLoadTable
         :tableData="tableData"
         @change_icon="changeIcon"
         :imgFlag="imgFlag"
       />
     </div>
-    <div class="page">
+    <div class="page" v-show="scope === '0'">
       <Tablepage
         :totalPage="totalPage"
         :currentPage="currentPage"
@@ -310,13 +310,13 @@ export default {
           alert("请导入附件");
           return;
         }
-        this.submitRequest();
       }
         this.submitRequest();
     },
     // 获取文件名
     getFileInfo: function (event) {
       this.file = event.target.files;
+      console.log(this.file)
       this.fileDes = [];
         this.file.forEach((item) => {
           this.fileDes.push(item.name);
@@ -337,9 +337,7 @@ export default {
     // 提交接口
     submitRequest: function () {
       let paramData = new FormData();
-      this.file.forEach((item) => {
-        paramData.append("file", item);
-      });
+      paramData.append("file", this.file);
       paramData.append("dataName", this.inforName);
       paramData.append("dataDesc", this.inforDes);
       paramData.append("sourceTime", this.materialTime);