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

src/components/Modal.vue

@@ -24,9 +24,9 @@
         <div class="bodyRow">
           <div class="contentCol1">
             <span>车系</span
-            ><select v-model="carT">
+            ><select v-model="carS" @change="chooseCarSeries">
               <option
-                v-for="(item, index) in carType"
+                v-for="(item, index) in carSeries"
                 :key="index"
                 :value="item.typeName"
               >
@@ -36,9 +36,9 @@
           </div>
           <div class="contentCol2">
             <span>车型</span
-            ><select v-model="carS" @change="chooseCarSeries">
+            ><select v-model="carT">
               <option
-                v-for="(item, index) in carSeries"
+                v-for="(item, index) in carType"
                 :key="index"
                 :value="item.typeName"
               >
@@ -56,7 +56,7 @@
             <span>发布板块</span
             ><select name="" id="" v-model="releaseP">
               <option
-                v-for="(item, index) in releasePlate"
+                v-for="(item, index) in releaseMedia"
                 :key="index"
                 :value="item.platformName"
               >
@@ -133,7 +133,7 @@ export default {
         return "";
       },
     },
-    releasePlate: {
+    releaseMedia: {
       type: Array,
       default: () => {
         return [];
@@ -177,6 +177,9 @@ export default {
     },
 
     edit: function () {
+      if(!this.testUrl){
+        alert("链接输入有误")
+      }
       let obj = {};
       //获取资料名
       let idVal = this.ziliaoId;
@@ -189,7 +192,7 @@ export default {
       obj = this.carSeries.find(function (item) {
         return item.typeName === nameCarS;
       });
-      console.log("chexii ", obj);
+      console.log("chexi ", obj);
       //carTypeId  表示车系 id
       this.carTypeId = obj.id;
       //获取车型名 this.carT
@@ -218,7 +221,7 @@ export default {
           articleLink: this.mediaUrl,
         },
       };
-      //     console.log("edit2:", config.data.carType);
+      //  console.log("edit2:", config);
       this.$emit("update", config);
     },
     //资料名称列表
@@ -372,11 +375,7 @@ export default {
       this.mediaUrl = this.LinkData.mediaUrl;
       this.carS = this.LinkData.carTypeName;
 
-      //this.carT = this.LinkData.carPlatformName;
-      console.log("chhhhhhhhhhhh", this.carS, this.carT);
-      console.log("chhhhhhhhhhhh", this.carType)
-      console.log("chhhhhhhhhhhh", this.LinkData)
-
+      this.carT = this.LinkData.carPlatformName;
       let time = this.LinkData.publishDate;
       if (time.length > 4) {
         let y = time.slice(0, 4);
@@ -388,15 +387,16 @@ export default {
       //console.log("console.log(this.forceUpdate);", typeof time, m, y);
 
       //缺少对应列表值 已有资料名在数据中无法查询到
-      this.releaseP = this.LinkData.publishSourceName;
+      this.releaseP = this.LinkData.publishPlatformName;
 
       this.contentName1 = this.LinkData.contentTypeName;
       this.contentName2 = this.LinkData.contentTypeName;
     },
-    /*  forceUpdata: function () { 
-      this.$forceUpdate();
-      console.log("console.log(this.forceUpdate);");
-    }, */
+    testUrl: function () {
+      var regex = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*)?$/;
+      console.log(regex)
+      return regex.test(this.mediaUrl); 
+    }
   },
   mounted() {
     this.chooseDataName();
@@ -407,11 +407,6 @@ export default {
 
     this.initialData();
   },
-  /*   created() {
-    console.log(this.LinkData);
-    this.ziliaoId = this.LinkData.id;
-    console.log(this.ziliaoId);
-  }, */
 };
 </script>
 

src/views/data/InforList.vue

@@ -150,7 +150,7 @@ export default {
                 informationId: obj.id,
               },
             };
-            this.downloadPost(config);
+            this.downloadPost(config, obj);
           },
         },
         {
@@ -236,35 +236,23 @@ export default {
       this.getDataListPage(this.currentPage);
     },
     //下载文件
-    downloadPost: function (config) {
-      console.log("下载文件:", config);
+    downloadPost: function (config, obj) {
+      console.log("下载文件:", config, obj);
       let url =
         this.onlineUrl +
         "/dealerDownload?informationId=" +
         config.data.informationId;
       window.open(url);
-      /*   return new Promise((resolve, reject) => {
-        this.$http({
-          url: config.url,
-          method: "get",
-          params: config.data,
-        })
-          .then((res) => {
-            console.log(res);
-            resolve(res);
-            let link = document.createElement("a");
-            link.href = window.URL.createObjectURL(new Blob([res.data]));
-            link.target = "_blank";
-            //文件名和格式
-            link.download = "文件模板.xlsx";
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-          })
-          .catch((err) => {
-            reject(err);
-          });
-      }); */
+
+      let data = {
+        // asc: asc,
+        // report: report,
+        //download: 1,
+        Page: this.currentPage,
+        Rows: this.pageSize,
+        agentId: this.userId,
+      };
+      this.newGetDataList(data);
     },
     //查看详情
     showDetail: function (config, i) {

src/views/data/UploadLink.vue

@@ -35,13 +35,14 @@
             :class="{ table_gray: index % 2 === 0 }"
           >
             <td v-if="flag">{{ index + 1 }}</td>
+            
             <td>{{ obj.publishDate }}</td>
             <!-- 发布日期 -->
             <td>{{ obj.informationName }}</td>
             <!-- 资料名称 -->
-            <td>{{ obj.carPlatformName }}</td>
-            <!-- 车系 -->
             <td>{{ obj.carTypeName }}</td>
+            <!-- 车系 -->
+            <td>{{ obj.carPlatformName }}</td>
             <!-- 车型 -->
             <td>{{ obj.publishSourceName }}</td>
             <!-- 发布版块 -->
@@ -53,8 +54,11 @@
             <!-- 内容分类 -->
             <td>{{ obj.mediaTitle }}</td>
             <!-- 稿件标题 -->
-            <td><a :href="obj.mediaUrl" target="blank">{{ obj.mediaUrl }}</a></td>
+            <td>
+              <a :href="obj.mediaUrl" target="blank">{{ obj.mediaUrl }}</a>
+            </td>
             <!-- 链接 -->
+
             <td class="operationStyle">
               <span @click="toggleModal(index)">编辑</span>
               <span @click="toggleModal2(index)">删除</span>
@@ -79,7 +83,7 @@
       :LinkData="modalData"
       @update="editTitle"
       :selectedPlatform="selectedPlatform"
-      :releasePlate="releasePlate"
+      :releaseMedia="releaseMedia"
     ></Modal>
 
     <div class="timeLimitStyle">
@@ -175,7 +179,7 @@ export default {
       platform: [],
       platformVal: "",
 
-      releasePlate: [],
+      releaseMedia: [],
       selectedPlatform: "",
       selectedPlatformId: "",
       nowIndex: 0,
@@ -577,7 +581,8 @@ export default {
         .then((res) => {
           console.log(res);
           if (res.data.code === 200) {
-            this.releasePlate = res.data.data;
+            this.releaseMedia = res.data.data;
+            console.log("发布版块", this.releaseMedia)
           }
         })
         .catch((err) => {
@@ -808,7 +813,7 @@ export default {
   //background-color: #fff;
   height: 20px;
 }
-.bodyContent td:nth-last-child(2) a{
+.bodyContent td:nth-last-child(2) a {
   color: #0000ff;
 }
 .operationStyle {

src/views/data/components/InfoListItemDetail.vue

@@ -210,6 +210,7 @@ export default {
     display: flex;
     border: 1px solid #ccc;
     padding: 20px;
+    height: 390px;
     .content_datail {
       width: 100%;
       padding: 20px 50px 0;
@@ -250,6 +251,7 @@ export default {
 }
 .filesStyle {
   margin-right: 16px;
+  display: block;
 }
 
 .filesName p {
@@ -257,8 +259,11 @@ export default {
   margin: 4px;
 }
 .filesName {
-  height: 50px;
+  /*   height: 50px;
   display: flex;
-  flex-direction: column;
+  flex-direction: column; */
+  position: relative;
+  left: 50px;
+  top: -20px;
 }
 </style>