Merge branch 'wangtao-daily' of uskycloud/usky-web-mobile into master

src/api/common/message.js

@@ -7,4 +7,10 @@ export function infoList(param) {
         method: "GET",
         data: param,
     });
+}
+export function infoOne(id) {
+    return request({
+        url: "/system/notice/" + id,
+        method: "GET",
+    });
 }

src/api/mine/info.js

@@ -74,4 +74,15 @@ export function addMceSetting(data) {
     method: 'post',
     data
   })
-}
+}
+
+/**
+ * @消息设置接口
+ * @删除
+ */
+export function mceDelete(id) {
+  return request({
+      url: '/system/mceReceive/'  + id,
+      method: 'delete'
+  })
+}

src/config.js

@@ -5,7 +5,7 @@ export default {
   ip: "192.168.10.165:9300",
 
   //#ifdef APP-PLUS || MP-WEIXIN
-  baseUrl: "https://gateWay.usky.cn/prod-api",
+  // baseUrl: "https://gateWay.usky.cn/prod-api",
   //#endif
 
   //#ifdef H5

src/pages.json

@@ -158,6 +158,18 @@
                         }
                     }
                 },
+                {
+                    "path": "appMessage/nociteDetails",
+                    "style": {
+                        "navigationBarTitleText": "消息详情",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
                 {
                     "path": "alarmMessage/index",
                     "style": {

src/pages/business/common/projectMange/mall/components/mall-list.vue

@@ -1,5 +1,4 @@
 <template>
-  <view>
     <view class="box-head"><uni-mall-head ref="refUniMallHead" @change="tabChange"></uni-mall-head></view>
     <view class="box-list">
       <u-checkbox-group v-model="checkboxList" placement="column" :activeColor="$settingStore.themeColor.color" @change="checkboxChange">
@@ -55,7 +54,6 @@
         </u-button>
       </view>
     </view>
-  </view>
 </template>
 
 <script>
@@ -198,6 +196,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.boxWrap{
+  position: relative;
+  height:100%;
+}
 .box-head {
   position: fixed;
   left: 0px;
@@ -210,10 +212,16 @@ export default {
   z-index: 999;
 }
 .box-list {
+  position: absolute;
+  width:100%;
+  z-index: 0;
   padding-top: 52px;
   //#ifdef APP-PLUS || MP-WEIXIN
   padding-bottom: 60px;
   //#endif
+  //#ifdef H5
+  padding-bottom: 60px;
+  //#endif
   .box-list-item {
     position: relative;
     height: 60px;
@@ -292,6 +300,7 @@ export default {
       }
     }
   }
+
   .box-list-item-department + .box-list-item-user {
     margin-top: 10px;
   }
@@ -300,14 +309,13 @@ export default {
 .box-foot {
   position: fixed;
   bottom: 0px;
+  z-index: 1;
   width: 100%;
   height: 60px;
   background: #ffffff;
-  z-index: 999;
   box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
   display: flex;
   padding: 0 15px;
-
   &-left {
     margin: auto auto auto 0;
 

src/pages/business/common/projectMange/mall/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0;position: fixed;z-index: 9">
     <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" :title="pageTitle" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
       <template #left>
         <view class="u-navbar__content__left__item">
@@ -15,14 +15,14 @@
   </u-sticky>
 
   <oa-scroll
-    customClass="record-container scroll-height"
+    customClass="record-container"
     :isSticky="false"
     :customStyle="{
       //#ifdef APP-PLUS || MP-WEIXIN
       height: `calc(100vh - (44px + 48px + 60px + ${proxy.$settingStore.StatusBarHeight}))`,
       //#endif
       //#ifdef H5
-      height: 'calc(100vh - (0px + 48px + 60px))',
+      height: 'calc(100vh - 0px )',
       //#endif
     }"
     :refresherLoad="false"

src/pages/business/oa/approval/index.vue

@@ -137,7 +137,6 @@
       state.formList = res.data;
       for(let i=0;i<state.formList.length;i++){
         state.formList[i].icon = prefix + `images/oa/${state.formList[i].formImage}.png`
-        console.log(state.formList[i].icon)
       }
       state.appContent[0].array = state.formList
     })

src/pages/common/appMessage/details.vue

@@ -9,7 +9,7 @@
 
   <view>
     <uni-card class="view-title" :title="data?.infoTitle || ''">
-      <view class="uni-body view-content">{{ data?.infoContent || "" }}</view>
+      <rich-text :nodes="data?.infoContent || ''" class="uni-body view-content"></rich-text>
       <text class="uni-body view-time">{{ data?.createTime ? data.createTime.replace("T", " ") : "" }}</text>
     </uni-card>
   </view>

src/pages/common/appMessage/index.vue

@@ -34,12 +34,21 @@
           v-show="noticeList.length > 0"
           @click="goContentDetails(el)"
         >
-          <view style="width: 100%; max-width: 100%">
-            <view class="content-area-center-title font16">{{ el.infoTitle }}</view>
-            <view class="content-area-center-cont font14">{{ el.infoContent }}</view>
-          </view>
-          <view class="content-area-center-badge"><u-badge :isDot="el.readFlag == 0 ? true : false" type="error"></u-badge></view>
-          <view class="content-area-center-time font14">{{ proxy.$time.jktTimes(el.createTime.replace("T", " ")) }}</view>
+            
+        <uni-swipe-action style="width: 100%;" ref="swipeAction">
+          <uni-swipe-action-item :right-options="notice"  @click="noticeDelete(el)">
+            <view style="display: flex; align-items: center;">
+              <view style="width: 82% !important;float:left;">
+                <view class="content-area-center-title font16">{{ el.infoTitle }}</view>
+                <rich-text :nodes="el.infoContent" class="content-area-center-cont font14"></rich-text>
+              </view>
+              <view class="sign">
+                <view class="badge"><u-badge :isDot="el.readFlag == 0 ? true : false" type="error"></u-badge></view>
+                <view class="time font14">{{ proxy.$time.jktTimes(el.createTime.replace("T", " ")) }}</view>
+              </view>
+            </view>
+          </uni-swipe-action-item>
+        </uni-swipe-action>
         </view>
       </view>
     </template>
@@ -51,7 +60,7 @@
 import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { getMceList, updateMceReceiveStatus } from "@/api/mine/info.js";
+import { getMceList, updateMceReceiveStatus, mceDelete } from "@/api/mine/info.js";
 import { projectApi } from "@/api/business/project.js";
 
 /*----------------------------------组件引入-----------------------------------*/
@@ -71,9 +80,19 @@ const state = reactive({
     typeName: "",
   },
 });
-
+const notice = ref([
+  {
+    text: '删除',
+    style: {
+      backgroundColor: '#FF0000',
+    },
+    icon: 'trash', // 如果库支持图标，可以这样设置
+  },
+])
+const swipeAction = ref(null);
 const { scrollIntoView, noticeList } = toRefs(state);
 
+
 /**
  * @跳转相应类型系统
  */
@@ -95,7 +114,12 @@ function goContentDetails(e) {
       proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.moduleId}`);
     }
   } else {
-    proxy.$tab.navigateTo(`/pages/common/appMessage/details?contentId=${e.contentId}`).then(() => {});
+    //通知公告
+    if(e.infoType == 1){
+      proxy.$tab.navigateTo(`/pages/common/appMessage/nociteDetails?moduleId=${e.moduleId}`).then(() => {});
+    }else{
+      proxy.$tab.navigateTo(`/pages/common/appMessage/details?contentId=${e.contentId}`).then(() => {});
+    }
   }
 
   //是否已读
@@ -104,6 +128,18 @@ function goContentDetails(e) {
   }
 }
 
+function noticeDelete(e) {
+  mceDelete(e.contentId).then(() => {
+    for(let i=0;i<noticeList.value.length;i++){
+      if(noticeList.value[i].id == e.id){
+        swipeAction.value[i].closeAll()       
+        noticeList.value.splice(i,1);
+      }
+    }
+    proxy.$modal.msg("删除成功");
+  })
+}
+
 /**
  * @通知公告列表
  * @api接口调用
@@ -201,12 +237,11 @@ onNavigationBarButtonTap((e) => {
     font-weight: 600;
   }
 
-  &-center {
+  .content-area-center {
     margin: 0;
     padding: 15px;
     overflow: hidden;
     border-bottom: 1px solid #eaeef1;
-
     &:nth-child(2) {
       border-radius: 10px 10px 0 0;
     }
@@ -229,14 +264,24 @@ onNavigationBarButtonTap((e) => {
     &-cont {
       color: #666666;
     }
-
-    &-badge {
-      margin: auto 10px auto 0;
-    }
-
-    &-time {
-      margin: auto 0.9375rem auto 0;
+    .sign{
+      width:18%;
+      margin-right:4%;
+      text-align: right;
+      .badge {
+        margin-right:6px;
+        display: inline-block;
+      }
+      .time {
+        display: inline-block;
+      }
     }
+    
   }
 }
 </style>
+<style>
+.uni-swipe_button-text,.uni-swipe_button .button-hock{
+  font-size: 12px !important;
+}
+</style>

src/pages/common/appMessage/nociteDetails.vue

@@ -0,0 +1,118 @@
+<template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="消息详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+  <view>
+    <view class="content">
+      <view class="view-wrap">
+        标题: <text class="weight-bold">{{ data?.noticeTitle || '' }}</text>
+      </view>
+      <view class="view-wrap">
+        作者: <text class="uni-body">{{ data?.author || '' }}</text>
+      </view>
+      <view class="view-wrap">
+        发送到: <text class="uni-body">{{ data?.deptId ? proxy.$common.mapping("deptName", "deptId", data.deptId, deptList)  : '' }}</text>
+      </view>
+      <view class="view-wrap">
+        内容: 
+        <rich-text :nodes="data?.noticeContent || ''" class="uni-body view-content"></rich-text>
+      </view>
+      <view class="view-wrap" v-if="data.fileUrl">
+          <view v-for="(item, index) in JSON.parse(data.fileUrl)" :key="index" class="fileImg">
+            <a :href="item.url" style="color: #333;">
+              <image src="/static/images/system/doc.svg" alt="" v-if="item.name.split('.').pop() == 'doc'" />
+              <image src="/static/images/system/docx.svg" alt="" v-if="item.name.split('.').pop() == 'docx'" />
+              <image src="/static/images/system/pdf.svg" alt="" v-if="item.name.split('.').pop() == 'pdf'" />
+              <image src="/static/images/system/ppt.svg" alt="" v-if="item.name.split('.').pop() == 'ppt'" />
+              <image src="/static/images/system/pptx.svg" alt="" v-if="item.name.split('.').pop() == 'pptx'" />
+              <image src="/static/images/system/xls.svg" alt="" v-if="item.name.split('.').pop() == 'xls'" />
+              <image src="/static/images/system/xlsx.svg" alt="" v-if="item.name.split('.').pop() == 'xlsx'" />
+              <image src="/static/images/system/zip.svg" alt="" v-if="item.name.split('.').pop() == 'zip'" />
+              <span>{{ item.name }}</span>
+            </a>
+          </view>
+        </view>
+    </view>
+  </view>
+</template>
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
+import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { infoOne } from "@/api/common/message.js";
+import { listDeptNoAuth } from "@/api/system/user.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const data = ref();//详情数据
+const deptList = ref([]);//部门列表
+function init(options) {
+  listDeptNoAuth().then((res) => {
+    deptList.value = res.data;
+    infoOne(options.moduleId).then((requset) => {
+      data.value = requset.data
+    });
+  })
+}
+onLoad((options) => {
+  init(options);
+});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+</script>
+
+<style scoped lang="scss">
+.content {
+  max-height:calc(100vh - 80px);
+  padding:10px;
+  overflow: auto;
+}
+
+.view-content {
+  font-size: 12px;
+  padding: 12px 0 0;
+  color: #333;
+  line-height: 24px;
+  font-weight: normal;
+}
+.view-time {
+  margin: 30px 0 10px;
+  font-size: 12px;
+  float: right;
+}
+.view-wrap{
+  margin-top:10px;
+  font-weight: 400;
+  padding-bottom:8px;
+  border-bottom:4px solid rgba(243,243,243,1);
+  .weight-bold{
+    font-weight: 600;
+  }
+  .fileImg{
+    height:auto;
+    image{
+      width:20px;
+      height:20px;
+      vertical-align: middle;
+    }
+    span{
+      margin-left:10px;
+    }
+  }
+}
+.view-wrap:nth-child(1){
+  margin-top:0;
+}
+
+</style>

src/static/images/system/doc.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#2287FF;}
+</style>
+<g>
+	<path class="st0" d="M18.4,21.2c0-1.7-0.4-2.2-1.6-2.2s-1.6,0.5-1.6,2.2c0,1.7,0.4,2.2,1.6,2.2S18.4,22.9,18.4,21.2z"/>
+	<path class="st0" d="M10.8,21.2c0-1.3-0.3-2.2-1.7-2.2c-1.3,0-1.5,1-1.5,2.2c0,1.2,0.2,2.2,1.5,2.2C10.4,23.4,10.8,22.6,10.8,21.2z
+		"/>
+	<path class="st0" d="M29.3,13.3V8l-6.7-8h-20v13.3H0v13.3h2.7V28c0,2.3,1.7,4,4,4h22.7v-5.3H32V13.3H29.3z M23.5,3.5l3.1,3.7h-3.1
+		V3.5z M27.8,30.4L27.8,30.4H6.7c-1.3,0-2.4-1.1-2.4-2.4v-1.3h23.5V30.4z M6.1,21.2c0-1.8,0.5-3.4,2.6-3.4c1.2,0,1.8,0.4,2,1v-3.6
+		h1.5v9.1h-1.3l-0.1-0.9c-0.3,0.6-0.9,1.1-2,1.1C6.6,24.6,6.1,23.3,6.1,21.2z M13.7,21.2c0-2.6,1.1-3.4,3.1-3.4s3.1,0.7,3.1,3.4
+		c0,2.6-1.1,3.4-3.1,3.4C14.9,24.6,13.7,23.9,13.7,21.2z M24.5,23.3c0.5,0,1.1-0.1,1.5-0.3v1.3c-0.4,0.1-1.1,0.2-1.7,0.2
+		c-2,0-3.1-0.7-3.1-3.4c0-2.6,1.2-3.4,3.1-3.4c0.7,0,1.3,0.1,1.7,0.2v1.3c-0.5-0.2-0.9-0.3-1.5-0.3c-1.2,0-1.7,0.5-1.7,2.1
+		C22.7,22.9,23.2,23.3,24.5,23.3z M27.8,13.3H4.3V1.6h17.6v7.2h5.9V13.3z"/>
+</g>
+</svg>

src/static/images/system/docx.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#2287FF;}
+</style>
+<g>
+	<path class="st0" d="M7.4,21.2C7.4,19.9,7,19,5.7,19s-1.5,1-1.5,2.2s0.2,2.2,1.5,2.2C7,23.4,7.4,22.6,7.4,21.2z"/>
+	<path class="st0" d="M32,13.3h-2.7V8l-6.7-8h-20v13.3H0v13.3h2.7V28c0,2.3,1.7,4,4,4h22.7v-5.3H32V13.3z M23.5,3.5l3.1,3.7h-3.1
+		V3.5z M4.3,1.6h17.6v7.2h5.9v4.5H4.3V1.6z M21.1,23.3c0.5,0,1.1-0.1,1.5-0.3v1.3c-0.4,0.1-1.1,0.2-1.7,0.2c-2,0-3.1-0.7-3.1-3.4
+		c0-2.6,1.2-3.4,3.1-3.4c0.7,0,1.3,0.1,1.7,0.2v1.3c-0.5-0.2-0.9-0.3-1.5-0.3c-1.2,0-1.7,0.5-1.7,2.1C19.3,22.9,19.8,23.3,21.1,23.3
+		z M16.6,21.2c0,2.6-1.1,3.4-3.1,3.4s-3.1-0.7-3.1-3.4c0-2.6,1.1-3.4,3.1-3.4C15.4,17.9,16.6,18.6,16.6,21.2z M2.7,21.2
+		c0-1.8,0.5-3.4,2.6-3.4c1.2,0,1.8,0.4,2,1v-3.6h1.5v9.1H7.4l-0.1-0.9c-0.3,0.6-0.9,1.1-2,1.1C3.2,24.6,2.7,23.3,2.7,21.2z
+		 M27.7,30.4h-21c-1.3,0-2.4-1.1-2.4-2.4v-1.3h23.5L27.7,30.4L27.7,30.4z M28,24.5l-1.5-2.4h-0.1L25,24.5h-1.8l2.2-3.3l-2-3.2h1.7
+		l1.4,2.3h0.1L28,18h1.7l-2.1,3.2l2.2,3.3H28z"/>
+	<path class="st0" d="M11.9,21.2c0,1.7,0.4,2.2,1.6,2.2s1.6-0.5,1.6-2.2S14.7,19,13.5,19C12.2,19,11.9,19.6,11.9,21.2z"/>
+</g>
+</svg>

src/static/images/system/pdf.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FF3C1A;}
+</style>
+<g>
+	<path class="st0" d="M17.4,17.8c-1.3,0-1.5,1-1.5,2.2s0.2,2.2,1.5,2.2s1.7-0.8,1.7-2.2C19.1,18.7,18.8,17.8,17.4,17.8z"/>
+	<path class="st0" d="M32,13.3h-2.7V8l-6.7-8h-20v13.3H0v13.3h2.7V28c0,2.3,1.7,4,4,4h22.7v-5.3H32V13.3z M25.5,16.7v1.2h-1.4v5.3
+		h-1.5v-5.3h-1v-1.2h1v-0.1c0-2.2,0.9-2.6,2.4-2.6c0.3,0,0.5,0,0.7,0.1v1.1c-0.2,0-0.4,0-0.6,0c-0.9,0-1.1,0.3-1.1,1.6h1.5V16.7z
+		 M23.5,3.5l3.1,3.7h-3.1V3.5z M4.3,1.6h17.6v7.2h5.9v4.5H4.3V1.6z M19,14.1h1.5v9.1h-1.3l-0.1-0.9c-0.3,0.6-0.9,1.1-2,1.1
+		c-2.1,0-2.6-1.3-2.6-3.4c0-1.8,0.5-3.4,2.6-3.4c1.2,0,1.8,0.4,2,1v-3.5H19z M10.6,16.6c2.1,0,2.6,1.3,2.6,3.4
+		c0,1.8-0.5,3.4-2.6,3.4c-1.2,0-1.7-0.4-2-1v3.3H7.1v-8.9h1.5v0.9C8.9,17.1,9.4,16.6,10.6,16.6z M27.7,30.4h-21
+		c-1.3,0-2.4-1.1-2.4-2.4v-1.3h23.5L27.7,30.4L27.7,30.4z"/>
+	<path class="st0" d="M10.2,22.2c1.3,0,1.5-1,1.5-2.2s-0.2-2.2-1.5-2.2S8.5,18.6,8.5,20C8.5,21.3,8.9,22.2,10.2,22.2z"/>
+</g>
+</svg>

src/static/images/system/ppt.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FF701A;}
+</style>
+<g>
+	<path class="st0" d="M17.9,21.8c1.3,0,1.5-1,1.5-2.2s-0.2-2.2-1.5-2.2s-1.7,0.8-1.7,2.2C16.3,20.9,16.6,21.8,17.9,21.8z"/>
+	<path class="st0" d="M10.3,21.8c1.3,0,1.5-1,1.5-2.2s-0.2-2.2-1.5-2.2s-1.7,0.8-1.7,2.2C8.6,20.9,9,21.8,10.3,21.8z"/>
+	<path class="st0" d="M29.3,13.3V8l-6.7-8h-20v13.3H0v13.3h2.7V28c0,2.3,1.7,4,4,4h22.7v-5.3H32V13.3H29.3z M23.5,3.5l3.1,3.7h-3.1
+		V3.5z M27.7,30.4h-21c-1.3,0-2.4-1.1-2.4-2.4v-1.3h23.5L27.7,30.4L27.7,30.4z M10.7,16.2c2.1,0,2.6,1.3,2.6,3.4
+		c0,1.8-0.5,3.4-2.6,3.4c-1.2,0-1.7-0.4-2-1v3.3H7.2v-8.9h1.5v0.9C8.9,16.7,9.5,16.2,10.7,16.2z M18.3,16.2c2.1,0,2.6,1.3,2.6,3.4
+		c0,1.8-0.5,3.4-2.6,3.4c-1.2,0-1.7-0.4-2-1v3.3h-1.5v-8.9h1.5v0.9C16.6,16.7,17.2,16.2,18.3,16.2z M25.5,16.4v1.2h-1.4v3.1
+		c0,0.8,0.1,1,0.8,1c0.2,0,0.4,0,0.6-0.1v1.2c-0.3,0-0.5,0.1-0.8,0.1c-1.5,0-2.1-0.4-2.1-2.1v-3.2h-0.9v-1.2h0.9v-1.5h1.5v1.5H25.5z
+		 M27.7,13.3H4.3V1.6h17.6v7.2h5.9v4.5H27.7z"/>
+</g>
+</svg>

src/static/images/system/pptx.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FF701A;}
+</style>
+<g>
+	<path class="st0" d="M32,13.3h-2.7V8l-6.7-8h-20v13.3H0v13.3h2.7V28c0,2.3,1.7,4,4,4h22.7v-5.3H32V13.3z M23.5,3.5l3.1,3.7h-3.1
+		V3.5z M4.3,1.6h17.6v7.2h5.9v4.5H4.3V1.6z M19.2,14.8h1.5v1.5h1.4v1.2h-1.4v3.1c0,0.8,0.1,1,0.8,1c0.2,0,0.4,0,0.6-0.1v1.2
+		c-0.3,0-0.5,0.1-0.8,0.1c-1.5,0-2.1-0.4-2.1-2.1v-3.2h-0.9v-1.2h0.9V14.8z M14.9,16.2c2.1,0,2.6,1.3,2.6,3.4c0,1.8-0.5,3.4-2.6,3.4
+		c-1.2,0-1.7-0.4-2-1v3.3h-1.5v-8.9h1.5v0.9C13.2,16.7,13.8,16.2,14.9,16.2z M3.8,25.2v-8.9h1.5v0.9c0.3-0.6,0.8-1,2-1
+		c2.1,0,2.6,1.3,2.6,3.4c0,1.8-0.5,3.4-2.6,3.4c-1.2,0-1.7-0.4-2-1v3.3L3.8,25.2L3.8,25.2z M27.7,30.4h-21c-1.3,0-2.4-1.1-2.4-2.4
+		v-1.3h23.5L27.7,30.4L27.7,30.4z M27.3,22.8l-1.5-2.4h-0.1l-1.5,2.4h-1.8l2.2-3.3l-2.1-3.2h1.7l1.4,2.3h0.1l1.4-2.3h1.7l-2.1,3.2
+		l2.2,3.3H27.3z"/>
+	<path class="st0" d="M14.5,21.8c1.3,0,1.5-1,1.5-2.2s-0.2-2.2-1.5-2.2s-1.7,0.8-1.7,2.2C12.9,20.9,13.2,21.8,14.5,21.8z"/>
+	<path class="st0" d="M6.9,21.8c1.3,0,1.5-1,1.5-2.2s-0.2-2.2-1.5-2.2s-1.7,0.8-1.7,2.2C5.2,20.9,5.6,21.8,6.9,21.8z"/>
+</g>
+</svg>

src/static/images/system/xls.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0AAB1A;}
+</style>
+<path class="st0" d="M32,13.3h-2.7V8l-6.7-8h-20v13.3H0v13.3h2.7V28c0,2.3,1.7,4,4,4h22.7v-5.3H32V13.3z M23.5,3.5l3.1,3.7h-3.1V3.5
+	z M4.3,1.6h17.6v7.2h5.9v4.5H4.3V1.6z M20.6,21.6c-1.4-0.3-1.8-0.8-1.8-1.8c0-1.2,0.7-1.9,2.5-1.9c0.7,0,1.4,0.1,1.7,0.2l0,1.2
+	c-0.3-0.1-1-0.2-1.6-0.2c-0.8,0-1.1,0.2-1.1,0.7s0.2,0.6,1.2,0.8c1.4,0.3,1.9,0.8,1.9,2c0,1.5-0.9,2-2.6,2c-0.7,0-1.5-0.1-2-0.2
+	v-1.3c0.6,0.2,1.3,0.3,1.9,0.3c0.8,0,1.2-0.2,1.2-0.8S21.7,21.8,20.6,21.6z M17.6,23.3c0.1,0,0.3,0,0.4,0v1.2
+	c-0.2,0-0.5,0.1-0.7,0.1c-1.3,0-1.7-0.5-1.7-1.6v-7.6H17v7.2C17,23.2,17.2,23.3,17.6,23.3z M8.3,18H10l1.4,2.3h0.1l1.4-2.3h1.7
+	l-2.1,3.2l2.2,3.3h-1.8l-1.5-2.4h-0.1l-1.5,2.4H8.1l2.2-3.3L8.3,18z M27.7,30.4h-21c-1.3,0-2.4-1.1-2.4-2.4v-1.3h23.5L27.7,30.4
+	L27.7,30.4z"/>
+</svg>

src/static/images/system/xlsx.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0AAB1A;}
+</style>
+<path class="st0" d="M32,13.3h-2.7V8l-6.7-8h-20v13.3H0v13.3h2.7V28c0,2.3,1.7,4,4,4h22.7v-5.3H32V13.3z M23.5,3.5l3.1,3.7h-3.1V3.5
+	z M4.3,1.6h17.6v7.2h5.9v4.5H4.3V1.6z M20.8,18h1.7l1.4,2.3H24l1.4-2.3h1.7L25,21.1l2.2,3.3h-1.8L24,22.1h-0.1l-1.5,2.4h-1.8
+	l2.2-3.3L20.8,18z M17.3,21.6c-1.4-0.3-1.8-0.8-1.8-1.8c0-1.2,0.7-1.9,2.5-1.9c0.7,0,1.4,0.1,1.7,0.2l-0.1,1.2
+	c-0.3-0.1-1-0.2-1.6-0.2c-0.8,0-1.1,0.2-1.1,0.7s0.2,0.6,1.2,0.8c1.4,0.3,1.9,0.8,1.9,2c0,1.5-0.9,2-2.6,2c-0.7,0-1.5-0.1-2-0.2
+	v-1.3c0.6,0.2,1.3,0.3,1.9,0.3c0.8,0,1.2-0.2,1.2-0.8C18.6,22,18.4,21.8,17.3,21.6z M14.2,23.3c0.1,0,0.3,0,0.4,0v1.2
+	c-0.2,0-0.5,0.1-0.7,0.1c-1.3,0-1.7-0.5-1.7-1.6v-7.6h1.5v7.2C13.7,23.2,13.8,23.3,14.2,23.3z M4.9,18h1.7L8,20.3h0.1L9.5,18h1.7
+	l-2.1,3.2l2.2,3.3H9.6l-1.5-2.4H8l-1.5,2.4H4.8L7,21.2L4.9,18z M27.7,30.4h-21c-1.3,0-2.4-1.1-2.4-2.4v-1.3h23.5L27.7,30.4
+	L27.7,30.4z"/>
+</svg>

src/static/images/system/zip.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#A766C5;}
+</style>
+<g>
+	<path class="st0" d="M32,13.3h-2.7V8l-6.7-8h-20v13.3H0v13.3h2.7V28c0,2.3,1.7,4,4,4h22.7v-5.3H32V13.3z M21.5,16.6
+		c2.1,0,2.6,1.3,2.6,3.4c0,1.8-0.5,3.4-2.6,3.4c-1.2,0-1.7-0.4-2-1v3.3H18v-8.9h1.5v0.9C19.8,17.1,20.3,16.6,21.5,16.6z M23.5,3.5
+		l3.1,3.7h-3.1V3.5z M4.3,1.6h17.6v7.2h5.9v4.5H4.3V1.6z M14.5,14.9c0-0.7,0.2-0.8,0.9-0.8c0.7,0,0.9,0.1,0.9,0.8s-0.2,0.8-0.9,0.8
+		C14.7,15.8,14.5,15.7,14.5,14.9z M16.1,16.8v6.5h-1.5v-6.5H16.1z M8.1,18v-1.2H13V18l-3.3,4l0,0h3.6v1.2H7.9V22l3.3-3.9V18H8.1z
+		 M27.7,30.4h-21c-1.3,0-2.4-1.1-2.4-2.4v-1.3h23.5L27.7,30.4L27.7,30.4z"/>
+	<path class="st0" d="M21.1,22.2c1.3,0,1.5-1,1.5-2.2s-0.2-2.2-1.5-2.2s-1.7,0.8-1.7,2.2C19.4,21.3,19.8,22.2,21.1,22.2z"/>
+</g>
+</svg>

src/store/modules/setting.js

@@ -394,19 +394,10 @@ const settingStores = defineStore("storage-setting", {
                     }
                 });
             } else {
-                modal.confirmInput("确定注销并退出系统吗？", "请输入密码").then((res) => {
-                    if (res.confirm) {
-                        if (!res.content) {
-                            modal.msg("请输入密码")
-                        } else if (res.content == "sh628628") {
-                            useStore.LogOut().then(() => {
-                                modal.msgSuccess("退出成功")
-                                tab.reLaunch("/pages/index");
-                            });
-                        } else {
-                            modal.msg("密码错误")
-                        }
-                    }
+                modal.confirm("确定注销并退出系统吗？").then(() => {
+                    useStore.LogOut().then(() => {
+                        tab.reLaunch("/pages/index");
+                    });
                 });
             }
             //#endif