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

src/App.vue

@@ -38,7 +38,7 @@ export default {
     return {
       navTitle1: ' > 数据管理',
       navTitle2: '',
-      isManufacturer: 'distributor', // distributor 经销商 manufacturer 厂商
+      isManufacturer: 'manufacturer', // distributor 经销商 manufacturer 厂商
       userAccount: ''
     }
   },

src/views/account/AccountIndex.vue

@@ -34,9 +34,17 @@
         </div>
         <div class="current_button" @click="submit">确定</div>
       </div>
-      <Count :sum="sum" />
+      <div style="display: flex">
+        <div style="margin-top: 10px"><Count :sum="sum" /></div>
+        <div
+          class="current_button"
+          style="margin-top: 10px"
+          @click="exportData"
+        >
+          导出
+        </div>
+      </div>
     </div>
-
     <Table :tableData="tableData" @edit_data="editData"> </Table>
     <div v-if="sum > 0">
       <TablePage
@@ -72,6 +80,7 @@ export default {
       currentPage: 1,
       sum: 0,
       pageSize: 20,
+      onlineUrl: "http://8.136.230.133:8080",
     };
   },
   computed: {
@@ -151,6 +160,9 @@ export default {
         this.getDealerListRequest(dataObj);
       });
     },
+    exportData: function () {
+      this.exportTem();
+    },
     //获取经销商列表
     getDealerListRequest(data = {}) {
       this.$http({
@@ -279,6 +291,11 @@ export default {
           });
       });
     },
+    // 导出   接口
+    exportTem: function () {
+      let url = this.onlineUrl + "/sys/mediaAccount/export";
+      window.open(url);
+    },
   },
   mounted() {
     this.selectSysDataDictList();
@@ -353,7 +370,7 @@ export default {
       }
     }
   }
-  .count{
+  .count {
     display: flex;
     justify-content: space-between;
   }

src/views/account/components/AccountTable.vue

@@ -32,19 +32,23 @@
           <td>{{ obj.platformName }}</td>
           <td>{{ obj.accountCode }}</td>
           <td>{{ obj.authorizationName }}</td>
-          <td>{{ obj.fansCount}}</td>
+          <td>{{ obj.fansCount }}</td>
           <td class="operation">
             <span @click="edit(index)">编辑</span>
           </td>
         </tr>
       </tbody>
     </table>
-    <EditModal
-      @edit_data="editData"
-      @hide_modal="closeModal"
-      :modalFlag="deleteModalFlag"
-      :dataObj="modalData"
-    ></EditModal>
+    <div v-if="deleteModalFlag">
+      <EditModal
+        @edit_data="editData"
+        @hide_modal="closeModal"
+        :dataObj="modalData"
+        :modalAccount='modalAccount'
+        :authorizationName='modalAuthorizationName'
+        :modalFanCount='modalFanCount'
+      ></EditModal>
+    </div>
   </div>
 </template>
 
@@ -74,6 +78,9 @@ export default {
       index: 0,
       editFlag: [],
       modalData: {},
+      modalAccount: '',
+      modalAuthorizationName: '',
+      modalFanCount: ''
     };
   },
   methods: {
@@ -81,6 +88,9 @@ export default {
       this.index = i;
       this.deleteModalFlag = true;
       this.modalData = this.tableData[i];
+      this.modalAccount = this.modalData.accountCode;
+      this.modalAuthorizationName = this.modalData.authorizationName;
+      this.modalFanCount = this.modalData.fansCount;
     },
     // 模态框确认
     editData: function (isAttesta, fansNum, accountCode) {
@@ -91,8 +101,7 @@ export default {
     closeModal: function () {
       this.deleteModalFlag = false;
     },
-    mounted() {
-    },
+    mounted() {},
   },
 };
 </script>

src/views/account/components/EditModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="delete_modal" v-if="modalFlag">
+  <div class="delete_modal">
     <div class="modal_content">
       <p class="edit">编辑</p>
       <div class="content">
@@ -21,19 +21,19 @@
         </div>
         <div class="account">
           <p style="width: 100px">平台账号</p>
-          <input v-model="accountCode" :placeholder="dataObj['accountCode']"/>
+          <input v-model="accountCode"/>
         </div>
         <div class="isAttest">
           <p style="width: 100px">是否认证</p>
-          <select ref="selectValue">
+          <select v-model="selectValue">
             <!-- 原来列表展示什么，select默认展示 -->
-            <option>{{ dataObj.authorizationName === '是' ? "是" : "否" }}</option>
-            <option>{{ dataObj.authorizationName === '是' ? "否" : "是" }}</option>
+            <option>{{ authorizationName === '是' ? "是" : "否" }}</option>
+            <option>{{ authorizationName === '是' ? "否" : "是" }}</option>
           </select>
         </div>
         <div class="fans">
           <p style="width: 100px">粉丝数</p>
-          <input v-model="fansNums" :placeholder="dataObj['fansCount']"/>
+          <input v-model="fansNums" type="number"/>
         </div>
       </div>
       <div class="btn">
@@ -49,36 +49,47 @@
 <script>
 export default {
   props: {
-    modalFlag: {
-      type: Boolean,
-      default: true,
-    },
     dataObj: {
       type: Object,
       default: () => {
         return {};
       },
     },
+    modalAccount: {
+      type: String,
+      default: ''
+    },
+    authorizationName: {
+      type: String,
+      default: ''
+    },
+    modalFanCount: {
+      type: Number,
+      default: 0
+    },
   },
   data() {
     return {
-      accountCode: '',
-      fansNums: ''
+      accountCode: this.modalAccount,
+      fansNums: this.modalFanCount,
+      selectValue: this.authorizationName
     };
   },
   methods: {
     submit: function () {
-      let isAttesta = this.$refs.selectValue.value || "";
-      let fansNum = this.fansNums || this.dataObj['accountCode'];
-      let accountCode = this.accountCode || this.dataObj['accountCode'];
-      fansNum = +fansNum;
-      if (fansNum <= 0) {
-        alert("请填写大于零的整数");
-      } else if (Math.ceil(fansNum) !== fansNum) {
-        alert("请填写大于零的整数");
-      } else {
-        this.$emit("edit_data", isAttesta, fansNum, accountCode);
+      let isAttesta = this.selectValue;
+      let fansNum = this.fansNums;
+      let accountCode = this.accountCode;
+      console.log(isAttesta, fansNum, accountCode);
+      if (!accountCode) {
+        alert('平台账号不能为空');
+        return
+      }
+      if (fansNum < 0) {
+        alert('粉丝数必须是大于等于0！');
+        return
       }
+      this.$emit("edit_data", isAttesta, fansNum, accountCode);
     },
     hideModal: function () {
       this.$emit("hide_modal");

src/views/data/UploadLinks.vue

@@ -32,7 +32,10 @@
     </div>
     <div class="count">
       <p>针对论坛及其它平台链接上传</p>
-      <Count :sum="sum" />
+      <div style="display: flex">
+        <div><Count :sum="sum" /></div>
+        <div class="current_button" @click="exportData">导出</div>
+      </div>
     </div>
     <div class="tableBox">
       <Table :tableData="tableData" @go_detail="ulrJump"></Table>
@@ -67,6 +70,7 @@ export default {
       areaValue: "",
       startTime: "",
       endTime: "",
+      onlineUrl: "http://8.136.230.133:8080",
     };
   },
   computed: {
@@ -122,6 +126,9 @@ export default {
     ulrJump: function (url) {
       window.open(url);
     },
+    exportData: function () {
+      this.exportTem();
+    },
     // 获取表格数据
     firmsLinkUpload: function (data = {}) {
       this.$http({
@@ -130,7 +137,7 @@ export default {
         data: data,
       })
         .then((res) => {
-          console.log(res.data.data)
+          console.log(res.data.data);
           this.tableData = res.data.data;
           this.sum = res.data.count;
         })
@@ -155,6 +162,11 @@ export default {
           console.log(err);
         });
     },
+    // 导出   接口
+    exportTem: function () {
+      let url = this.onlineUrl + "/exportFactory";
+      window.open(url);
+    },
   },
   created() {
     let req = {

src/views/data/components/UploadLinksTable.vue

@@ -40,8 +40,8 @@
            
           <td>{{ obj.carTypeName }}</td>
           <td>{{ obj.carPlatformName }}</td>
-          <td>{{ obj.publishPlatformName || '-' }}</td>
-          <td>{{ obj.publishSourceName }}</td>
+          <td>{{ obj.publishSourceName || '-' }}</td>
+          <td>{{ obj.publishPlatformName }}</td>
           <td>{{ obj.projectTypeName || '-'}}</td>
           <td>{{ obj.mediaTypeName }}</td>
           <td>{{ obj.contentTypeName || '-'}}</td>

src/views/data/components/UploadRecordDetail.vue

@@ -11,12 +11,12 @@
         </div>
         <div class="detail">
           <p style="width: 65px">上传时间：</p>
-          <p>{{ detailData.filePulishTime }}</p>
+          <p>{{ (detailData.filePulishTime || '').replace(RegExp("-", "g"), '/') }}</p>
         </div>
         <div class="multiDetail">
           <div class="time">
             <p style="width: 65px">素材时间：</p>
-            <p>{{ detailData.fileUploadDate }}</p>
+            <p>{{ (((detailData.fileUploadDate || '').replace('T', ' ')).slice(0, -4)).replace(RegExp("-", "g"), '/') }}</p>
           </div>
           <div class="range">
             <p style="width: 75px">经销商范围：</p>

src/views/parameter/CommonParam.vue

@@ -79,6 +79,7 @@ export default {
           data: {},
         })
           .then((res) => {
+            console.log(res,44)
             if (res.data && res.data.code === 200) {
               this.dictList = res.data.data;
               resolve();
@@ -104,6 +105,7 @@ export default {
         },
       })
         .then((res) => {
+          console.log(res, 333);
           if (res.data && res.data.code === 200) {
             this.dictId = res.data.data[0]["id"];
             this.timeLimit = res.data.data[0]["dictName"];

src/views/parameter/LinkUpload.vue

@@ -19,6 +19,7 @@
       <div class="table">
         <Table
           :tableData="tableData"
+          :selectedplateForm="selectedplateForm"
           @edit="edit"
           @delet_data="deleteData"
           :pageSize="sum"

src/views/parameter/components/LinkUpload/Modal.vue

@@ -4,7 +4,11 @@
       <div class="modal_content">
         <div class="time">
           <p>选择时间</p>
-          <input type="month" v-model="time" />
+          <input
+            type="month"
+            v-model="time"
+            :min="localMonth"
+          />
         </div>
         <div class="plate">
           <p>选择平台</p>
@@ -41,10 +45,15 @@ export default {
     return {
       time: "",
       num: 0,
+      localMonth: ''
     };
   },
   methods: {
     submit: function () {
+      if (!this.time) {
+        alert("请选择上传时间");
+        return;
+      }
       if (!this.num) {
         alert("请选择上传数量");
         return;
@@ -66,9 +75,21 @@ export default {
     mousewheel: function (e) {
       e.preventDefault();
     },
+        // 获取当前的月份
+    getLocalMonth: function () {
+      let data = new Date();
+      let year = data.getFullYear();
+      let month = data.getMonth() + 1;
+      if (month < 10) {
+        month = "0" + month;
+      } else {
+        month = month + "";
+      }
+      this.localMonth = year + "-" + month;
+    },
   },
   created() {
-    console.log(this.selectedplateForm);
+    this.getLocalMonth()
   }
 };
 </script>

src/views/parameter/components/LinkUpload/Table.vue

@@ -16,7 +16,7 @@
           :class="{ table_gray: index % 2 === 0 }"
         >
           <td>{{ obj.publishMonth || "" }}</td>
-          <td>{{ obj.publishPlatformName || "" }}</td>
+          <td>{{ obj.publishPlatformName || selectedplateForm.platformName }}</td>
           <td style="width: 20%">
             <p v-if="!editFlag[index]">{{ obj.publishCount || "" }}</p>
             <input type="text" v-model="newName" v-else />
@@ -53,6 +53,12 @@ export default {
       type: Number,
       default: 2,
     },
+    selectedplateForm: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
   },
   components: {
     DeleteModal,