From 60c82fec357987261cc6a2e429f2ce4b47590b52 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Mon, 28 Jun 2021 17:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 15 ++++----
 .../EntityApply/EntityApplySearch.vue         | 10 +----
 src/components/Innovative/InnovativeEdit.vue  | 38 +++++++++----------
 .../Challenge/components/ChallengeSearch.vue  | 18 +--------
 4 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9bace51..238c467 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <template>
   <a-config-provider :locale="zh_CN">
     <div class="d-flex flex-row flex-nowrap" id="app">
-      <btn-con /> 
+      <!-- <btn-con /> -->
       <router-view class="flex-1 bg pa-3"></router-view>
     </div>
   </a-config-provider>
@@ -11,12 +11,12 @@
 import { mapState, mapActions, mapMutations } from 'vuex';
 import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
 import BtnCon from 'components/BtnCom/BtnCon.vue';
-// 
+//
 export default {
   name: 'App',
-  components: { BtnCon }, 
+  components: { BtnCon },
   data() {
-    return {zh_CN,};
+    return { zh_CN };
   },
 
   computed: mapState(['anyringToken', 'ptProps']),
@@ -33,9 +33,9 @@ export default {
 
   created() {
     // // 测试数据
-    const userId = '1218763410024566784';
-    const params = { userId };
-    this.getUserId(params);
+    // const userId = '1218763410024566784';
+    // const params = { userId };
+    // this.getUserId(params);
 
     const that = this;
     window.plugin = window.TallPlugin.init();
@@ -43,7 +43,6 @@ export default {
     // created接受一个回调函数 created成功后调用 可选参数
     // 接受PT传过来的 插件id，项目id，角色id，任务id，userId
     window.plugin.created(function(props) {
-      console.log('props: ', props);
       that.setPtProps(props);
     });
   },
diff --git a/src/components/EntityApply/EntityApplySearch.vue b/src/components/EntityApply/EntityApplySearch.vue
index af392bd..772ec88 100644
--- a/src/components/EntityApply/EntityApplySearch.vue
+++ b/src/components/EntityApply/EntityApplySearch.vue
@@ -26,7 +26,6 @@
     <a-button @click="handleTableChange" class="mx-2" icon="search" type="primary">搜索</a-button>
 
     <div class="flex-1"></div>
-    <!-- <a-button @click="showModal" class="editable-add-btn mb-3" type="primary">增加</a-button> -->
 
     <!-- 添加 -->
     <a-button @click="exportVisible = true" class="mx-2" type="primary">下载报表</a-button>
@@ -138,10 +137,6 @@ export default {
       this[type] = value;
     },
 
-    showModal() {
-      this.visible = true;
-    },
-
     closeModal() {
       this.visible = false;
     },
@@ -160,10 +155,6 @@ export default {
       await this.$emit('entityApplicationSearch', condition);
     },
 
-    showModal() {
-      this.exportVisible = true;
-    },
-
     handleCancel(e) {
       console.log('Clicked cancel button');
       this.exportVisible = false;
@@ -176,6 +167,7 @@ export default {
         this.yearShowOne = true;
       }
     },
+
     // 时间选择
     panelChangeOne(value) {
       this.platform.time = this.$moment(value).format('YYYY');
diff --git a/src/components/Innovative/InnovativeEdit.vue b/src/components/Innovative/InnovativeEdit.vue
index db1205b..9aed627 100644
--- a/src/components/Innovative/InnovativeEdit.vue
+++ b/src/components/Innovative/InnovativeEdit.vue
@@ -2,9 +2,9 @@
   <div class="d-flex flex-wrap pb-3">
     <!-- 编辑 -->
     <a-modal
-      :maskClosable="false"
+      :mask-closable="false"
       @cancel="$emit('closeModal')"
-      destroyOnClose
+      destroy-on-close
       footer
       title="修改产品"
       v-model="editVisible"
@@ -154,12 +154,12 @@ const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };
 
 export default {
   name: 'InnovativeEdit',
+  components: { QuillEditor },
   props: {
     editVisible: { type: Boolean, default: false },
     typeLists: { type: Object, default: () => {} },
     editItem: { type: Object, default: () => {} },
   },
-  components: { QuillEditor },
   data() {
     this.handleSearchTasks = debounce(this.handleSearchTasks, 800);
     return {
@@ -186,22 +186,6 @@ export default {
     };
   },
 
-  watch: {
-    editItem(val) {
-      if (val) {
-        if (val.companyid) {
-          this.companyid = val.companyid;
-        }
-        if (val.companyname) {
-          this.companyname = val.companyname;
-        }
-        if (val.details) {
-          this.details = val.details;
-        }
-      }
-    },
-  },
-
   computed: {
     oldTypes() {
       const { typeLists, editItem } = this;
@@ -220,6 +204,22 @@ export default {
     },
   },
 
+  watch: {
+    editItem(val) {
+      if (val) {
+        if (val.companyid) {
+          this.companyid = val.companyid;
+        }
+        if (val.companyname) {
+          this.companyname = val.companyname;
+        }
+        if (val.details) {
+          this.details = val.details;
+        }
+      }
+    },
+  },
+
   async created() {
     const params = {
       param: {
diff --git a/src/views/Challenge/components/ChallengeSearch.vue b/src/views/Challenge/components/ChallengeSearch.vue
index 6b496b3..1528f26 100644
--- a/src/views/Challenge/components/ChallengeSearch.vue
+++ b/src/views/Challenge/components/ChallengeSearch.vue
@@ -36,7 +36,6 @@
 
 <script>
 import ChallengeAdd from './ChallengeAdd.vue';
-import { queryMold } from 'config/api';
 
 export default {
   name: 'CollegeSearch',
@@ -53,9 +52,7 @@ export default {
       billboardStatus: '',
     };
   },
-  created() {
-    this.getQueryMold();
-  },
+
   methods: {
     onChange(e) {
       console.log(this.$moment(e[0]._d).format('YYYY-MM-DD HH:mm:ss'));
@@ -83,19 +80,6 @@ export default {
       const condition = { title, companyName, startTime, endTime, servics, billboardStatus };
       await this.$emit('getListData', condition);
     },
-    async getQueryMold() {
-      try {
-        const res = await queryMold();
-        const { code, msg, data } = res.data;
-        if (code === 200) {
-          this.bannersList = data;
-        } else {
-          this.$message.error(msg);
-        }
-      } catch (error) {
-        this.$message.error(error);
-      }
-    },
   },
 };
 </script>