Merge branch 'makui_notice' into V4.3.1

src/main.js

@@ -2,7 +2,7 @@
  * @Author: mk 2403457699@qq.com
  * @Date: 2022-12-16 09:05:10
  * @LastEditors: mk 2403457699@qq.com
- * @LastEditTime: 2023-08-10 16:49:19
+ * @LastEditTime: 2024-05-07 15:54:09
  * @Description: 全局挂载提示信息,避免同时出现多条信息
  *
  *
@@ -38,6 +38,9 @@ import util from "@js/util";
 import Moment from "moment";
 import getQueryPara from "dai-js/modules/getQueryPara";
 import NodeWrap from "@/components/Tree/nodeWrap.vue";
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
 // import AddNode from "@/components/Tree/addNode.vue";
 import NodeWrapJw from "@/components/JwTree/nodeWrap.vue";
 import NodeWrapGrid from "@/components/GridTree/nodeWrap.vue";

src/router/index.js

@@ -98,6 +98,16 @@ export const moduleRoutes = {
         ],
       },
     },
+    {
+      path: "notice-version",
+      props: true,
+      name: "notice-version",
+      component: () => import("@/views/modules/home/cpts/notice_version_update"),
+      meta: {
+        isTab: true,
+        title: "版本更新",
+      },
+    },
     {
       path: "base-nonIntResi",
       props: true,

src/views/modules/home/cpts/notice_version_update.vue

@@ -0,0 +1,48 @@
+<template>
+    <div class=''>
+        <div v-html="detailData.richContent" class="ql-editor"></div>
+    </div>
+</template>
+
+<script>
+import { requestGet} from "@/js/dai/request";
+import { mapGetters } from "vuex";
+export default {
+    data() {
+        return {
+            detailData:null
+        };
+    },
+    activated() {
+        this.getNoticeDetail()
+    },
+    methods: {
+        async getNoticeDetail() {
+			const url = `/sys/sysVersionUpgrade/detail/${this.$route.query.version_id}`;
+			const { data, code, msg } = await requestGet(url);
+			if (code === 0) {
+                this.detailData= data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+    },
+    components:{},
+    computed:{
+        maxTableHeight () {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight ;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    },
+    watch: {},
+}
+</script>
+
+<style lang='scss' scoped>
+   .ql-editor{
+    background: #fff;
+    margin: 10px 6px;
+   }
+</style>

src/views/modules/home/notice.vue

@@ -188,10 +188,18 @@ export default {
 				this.$router.push({
 					path: obj[item.category],
 				});
+			} else if(item.msgType == "sys_version_upgrade_publish"){
+				let {  targetId } = item
+				this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
+				this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+					if (item.name === "notice-version") {
+						return { ...item };
+					}
+					return item;
+				});
 			}
-			this.getNoticeData()
 		},
-
+		
 		async read(item, index) {
 			if (item && item.readFlag == 1) return;