From ce1667716d7fe2e2f8a9868ace71b3d1990db62c Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Thu, 9 Dec 2021 15:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E9=80=89=E6=8B=A9=E5=88=9B=E5=BB=BA=E4=BA=BA?=
 =?UTF-8?q?=20=E6=9F=A5=E7=9C=8B=E8=BF=94=E5=9B=9E=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/Introduce.vue    | 20 +++++++++++++
 src/views/serve/projectAdd.vue  |  7 +++--
 src/views/serve/projectList.vue | 51 +++++++++++++++++----------------
 3 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/views/data/Introduce.vue b/src/views/data/Introduce.vue
index 66e5f3d..0f9b402 100644
--- a/src/views/data/Introduce.vue
+++ b/src/views/data/Introduce.vue
@@ -24,11 +24,15 @@
                                 <p class="label">数据源</p>
                                 <el-input style="width: 250px" placeholder="请输入数据源" v-model="dataSource" type="text" :disabled="!editing"></el-input>
                             </div>
+
                         </template>
                         <div class="field">
                             <p class="label">关键字</p>
                             <div class="tag-add" v-if="editing">
                                 <el-input placeholder="请输入关键字" size="small" v-model="newKeyword"></el-input>
+                                <span v-if="editing">
+                                    <el-button @click="save" style="color: #9076FF;border: 1px solid #9076FF;border-radius:5px;height: 25px;line-height: 0px">保 存</el-button>
+                                </span>
                             </div>
                             <div class="tag-wrap">
                                 <el-tag
@@ -160,6 +164,22 @@ export default {
                 this.getKeyword()
             }).catch(res => {})
         },
+        save(){
+            const keyword = this.newKeyword
+            if (keyword) {
+                if (this.keywordList.find(e => e.keyword === keyword)) return this.$message.error('请不要输入重复关键字！')
+                // this.confirmEdit()
+                this.$post(this.api.addKeyword,{
+                    categoryId: this.categoryId,
+                    keyword
+                }).then(res => {
+                    this.newKeyword = ''
+                    this.getKeyword()
+                }).catch(res => {})
+            } else {
+                this.confirmEdit()
+            }
+        },
         addKeyword() {
             const keyword = this.newKeyword
             if (keyword) {
diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue
index 01dd204..590832f 100644
--- a/src/views/serve/projectAdd.vue
+++ b/src/views/serve/projectAdd.vue
@@ -229,9 +229,10 @@ export default {
     data() {
         return {
             projectId: this.$route.query.projectId,
+            founder: this.$route.query.founder,
             token: btoa(sessionStorage.getItem("token")),
-            isDetail: Boolean(this.$route.query.show),
-
+            isDetail: this.$route.query.show,
+            isDetails:this.$route.query.isDetails,
             projectManage: {
                 founder: 0, // 创建人角色(0、系统 1、老师)
                 projectName: "", // 项目名称
@@ -331,7 +332,7 @@ export default {
                 this.$confirm("确定返回？未更新的信息将不会保存。", "提示", {
                     type: "warning"
                 }).then(() => {
-                    this.$router.back();
+                    this.$router.push(`/projectList?systemId=${this.$route.query.systemId}&show=${this.isDetails}&founder=${this.founder}`);
                 }).catch(() => {
                 });
             }
diff --git a/src/views/serve/projectList.vue b/src/views/serve/projectList.vue
index 8d977b4..c5f0c29 100644
--- a/src/views/serve/projectList.vue
+++ b/src/views/serve/projectList.vue
@@ -17,7 +17,7 @@
                     </div>
                     <div>
                         <el-form label-width="80px">
-                            <el-col :span="6">
+                            <el-col :span="4">
                                 <el-form-item label="创建人">
                                     <el-select v-model="queryData.founder" clearable placeholder="请选择创建人"
                                                @change="initData">
@@ -26,7 +26,7 @@
                                     </el-select>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="6">
+                            <el-col :span="4">
                                 <el-form-item label="状态">
                                     <el-select v-model="queryData.state" clearable placeholder="请选择状态" @change="initData">
                                         <el-option v-for="(item,index) in stateList" :key="index" :label="item.label"
@@ -34,7 +34,7 @@
                                     </el-select>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="6">
+                            <el-col :span="4">
                                 <el-form-item label="权限">
                                     <el-select v-model="queryData.permissions" placeholder="请选择" @change="initData">
                                         <el-option
@@ -48,7 +48,8 @@
                             </el-col>
                             <el-col :span="6">
                                 <el-form-item>
-                                    <el-input placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
+                                    <el-input placeholder="请输入项目名称" prefix-icon="el-icon-search"
+                                              v-model="keyword" clearable></el-input>
                                 </el-form-item>
                             </el-col>
                         </el-form>
@@ -137,7 +138,7 @@
 
 <script>
 import { mapState, mapActions } from 'vuex';
-
+import Setting from "@/setting";
 export default {
     data() {
         return {
@@ -153,20 +154,16 @@ export default {
             status: '',
             listData: [],
             total: 0,
-            permissionsList: [
-                {
+            permissionsList: [{
                     value: '',
                     label: '不限'
-                },
-                {
+                }, {
                     value: 0,
                     label: '练习'
-                },
-                {
+                }, {
                     value: 1,
                     label: '考核'
-                },
-                {
+                }, {
                     value: 2,
                     label: '竞赛'
                 }
@@ -176,12 +173,13 @@ export default {
                 1: '考核',
                 2: '竞赛'
             },
-            founderList: [
-                {
+            founderList: [{
+                    value: 2,
+                    label: '全部'
+                }, {
                     value: 0,
                     label: '系统'
-                },
-                {
+                }, {
                     value: 1,
                     label: '老师'
                 }
@@ -190,16 +188,13 @@ export default {
                 0: '系统',
                 1: '老师'
             },
-            stateList: [
-                {
+            stateList: [{
                     value: '',
                     label: '不限'
-                },
-                {
+                }, {
                     value: 0,
                     label: '草稿箱'
-                },
-                {
+                }, {
                     value: 1,
                     label: '已发布'
                 }
@@ -226,6 +221,12 @@ export default {
         }
     },
     mounted() {
+        console.log(this.$route.query.founder)
+        if (this.$route.query.founder && this.$route.query.founder != 'undefined'){
+            this.queryData.founder = +this.$route.query.founder
+        }else{
+            this.queryData.founder = 2
+        }
         this.getData();
     },
     methods: {
@@ -253,10 +254,10 @@ export default {
             this.getData();
         },
         add() { // 新增项目
-            this.$router.push(`/projectAdd?systemId=${this.systemId}`);
+            this.$router.push(`/projectAdd?systemId=${this.systemId}&founder=${this.queryData.founder}&isDetails=${this.$route.query.show}`);
         },
         edit(row) { // 编辑
-            this.$router.push(`/projectAdd?systemId=${this.systemId}&projectId=${row.projectId}`);
+            this.$router.push(`/projectAdd?systemId=${this.systemId}&projectId=${row.projectId}&founder=${this.queryData.founder}&isDetails=${this.$route.query.show}`);
         },
         handleSelectionChange(val) { // 处理多选
             this.multipleSelection = val;