修复黄主任提出bug

admin-ui/src/views/index.vue

@@ -105,27 +105,69 @@
             </div>
           </div>
         </div>
+        <!--通知公告-->
+        <div class="out">
+          <div class="int">
+            <div class="bos">
+              <div class="lab">
+                <div class="bsg"></div>
+                <div class="tit">通知公告</div>
+              </div>
+              <el-table :data="noticeList" border height="270px">
+                <el-table-column label="通知标题" align="left" prop="title" />
+                <el-table-column label="创建时间" align="center" prop="createTime" width="200" />
+                <el-table-column label="操作" align="center" width="120">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-view" @click="op('detail', scope.row)">查看</el-button>
+                  </template>
+                </el-table-column>
+                <template slot="empty">
+                  <el-empty></el-empty>
+                </template>
+              </el-table>
+            </div>
+          </div>
+        </div>
       </div>
       <!--手机预览-->
       <div class="pop" style="width: 35%">
         <div class="out">
           <div class="int">
             <div class="bos">
+              <div class="jsxq">
+                <span class="de" @click="current = 0" :class="{ active: current == 0 }">小程序个人介绍页</span>
+                <span class="de" @click="current = 1" :class="{ active: current == 1 }">小程序主页</span>
+              </div>
               <div class="div-mc">
                 <div class="guise-mobile">
-                  <div class="guise-mobile-show" ref="scrollbar">
-                    <div class="js">
+                  <div class="guise-mobile-show" ref="scrollbar" :style="{ padding: current == 0 ? '10px' : '0px' }">
+                    <div class="js" v-if="current == 0">
                       <div class="head"><img :src="user.avatar" /></div>
                       <div class="name">{{ user.nickName }}</div>
                       <div class="introduce" v-html="user.introduce" v-if="user.introduce"></div>
                       <el-empty v-else description="暂无个人介绍" :image-size="80" v-else></el-empty>
                     </div>
+                    <img src="../assets/images/phone.jpg" style="width: 100%" v-else />
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
+        <!--小程序码-->
+        <div class="out">
+          <div class="int">
+            <div class="bos">
+              <div class="lab">
+                <div class="bsg"></div>
+                <div class="tit">小程序码</div>
+              </div>
+              <div style="height: 220px; text-align: center">
+                <img src="../assets/images/xcx.jpg" style="height: 200px; margin: 0 auto" />
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="chart-wrapper" v-else>
@@ -152,61 +194,6 @@
             </div>
           </div>
         </div>
-        <!--数据统计-->
-        <div class="out">
-          <div class="int">
-            <div class="bos">
-              <div class="lab">
-                <div class="bsg"></div>
-                <div class="tit">数据统计</div>
-              </div>
-              <div class="yr">
-                <div class="rout" style="padding-left: 0px">
-                  <div class="rint" style="background-color: rgb(242 232 255)">
-                    <div class="icon" style="color: #8642df">&#xe6b6;</div>
-                    <div class="rcon">
-                      <div class="rtt">患者数据</div>
-                      <div class="rdesc">{{ data.count.visit || 0 }}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="yr">
-                <div class="rout">
-                  <div class="rint" style="background-color: rgb(255 245 229)">
-                    <div class="icon" style="color: #fab22e">&#xe716;</div>
-                    <div class="rcon">
-                      <div class="rtt">复诊提醒</div>
-                      <div class="rdesc">{{ data.count.up || 0 }}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="yr">
-                <div class="rout">
-                  <div class="rint" style="background-color: rgb(237 246 254)">
-                    <div class="icon" style="color: #489afd">&#xe62f;</div>
-                    <div class="rcon">
-                      <div class="rtt">随访记录</div>
-                      <div class="rdesc">{{ data.count.record || 0 }}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="yr">
-                <div class="rout" style="padding-right: 0px">
-                  <div class="rint" style="background-color: rgb(255 242 245)">
-                    <div class="icon" style="color: #fa5376">&#xe69a;</div>
-                    <div class="rcon">
-                      <div class="rtt">知识库</div>
-                      <div class="rdesc">{{ data.count.knowledge || 0 }}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
         <!--快捷菜单-->
         <div class="out">
           <div class="int">
@@ -228,6 +215,29 @@
             </div>
           </div>
         </div>
+        <!--通知公告-->
+        <div class="out">
+          <div class="int">
+            <div class="bos">
+              <div class="lab">
+                <div class="bsg"></div>
+                <div class="tit">通知公告</div>
+              </div>
+              <el-table :data="noticeList" border height="460px">
+                <el-table-column label="通知标题" align="left" prop="title" />
+                <el-table-column label="创建时间" align="center" prop="createTime" width="200" />
+                <el-table-column label="操作" align="center" width="120">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-view" @click="op('detail', scope.row)">查看</el-button>
+                  </template>
+                </el-table-column>
+                <template slot="empty">
+                  <el-empty></el-empty>
+                </template>
+              </el-table>
+            </div>
+          </div>
+        </div>
       </div>
       <!--手机预览-->
       <div class="pop" style="width: 35%">
@@ -236,19 +246,28 @@
             <div class="bos">
               <div class="div-mc">
                 <div class="guise-mobile">
-                  <div class="guise-mobile-show" ref="scrollbar">
-                    <div class="js">
-                      <div class="head"><img :src="user.avatar" /></div>
-                      <div class="name">{{ user.nickName }}</div>
-                      <div class="introduce" v-html="user.introduce" v-if="user.introduce"></div>
-                      <el-empty v-else description="暂无个人介绍" :image-size="80" v-else></el-empty>
-                    </div>
+                  <div class="guise-mobile-show" ref="scrollbar" style="padding: 0px">
+                    <img src="../assets/images/phone.jpg" style="width: 100%" />
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
+        <!--小程序码-->
+        <div class="out">
+          <div class="int">
+            <div class="bos">
+              <div class="lab">
+                <div class="bsg"></div>
+                <div class="tit">小程序码</div>
+              </div>
+              <div style="height: 240px; text-align: center">
+                <img src="../assets/images/xcx.jpg" style="height: 200px; margin: 0 auto" />
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -256,13 +275,18 @@
 
 <script>
 import Vue from 'vue';
+const phone = require('@/assets/images/phone.jpg');
+import detail from '@/views/work/notice/detail';
 export default {
   name: 'Index',
   components: {},
   data() {
     return {
+      current: 0,
       user: this.$store.state.user,
+      phone: phone,
       data: { count: {} },
+      noticeList: [],
       menu: [
         {
           icon: '&#xe6b6;',
@@ -315,6 +339,14 @@ export default {
       this.ajax({ url: '/home/index' }).then((response) => {
         this.data = response.data;
       });
+      this.ajax({ url: '/work/notice/list', data: { pageNum: 1, pageSize: 10, state: 0, orderByColumn: 'id', isAsc: 'desc' } }).then((response) => {
+        this.noticeList = response.rows;
+      });
+    },
+    op(tag, row) {
+      if (tag == 'detail') {
+        this.iframe({ obj: detail, param: { id: row.id }, title: '查看详情', width: '58%', height: '65%' });
+      }
     }
   }
 };
@@ -351,6 +383,18 @@ export default {
     padding: 0px 10px 0px 10px;
     width: 100%;
     border: 0px;
+    margin-bottom: 0px;
+    .jsxq {
+      text-align: center;
+      .de {
+        padding-right: 10px;
+        font-size: 13px;
+        cursor: pointer;
+        &.active {
+          color: #1890ff;
+        }
+      }
+    }
     .yr {
       float: left;
       width: 25%;

admin-ui/src/views/system/dept/edit.vue

@@ -9,14 +9,14 @@
         <editor v-model="form.brief" placeholder="请输入"></editor>
       </el-form-item>
       <el-row>
-        <el-col :span="10">
-          <el-form-item label="显示排序" prop="orderNum"><el-input-number v-model="form.orderNum" controls-position="right" :min="0" /></el-form-item>
+        <el-col :span="12">
+          <el-form-item label="显示排序" prop="orderNum"><el-input-number v-model="form.orderNum" controls-position="right" :min="0" style="width: 100%" /></el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="12">
           <el-form-item label="科室状态">
-            <el-radio-group v-model="form.status">
-              <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-            </el-radio-group>
+            <el-select v-model="form.status" placeholder="请选择">
+              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>

admin-ui/src/views/system/dept/index.vue

@@ -125,7 +125,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.iframe({ obj: edit, param: { parentId: row.deptId, ancestors: row.ancestors }, title: '新增科室', width: '55%', height: '78%' });
+      this.iframe({ obj: edit, param: { parentId: row.deptId, ancestors: row.ancestors }, title: '新增科室', width: '60%', height: '82%' });
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {
@@ -137,7 +137,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.iframe({ obj: edit, param: { id: row.deptId }, title: '编辑科室', width: '55%', height: '78%' });
+      this.iframe({ obj: edit, param: { id: row.deptId }, title: '编辑科室', width: '55%', height: '82%' });
     },
     /** 删除按钮操作 */
     handleDelete(row) {

admin-ui/src/views/work/notice/detail.vue

@@ -0,0 +1,49 @@
+<template>
+  <div class="cmain">
+    <div class="tz">
+      <div class="ctitle">{{ form.title }}</div>
+       <el-divider>通知内容</el-divider>
+      <div class="nr" v-html="form.contents"></div>
+      <div class="sj">{{ form.createTime }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      form: {}
+    };
+  },
+  mounted() {
+    if (this.param.id) {
+      this.ajax({ url: '/work/notice/detail/' + this.param.id }).then((response) => {
+        this.form = response.data;
+        this.form.contents = response.data.contents.replace(new RegExp('/profile/upload/', 'g'), this.baseUrl + '/profile/upload/');
+      });
+    }
+  },
+  methods: {}
+};
+</script>
+<style lang="scss">
+.tz {
+  padding: 20px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  border-radius: 7px;
+  .ctitle {
+    font-size: 22px;
+    font-weight: bold;
+    text-align: center;
+    margin-bottom: 30px;
+  }
+  .nr{
+    margin-top: 30px;
+    margin-bottom: 30px;
+  }
+  .sj{
+    text-align: right;
+  }
+}
+</style>

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/NoticeController.java

@@ -26,7 +26,6 @@ public class NoticeController extends BaseController {
     @Autowired
     private INoticeService noticeService;
 
-    @PreAuthorize("@ss.hasPermi('work:notice:list')")
     @GetMapping("/list")
     public TableDataInfo list(Notice notice){
         startPage();
@@ -34,7 +33,6 @@ public class NoticeController extends BaseController {
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('work:notice:query')")
     @GetMapping(value = "/detail/{id}")
     public AjaxResult detail(@PathVariable("id") Long id){
         return AjaxResult.success(noticeService.getById(id));