解决冲突

src/App.vue

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

src/components/Modal.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="modal-backdrop">
-    <div class="modal" :style="mainStyles">  <!--  id="unloadFile" -->
+    <div class="modal">
+      <!--  id="unloadFile" :style="mainStyles"-->
       <div class="modal-header">
         <h3>编辑</h3>
       </div>
@@ -68,24 +69,21 @@
         </div>
         <div class="bodyRow">
           <span>标题</span>
-          <input
-            type="text"
-            placeholder="文章标题"
-            v-model="dataset_title"
-          />
+          <input type="text" placeholder="文章标题" v-model="dataset_title" />
+          <!--     <span>{{dataset_title}}</span> -->
         </div>
         <div class="bodyRow">
           <span>链接</span>
-          <input
-            type="text"
-            placeholder="文章链接"
-            v-model="dataset_link"
-          />
+          <input type="text" placeholder="文章链接" v-model="dataset_link" />
         </div>
       </div>
       <div class="modal-footer">
         <!-- <button type="button" class="btn-confirm" @click="confirm">确认</button> -->
-        <button type="button" class="btn-confirm" @click="onSubmit('form')">
+        <button
+          type="button"
+          class="btn-confirm"
+          @click="onSubmit('form'), edit()"
+        >
           确认
         </button>
         <button type="button" class="btn-close" @click="closeSelf">取消</button>
@@ -97,32 +95,37 @@
 <script>
 export default {
   name: "Modal",
-  props: {},
+  props: {
+    //dataset_title: String,
+    //dataset_link: String,
+  },
   data() {
     return {
       formData: new FormData(),
+      dataset_title: "",
+      dataset_link: "",
     };
   },
   methods: {
     closeSelf() {
       this.$emit("closeme");
     },
-/*     toUploadFile() {
+    /*     toUploadFile() {
       let btn = document.getElementById("unloadFile");
       btn.click();
       this.dialogVisible = false;
       this.uploadPercent = 0;
     }, */
     onSubmit() {
-      this.formData.append("dataset_title", this.dataset_title);
+      /* this.formData.append("dataset_title", this.dataset_title);
       this.formData.append("dataset_link", this.dataset_link);
 
       this.$http({
         method: "post",
         url: "/auth/checkSign",
         data: {
-          /*  token: token, */
-          /*   this.$http.post("/datasets/", this.formData) */
+          //  token: token,  
+          //this.$http.post("/datasets/", this.formData) 
         },
       })
         .then((r) => {
@@ -140,9 +143,16 @@ export default {
             title: "失败",
             message: "创建数据集失败",
           });
-        });
+        }); */
+    },
+    edit: function () {
+      // 数据发送给父组件
+      this.$emit("update", this.dataset_title)  ;
+      this.book = "";
+      console.log("modal:", this.dataset_title);
     },
   },
+  computed: {},
 };
 </script>
 
@@ -159,7 +169,7 @@ export default {
   align-items: center;
 }
 .modal {
-  background-color: #fff;
+  background-color: #eeeeee;
   box-shadow: 2px 2px 20px 1px;
   overflow-x: auto;
   display: flex;
@@ -211,7 +221,7 @@ export default {
   margin: 10px;
 }
 .bodyRow select {
-  width: 80px;
+  width: 120px;
 }
 .bodyRow input {
   width: 480px;
@@ -229,7 +239,7 @@ export default {
   display: flex;
   justify-content: flex-end;
   align-items: center;
-  width: 403px;
+  width: 363px;
 }
 </style>
  

src/components/Modal2.vue

@@ -0,0 +1,100 @@
+<template>
+  <div class="modal-backdrop">
+    <div class="modal">
+      <!--  id="unloadFile" :style="mainStyles"-->
+      <!-- <div class="modal-header">
+        <h3>编辑</h3>
+      </div> -->
+      <div class="modal-body">
+        <div class="bodyRow">
+          确认删除？
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn-confirm" @click="confirm">确认</button>
+        <button type="button" class="btn-close" @click="closeSelf">取消</button>
+      </div>
+    </div>
+  </div>
+</template>
+ 
+<script>
+export default {
+  name: "Modal",
+  props: {},
+  data() {
+    return {};
+  },
+  methods: {
+    closeSelf() {
+      this.$emit("closeme2");
+    },
+    confirm() {
+      this.$emit("del");
+    },
+  },
+};
+</script>
+
+<style>
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.3);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.modal {
+  background-color: #eeeeee;
+  box-shadow: 2px 2px 20px 1px;
+  overflow-x: auto;
+  display: flex;
+  flex-direction: column;
+  border-radius: 16px;
+  width: 1030px;
+}
+.modal-header {
+  border-bottom: 1px solid #eee;
+  color: #313131;
+  justify-content: space-between;
+  padding: 15px;
+  display: flex;
+}
+.modal-footer {
+  border-top: 1px solid #eee;
+  justify-content: center;
+  padding: 15px;
+  display: flex;
+}
+.modal-body {
+  position: relative;
+  padding: 20px 150px 20px 150px;
+}
+.btn-close,
+.btn-confirm {
+  border-radius: 8px;
+  margin-left: 16px;
+  width: 56px;
+  height: 36px;
+  border: none;
+  cursor: pointer;
+}
+.btn-close {
+  color: #313131;
+  background-color: gray;
+}
+.btn-confirm {
+  color: #fff;
+  background-color: #2d8cf0;
+}
+.bodyRow {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>
+ 

src/views/data/InforList.vue

@@ -88,12 +88,12 @@ export default {
             this.downloadPost();
           },
         },
-        {
+     /*    {
           name: "反馈",
           function: () => {
             this.feedback();
           },
-        },
+        }, */
         {
           name: "查看详情>",
           function: () => {
@@ -112,7 +112,7 @@ export default {
           time: "2021/04",
           spread: "传播类型1",
           uploadTime: "",
-          down: "50/20",
+          down: "已下载",
           feedback: "未反馈",
         },
         {
@@ -120,7 +120,7 @@ export default {
           time: "2021/04",
           spread: "传播类型1",
           uploadTime: "",
-          down: "50/20",
+          down: "已下载",
           feedback: "未反馈",
         },
         {
@@ -128,7 +128,7 @@ export default {
           time: "2021/04",
           spread: "传播类型1",
           uploadTime: "",
-          down: "50/20",
+          down: "已下载",
           feedback: "未反馈",
         },
       ],

src/views/data/UploadLink.vue

@@ -29,28 +29,67 @@
             :class="{ table_gray: !discolor && index % 2 === 0 }"
           >
             <td v-if="flag">{{ index + 1 }}</td>
-            <td v-for="(item, index) in obj" :key="index">
-              {{ item }}
+            <td>
+              {{ obj.releaseTime }}
+            </td>
+            <td>
+              {{ obj.dataName }}
+            </td>
+            <td>
+              {{ obj.carSeries }}
+            </td>
+            <td>
+              {{ obj.carType }}
+            </td>
+            <td>
+              {{ obj.releaseMedia }}
+            </td>
+            <td>
+              {{ obj.projectClass }}
+            </td>
+            <td>
+              {{ obj.draftGenre }}
+            </td>
+            <td>
+              {{ obj.contentClass }}
+            </td>
+            <td>
+              {{ obj.articleTitle }}
+            </td>
+            <td>
+              {{ obj.articleLink }}
             </td>
             <td class="operationStyle">
               <span @click="toggleModal">编辑</span>
-              <span>删除</span>
+              <!-- <span @click="del(index)">删除</span> -->
+              <span @click="toggleModal2">删除</span>
             </td>
           </tr>
         </tbody>
       </table>
     </div>
-    <Modal v-show="showModal" v-on:closeme="closeme"></Modal>
+    <Modal
+      v-show="showModal"
+      v-on:closeme="closeme"
+      :dataset_title="tableData.articleTitle"
+      @update="editTitle"
+    ></Modal>
     <div class="fileOperation">
       <span class="operationStyle">导入模板</span>
       <button>导入</button>
       <button>导出</button>
     </div>
+    <Modal2
+      v-show="showModal2"
+      v-on:closeme2="closeme2"
+      v-on:del="del"
+    ></Modal2>
   </div>
 </template>
 
 <script>
 import Modal from "../../components/Modal";
+import Modal2 from "../../components/Modal2";
 export default {
   props: {
     isManufacturer: {
@@ -60,10 +99,12 @@ export default {
   },
   components: {
     Modal,
+    Modal2,
   },
   data() {
     return {
       showModal: false,
+      showModal2: false,
       // 表格配置
       sum: 240, // 一共有多少条数据
       pageSize: 20, // 每页展示的数据
@@ -109,6 +150,45 @@ export default {
           articleTitle: "S雷克萨斯",
           articleLink: "d",
         },
+        {
+          releaseTime: "2021/03/04",
+          dataName: "雷克萨斯ES上市",
+          carSeries: "雷克萨斯ES",
+          carType: "ES雷克萨斯",
+          releaseMedia: "S雷克萨斯",
+          // releasePlate: " ",
+          projectClass: "东区",
+          draftGenre: "雷克萨斯ES",
+          contentClass: "ES雷克萨斯",
+          articleTitle: "S雷克萨斯",
+          articleLink: "d",
+        },
+        {
+          releaseTime: "",
+          dataName: "",
+          carSeries: "",
+          carType: "",
+          releaseMedia: "",
+          // releasePlate: " ",
+          projectClass: "",
+          draftGenre: "",
+          contentClass: "",
+          articleTitle: "",
+          articleLink: "",
+        },
+        {
+          releaseTime: "",
+          dataName: "",
+          carSeries: "",
+          carType: "",
+          releaseMedia: "",
+          // releasePlate: " ",
+          projectClass: "",
+          draftGenre: "",
+          contentClass: "",
+          articleTitle: "",
+          articleLink: "",
+        },
       ],
       flag: true,
       operation: [
@@ -140,6 +220,38 @@ export default {
     closeme: function () {
       this.showModal = !this.showModal;
     },
+    toggleModal2: function () {
+      this.showModal2 = !this.showModal2;
+    },
+    closeme2: function () {
+      this.showModal2 = !this.showModal2;
+    },
+    editTitle: function (val) {
+      this.dataset_title = new Array(val);
+      console.log("Link:", this.dataset_title);
+    },
+    /*     add: function () {
+      this.myData.push({
+        username: this.username,
+        age: this.age,
+      });
+      (this.username = ""), (this.age = "");
+    }, */
+    del: function (n) {
+      this.showModal2 = !this.showModal2;
+      //清空数据
+      if (n == -2) {
+        this.tableData = "";
+      }
+      //清空某一项数据
+      {
+        let obj = this.tableData[n];
+        console.log(obj);
+        Object.keys(obj).forEach((key) => {
+          obj[key] = "";
+        });
+      }
+    },
   },
 };
 </script>
@@ -218,6 +330,10 @@ export default {
   width: 100px;
   padding: 7px 5px;
 }
+.tableHeadStyle2 td:nth-child(12) {
+  width: 100px;
+  padding: 7px 5px;
+}
 .tableHeadStyle2 td:nth-child(2) {
   width: 100px;
   padding: 7px 5px;
@@ -232,6 +348,7 @@ export default {
 }
 .bodyContent td {
   background-color: #fff;
+  height: 17px;
 }
 .operationStyle {
   color: #0000ff;
@@ -241,10 +358,10 @@ export default {
 .operationStyle span {
   color: #0000ff;
 }
-.fileOperation{
-    display: flex;
-    justify-content: flex-start;
-    margin: 10px;
-    align-items: center;
+.fileOperation {
+  display: flex;
+  justify-content: flex-start;
+  margin: 10px;
+  align-items: center;
 }
 </style>