clay commit : 通知公告

2022-11-17 20:52:31 +08:00
parent 6606d80693
commit fccdca2239
6 changed files with 93 additions and 9 deletions
--- a/ebts-ui/src/api/sist/article.js
+++ b/ebts-ui/src/api/sist/article.js
@@ -45,6 +45,14 @@ export function getArticleNav() {
  })
 }

+// 查询系统文章详细
+export function getArticleAllNav() {
+  return request({
+    url: '/sist/article/all-nav',
+    method: 'get'
+  })
+}
+
 export function getArticleApprove(type) {
  return request({
    url: '/sist/article/approve/'+type,
--- a/ebts-ui/src/layout/components/Navbar.vue
+++ b/ebts-ui/src/layout/components/Navbar.vue
@@ -3,6 +3,10 @@
    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />

 <!--    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />-->
+    <div id="notice" style="position: absolute; top: 20px; left: 300px; width: 700px;">
+<!--      <span></span>-->
+      111122222222222222222222222222222222222222
+    </div>
    <breadcrumb
      id="breadcrumb-container"
      class="breadcrumb-container"
@@ -108,6 +112,23 @@ export default {
 </script>

 <style lang="scss" scoped>
+@keyframes slidein {
+  from {
+    margin-left: 56%;
+    width: 300%;
+  }
+
+  to {
+    margin-left: 0%;
+    width: 100%;
+  }
+}
+#notice{
+  //animation-duration: 3s;
+  //animation-name: slidein;
+  //animation-iteration-count: infinite;
+  animation: 3s linear 1s slidein;
+}
 .navbar {
  height: 50px;
  overflow: hidden;
@@ -128,6 +149,8 @@ export default {
    }
  }

+
+
  .breadcrumb-container {
    float: left;
  }
--- a/ebts-ui/src/permission.js
+++ b/ebts-ui/src/permission.js
@@ -13,11 +13,13 @@ const defaultSettings = require('@/settings.js')

 router.beforeEach((to, from, next) => {
  NProgress.start()
+  // debugger
  if (getToken()) {
    /* has token*/
    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
+      // next({ path: '/' })
+      console.log("ce")
+      // NProgress.done()
    } else {
      if (store.getters.roles.length === 0) {
        // 判断当前用户是否已拉取完user_info信息
--- a/ebts-ui/src/views/sist/article/components/article.vue
+++ b/ebts-ui/src/views/sist/article/components/article.vue
@@ -67,7 +67,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="12">
-              <el-form-item label="审批人">
+              <el-form-item label="审批人" v-show="isAuditShow.sist">
                <el-select v-model="params.sistApprove" placeholder="请选择文章类型" clearable :style="{width: '100%'}">
                  <el-option
                    v-for="dict in sistApproveOption"
@@ -94,7 +94,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="12">
-              <el-form-item label="审批人">
+              <el-form-item label="审批人" v-show="isAuditShow.lab">
                <el-select v-model="params.labApprove" placeholder="请选择文章类型" clearable :style="{width: '100%'}">
                  <el-option
                    v-for="dict in labApproveOption"
@@ -146,7 +146,7 @@
        <el-col :span="24" class="submitForm">
          <el-form-item size="large">
            <el-button type="success" @click="saveDrafts">保存草稿</el-button>
-            <el-button type="primary" @click="submitForm">提交审核</el-button>
+            <el-button type="primary" @click="submitForm">{{(isAuditShow.sist || isAuditShow.lab) ? "提交审核":"发布"}}</el-button>
          </el-form-item>
        </el-col>
      </el-row>
@@ -154,8 +154,6 @@
  </div>
 </template>
 <script>
-// import ArticleFile from './ArticleFile'
-// import Editor from '@/views/utils/Editor'
 import TinymceEditor from '@/views/utils/tinymce/Tinymce'
 import {updateArticle, getArticle, drafts, getArticleType, getArticleApprove} from "@/api/sist/article";
 import {Message} from "element-ui";
@@ -195,6 +193,10 @@ export default {
        sist: true,
        lab: true,
      },
+      isAuditShow:{
+        sist:false,
+        lab:false
+      },
      params: {
        sistArticleType: null,
        sistApprove: null,
@@ -353,12 +355,22 @@ export default {
    },

    getSistApprove(navId) {
+      if (!navId){
+        return
+      }
+      this.isAuditShow.sist = false
+      this.auditShow(navId,1)
      this.judgeThumbnail(navId)
      getArticleApprove(navId).then(res => {
        this.sistApproveOption = res.data
      })
    },
    getLabApprove(navId) {
+      if (!navId){
+        return
+      }
+      this.isAuditShow.lab = false
+      this.auditShow(navId,2)
      this.judgeThumbnail(navId)
      getArticleApprove(navId).then(res => {
        this.labApproveOption = res.data
@@ -374,6 +386,19 @@ export default {
        }
      }
    },
+    auditShow(navId,type){
+      let typeList = this.articleTypeOptions
+      for (let item of typeList) {
+        if (navId === item.id && item.isAudit == 1){
+          if (type == 1){
+            this.isAuditShow.sist = true
+          }else {
+            this.isAuditShow.lab = true
+          }
+          return
+        }
+      }
+    },
    submitForm() {
      let that_ = this
      this.$refs['elForm'].validate(valid => {
--- a/ebts-ui/src/views/sist/article/index.vue
+++ b/ebts-ui/src/views/sist/article/index.vue
@@ -232,7 +232,7 @@
 import { listArticle, delArticle, exportArticle, offline, putIndex } from '@/api/sist/article'
 import Editor from '@/components/Editor'
 import store from '@/store'
-import { getArticleNav } from '../../../api/sist/article'
+import { getArticleAllNav } from '../../../api/sist/article'

 export default {
  name: 'Article',
@@ -356,7 +356,7 @@ export default {
        this.isAdmin = true
      }
    }
-    getArticleNav().then(res=>{
+    getArticleAllNav().then(res=>{
      let data = res.data
      this.articleTypeOptions = data
    })
--- a/ebts-ui/src/views/sist/navigation/index.vue
+++ b/ebts-ui/src/views/sist/navigation/index.vue
@@ -147,6 +147,16 @@
            </el-radio-button>
          </el-radio-group>
        </el-form-item>
+        <el-form-item label="审核" prop="isAudit" v-show="isThumbnailShow">
+          <el-radio-group v-model="form.isAudit">
+            <el-radio-button
+              v-for="dict in auditOptions"
+              :key="dict.key"
+              :label="dict.key"
+            >{{ dict.label }}
+            </el-radio-button>
+          </el-radio-group>
+        </el-form-item>
        <el-form-item label="模板" prop="isSimple" v-show="isThumbnailShow">
          <el-radio-group v-model="form.isSimple">
            <el-radio-button
@@ -291,6 +301,16 @@ export default {
          label: '有'
        }
      ],
+      auditOptions: [
+        {
+          key: 1,
+          label: '审核'
+        },
+        {
+          key: 0,
+          label: '自动审核'
+        }
+      ],
      simpleOptions:[
        {
          key: 0,
@@ -449,6 +469,9 @@ export default {
        sort: 0,
        refId: null,
        enRefId: null,
+        isThumbnail: null,
+        isSimple: null,
+        isAudit: null,
        displayType: '1'
      }
      this.anvTypeEdit = true
@@ -472,6 +495,9 @@ export default {
      this.form.pid = row.id
      this.form.sitetype = row.sitetype
      this.form.type = '0'
+      this.form.isThumbnail = 0
+      this.form.isAudit = 1
+      this.form.isSimple = 0
      this.title = '添加下级导航'
    },
    handleUpdateDetails(refId,navId) {