From acca664ae567b0d710fe671aaa3a465716191b3f Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 16 Jan 2022 21:14:15 +0800
Subject: [PATCH] 11

---
 ebts-ui/package.json                          |  2 +-
 .../views/sist/article/components/approve.vue |  2 ++
 .../views/sist/article/components/article.vue | 14 +++++-----
 ebts-ui/src/views/sist/article/index.vue      | 26 +++++++++----------
 ebts-ui/src/views/sist/banner/index.vue       |  2 +-
 ebts-ui/src/views/sist/navigation/index.vue   | 14 ++++++----
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/ebts-ui/package.json b/ebts-ui/package.json
index 9616b26..5db0a5a 100644
--- a/ebts-ui/package.json
+++ b/ebts-ui/package.json
@@ -66,7 +66,7 @@
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vuedraggable": "2.20.0",
-    "vuex": "3.1.0",
+    "vuex": "^3.6.2",
     "wangeditor": "^4.7.11"
   },
   "devDependencies": {
diff --git a/ebts-ui/src/views/sist/article/components/approve.vue b/ebts-ui/src/views/sist/article/components/approve.vue
index 668c0e7..9b5eba6 100644
--- a/ebts-ui/src/views/sist/article/components/approve.vue
+++ b/ebts-ui/src/views/sist/article/components/approve.vue
@@ -65,6 +65,7 @@
 <script>
 import {approve, getArticle, rejected} from "@/api/sist/article";
 import Editor from '@/views/utils/Editor'
+import {parseTime} from "@/utils/hcy";
  export default {
   components: {
     Editor
@@ -130,6 +131,7 @@ import Editor from '@/views/utils/Editor'
             cancelButtonText: "取消",
             type: "warning"
           }).then(function () {
+            that.publishTime = that.parseTime(new Date())
             that.toApprove()
           })
         } else {
diff --git a/ebts-ui/src/views/sist/article/components/article.vue b/ebts-ui/src/views/sist/article/components/article.vue
index 5f1ebf0..0ce4a86 100644
--- a/ebts-ui/src/views/sist/article/components/article.vue
+++ b/ebts-ui/src/views/sist/article/components/article.vue
@@ -308,13 +308,13 @@ export default {
             })
             return
           }
-          if (that_.imgurlShow&&(that_.formData.imgurl == ''||that_.formData.imgurl == null)){
-            Message({
-              message: "请选择缩略图",
-              type: "error",
-            })
-            return;
-          }
+          // if (that_.imgurlShow&&(that_.formData.imgurl == ''||that_.formData.imgurl == null)){
+          //   Message({
+          //     message: "请选择缩略图",
+          //     type: "error",
+          //   })
+          //   return;
+          // }
         }
         that_.formData.params = that_.params
         if (that_.submit == 0) {
diff --git a/ebts-ui/src/views/sist/article/index.vue b/ebts-ui/src/views/sist/article/index.vue
index 8d030a4..d2a5a7c 100644
--- a/ebts-ui/src/views/sist/article/index.vue
+++ b/ebts-ui/src/views/sist/article/index.vue
@@ -119,7 +119,7 @@
       <el-table-column label="文章类型" align="center" prop="type" :formatter="articleTypeFormat"/>
       <el-table-column label="发布人姓名" align="center" prop="publishUserName"/>
       <el-table-column label="是否置顶" align="center" prop="isTop" :formatter="isTopFormat"/>
-      <el-table-column label="是否显示" align="center" prop="isView" :formatter="isViewFormat"/>
+<!--      <el-table-column label="是否显示" align="center" prop="isView" :formatter="isViewFormat"/>-->
       <el-table-column label="查看次数" align="center" prop="viewCount"/>
       <el-table-column label="缩略图" align="center" prop="imgurl">
         <template slot-scope="scope">
@@ -228,7 +228,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 系统文章表格数据
+      // 文章表格数据
       articleList: [],
       // 弹出层标题
       title: "",
@@ -265,31 +265,31 @@ export default {
       // 表单校验
       rules: {
         siteType: [
-          {required: true, message: "站点类型 1： sist    2: lab 3: 双边都发不能为空}", trigger: "change"},
+          {required: true, message: "站点类型", trigger: "change"},
         ],
         type: [
-          {required: true, message: "1: 2: 3: 根据导航不能为空}", trigger: "change"},
+          {required: true, message: "", trigger: "change"},
         ],
         content: [
-          {required: true, message: "文章内容不能为空}", trigger: "blur"},
+          {required: true, message: "文章内容不能为空", trigger: "blur"},
         ],
         title: [
-          {required: true, message: "文章标题不能为空}", trigger: "blur"},
+          {required: true, message: "文章标题不能为空", trigger: "blur"},
         ],
         publishTime: [
           {required: true, message: "发布时间", trigger: "blur"},
         ],
         publishUserName: [
-          {required: true, message: "发布人姓名不能为空}", trigger: "blur"},
+          {required: true, message: "发布人姓名不能为空", trigger: "blur"},
         ],
         isTop: [
-          {required: true, message: "是否置顶不能为空}", trigger: "change"},
+          {required: true, message: "是否置顶不能为空", trigger: "change"},
         ],
         isView: [
-          {required: true, message: "是否显示不能为空}", trigger: "change"},
+          {required: true, message: "是否显示不能为空", trigger: "change"},
         ],
         isEnglish: [
-          {required: true, message: "是否英文不能为空}", trigger: "blur"},
+          {required: true, message: "是否英文不能为空", trigger: "blur"},
         ],
       }
     };
@@ -319,7 +319,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询系统文章列表 */
+    /** 查询文章列表 */
     getList() {
       this.loading = true;
       listArticle(this.queryParams).then(response => {
@@ -405,7 +405,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除系统文章编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除该文章的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -419,7 +419,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有系统文章数据项?', "警告", {
+      this.$confirm('是否确认导出所有文章数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
diff --git a/ebts-ui/src/views/sist/banner/index.vue b/ebts-ui/src/views/sist/banner/index.vue
index 1c7411d..74e984a 100644
--- a/ebts-ui/src/views/sist/banner/index.vue
+++ b/ebts-ui/src/views/sist/banner/index.vue
@@ -80,7 +80,7 @@
           <span>{{ ((queryParams.pageInfo.pageNum - 1) * queryParams.pageInfo.pageSize + scope.$index + 1)}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="标题" align="left" prop="center" />
+      <el-table-column label="标题" align="left" prop="title" />
       <el-table-column label="站点类型" align="center" prop="sitetype" :formatter="sitetypeFormat"/>
       <el-table-column label="轮播类型" align="center" prop="type":formatter="bannerStyleFormat" />
       <el-table-column label="图表路径" align="center">
diff --git a/ebts-ui/src/views/sist/navigation/index.vue b/ebts-ui/src/views/sist/navigation/index.vue
index bfdeef3..bff1cf0 100644
--- a/ebts-ui/src/views/sist/navigation/index.vue
+++ b/ebts-ui/src/views/sist/navigation/index.vue
@@ -136,7 +136,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-show="inageShow" label="" prop="link">
+        <el-form-item v-show="imageShow" label="" prop="link">
               <UploadFile v-model="form.link"
                           file-type="image"
                           :v-public="true"
@@ -215,7 +215,7 @@ export default {
       showSearch: true,
       articleSelShow: false,
       empleeSelShow: false,
-      inageShow:false,
+      imageShow:false,
       // 导航表格数据
       navigationTypeOptions: [],
       // 导航树选项
@@ -327,7 +327,7 @@ export default {
     // 表单重置
     reset() {
       this.articleSelShow = false
-      this.inageShow = false;
+      this.imageShow = false;
       this.empleeSelShow = false
       this.form = {
         id: null,
@@ -404,9 +404,9 @@ export default {
       }
 
       if (this.form.type==0){
-        this.inageShow = false;
+        this.imageShow = false;
       }else {
-        this.inageShow = true;
+        this.imageShow = true;
       }
     },
     /** 修改按钮操作 */
@@ -442,6 +442,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if (this.imageShow&&this.form.link){
+            this.msgError("图片不能为空,若您已上传请稍等一下!");
+            return
+          }
           if (this.form.id != null) {
             updateNavigation(this.form).then(response => {
               this.msgSuccess("修改成功");