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

src/App.vue

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

src/views/data/InforList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="upload_record" v-if="initialPage">
-    <!--   <h1>资料列表</h1> -->
+      <!--   <h1>资料列表</h1> -->
       <div class="search HeadLeft">
         <div class="input">
           <img src="../../img/search.png" />
@@ -9,7 +9,7 @@
         </div>
         <button>搜索</button>
       </div>
-   <!--    <div class="searchBox">
+      <!--    <div class="searchBox">
         <div class="search_inside">
           <span><img src="" alt="" /></span>
           <input type="text" name="" id="" placeholder="请输入要搜索的资料名" />
@@ -58,14 +58,22 @@
                 :key="index"
                 :class="{ table_gray: !discolor && index % 2 === 0 }"
               >
-                <td v-for="(item, index) in obj" :key="index" :style="trStyle">
-                  {{ item }}
-                </td>
+                <!--  <td v-for="(item, i) in obj" :key="i" :style="trStyle"> -->
+                <td>{{ obj.informationName }}</td>
+                <td>{{ obj.filePulishTime }}</td>
+                <td>{{ obj.accountScope }}</td>
+                <td>{{ obj.fileUploadDate }}</td>
+                <td>{{ obj.download }}</td>
+                <td>{{ obj.report }}</td>
+
                 <td v-if="operation" :style="trStyle" class="operationStyle">
                   <span
                     v-for="(operationObj, i) in operation"
                     :key="i"
-                    @click="operationObj.function(obj);nowIndex=index"
+                    @click="
+                      operationObj.function(obj);
+                      nowIndex = index;
+                    "
                     >{{ operationObj.name }}
                   </span>
                 </td>
@@ -81,20 +89,18 @@
           @change_page="changePage"
           @jump_page="jumpPage"
         />
-        <p>共{{1}}页，共{{3}}条数据</p>
+        <p>共{{ 1 }}页，共{{ 3 }}条数据</p>
       </div>
     </div>
     <div v-else>
-      <Detail
-      :detailData="tableData"
-      :nowIndex="nowIndex"></Detail>
+      <Detail :detailData="tableData" :nowIndex="nowIndex"></Detail>
     </div>
   </div>
 </template>
 
 <script>
 import TablePage from "../../components/TablePage";
-import Detail from './components/InfoListItemDetail';
+import Detail from "./components/InfoListItemDetail";
 export default {
   props: {
     isManufacturer: {
@@ -128,11 +134,11 @@ export default {
           function: (obj) => {
             //this.download();
             let config = {
-              url:'/dealerDownload',
-              data:{
-                informationId:obj.id,
-                agentId:obj.agentId
-              }
+              url: "/dealerDownload",
+              data: {
+                informationId: obj.id,
+                agentId: obj.agentId,
+              },
             };
             this.downloadPost(config);
           },
@@ -187,7 +193,7 @@ export default {
         color: "white",
       },
       trStyle: {
-        width: "150px",
+        minwidth: "150px",
         height: "30px",
         overflow: "hidden",
       },
@@ -246,7 +252,7 @@ export default {
     },
     //下载文件
     downloadPost: function (config) {
-      console.log("下载文件:",config);
+      console.log("下载文件:", config);
       return new Promise((resolve, reject) => {
         this.$http({
           url: config.url,
@@ -254,7 +260,7 @@ export default {
           data: config.data,
         })
           .then((res) => {
-            console.log(res)
+            console.log(res);
             resolve(res);
             let link = document.createElement("a");
             link.href = window.URL.createObjectURL(new Blob([res.data]));
@@ -272,23 +278,24 @@ export default {
     },
     //获取资料列表
     getDataList: function () {
-        this.$http({
-          url:'/firmsUploadListByAgent',
-          method: "post",
-          data: {},
-        }).then((res) => {
-           console.log(res);
-           if(res.data.code === 200){
-             this.tableData = res.data.data;
-           }
+      this.$http({
+        url: "/firmsUploadListByAgent",
+        method: "post",
+        data: {},
+      })
+        .then((res) => {
+          console.log(res);
+          if (res.data.code === 200) {
+            this.tableData = res.data.data;
+          }
         })
-      .catch((err) => {
-           console.log(err);
-     });
+        .catch((err) => {
+          console.log(err);
+        });
     },
   },
   mounted() {
-      this.getDataList()
+    this.getDataList();
   },
 };
 </script>
@@ -332,12 +339,12 @@ export default {
   }
 }
 .table_gray {
-  background-color: #EEEEEE;
+  background-color: #eeeeee;
 }
 .operationStyle span {
   color: #0000ff;
 }
-.operationStyle  {
+.operationStyle {
   color: #0000ff;
   display: flex;
   justify-content: space-around;
@@ -354,7 +361,7 @@ export default {
     display: flex;
     align-items: center;
     margin-left: 16px;
-    border: 1px  solid #ccc;
+    border: 1px solid #ccc;
     img {
       width: 28px;
       height: 28px;
@@ -371,16 +378,16 @@ export default {
     }
   }
 }
-.HeadLeft{
-  border: 1px solid  #ccc;
+.HeadLeft {
+  border: 1px solid #ccc;
 }
-.pageD{
+.pageD {
   display: flex;
   justify-content: flex-end;
   align-items: center;
   margin-top: 10px;
 }
-.pageD p{
+.pageD p {
   margin-left: 16px;
 }
 </style>