问题修改

src/components/Navigation.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="navigation">
-    <p>经销商社交媒体工作平台{{navTitle1}}{{navTitle2}}</p>
+    <p>经销商社交媒体数据平台{{navTitle1}}{{navTitle2}}</p>
   </div>
 </template>
 

src/views/account/components/EditModal.vue

@@ -21,7 +21,7 @@
         </div>
         <div class="account">
           <p style="width: 100px">平台账号</p>
-          <input v-model="accountCode"/>
+          <input v-model="accountCode" :placeholder="dataObj['accountCode']"/>
         </div>
         <div class="isAttest">
           <p style="width: 100px">是否认证</p>
@@ -33,7 +33,7 @@
         </div>
         <div class="fans">
           <p style="width: 100px">粉丝数</p>
-          <input ref="inputValue" v-model="fansNums"/>
+          <input v-model="fansNums" :placeholder="dataObj['fansCount']"/>
         </div>
       </div>
       <div class="btn">
@@ -62,21 +62,22 @@ export default {
   },
   data() {
     return {
-      accountCode: this.dataObj['accountCode'],
-      fansNums: this.dataObj['fansNums']
+      accountCode: '',
+      fansNums: ''
     };
   },
   methods: {
     submit: function () {
       let isAttesta = this.$refs.selectValue.value || "";
-      let fansNum = this.fansNums;
+      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, this.accountCode);
+        this.$emit("edit_data", isAttesta, fansNum, accountCode);
       }
     },
     hideModal: function () {

src/views/data/UploadInfor.vue

@@ -72,7 +72,10 @@
         <div class="addByGroup">
           <span>按小组添加</span>
           <div class="selectBox">
-            <img src="../../img/select.png" @click="showOption" />
+            <div class="group_select" @click="showOption">
+              <p>请选择</p>
+              <img src="../../img/select_arrow.png" />
+            </div>
             <div class="optionBox" v-if="optionFlag">
               <ul>
                 <li v-for="(item, index) in groupList" :key="index">
@@ -119,12 +122,12 @@
 
     <div class="uploadFile">
       <p>附件</p>
-      <div class="fileDes">
-        <p v-for="(item, index) in fileDes" :key="index">{{ item }}</p>
-      </div>
       <label for="fileInput" @change="getFileInfo($event)"
         >导入<input type="file" name="fileName" id="fileInput" multiple
       /></label>
+      <div class="fileDes">
+        <p v-for="(item, index) in fileDes" :key="index">{{ item }}</p>
+      </div>
     </div>
     <button @click="submit" class="submitBtn">提交</button>
     <TipModal
@@ -619,6 +622,29 @@ export default {
     .selectBox {
       position: relative;
       margin-left: 17px;
+      .group_select {
+        width: 124px;
+        height: 28px;
+        border: 1px solid #ccc;
+        background-color: #fff;
+        padding: 0 10px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        p {
+          font-size: 12px;
+          height: 28px;
+          line-height: 28px;
+          color: #555555;
+        }
+        img {
+          width: 16px;
+          height: 16px;
+        }
+        &:hover {
+          cursor: pointer;
+        }
+      }
       img {
         width: 144px;
         height: 28px;
@@ -685,7 +711,8 @@ export default {
       line-height: 20px;
     }
     .fileDes {
-      width: 100px;
+      margin-left: 20px;
+      width: 500px;
       overflow: hidden;
       overflow: hidden; /* 超出一行文字自动隐藏 */
       text-overflow: ellipsis; /* 文字隐藏后添加省略号 */

src/views/data/UploadLinks.vue

@@ -88,9 +88,6 @@ export default {
         endTime: this.endTime,
       };
       this.firmsLinkUpload(data);
-      this.areaValue = "";
-      this.startTime = "";
-      this.endTime = "";
     },
     changePage: function (page) {
       this.currentPage = page;

src/views/data/UploadRecord.vue

@@ -81,7 +81,9 @@ export default {
       if (this.inputValue !== "请输入要搜索的资料名") {
         data = {
           informationName: this.inputValue,
-          asc: this.asc
+          asc: this.asc,
+          page: this.currentPage,
+          rows: this.pageSize,
         };
       }
       this.getFirmsUploadList(data);
@@ -101,7 +103,7 @@ export default {
       let req = {
         page: this.currentPage,
         rows: this.pageSize,
-        asc: this.asc
+        asc: this.asc,
       };
       this.getFirmsUploadList(req);
     },
@@ -124,7 +126,7 @@ export default {
       let req = {
         page: this.currentPage,
         rows: this.pageSize,
-        asc: this.asc
+        asc: this.asc,
       };
       this.getFirmsUploadList(req);
     },
@@ -137,21 +139,30 @@ export default {
     },
     delet: function (i) {
       let id = this.tableData[i].id;
-      this.deleteInformationInfo(id).then(() => {
-        this.currentPage = Math.ceil((this.sum - 1) / this.pageSize);
-        let req = {
+      this.deleteInformationInfo(id)
+        .then(() => {
+          this.currentPage = Math.ceil((this.sum - 1) / this.pageSize);
+          let req = {
+            page: this.currentPage,
+            rows: this.pageSize,
+            asc: this.asc,
+          };
+          this.getFirmsUploadList(req);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    detail: function (i) {
+      this.$router.push({
+        query: {
+          tag: "detail",
+          id: i,
           page: this.currentPage,
           rows: this.pageSize,
-          asc: this.asc
-        };
-        this.getFirmsUploadList(req);
-      }).catch((err) => {
-        console.log(err)
+        },
       });
     },
-    detail: function (i) {
-      this.$router.push({ query: { tag: "detail", id: i, page: this.currentPage, rows: this.pageSize } });
-    },
     // 上传记录列表接口
     getFirmsUploadList: function (data = {}) {
       this.$http({
@@ -195,7 +206,7 @@ export default {
               alert("删除成功");
               resolve();
             } else {
-              alert('删除失败，请重试')
+              alert("删除失败，请重试");
               console.log(res.message);
               rejecct();
             }
@@ -211,7 +222,7 @@ export default {
     let res = {
       page: 1,
       rows: this.pageSize,
-      asc: this.asc
+      asc: this.asc,
     };
     this.getFirmsUploadList(res);
   },

src/views/data/components/UploadLinksTable.vue

@@ -34,9 +34,10 @@
           <td>{{ obj.dlrCode }}</td>
           <td style="width: 180px">{{ obj.dlrName }}</td>
           <td>{{ obj.localArea }}</td>
-          <td>{{ obj.publishDate }}</td>
+          <td>{{ (obj.publishDate).replace(RegExp("-", "g"), '/') }}</td>
           <td style="width: 180px">{{ obj.informationName }}</td>
-          <td>{{ obj.reportDate }}</td>
+          <td>{{ (((obj.reportDate || '').replace('T', ' ')).slice(0, -4)).replace(RegExp("-", "g"), '/') }}</td>
+           
           <td>{{ obj.carTypeName }}</td>
           <td>{{ obj.carPlatformName }}</td>
           <td>{{ obj.publishPlatformName || '-' }}</td>

src/views/data/components/UploadRecordDetail.vue

@@ -51,7 +51,7 @@
       <div class="table" v-show="isShowTable">
         <div class="table_option">
           <select @change="seletByArea" v-model="optionValue">
-            <option value="">请选择</option>
+            <option value="">全区</option>
             <option v-for="(item, index) in areaList" :key="index">
               {{ item }}
             </option>

src/views/data/components/UploadRecordTable.vue

@@ -18,13 +18,13 @@
           :class="{ table_gray: index % 2 === 0 }"
         >
           <td style="width: 20%">{{ obj.informationName }}</td>
-          <td style="width: 10%">{{ obj.filePulishTime }}</td>
+          <td style="width: 10%">{{ (obj.filePulishTime || '').replace('-', '/') }}</td>
           <td style="width: 10%">{{ obj.accountScope === 1 ? "共通" : "部分" }}</td>
           <td style="width: 10%">
             <span>{{ obj. totalCount }}</span
             >/<span style="color: #A30014">{{ obj.downloadCount }}</span>
           </td>
-          <td style="width: 15%">{{ obj.fileUploadDate }}</td>
+          <td style="width: 15%">{{ (((obj.fileUploadDate || '').replace('T', ' ')).slice(0, -4)).replace(RegExp("-", "g"), '/') }}</td>
           <td style="width: 25%" class="operation">
             <span @click="download(index)">下载</span>
             <span @click="delet(index)">删除</span>

src/views/parameter/ContentCategory2.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="car_series">
       <div class="count">
-        <button @click="showModal">新增分类</button>
+        <button @click="showModal">新增类别</button>
         <Count :sum="sum"></Count>
       </div>
       <div class="table">

src/views/parameter/components/Carseries/CarSeriesTable.vue

@@ -72,7 +72,7 @@ export default {
     // 点击编辑
     edit: function (i) {
       this.getEditArr(); // 确保只有一个在编辑
-      this.newName = this.tableData[i] && this.tableData[i].carSeries;
+      this.newName = this.tableData[i] && this.tableData[i].typeName;
       this.editFlag.splice(i, 1, true);
     },
     // 确认编辑

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

@@ -3,7 +3,7 @@
     <div class="vehicle_servies_modal" @mousewheel="mousewheel">
       <div class="modal_content">
         <div class="input">
-          <p>稿件名称</p>
+          <p>类别名称</p>
           <input type="text" v-model="name" />
         </div>
         <div class="btn">

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

@@ -3,7 +3,7 @@
     <div class="vehicle_servies_modal" @mousewheel="mousewheel">
       <div class="modal_content">
         <div class="input">
-          <p>稿件名称</p>
+          <p>类别名称</p>
           <input type="text" v-model="name" />
         </div>
         <div class="btn">

src/views/parameter/components/Grouping/GroupMember.vue

@@ -23,6 +23,7 @@
       <div class="modal" v-if="modalFlag">
         <Modal
           :modalFlag="modalFlag"
+          :tableList='tableData'
           @submit="submit"
           @hide_modal="showModal"
         ></Modal>

src/views/parameter/components/Grouping/GroupMemberModal.vue

@@ -41,8 +41,7 @@
             @change_icon="changeIcon"
           >
           </Table>
-        </div>
-        <div class="page" v-if="sum > 0">
+                  <div class="page" v-if="sum > 0">
           <Tablepage
             :totalPage="totalPage"
             :currentPage="currentPage"
@@ -50,6 +49,7 @@
             @jump_page="jumpPage"
           />
         </div>
+        </div>
         <div class="btn">
           <div
             class="current_button"
@@ -81,6 +81,12 @@ export default {
       type: Boolean,
       default: false,
     },
+    tableList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
   },
   components: {
     Table,
@@ -202,7 +208,6 @@ export default {
       })
         .then((res) => {
           console.log(res);
-          this.tableData = [];
           let nowSum = this.sum;
           if (res.data && res.data.code === 200) {
             // created时，获取自定义添加datalist下拉框的值
@@ -215,6 +220,7 @@ export default {
               });
             } else {
               // 整合数据， 主要目的是加一个 flag，在用户点击筛选的时候，好判断
+              this.tableData = [];
               res.data.data.forEach((item) => {
                 this.allDlr.push({
                   id: item.id,
@@ -260,7 +266,6 @@ export default {
           console.log(res, 11);
           if (res.data && res.data.code === 200) {
             this.areaList = res.data.data;
-            console.log(this.areaList);
           } else {
             console.log(res);
           }
@@ -272,6 +277,7 @@ export default {
   },
   created() {
     this.getDlrData({}, true);
+    this.tableData = this.tableList;
     this.getAreaList();
   },
 };
@@ -289,10 +295,11 @@ export default {
   justify-content: center;
   align-items: center;
   .modal_content {
-    width: 800px;
-    height: 650px;
+    width: 700px;
+    height: 600px;
     background-color: #fff;
-    padding: 20px 30px;
+    padding: 30px 60px;
+    position: relative;
     .addByArea {
       display: flex;
       height: 28px;
@@ -336,7 +343,7 @@ export default {
       justify-content: flex-end;
     }
     .table {
-      max-height: 450px;
+      height: 400px;
       overflow: auto;
     }
     .btn {

src/views/parameter/components/Grouping/ModalTable.vue

@@ -96,11 +96,11 @@ export default {
     }
     tbody {
       tr {
-        height: 36px;
+        height: 30px;
       }
       td {
         background: #ffffff;
-        height: 36px;
+        height: 30px;
         width: 20%;
         img {
           height: 20px;

src/views/parameter/components/PlatformModule/DetailPage.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="car_series">
       <div class="count">
-        <button @click="showModal">新增板块</button>
+        <button @click="showModal">新增版块</button>
         <Count :sum="sum"></Count>
       </div>
       <div class="table">

src/views/parameter/components/PlatformModule/PlatformTable.vue

@@ -27,7 +27,7 @@
             <span @click="submitEdit(index)" v-else>确定</span>
             <span @click="showModal(index)">删除</span>
             <span @click="plate(index)" v-if="obj.platformName !=='其它'"
-              >平台板块></span
+              >平台版块></span
             >
             <span v-else class="nono">占位模块></span>
           </td>