From 86b7e3f1906686c68a2162e85a72cd4fe3e66c3e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 30 Nov 2021 15:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/serve.js                                 |   2 +-
 src/apps/AppNotification/AppNotification.vue | 589 +++++++++----------
 2 files changed, 295 insertions(+), 296 deletions(-)

diff --git a/bin/serve.js b/bin/serve.js
index 7cf9de79..91cc9de7 100644
--- a/bin/serve.js
+++ b/bin/serve.js
@@ -68,7 +68,7 @@ const start = () => {
       navigationStyle: "custom"
     }
   }
-  findApp('src/apps', file => {
+  findApp('src/utils', file => {
     if (/.*\\.+\\App[^\\]+\.vue/g.test(file)) {
       let app = {
         name: file.replace(/.*\\([^\\]+).vue/g, '$1'),
diff --git a/src/apps/AppNotification/AppNotification.vue b/src/apps/AppNotification/AppNotification.vue
index 81299bcc..0cdf40db 100644
--- a/src/apps/AppNotification/AppNotification.vue
+++ b/src/apps/AppNotification/AppNotification.vue
@@ -10,14 +10,14 @@
             <label>
               <b v-if="index==0 && item.readStatus==0"></b>
               <div class="tag" v-if="index==1" :style="color(item.status)">
-                {{$dict.getLabel("announcementStatus",item.status)}}
+                {{ $dict.getLabel("announcementStatus", item.status) }}
               </div>
-              {{item.title}}
+              {{ item.title }}
             </label>
             <u-gap height="16"></u-gap>
             <span class="info">
-            <text>{{item.releaseUserName}}</text>
-            <text>{{item.releaseTime}}</text>
+            <text>{{ item.releaseUserName }}</text>
+            <text>{{ item.releaseTime }}</text>
           </span>
           </template>
           <template v-else>
@@ -26,14 +26,14 @@
                 <label>
                   <b v-if="index==0 && item.readStatus==0"></b>
                   <div class="tag" v-if="index==1" :style="color(item.status)">
-                    {{$dict.getLabel("announcementStatus",item.status)}}
+                    {{ $dict.getLabel("announcementStatus", item.status) }}
                   </div>
-                  {{item.title}}
+                  {{ item.title }}
                 </label>
                 <u-gap height="16"></u-gap>
                 <span class="info">
-                <text>{{item.releaseUserName}}</text>
-                <text>{{item.releaseTime}}</text>
+                <text>{{ item.releaseUserName }}</text>
+                <text>{{ item.releaseTime }}</text>
               </span>
               </div>
               <img :src="item.imgUrl" alt="">
@@ -51,7 +51,7 @@
             <div class="colum" v-for="(item,index) in optList" :key="index" @click="handleOpt(item)">
               <u-icon :name="item.icon" size="100" :custom-style="{backgroundColor:'#fff',borderRadius:'8px'}"></u-icon>
               <u-gap height="16"></u-gap>
-              {{item.name}}
+              {{ item.name }}
             </div>
           </u-row>
           <div class="btn" @click="show=false">关闭</div>
@@ -66,324 +66,323 @@
 </template>
 
 <script>
-  import AiAdd from "../../components/AiAdd";
-  import AiEmpty from "../../components/AiEmpty";
-  import AiTopFixed from "../../components/AiTopFixed";
-  import {add, detail, read} from "./components"
+import AiAdd from "../../components/AiAdd";
+import AiEmpty from "../../components/AiEmpty";
+import AiTopFixed from "../../components/AiTopFixed";
+import {add, detail, read} from "./components"
 
-  export default {
-    name: "AppNotification",
-    appName: "通知公告",
-    components: {AiAdd, AiEmpty, AiTopFixed, add, detail, read},
-    data() {
-      return {
-        index: 0,
-        show: false,
-        modal: false,
-        content: "",
-        current: 1,
-        dataList: [],
-        detail: {},
-        showList: true,
-        comp: "",
-        params: null,
-        status: "加载更多",
-      }
+export default {
+  name: "AppNotification",
+  appName: "通知公告",
+  components: {AiAdd, AiEmpty, AiTopFixed, add, detail, read},
+  data() {
+    return {
+      index: 0,
+      show: false,
+      modal: false,
+      content: "",
+      current: 1,
+      dataList: [],
+      detail: {},
+      showList: true,
+      comp: "",
+      params: null,
+      status: "加载更多",
+    }
+  },
+
+  computed: {
+    tabs() {
+      return [{name: "最新公告"}, {name: "公告管理"}];
     },
-
-    computed: {
-      tabs() {
-        return [{name: "最新公告"}, {name: "公告管理"}];
-      },
-      optList() {
-        return [
-          {
-            name: "详情",
-            icon: this.$cdn + "notice/yl.png",
-            val: 0,
-            show: true,
-          },
-          {
-            name: "撤回",
-            icon: this.$cdn + "notice/ch.png",
-            val: 1,
-            show: this.detail?.status == 1,
-          },
-          {
-            name: "发布",
-            icon: this.$cdn + "notice/fb.png",
-            val: 2,
-            show: this.detail?.status == 0,
-          },
-          {
-            name: "编辑",
-            icon: this.$cdn + "notice/bj.png",
-            val: 3,
-            show: this.detail?.status == 0 || this.detail?.status == 3,
-          }, {
-            name: "删除",
-            icon: this.$cdn + "notice/sc.png",
-            val: 4,
-            show: true,
-          }
-        ].filter(e => e.show)
-      }
-    },
-
-    created() {
-      this.$dict.load("announcementStatus");
-    },
-
-    methods: {
-      emitShow(){
-        const {id} = this.$route.query
-        if(id){
-          this.comp = "detail";
-          this.params = {
-            id,
-            flag: true
-          };
-          this.showList = false;
+    optList() {
+      return [
+        {
+          name: "详情",
+          icon: this.$cdn + "notice/yl.png",
+          val: 0,
+          show: true,
+        },
+        {
+          name: "撤回",
+          icon: this.$cdn + "notice/ch.png",
+          val: 1,
+          show: this.detail?.status == 1,
+        },
+        {
+          name: "发布",
+          icon: this.$cdn + "notice/fb.png",
+          val: 2,
+          show: this.detail?.status == 0,
+        },
+        {
+          name: "编辑",
+          icon: this.$cdn + "notice/bj.png",
+          val: 3,
+          show: this.detail?.status == 0 || this.detail?.status == 3,
+        }, {
+          name: "删除",
+          icon: this.$cdn + "notice/sc.png",
+          val: 4,
+          show: true,
         }
-        this.current = 1;
-        this.getList();
-      },
-      emitReachBottom(){
-        this.current = this.current + 1;
-        this.getList()
-      },
-      changeState() {
-        this.$http.post(this.content == '删除' ? '/app/appannouncement/delete' : "/app/appannouncement/update-status", null, {
-          params: {
-            [this.content == '删除' ? 'ids' : 'id']: this.detail.id
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast(this.content + "成功");
-            this.modal = false;
-            this.getList();
-          }
-        })
-      },
-      confirm() {
+      ].filter(e => e.show)
+    }
+  },
+
+  created() {
+    this.$dict.load("announcementStatus");
+  },
+
+  methods: {
+    emitShow() {
+      const {id} = this.$route.query
+      if (id) {
+        this.comp = "detail";
+        this.params = {
+          id,
+          flag: true
+        };
+        this.showList = false;
+      }
+      this.current = 1;
+      this.getList();
+    },
+    emitReachBottom() {
+      this.current = this.current + 1;
+      this.getList()
+    },
+    changeState() {
+      this.$http.post(this.content == '删除' ? '/app/appannouncement/delete' : "/app/appannouncement/update-status", null, {
+        params: {
+          [this.content == '删除' ? 'ids' : 'id']: this.detail.id
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast(this.content + "成功");
+          this.modal = false;
+          this.getList();
+        }
+      })
+    },
+    confirm() {
+      this.show = false;
+      this.changeState();
+    },
+    handleOpt(item) {
+      this.content = {
+        1: "撤回",
+        2: "发布",
+        4: "删除",
+      }[item.val];
+
+      if (item.val == 0) {
         this.show = false;
-        this.changeState();
-      },
-      handleOpt(item) {
-        this.content = {
-          1: "撤回",
-          2: "发布",
-          4: "删除",
-        }[item.val];
+        this.comp = "detail";
+        this.params = {
+          id: this.detail.id,
+          flag: true
+        };
+        this.showList = false;
+        return
+      }
 
-        if (item.val == 0) {
-          this.show = false;
-          this.comp = "detail";
-          this.params = {
-            id: this.detail.id,
-            flag: true
-          };
-          this.showList = false;
-          return
-        }
+      if ([1, 2, 4].includes(item.val)) {
+        return this.modal = true;
+      }
 
-        if ([1, 2, 4].includes(item.val)) {
-          return this.modal = true;
-        }
-
-        if (item.val == 3) {
-          this.show = false;
-          this.comp = "add";
-          this.params = {
-            id: this.detail.id,
-            flag: false
-          };
-          this.showList = false;
-          return
-        }
-      },
-      color(status) {
-        return [
-          {backgroundColor: "rgba(255,136,34,0.1)", color: "#FF8822"},
-          {backgroundColor: "rgba(34,102,255,0.1)", color: "#2266FF"},
-          {backgroundColor: "rgba(102,102,102,0.1)", color: "#666666"},
-          {backgroundColor: "rgba(255,136,34,0.1)", color: "#FF8822"}
-        ][status];
-      },
-      handeClick(item) {
-        this.detail = item;
-        if (this.index == 1) {
-          this.show = true;
-        } else {
-          this.comp = "detail";
-          this.params = {
-            id: this.detail.id,
-            flag: true
-          };
-          this.showList = false;
-        }
-      },
-      add() {
+      if (item.val == 3) {
+        this.show = false;
         this.comp = "add";
         this.params = {
-          id: null,
+          id: this.detail.id,
           flag: false
         };
         this.showList = false;
-      },
-      change(val) {
-        this.index = val;
-        this.current = 1;
-        this.getList()
-      },
-      getList() {
-        this.$http.post(this.index == 0 ? "/app/appannouncement/list-latest" : "/app/appannouncement/list-mgr", null, {
-          params: {
-            size: 10,
-            current: this.current
-          }
-        }).then(res => {
-          if (res && res.data) {
-            if (this.current > 1 && this.current > res.data.pages) {
-              this.status = "已经到底啦"
-            }
-            this.dataList = this.current > 1 ? [...this.dataList, ...res.data.records] : res.data.records
-          }
-        })
       }
     },
+    color(status) {
+      return [
+        {backgroundColor: "rgba(255,136,34,0.1)", color: "#FF8822"},
+        {backgroundColor: "rgba(34,102,255,0.1)", color: "#2266FF"},
+        {backgroundColor: "rgba(102,102,102,0.1)", color: "#666666"},
+        {backgroundColor: "rgba(255,136,34,0.1)", color: "#FF8822"}
+      ][status];
+    },
+    handeClick(item) {
+      this.detail = item;
+      if (this.index == 1) {
+        this.show = true;
+      } else {
+        this.comp = "detail";
+        this.params = {
+          id: this.detail.id,
+          flag: true
+        };
+        this.showList = false;
+      }
+    },
+    add() {
+      this.comp = "add";
+      this.params = {
+        id: null,
+        flag: false
+      };
+      this.showList = false;
+    },
+    change(val) {
+      this.index = val;
+      this.current = 1;
+      this.getList()
+    },
+    getList() {
+      this.$http.post(this.index == 0 ? "/app/appannouncement/list-latest" : "/app/appannouncement/list-mgr", null, {
+        params: {
+          size: 10,
+          current: this.current
+        }
+      }).then(res => {
+        if (res && res.data) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            this.status = "已经到底啦"
+          }
+          this.dataList = this.current > 1 ? [...this.dataList, ...res.data.records] : res.data.records
+        }
+      })
+    },
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .notification {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    padding-bottom: 32px;
+.notification {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  padding-bottom: 32px;
 
-    ::v-deep .content {
-      padding: 0 !important;
-    }
+  ::v-deep .content {
+    padding: 0 !important;
+  }
 
-    .body {
+  .body {
+    box-sizing: border-box;
+    padding: 32px;
+
+    .card {
+      height: 208px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
       box-sizing: border-box;
       padding: 32px;
+      border-radius: 8px;
+      background-color: #ffffff;
+      margin-bottom: 32px;
 
-      .card {
-        height: 208px;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        box-sizing: border-box;
-        padding: 32px;
-        border-radius: 8px;
-        background-color: #ffffff;
-        margin-bottom: 32px;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-
-        & > label {
-          font-size: 32px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
-          color: #333333;
-          line-height: 44px;
-        }
-
-        b {
-          display: inline-block;
-          font-style: normal;
-          width: 16px;
-          height: 16px;
-          border-radius: 50%;
-          background: #FF4466;
-          margin-right: 8px;
-        }
-
-        .tag {
-          width: 96px;
-          height: 44px;
-          display: inline-block;
-          border-radius: 8px;
-          margin-right: 16px;
-          font-size: 26px;
-          font-weight: 400;
-          line-height: 46px;
-          text-align: center;
-        }
-
-        .info {
-          font-size: 28px;
-          color: #999999;
-          line-height: 40px;
-
-          & > text:first-child {
-            margin-right: 32px;
-          }
-        }
-
-        & > .has-pic {
-          display: flex;
-          justify-content: space-between;
-
-          & > .left {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-
-            & > label {
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-box-orient: vertical;
-              -webkit-line-clamp: 2;
-            }
-          }
-
-          & > img {
-            width: 192px;
-            height: 144px;
-            flex-shrink: 0;
-            margin-left: 32px;
-          }
-        }
+      &:last-child {
+        margin-bottom: 0;
       }
-    }
 
-    .popup-wrap {
-      height: 368px;
-      background-color: #F7F7F7;
-
-      .btn {
-        height: 96px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 30px;
-        font-weight: 500;
+      & > label {
+        font-size: 32px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
         color: #333333;
-        background-color: #ffffff;
+        line-height: 44px;
       }
 
-      & > .u-row {
-        height: 272px;
-        box-sizing: border-box;
-        padding: 0 46px;
+      b {
+        display: inline-block;
+        font-style: normal;
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background: #FF4466;
+        margin-right: 8px;
+      }
 
-        & > .colum {
+      .tag {
+        width: 96px;
+        height: 44px;
+        display: inline-block;
+        border-radius: 8px;
+        margin-right: 16px;
+        font-size: 26px;
+        font-weight: 400;
+        line-height: 46px;
+        text-align: center;
+      }
+
+      .info {
+        font-size: 28px;
+        color: #999999;
+        line-height: 40px;
+
+        & > text:first-child {
+          margin-right: 32px;
+        }
+      }
+
+      & > .has-pic {
+        display: flex;
+        justify-content: space-between;
+
+        & > .left {
           display: flex;
           flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          font-size: 26px;
-          color: #666666;
+          justify-content: space-between;
+
+          & > label {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+          }
+        }
+
+        & > img {
+          width: 192px;
+          height: 144px;
+          flex-shrink: 0;
+          margin-left: 32px;
         }
       }
     }
   }
+
+  .popup-wrap {
+    height: 368px;
+    background-color: #F7F7F7;
+
+    .btn {
+      height: 96px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 30px;
+      font-weight: 500;
+      color: #333333;
+      background-color: #ffffff;
+    }
+
+    & > .u-row {
+      height: 272px;
+      box-sizing: border-box;
+      padding: 0 46px;
+
+      & > .colum {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        font-size: 26px;
+        color: #666666;
+      }
+    }
+  }
+}
 </style>