From ea3a1cfbe5f4a08b962e44b57275e853484cd3c8 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 31 May 2021 09:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/rolling-notice/index.vue   |  41 +++--
 ruoyi-ui/src/views/index.vue                  |  23 ++-
 ruoyi-ui/src/views/system/notice/index.vue    | 166 ++++++++++++------
 .../mybatis/system/SysNoticeMapper.xml        |   3 +
 4 files changed, 163 insertions(+), 70 deletions(-)

diff --git a/ruoyi-ui/src/components/rolling-notice/index.vue b/ruoyi-ui/src/components/rolling-notice/index.vue
index 897295d3d..636387e56 100644
--- a/ruoyi-ui/src/components/rolling-notice/index.vue
+++ b/ruoyi-ui/src/components/rolling-notice/index.vue
@@ -7,26 +7,31 @@
     <!-- 滚动文字区域 -->
     <div class="marquee-wrap">
       <ul class="marquee-box" id="marquee-box">
-        <li class="marquee-list" :key="i" v-for="i in 3" v-html="message" :id="i==1?'marquee':''"></li>
+        <li
+          class="marquee-list"
+          :key="i"
+          v-for="i in 1"
+          v-html="message"
+          :id="i == 1 ? 'marquee' : ''"
+        ></li>
       </ul>
     </div>
   </div>
 </template>
 <script type="text/javascript">
+
 export default {
-  name: 'notice',
+  name: "notice",
   props: {
     message: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
   },
   data() {
-    return {
-
-    };
+    return {};
   },
-  mounted: function() {
+  mounted: function () {
     // 延时滚动
     setTimeout(() => {
       this.runMarquee();
@@ -48,14 +53,14 @@ export default {
         // marquee.style.transform = 'translateX(' + disx + 'px)'
         marquee.style.left = disx + "px";
       }, 30); //滚动速度
-    }
-  }
+    },
+  },
 };
 // JavaScript Document
 (function px2rem(doc, win) {
   var docEl = doc.documentElement,
     resizeEvt = "orientationchange" in window ? "orientationchange" : "resize",
-    recalc = function() {
+    recalc = function () {
       var clientWidth = docEl.clientWidth;
       if (!clientWidth) return;
       docEl.style.fontSize = 100 * (clientWidth / 750) + "px";
@@ -64,7 +69,7 @@ export default {
   // 窗口大小发生变化，初始化
   win.addEventListener(resizeEvt, recalc, false);
   doc.addEventListener("DOMContentLoaded", recalc, false);
-  setTimeout(function() {
+  setTimeout(function () {
     px2rem(doc, win);
   }, 200);
 })(document, window);
@@ -97,12 +102,12 @@ li {
   display: flex;
   justify-content: center;
   align-items: center;
-   color: #E6A23C;
-   flex: 0 0 100px;
+  color: #e6a23c;
+  flex: 0 0 100px;
 }
 .ico-horn .icon {
-    font-size: 24px;
-    color: #E6A23C;
+  font-size: 24px;
+  color: #e6a23c;
 }
 /* 以下代码与滚动相关 */
 .marquee-wrap {
@@ -111,7 +116,7 @@ li {
   overflow: hidden;
   width: 100%;
   height: 100%;
-    margin-left: 8px;
+  margin-left: 8px;
 }
 .marquee-box {
   position: absolute;
@@ -122,7 +127,7 @@ li {
 }
 .marquee-list {
   margin-right: 10px;
-} 
+}
 .marquee-list span {
   padding: 0 0.04rem;
   color: #ffe17b;
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 11b2cfbe0..89954164f 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -58,6 +58,7 @@ import PieChart from "./dashboard/PieChart";
 import BarChart from "./dashboard/BarChart";
 import LineChart from "./dashboard/LineChart";
 import { bindwx, isbindwx, wxlogin } from "@/api/system/user";
+import { listNotice, getNotice } from "@/api/system/notice";
 //import { getSchoolCalendars } from "@/api/benyi/schoolcalendar";
 //备用进行班级园历显示操作import { getSchoolCalendarsClass } from "@/api/benyi/schoolcalendarclass";
 
@@ -73,22 +74,42 @@ export default {
   },
   data() {
     return {
-      message: `本一智慧平台可用手机微信登录啦！关注“本一智慧平台”公众号，点击左下角菜单“智慧平台”，进入2.0平台入口。首次登录输入账号密码，根据提示绑定微信号码！以后登录，可以使用手机直接微信登录，无需再输入账号密码，方便快捷！`,
+      message: ``,
       code: "",
       calendarData: [],
       value: new Date(),
       // 查询参数
       queryParams: {},
+      // 查询参数
+      queryParams_note: {
+        status: "0",
+      },
       // lineChartData: lineChartData.newVisitis,
     };
   },
   created() {
+    this.getList();
     this.code = this.$route.query.code;
     //console.log(this.code);
     this.bindWxInfo();
     //this.getSchoolCalendarList();
   },
   methods: {
+    /** 查询公告列表 */
+    getList() {
+      listNotice(this.queryParams_note).then((response) => {
+        console.log(response.rows);
+        if (response.rows.length > 0) {
+          var msg = "";
+          response.rows.forEach((element) => {
+            msg = msg + element.noticeContent;
+          });
+          this.message = msg;
+        } else {
+          this.message = "暂无公告";
+        }
+      });
+    },
     async bindWxInfo() {
       await isbindwx().then((res) => {
         if (this.code != "" && this.code != null && res.msg == "1") {
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index 404bec3e4..19edcf1a2 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="68px"
+    >
       <el-form-item label="公告标题" prop="noticeTitle">
         <el-input
           v-model="queryParams.noticeTitle"
@@ -20,7 +25,12 @@
         />
       </el-form-item>
       <el-form-item label="类型" prop="noticeType">
-        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
+        <el-select
+          v-model="queryParams.noticeType"
+          placeholder="公告类型"
+          clearable
+          size="small"
+        >
           <el-option
             v-for="dict in typeOptions"
             :key="dict.dictValue"
@@ -30,8 +40,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -43,7 +61,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:notice:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,7 +72,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:notice:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -63,13 +83,23 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:notice:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="noticeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
+      <el-table-column
+        label="序号"
+        align="center"
+        prop="noticeId"
+        width="100"
+      />
       <el-table-column
         label="公告标题"
         align="center"
@@ -90,13 +120,27 @@
         :formatter="statusFormat"
         width="100"
       />
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" 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>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -104,20 +148,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:notice:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:notice:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -130,7 +176,10 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="公告标题" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
+              <el-input
+                v-model="form.noticeTitle"
+                placeholder="请输入公告标题"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -152,18 +201,19 @@
                   v-for="dict in statusOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
-                >{{dict.dictLabel}}</el-radio>
+                  >{{ dict.dictLabel }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="内容">
-              <Editor v-model="form.noticeContent" />
+              <el-input type="textarea" v-model="form.noticeContent" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer" style="padding-top:20px">
+      <div slot="footer" class="dialog-footer" style="padding-top: 20px">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -172,14 +222,21 @@
 </template>
 
 <script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
-import Editor from '@/components/Editor';
+import {
+  listNotice,
+  getNotice,
+  delNotice,
+  addNotice,
+  updateNotice,
+  exportNotice,
+} from "@/api/system/notice";
+//import Editor from '@/components/Editor';
 
 export default {
   name: "Notice",
-  components: {
-    Editor
-  },
+  // components: {
+  //   Editor
+  // },
   data() {
     return {
       // 遮罩层
@@ -208,27 +265,27 @@ export default {
         pageSize: 10,
         noticeTitle: undefined,
         createBy: undefined,
-        status: undefined
+        status: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         noticeTitle: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
+          { required: true, message: "公告标题不能为空", trigger: "blur" },
         ],
         noticeType: [
-          { required: true, message: "公告类型不能为空", trigger: "blur" }
-        ]
-      }
+          { required: true, message: "公告类型不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
     this.getList();
-    this.getDicts("sys_notice_status").then(response => {
+    this.getDicts("sys_notice_status").then((response) => {
       this.statusOptions = response.data;
     });
-    this.getDicts("sys_notice_type").then(response => {
+    this.getDicts("sys_notice_type").then((response) => {
       this.typeOptions = response.data;
     });
   },
@@ -236,7 +293,7 @@ export default {
     /** 查询公告列表 */
     getList() {
       this.loading = true;
-      listNotice(this.queryParams).then(response => {
+      listNotice(this.queryParams).then((response) => {
         this.noticeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -262,7 +319,7 @@ export default {
         noticeTitle: undefined,
         noticeType: undefined,
         noticeContent: undefined,
-        status: "0"
+        status: "0",
       };
       this.resetForm("form");
     },
@@ -278,9 +335,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.noticeId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.noticeId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -291,19 +348,19 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const noticeId = row.noticeId || this.ids
-      getNotice(noticeId).then(response => {
+      const noticeId = row.noticeId || this.ids;
+      getNotice(noticeId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改公告";
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.noticeId != undefined) {
-            updateNotice(this.form).then(response => {
+            updateNotice(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
@@ -313,7 +370,7 @@ export default {
               }
             });
           } else {
-            addNotice(this.form).then(response => {
+            addNotice(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
@@ -328,18 +385,25 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const noticeIds = row.noticeId || this.ids
-      this.$confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项?', "警告", {
+      const noticeIds = row.noticeId || this.ids;
+      this.$confirm(
+        '是否确认删除公告编号为"' + noticeIds + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+          type: "warning",
+        }
+      )
+        .then(function () {
           return delNotice(noticeIds);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
-    }
-  }
+        })
+        .catch(function () {});
+    },
+  },
 };
 </script>
\ No newline at end of file
diff --git a/ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml
index c12816a2c..77abb539f 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml
@@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="noticeType != null and noticeType != ''">
 				AND notice_type = #{noticeType}
 			</if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
 			<if test="createBy != null and createBy != ''">
 				AND create_by like concat('%', #{createBy}, '%')
 			</if>