From 3fea5132ce63e059129e14e90d3edb2f0138b997 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Sat, 4 Jun 2022 19:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=92=8C=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=9A=84=E5=A4=9A=E7=A7=9F=E6=88=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/controller/NewsCategoryController.java      |  2 +-
 vue/src/views/index.vue                             |  4 ++--
 vue/src/views/iot/news/index.vue                    | 13 ++++++++++---
 vue/src/views/system/notice/index.vue               | 10 +++++++++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/NewsCategoryController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/NewsCategoryController.java
index 8aa2e851..60f65e22 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/NewsCategoryController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/NewsCategoryController.java
@@ -55,7 +55,7 @@ public class NewsCategoryController extends BaseController
     /**
      * 查询新闻分类简短列表
      */
-    @PreAuthorize("@ss.hasPermi('iot:newsCategory:list')")
+    @PreAuthorize("@ss.hasPermi('iot:news:list')")
     @GetMapping("/newsCategoryShortList")
     @ApiOperation("分类简短列表")
     public AjaxResult newsCategoryShortList()
diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue
index 0e1059a1..32424c2d 100644
--- a/vue/src/views/index.vue
+++ b/vue/src/views/index.vue
@@ -147,12 +147,12 @@
                             <el-tag size="mini" effect="dark" v-else>信息</el-tag>
                             {{item.noticeTitle}}
                         </div>
-                        <div style="display:table-cell;width:90px;">{{ parseTime(item.createTime, '{y}-{m}-{d}') }}</div>
+                        <div style="display:table-cell;width:90px;font-size:14px;"><i class="el-icon-time"></i> {{ parseTime(item.createTime, '{y}-{m}-{d}') }}</div>
                     </div>
                 </div>
             </el-card>
 
-        </el-col>
+        </el-col>   
     </el-row>
 
     <el-row :gutter="40" v-if="isAdmin" style="margin-bottom:80px;">
diff --git a/vue/src/views/iot/news/index.vue b/vue/src/views/iot/news/index.vue
index f162a4ac..d113ed93 100644
--- a/vue/src/views/iot/news/index.vue
+++ b/vue/src/views/iot/news/index.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="60px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="60px" v-if="isAdmin">
         <el-form-item label="标题" prop="title">
             <el-input v-model="queryParams.title" placeholder="请输入标题" clearable size="small" @keyup.enter.native="handleQuery" />
         </el-form-item>
@@ -168,6 +168,8 @@ export default {
     },
     data() {
         return {
+            // 是否为管理员
+            isAdmin:false,
             // 遮罩层
             loading: true,
             // 选中数组
@@ -196,7 +198,7 @@ export default {
                 isTop: null,
                 isBanner: null,
                 categoryName: null,
-                status: null,
+                status: '1', // 默认为发布
             },
             // 表单参数
             form: {},
@@ -228,13 +230,18 @@ export default {
     },
     created() {
         this.getList();
-
+        this.init();
         // 获取分类列表
         listShortNewsCategory().then(response => {
             this.categoryList = response.data;
         })
     },
     methods: {
+        init() {
+            if (this.$store.state.user.roles.indexOf("tenant") === -1 || this.$store.state.user.roles.indexOf("tenant") === -1) {
+                this.isAdmin = true
+            }
+        },
         /** 查询新闻资讯列表 */
         getList() {
             this.loading = true;
diff --git a/vue/src/views/system/notice/index.vue b/vue/src/views/system/notice/index.vue
index 764516ac..10f9ff5c 100644
--- a/vue/src/views/system/notice/index.vue
+++ b/vue/src/views/system/notice/index.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" v-if="isAdmin">
         <el-form-item label="公告标题" prop="noticeTitle">
             <el-input v-model="queryParams.noticeTitle" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
@@ -113,6 +113,8 @@ export default {
     dicts: ['sys_notice_status', 'sys_notice_type'],
     data() {
         return {
+            // 是否为管理员
+            isAdmin:false,
             // 遮罩层
             loading: true,
             // 选中数组
@@ -158,8 +160,14 @@ export default {
     },
     created() {
         this.getList();
+        this.init();
     },
     methods: {
+        init() {
+            if (this.$store.state.user.roles.indexOf("tenant") === -1 || this.$store.state.user.roles.indexOf("tenant") === -1) {
+                this.isAdmin = true
+            }
+        },
         /** 查询公告列表 */
         getList() {
             this.loading = true;