From c2ced3d62a846e331061ced6dc9281049332d46d Mon Sep 17 00:00:00 2001
From: dengjie <209192278@qq.com>
Date: Mon, 21 Nov 2022 22:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ebts-ui/src/layout/components/Navbar.vue  | 11 ++--
 ebts-ui/src/views/system/notice/index.vue | 79 ++++++++++++-----------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/ebts-ui/src/layout/components/Navbar.vue b/ebts-ui/src/layout/components/Navbar.vue
index 6a97821..4174d6e 100644
--- a/ebts-ui/src/layout/components/Navbar.vue
+++ b/ebts-ui/src/layout/components/Navbar.vue
@@ -26,9 +26,9 @@
 
       <!--    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />-->
       <!--    position: absolute; top: 20px; left: 300px; width: 700px;-->
-      <div id="notice">
-        <span id="notice_text" @click="noticeClick(fiche.noticeId)">{{ fiche.noticeTitle }}</span>
-      </div>
+<!--      <div id="notice">-->
+<!--        <span id="notice_text" @click="noticeClick(fiche.noticeId)">{{ fiche.noticeTitle }}</span>-->
+<!--      </div>-->
       <breadcrumb
         id="breadcrumb-container"
         class="breadcrumb-container"
@@ -132,13 +132,12 @@ export default {
     }
   },
   mounted() {
-
+    this.initInform()
     let notice_text = document.getElementById('notice_text')
     notice_text.addEventListener('webkitAnimationEnd', function() {
       this.style.marginLeft = 0
     }, false)
-    this.initFiche()
-    this.initInform()
+    // this.initFiche()
   },
   methods: {
     userDelNotice(id,type) {
diff --git a/ebts-ui/src/views/system/notice/index.vue b/ebts-ui/src/views/system/notice/index.vue
index fe7c30e..f65253a 100644
--- a/ebts-ui/src/views/system/notice/index.vue
+++ b/ebts-ui/src/views/system/notice/index.vue
@@ -19,16 +19,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型" prop="noticeType">
-        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
-          <el-option
-            v-for="dict in typeOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="类型" prop="noticeType">-->
+<!--        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in typeOptions"-->
+<!--            :key="dict.dictValue"-->
+<!--            :label="dict.dictLabel"-->
+<!--            :value="dict.dictValue"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -80,21 +80,21 @@
         prop="noticeTitle"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
-        label="公告类型"
-        align="center"
-        prop="noticeType"
-        :formatter="typeFormat"
-        width="100"
-      />
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="status"
-        :formatter="statusFormat"
-        width="100"
-      />
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
+<!--      <el-table-column-->
+<!--        label="公告类型"-->
+<!--        align="center"-->
+<!--        prop="noticeType"-->
+<!--        :formatter="typeFormat"-->
+<!--        width="100"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="状态"-->
+<!--        align="center"-->
+<!--        prop="status"-->
+<!--        :formatter="statusFormat"-->
+<!--        width="100"-->
+<!--      />-->
+<!--      <el-table-column label="创建者" align="center" prop="createBy" width="100" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -137,18 +137,18 @@
               <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="公告类型" prop="noticeType">
-              <el-select v-model="form.noticeType" placeholder="请选择">
-                <el-option
-                  v-for="dict in typeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="公告类型" prop="noticeType">-->
+<!--              <el-select v-model="form.noticeType" placeholder="请选择">-->
+<!--                <el-option-->
+<!--                  v-for="dict in typeOptions"-->
+<!--                  :key="dict.dictValue"-->
+<!--                  :label="dict.dictLabel"-->
+<!--                  :value="dict.dictValue"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="24">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
@@ -266,9 +266,9 @@ export default {
       this.form = {
         noticeId: undefined,
         noticeTitle: undefined,
-        noticeType: undefined,
+        noticeType: "2",
         noticeContent: undefined,
-        status: "0"
+        status: "0",
       };
       this.resetForm("form");
     },
@@ -307,6 +307,7 @@ export default {
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {
+        this.form.noticeType = "1"
         if (valid) {
           if (this.form.noticeId != undefined) {
             updateNotice(this.form).then(response => {