Merge remote-tracking branch 'origin/main' into dev-cl

# Conflicts:
#	.env.base
#	vite.config.js

.env.base

@@ -1,21 +1,20 @@
 # 本地开发环境
-VITE_NODE_ENV=development
+NODE_ENV=development
 
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
-# VITE_BASE_URL='http://114.55.169.15:48080'
+#VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
+VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
-# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=/dev-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/

.env.dev

@@ -7,16 +7,16 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=/dev-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/
 
 # 是否删除debugger
 VITE_DROP_DEBUGGER=false

.env.front

@@ -7,16 +7,16 @@ VITE_DEV=true
 VITE_BASE_URL='http://118.31.23.45:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=/dev-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/
 
 # 项目本地运行端口号, 与.vscode/launch.json配合
 VITE_PORT=80

.env.pro

@@ -4,13 +4,13 @@ VITE_NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='/crm-api'
+VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='/crm-api/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/
 
 # 输出路径
 VITE_OUT_DIR=dist-pro

.env.stage

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH='/crm'
+VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/'
 
 # 输出路径
 VITE_OUT_DIR=dist-stage

.env.static

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/admin-ui-vue3/
 
 # 输出路径
 VITE_OUT_DIR=dist-dev

.env.test

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=false
 VITE_SOURCEMAP=true
 
 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/
 
 # 输出路径
 VITE_OUT_DIR=dist-test

index.html

@@ -141,7 +141,7 @@
     <script type="module" src="/src/main.js"></script>
     <script type="text/javascript">
       window._AMapSecurityConfig = {
-        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab' // 你的密钥
+        securityJsCode: 'a2f0d14a4c5c1e387f9271b1045a781d' // 你的密钥
       }
     </script>
   </body>

src/App.vue

@@ -2,19 +2,19 @@
 import { isDark } from '@/utils/is'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import routerSearch from '@/components/RouterSearch/index.vue'
-import cache from '@/plugins/cache'
 
 const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('app')
 const appStore = useAppStore()
 const currentSize = computed(() => appStore.getCurrentSize)
 const greyMode = computed(() => appStore.getGreyMode)
+const { wsCache } = useCache()
 
 // 根据浏览器当前主题设置系统主题色
 const setDefaultTheme = () => {
-  let isDarkTheme = cache.local.get(CACHE_KEY.IS_DARK)
+  let isDarkTheme = wsCache.get(CACHE_KEY.IS_DARK)
   if (isDarkTheme === null) {
     isDarkTheme = isDark()
   }

src/api/clue/afterSale.js

@@ -1,39 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getAfterSaleList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-after-sale/list', params })
-}
-
-// 查询（精简)列表
-export const getAfterSalePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-after-sale/page', params })
-}
-
-// 新增
-export const createAfterSale = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sign-after-sale/create',
-    data,
-    isSubmitForm: true
-  })
-}
-
-// 审核
-export const auditAfterSale = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-after-sale/check', data })
-}
-
-export const batchAuditAfterSale = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-after-sale/batch/check', data })
-}
-
-// 撤销
-export const cancelApplyAfterSale = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-after-sale/revoke', params: data })
-}
-
-// 查询详情
-export const getAfterSaleDetail = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-after-sale/get', params })
-}

src/api/clue/clueCache.js

@@ -1,11 +0,0 @@
-import request from '@/config/axios'
-
-// 查询用户配置
-export const getClueCache = async (params) => {
-  return await request.get({ url: '/admin-api/crm/param-user-setting/get-by-user', params })
-}
-
-// 保存用户配置
-export const setClueCache = async (data) => {
-  return await request.post({ url: '/admin-api/crm/param-user-setting/save', data })
-}

src/api/clue/clueField.js

@@ -1,40 +0,0 @@
-import request from '@/config/axios'
-
-// 创建
-export const createField = (data) => {
-  return request.post({ url: '/admin-api/crm/param/create', data: { ...data, module: 1 } })
-}
-
-// 更新
-export const updateField = (data) => {
-  return request.put({ url: '/admin-api/crm/param/update', data })
-}
-
-// 删除
-export const deleteField = (id) => {
-  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
-}
-
-// 获得
-export const getField = (id) => {
-  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
-}
-
-// 获得精简信息列表
-export const getSimpleFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 1 } })
-}
-
-// 获取自定义字段
-export const getDiyFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 1 } })
-}
-
-// 状态修改
-export const updateFieldStatus = (signParamId, status) => {
-  const data = {
-    signParamId,
-    status
-  }
-  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
-}

src/api/clue/clueGetSet.js

@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 线索获取规则
-export const getClueGainRuleList = () => {
-  return request.get({ url: '/admin-api/crm/sch-clue-gain-rule/list' })
-}
-
-// 删除
-export const deleteClueGainRule = (id) => {
-  return request.delete({ url: `/admin-api/crm/sch-clue-gain-rule/delete?id=${id}` })
-}
-
-// 线索获取规则保存
-export const saveClueGainRule = (data) => {
-  return request.put({ url: '/admin-api/crm/sch-clue-gain-rule/batchUpdate', data })
-}
-
-// 线索规则
-export const getClueDistributeRuleByUser = (params) => {
-  return request.get({ url: '/admin-api/crm/sch-clue-distribution-rule/queryByUserId', params })
-}
-
-// 删除
-export const deleteClueDistributeRule = (id) => {
-  return request.delete({ url: `/admin-api/crm/sch-clue-gain-rule/delete?id=${id}` })
-}

src/api/clue/delivery.js

@@ -1,21 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getDeliveryList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-send/list', params })
-}
-
-// 查询分页列表
-export const getDeliveryPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-send/page', params })
-}
-
-// 新增
-export const createDelivery = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-send/create', data, isSubmitForm: true })
-}
-
-// 查询详情
-export const getDeliveryDetail = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-send/get', params })
-}

src/api/clue/extraFee.js

@@ -1,30 +0,0 @@
-import request from '@/config/axios'
-
-// 获得列表
-export const getExtraFeePage = (params) => {
-  return request.get({ url: '/admin-api/crm/extra-pay/page', params })
-}
-
-// 创建
-export const createExtraFee = (data) => {
-  return request.post({ url: '/admin-api/crm/extra-pay/create', data, isSubmitForm: true })
-}
-
-// 更新
-export const updateExtraFee = (data) => {
-  return request.put({ url: '/admin-api/crm/extra-pay/update', data })
-}
-
-// 删除
-export const deleteExtraFee = (id) => {
-  return request.delete({ url: `/admin-api/crm/extra-pay/delete?id=${id}` })
-}
-
-// 获得
-export const getExtraFee = (id) => {
-  return request.get({ url: `/admin-api/crm/extra-pay/get?id=${id}` })
-}
-
-export const getExtraFeeSimpleList = async () => {
-  return await request.get({ url: '/admin-api/crm/extra-pay/simple-list' })
-}

src/api/clue/followRecord.js

@@ -1,20 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getFollowList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/clue-follow-record/list', params })
-}
-
-// 新增
-export const createFollow = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/clue-follow-record/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 删除
-export const deleteFollow = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/clue-follow-record/delete?id=' + id })
-}

src/api/clue/index.js

@@ -1,64 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getSimpleClueList = async () => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/list-all-simple' })
-}
-
-// 查询列表
-export const getCluePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/page', params })
-}
-
-// 查询详情
-export const getClue = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/get?id=' + id })
-}
-
-// 新增
-export const createClue = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-clue/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateClue = async (params) => {
-  return await request.put({ url: '/admin-api/crm/sch-clue/update', data: params })
-}
-
-// 删除
-export const deleteClue = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sch-clue/delete?id=' + id })
-}
-
-// 释放
-export const releaseClue = async (data) => {
-  return await request.put({ url: '/admin-api/crm/sch-clue/public/save', data })
-}
-
-// 通用查询数量
-export const getClueCount = async () => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/get-clue-num' })
-}
-
-// 获取操作记录
-export const getOpearateRecord = async (params) => {
-  return await request.get({ url: '/admin-api/crm/clue-operate-record/list', params })
-}
-
-// 获取公海线索
-export const getPublicClue = async (data) => {
-  return await request.put({ url: '/admin-api/crm/sch-clue/public/save', data })
-}
-
-// 获得线索跟进用户信息
-export const getFollowUserList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/get-follow-user', params })
-}
-
-export const batchUpdateFollowUser = async (data) => {
-  return await request.put({ url: '/admin-api/crm/sch-clue/batchUpdateFollowUser', data })
-}

src/api/clue/orderField.js

@@ -1,40 +0,0 @@
-import request from '@/config/axios'
-
-// 创建
-export const createField = (data) => {
-  return request.post({ url: '/admin-api/crm/param/create', data: { ...data, module: 2 } })
-}
-
-// 更新
-export const updateField = (data) => {
-  return request.put({ url: '/admin-api/crm/param/update', data })
-}
-
-// 删除
-export const deleteField = (id) => {
-  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
-}
-
-// 获得
-export const getField = (id) => {
-  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
-}
-
-// 获得精简信息列表
-export const getSimpleFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 2 } })
-}
-
-// 获取自定义字段
-export const getDiyFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 2 } })
-}
-
-// 状态修改
-export const updateFieldStatus = (signParamId, status) => {
-  const data = {
-    signParamId,
-    status
-  }
-  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
-}

src/api/clue/payment.js

@@ -1,47 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getPaymentList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-pay-record/list', params })
-}
-
-// 查询（精简)列表
-export const getPaymentPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-pay-record/page', params })
-}
-
-// 新增
-export const createPayment = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sign-pay-record/create',
-    data,
-    isSubmitForm: true
-  })
-}
-
-// 审核
-export const auditPayment = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-pay-record/check', data })
-}
-
-export const batchAuditPayment = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-pay-record/batch/check', data })
-}
-
-// 撤销
-export const cancelApplyPayment = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-pay-record/revoke', params: data })
-}
-
-// 查询详情
-export const getPaymentDetail = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-pay-record/get', params })
-}
-
-// 撤销
-export const updateApplyPayment = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sign-pay-record/updateRecordMoney',
-    data
-  })
-}

src/api/clue/settle.js

@@ -1,31 +0,0 @@
-import request from '@/config/axios'
-
-// 查询招生结算列表
-export const getSchoolSettlePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/sch/page', params })
-}
-
-// 查询招生结算详情
-export const getSchoolSettleDetail = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/sch/get?id=' + id })
-}
-
-// 查询进销存结算列表
-export const getMallSettlePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/erp/page', params })
-}
-
-// 查询进销存结算详情
-export const getMallSettleDetail = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/erp/get?id=' + id })
-}
-
-// 批量结算
-export const batchSaveSettle = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-settlement/batch/save', data })
-}
-
-// 修改结算
-export const updateSettle = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-settlement/update/money', data })
-}

src/api/clue/sign.js

@@ -1,53 +0,0 @@
-import request from '@/config/axios'
-
-// 查询列表
-export const getSignPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign/page', params })
-}
-
-// 查询详情
-export const getSign = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sign/get?id=' + id })
-}
-
-// 新增
-export const createSign = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign/create', data: data, isSubmitForm: true })
-}
-
-// 取消登记
-export const cancelDeal = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sign/delete?id=' + id })
-}
-
-// 新增支出
-export const signAddPay = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign/extra-pay/save', data: data })
-}
-
-// 查询支出
-export const getSignExtraPayList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign/extra-pay/get', params })
-}
-
-// 安装状态修改
-export const updateInstallStatus = (signIdList, installStatus) => {
-  const data = {
-    signIdList,
-    installStatus
-  }
-  return request.post({ url: '/admin-api/crm/sign/install-status/batchSave', data: data })
-}
-
-// 修改生产状态
-export const updateProduceStatus = (data) => {
-  return request.put({ url: '/admin-api/crm/sign-prodcut/update', data: data })
-}
-
-export const updateProduceSort = (data) => {
-  return request.post({ url: '/admin-api/crm/sign-prodcut/adjust/sort', data: data })
-}
-
-export const getSignProfit = (params) => {
-  return request.get({ url: '/admin-api/crm/sign/profit', params })
-}

src/api/clue/skill.js

@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 获得列表
-export const getSkillPage = (params) => {
-  return request.get({ url: '/admin-api/crm/skill/page', params })
-}
-
-// 创建
-export const createSkill = (data) => {
-  return request.post({ url: '/admin-api/crm/skill/create', data, isSubmitForm: true })
-}
-
-// 更新
-export const updateSkill = (data) => {
-  return request.put({ url: '/admin-api/crm/skill/update', data })
-}
-
-// 删除
-export const deleteSkill = (id) => {
-  return request.delete({ url: `/admin-api/crm/skill/delete?id=${id}` })
-}
-
-// 获得
-export const getSkill = (id) => {
-  return request.get({ url: `/admin-api/crm/skill/get?id=${id}` })
-}

src/api/clue/source.js

@@ -1,31 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getSimpleSourceList = async () => {
-  return await request.get({ url: '/admin-api/crm/source/list' })
-}
-
-// 查询列表
-export const getSourcePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/source/list', params })
-}
-
-// 查询详情
-export const getSource = async (id) => {
-  return await request.get({ url: '/admin-api/crm/source/get?id=' + id })
-}
-
-// 新增
-export const createSource = async (data) => {
-  return await request.post({ url: '/admin-api/crm/source/create', data: data, isSubmitForm: true })
-}
-
-// 修改
-export const updateSource = async (params) => {
-  return await request.put({ url: '/admin-api/crm/source/update', data: params })
-}
-
-// 删除
-export const deleteSource = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/source/delete?id=' + id })
-}

src/api/home/index.js

@@ -1,20 +0,0 @@
-import request from '@/config/axios'
-// 线索情况
-export const getUserClueCount = async (params) => {
-  return await request.get({ url: '/admin-api/crm/home/get-user-count', params })
-}
-
-// 成交率
-export const getClueSignSignRate = async (params) => {
-  return await request.get({ url: '/admin-api/crm/home/get-sign-rate', params })
-}
-
-// 成交率
-export const getClueSignSignRank = async (params) => {
-  return await request.get({ url: '/admin-api/crm/home/get-sign-top10', params })
-}
-
-// 成交率
-export const getClueFollowRank = async (params) => {
-  return await request.get({ url: '/admin-api/crm/home/get-follow-top10', params })
-}

src/api/infra/file/index.ts

@@ -1,45 +0,0 @@
-import request from '@/config/axios'
-
-export interface FilePageReqVO extends PageParam {
-  path?: string
-  type?: string
-  createTime?: Date[]
-}
-
-// 文件预签名地址 Response VO
-export interface FilePresignedUrlRespVO {
-  // 文件配置编号
-  configId: number
-  // 文件上传 URL
-  uploadUrl: string
-  // 文件 URL
-  url: string
-}
-
-// 查询文件列表
-export const getFilePage = (params: FilePageReqVO) => {
-  return request.get({ url: '/infra/file/page', params })
-}
-
-// 删除文件
-export const deleteFile = (id: number) => {
-  return request.delete({ url: '/infra/file/delete?id=' + id })
-}
-
-// 获取文件预签名地址
-export const getFilePresignedUrl = (path: string) => {
-  return request.get<FilePresignedUrlRespVO>({
-    url: '/infra/file/presigned-url',
-    params: { path }
-  })
-}
-
-// 创建文件
-export const createFile = (data: any) => {
-  return request.post({ url: '/infra/file/create', data })
-}
-
-// 上传文件
-export const updateFile = (data: any) => {
-  return request.upload({ url: '/admin-api/system/file/upload', data })
-}

src/api/login/index.ts

@@ -71,10 +71,3 @@ export const getAppInfo = (instanceId: number) => {
     url: '/admin-api/system/serviceInstance/getInstanceInfo?instanceId=' + instanceId
   })
 }
-
-export const bindWx = (data: any) => {
-  return request.post({
-    url: '/admin-api/system/user/bind/wx',
-    data
-  })
-}

src/api/mall/product/brand.ts

@@ -32,30 +32,30 @@ export interface BrandVO {
 
 // 创建商品品牌
 export const createBrand = (data: BrandVO) => {
-  return request.post({ url: '/admin-api/crm/erp-product-brand/create', data, isSubmitForm: true })
+  return request.post({ url: '/product/brand/create', data })
 }
 
 // 更新商品品牌
 export const updateBrand = (data: BrandVO) => {
-  return request.put({ url: '/admin-api/crm/erp-product-brand/update', data })
+  return request.put({ url: '/product/brand/update', data })
 }
 
 // 删除商品品牌
 export const deleteBrand = (id: number) => {
-  return request.delete({ url: `/admin-api/crm/erp-product-brand/delete?id=${id}` })
+  return request.delete({ url: `/product/brand/delete?id=${id}` })
 }
 
 // 获得商品品牌
 export const getBrand = (id: number) => {
-  return request.get({ url: `/admin-api/crm/erp-product-brand/get?id=${id}` })
+  return request.get({ url: `/product/brand/get?id=${id}` })
 }
 
 // 获得商品品牌列表
 export const getBrandParam = (params: PageParam) => {
-  return request.get({ url: '/admin-api/crm/erp-product-brand/page', params })
+  return request.get({ url: '/product/brand/page', params })
 }
 
 // 获得商品品牌精简信息列表
 export const getSimpleBrandList = () => {
-  return request.get({ url: '/admin-api/crm/erp-product-brand/simple-list' })
+  return request.get({ url: '/product/brand/list-all-simple' })
 }

src/api/mall/product/category.ts

@@ -36,34 +36,25 @@ export interface CategoryVO {
 
 // 创建商品分类
 export const createCategory = (data: CategoryVO) => {
-  return request.post({
-    url: '/admin-api/crm/erp-product-category/create',
-    data,
-    isSubmitForm: true
-  })
+  return request.post({ url: '/product/category/create', data })
 }
 
 // 更新商品分类
 export const updateCategory = (data: CategoryVO) => {
-  return request.put({ url: '/admin-api/crm/erp-product-category/update', data })
+  return request.put({ url: '/product/category/update', data })
 }
 
 // 删除商品分类
 export const deleteCategory = (id: number) => {
-  return request.delete({ url: `/admin-api/crm/erp-product-category/delete?id=${id}` })
+  return request.delete({ url: `/product/category/delete?id=${id}` })
 }
 
 // 获得商品分类
 export const getCategory = (id: number) => {
-  return request.get({ url: `/admin-api/crm/erp-product-category/get?id=${id}` })
+  return request.get({ url: `/product/category/get?id=${id}` })
 }
 
 // 获得商品分类列表
 export const getCategoryList = (params: any) => {
-  return request.get({ url: '/admin-api/crm/erp-product-category/list', params })
-}
-
-// 获得商品分类列表
-export const getCategorySimpleList = (params: any) => {
-  return request.get({ url: '/admin-api/crm/erp-product-category/simple-list', params })
+  return request.get({ url: '/product/category/list', params })
 }

src/api/mall/product/index.js

@@ -1,33 +1,25 @@
 import request from '@/config/axios'
 // 查询列表
 export const getProductPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-product/page', params })
+  return await request.get({ url: '/admin-api/crm/erp-product//page', params })
 }
 
 // 查询详情
 export const getProduct = async (id) => {
-  return await request.get({ url: '/admin-api/crm/erp-product/get?id=' + id })
+  return await request.get({ url: '/admin-api/crm/erp-product//get?id=' + id })
 }
 
 // 新增
 export const createProduct = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-product/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/erp-product//create', data: data })
 }
 
 // 修改
 export const updateProduct = async (params) => {
-  return await request.put({ url: '/admin-api/crm/erp-product/update', data: params })
+  return await request.put({ url: '/admin-api/crm/erp-product//update', data: params })
 }
 
 // 删除
 export const deleteProduct = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/erp-product/delete?id=' + id })
-}
-
-export const getSimpleProductList = async () => {
-  return await request.get({ url: '/admin-api/crm/erp-product/simple-list' })
+  return await request.delete({ url: '/admin-api/crm/erp-product//delete?id=' + id })
 }

src/api/mall/product/productField.js

@@ -1,44 +0,0 @@
-import request from '@/config/axios'
-
-// 创建
-export const createField = (data) => {
-  return request.post({
-    url: '/admin-api/crm/param/create',
-    data: { ...data, module: 3 },
-    isSubmitForm: true
-  })
-}
-
-// 更新
-export const updateField = (data) => {
-  return request.put({ url: '/admin-api/crm/param/update', data })
-}
-
-// 删除
-export const deleteField = (id) => {
-  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
-}
-
-// 获得
-export const getField = (id) => {
-  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
-}
-
-// 获得精简信息列表
-export const getSimpleFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 3 } })
-}
-
-// 获取自定义字段
-export const getDiyFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 3 } })
-}
-
-// 状态修改
-export const updateFieldStatus = (signParamId, status) => {
-  const data = {
-    signParamId,
-    status
-  }
-  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
-}

src/api/mall/product/property.ts

@@ -42,11 +42,7 @@ export interface PropertyValueDetailVO {
 
 // 创建属性项
 export const createProperty = (data: PropertyVO) => {
-  return request.post({
-    url: '/admin-api/crm/erp-product-property/create',
-    data,
-    isSubmitForm: true
-  })
+  return request.post({ url: '/product/property/create', data })
 }
 
 // 更新属性项
@@ -93,7 +89,7 @@ export const getPropertyValue = (id: number): Promise<PropertyValueVO> => {
 
 // 创建属性值
 export const createPropertyValue = (data: PropertyValueVO) => {
-  return request.post({ url: '/admin-api/crm/erp-product-property-value/create', data })
+  return request.post({ url: '/product/property/value/create', data })
 }
 
 // 更新属性值

src/api/mall/product/spu.ts

@@ -0,0 +1,92 @@
+import request from '@/config/axios'
+
+export interface Property {
+  propertyId?: number // 属性编号
+  propertyName?: string // 属性名称
+  valueId?: number // 属性值编号
+  valueName?: string // 属性值名称
+}
+
+// TODO puhui999：是不是直接叫 Sku 更简洁一点哈。type 待后面，总感觉有个类型？
+export interface SkuType {
+  id?: number // 商品 SKU 编号
+  spuId?: number // SPU 编号
+  properties?: Property[] // 属性数组
+  price?: number // 商品价格
+  marketPrice?: number // 市场价
+  costPrice?: number // 成本价
+  barCode?: string // 商品条码
+  picUrl?: string // 图片地址
+  stock?: number // 库存
+  weight?: number // 商品重量，单位：kg 千克
+  volume?: number // 商品体积，单位：m^3 平米
+  subCommissionFirstPrice?: number // 一级分销的佣金
+  subCommissionSecondPrice?: number // 二级分销的佣金
+  salesCount?: number // 商品销量
+}
+
+// TODO puhui999：是不是直接叫 Spu 更简洁一点哈。type 待后面，总感觉有个类型？
+export interface SpuType {
+  id?: number
+  name?: string // 商品名称
+  categoryId?: number | null // 商品分类
+  keyword?: string // 关键字
+  unit?: number | null // 单位
+  picUrl?: string // 商品封面图
+  sliderPicUrls?: string[] // 商品轮播图
+  introduction?: string // 商品简介
+  deliveryTemplateId?: number | null // 运费模版
+  brandId?: number | null // 商品品牌编号
+  specType?: boolean // 商品规格
+  subCommissionType?: boolean // 分销类型
+  skus: SkuType[] // sku数组
+  description?: string // 商品详情
+  sort?: string // 商品排序
+  giveIntegral?: number // 赠送积分
+  virtualSalesCount?: number // 虚拟销量
+  recommendHot?: boolean // 是否热卖
+  recommendBenefit?: boolean // 是否优惠
+  recommendBest?: boolean // 是否精品
+  recommendNew?: boolean // 是否新品
+  recommendGood?: boolean // 是否优品
+}
+
+// 获得 Spu 列表
+export const getSpuPage = (params: PageParam) => {
+  return request.get({ url: '/product/spu/page', params })
+}
+
+// 获得 Spu 列表 tabsCount
+export const getTabsCount = () => {
+  return request.get({ url: '/product/spu/get-count' })
+}
+
+// 创建商品 Spu
+export const createSpu = (data: SpuType) => {
+  return request.post({ url: '/product/spu/create', data })
+}
+
+// 更新商品 Spu
+export const updateSpu = (data: SpuType) => {
+  return request.put({ url: '/product/spu/update', data })
+}
+
+// 更新商品 Spu status
+export const updateStatus = (data: { id: number; status: number }) => {
+  return request.put({ url: '/product/spu/update-status', data })
+}
+
+// 获得商品 Spu
+export const getSpu = (id: number) => {
+  return request.get({ url: `/product/spu/get-detail?id=${id}` })
+}
+
+// 删除商品 Spu
+export const deleteSpu = (id: number) => {
+  return request.delete({ url: `/product/spu/delete?id=${id}` })
+}
+
+// 导出商品 Spu Excel
+export const exportSpu = async (params) => {
+  return await request.download({ url: '/product/spu/export', params })
+}

src/api/mall/purchase/index.js

@@ -1,29 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getPurchasePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-purchase/page', params })
-}
-
-// 新增
-export const createPurchase = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-purchase/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updatePurchase = async (params) => {
-  return await request.put({ url: '/admin-api/crm/erp-purchase/update', data: params })
-}
-
-// 删除
-export const deletePurchase = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/erp-purchase/delete?id=' + id })
-}
-
-// 审核
-export const auditPurchase = async (data) => {
-  return await request.post({ url: '/admin-api/crm/erp-purchase/audit', data })
-}

src/api/mall/warehouse/index.js

@@ -1,49 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getWarehousePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-warehouse/page', params })
-}
-
-// 新增
-export const createWarehouse = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-warehouse/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateWarehouse = async (params) => {
-  return await request.put({ url: '/admin-api/crm/erp-warehouse/update', data: params })
-}
-
-// 删除
-export const deleteWarehouse = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/erp-warehouse/delete?id=' + id })
-}
-
-// 获取仓库
-export const getWarehouse = async (id) => {
-  return await request.get({ url: '/admin-api/crm/erp-warehouse/get?id=' + id })
-}
-
-// 获取仓库列表
-export const getSimpleWarehouseList = async () => {
-  return await request.get({ url: '/admin-api/crm/erp-warehouse/simple-list' })
-}
-
-// 获取库存
-export const getInventoryList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-inventory/page', params })
-}
-
-// 获取库存变动记录
-export const getInventoryRecord = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-inventory-record/page', params })
-}
-
-// 获取剩余库存
-export const getRemainInventoryList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-inventory-detail/list', params })
-}

src/api/school/class/index.js

@@ -5,10 +5,6 @@ export const getClassTypePage = async (params) => {
   return await request.get({ url: '/admin-api/crm/sch-class-type/page', params })
 }
 
-export const getClassTypeList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-class-type/list', params })
-}
-
 // 查询详情
 export const getClassType = async (id) => {
   return await request.get({ url: '/admin-api/crm/sch-class-type/get?id=' + id })
@@ -16,11 +12,7 @@ export const getClassType = async (id) => {
 
 // 新增
 export const createClassType = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-class-type/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/sch-class-type/create', data: data })
 }
 
 // 修改
@@ -30,7 +22,7 @@ export const updateClassType = async (params) => {
 
 // 删除
 export const deleteClassType = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sch-class-type/delete?id=' + id })
+  return await request.delete({ url: '/admin-api/crm/sch-class-type/delete?typeId=' + id })
 }
 
 // 修改状态

src/api/school/place/index.js

@@ -17,11 +17,7 @@ export const getPlace = async (id) => {
 
 // 新增
 export const createPlace = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-place/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/sch-place/create', data: data })
 }
 
 // 修改
@@ -34,10 +30,10 @@ export const deletePlace = async (id) => {
   return await request.delete({ url: '/admin-api/crm/sch-place/delete?id=' + id })
 }
 
-export const updatePlaceStatus = async (placeId, status) => {
+export const updatePlaceStatus = async (id, status) => {
   const data = {
-    placeId,
+    id,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data })
+  return request.put({ url: '/admin-api/crm/sch-place/update-status', data: data })
 }

src/api/school/sch/index.js

@@ -11,11 +11,7 @@ export const getSchool = async (id) => {
 
 // 新增
 export const createSchool = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-school/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/sch-school/create', data: data })
 }
 
 // 修改
@@ -28,10 +24,10 @@ export const deleteSchool = async (id) => {
   return await request.delete({ url: '/admin-api/crm/sch-school/delete?id=' + id })
 }
 
-export const updateSchoolStatus = async (schoolId, status) => {
+export const updateSchoolStatus = async (id, status) => {
   const data = {
-    schoolId,
+    id,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-school/status/update', data: data })
+  return request.put({ url: '/admin-api/crm/sch-school/update-status', data: data })
 }

src/api/school/setting/area.js

@@ -1,33 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getAreaPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/area/page', params })
-}
-
-export const getAreaSimpleList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/area/simple-list', params })
-}
-
-// 查询详情
-export const getArea = async (id) => {
-  return await request.get({ url: '/admin-api/crm/area/get?id=' + id })
-}
-
-// 新增
-export const createArea = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/area/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateArea = async (params) => {
-  return await request.put({ url: '/admin-api/crm/area/update', data: params })
-}
-
-// 删除
-export const deleteArea = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/area/delete?id=' + id })
-}

src/api/system/dept/index.ts

@@ -41,13 +41,3 @@ export const updateDept = async (params: DeptVO) => {
 export const deleteDept = async (id: number) => {
   return await request.delete({ url: '/admin-api/system/dept/delete?id=' + id })
 }
-
-// 获取部门业务指标
-export const getDeptTarget = async (deptId: number) => {
-  return await request.get({ url: '/admin-api/crm/dept-target/get', params: { deptId } })
-}
-
-// 更新部门业务指标
-export const updateDeptTarget = async (data: any) => {
-  return await request.put({ url: '/admin-api/crm/dept-target/save', data, isSubmitForm: true })
-}

src/api/system/dict/dict.data.ts

@@ -15,7 +15,7 @@ export type DictDataVO = {
 
 // 查询字典数据（精简)列表
 export const listSimpleDictData = () => {
-  return request.get({ url: '/admin-api/crm/dict-data/simple-list' })
+  return request.get({ url: '/admin-api/system/dict-data/simple-list' })
 }
 
 // 查询字典数据列表
@@ -44,11 +44,6 @@ export const deleteDictData = (id: number) => {
 }
 
 // 导出字典类型数据
-export const exportDictData = (params: any) => {
+export const exportDictData = (params) => {
   return request.get({ url: '/admin-api/crm/dict-data/export', params })
 }
-
-// 获取通用字典数据
-export const getGeneralSysDictData = (dictType: string) => {
-  return request.get({ url: '/admin-api/system/dict-data/get-by-type', params: { dictType } })
-}

src/api/system/library/index.js

@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 查询知识库列表
-export const getLibraryPage = (params) => {
-  return request.get({ url: '/admin-api/crm/knowledge-lib/page', params })
-}
-
-// 查询知识库详情
-export const getLibrary = (id) => {
-  return request.get({ url: '/admin-api/crm/knowledge-lib/get?id=' + id })
-}
-
-// 新增知识库
-export const createLibrary = (data) => {
-  return request.post({ url: '/admin-api/crm/knowledge-lib/create', data })
-}
-
-// 修改知识库
-export const updateLibrary = (data) => {
-  return request.put({ url: '/admin-api/crm/knowledge-lib/update', data })
-}
-
-// 删除知识库
-export const deleteLibrary = (id) => {
-  return request.delete({ url: '/admin-api/crm/knowledge-lib/delete?id=' + id })
-}

src/api/system/library/resource.js

@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 查询资源列表
-export const getResourcePage = (params) => {
-  return request.get({ url: '/admin-api/crm/knowledge-lib-info/page', params })
-}
-
-// 查询资源详情
-export const getResource = (id) => {
-  return request.get({ url: '/admin-api/crm/knowledge-lib-info/get?id=' + id })
-}
-
-// 新增资源
-export const createResource = (data) => {
-  return request.post({ url: '/admin-api/crm/knowledge-lib-info/create', data })
-}
-
-// 修改资源
-export const updateResource = (data) => {
-  return request.put({ url: '/admin-api/crm/knowledge-lib-info/update', data })
-}
-
-// 删除资源
-export const deleteResource = (id) => {
-  return request.delete({ url: '/admin-api/crm/knowledge-lib-info/delete?id=' + id })
-}

src/api/system/menu/index.ts

@@ -17,10 +17,7 @@ export interface MenuVO {
   alwaysShow?: boolean
   createTime: Date
 }
-// 获取服务列表
-export const getServiceAppList = () => {
-  return request.get({ url: '/admin-api/system/service/list' })
-}
+
 // 查询菜单（精简）列表
 export const getSimpleMenusList = () => {
   return request.get({ url: '/admin-api/system/menu/list-all-simple' })

src/api/system/notify/message/index.ts

@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import qs from 'qs'
 
 export interface NotifyMessageVO {
   id: number
@@ -15,39 +16,35 @@ export interface NotifyMessageVO {
 }
 
 // 查询站内信消息列表
-export const getNotifyMessagePage = async (params: any) => {
+export const getNotifyMessagePage = async (params: PageParam) => {
   return await request.get({ url: '/admin-api/system/notify-message/page', params })
 }
 
 // 获得我的站内信分页
-export const getMyNotifyMessagePage = async (params: any) => {
+export const getMyNotifyMessagePage = async (params: PageParam) => {
   return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
 }
 
 // 批量标记已读
-export const updateNotifyMessageRead = async (data: any) => {
+export const updateNotifyMessageRead = async (ids) => {
   return await request.put({
-    url: '/admin-api/system/notify-message/update-read?',
-    data
+    url:
+      '/admin-api/system/notify-message/update-read?' +
+      qs.stringify({ ids: ids }, { indices: false })
   })
 }
 
 // 标记所有站内信为已读
-export const updateAllNotifyMessageRead = async (data: any) => {
-  return await request.put({ url: '/admin-api/system/notify-message/update-all-read', data })
+export const updateAllNotifyMessageRead = async () => {
+  return await request.put({ url: '/admin-api/system/notify-message/update-all-read' })
 }
 
 // 获取当前用户的最新站内信列表
-export const getUnreadNotifyMessageList = async (params: any) => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list', params })
+export const getUnreadNotifyMessageList = async () => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list' })
 }
 
 // 获得当前用户的未读站内信数量
-export const getUnreadNotifyMessageCount = async (params: any) => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count', params })
-}
-
-// 获取详情
-export const getNotifyMessageDetail = async (id: number) => {
-  return await request.get({ url: '/admin-api/system/notify-message/get', params: { id } })
+export const getUnreadNotifyMessageCount = async () => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count' })
 }

src/api/system/role/daliyReport.js

@@ -1,25 +0,0 @@
-import request from '@/config/axios'
-
-// 获取角色快报配置
-export const getRoleDaliyReport = async (roleId) => {
-  return await request.get({
-    url: '/admin-api/system/role-message-setting/get',
-    params: { roleId }
-  })
-}
-
-// 保存角色每日快报配置
-export const updateRoleDaliyReport = async (data) => {
-  return await request.post({
-    url: '/admin-api/system/role-message-setting/save',
-    data,
-    isSubmitForm: true
-  })
-}
-
-// 获取每日快报发送内容
-export const getDaliyReportContent = async () => {
-  return await request.get({
-    url: '/admin-api/system/message-item/list-all-simple'
-  })
-}

src/api/system/set/index.js

@@ -1,16 +0,0 @@
-import request from '@/config/axios'
-
-// 通过key，查询内容
-export const getConfigByConfigKey = (params) => {
-  return request.get({ url: '/admin-api/crm/config/getConfigByConfigKey', params })
-}
-
-// 保存配置项
-export const updateConfig = (data) => {
-  return request.put({ url: '/admin-api/crm/config/batchUpdateConfigValue', data })
-}
-
-// 根据模块获取配置列表
-export const getConfigList = (params) => {
-  return request.get({ url: '/admin-api/crm/config/query', params })
-}

src/api/system/user/index.ts

@@ -74,13 +74,3 @@ export const updateUserStatus = (id: number, status: number) => {
 export const getSimpleUserList = (): Promise<UserVO[]> => {
   return request.get({ url: '/admin-api/system/user/list-all-simple' })
 }
-
-// 获取所有用户列表-无权限限制
-export const getAllUserList = (): Promise<UserVO[]> => {
-  return request.get({ url: '/admin-api/system/user/no/permission/list-all-simple' })
-}
-
-// 获取所有包括离职的用户
-export const getAllUserListWithHire = (): Promise<UserVO[]> => {
-  return request.get({ url: '/admin-api/system/user/no/permission/list-all' })
-}

src/components/Descriptions/src/Descriptions.vue

@@ -27,8 +27,7 @@ const props = defineProps({
   data: {
     type: Object as PropType<any>,
     default: () => ({})
-  },
-  defaultShow: propTypes.bool.def(true)
+  }
 })
 
 const { getPrefixCls } = useDesign()
@@ -58,7 +57,7 @@ const getBindItemValue = (item: DescriptionsSchema) => {
 }
 
 // 折叠
-const show = ref(props.defaultShow)
+const show = ref(true)
 
 const toggleClick = () => {
   if (props.collapse) {
@@ -78,7 +77,7 @@ const toggleClick = () => {
       v-if="title"
       :class="[
         `${prefixCls}-header`,
-        'h-40px flex justify-between items-center border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
+        'h-50px flex justify-between items-center border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
       ]"
       @click="toggleClick"
     >
@@ -132,7 +131,7 @@ const toggleClick = () => {
                 <DictTag :type="item.dictType" :value="data[item.field] + ''" />
               </slot>
               <slot v-else-if="item.isEditor">
-                <div v-if="data[item.field]" v-dompurify-html="data[item.field]"></div>
+                <div v-dompurify-html="data[item.field]"></div>
               </slot>
               <slot v-else :name="item.field" :row="data">{{ data[item.field] }}</slot>
             </template>

src/components/Dialog/src/Dialog.vue

@@ -55,8 +55,6 @@ const dialogStyle = computed(() => {
     height: unref(dialogHeight)
   }
 })
-
-const emit = defineEmits(['close'])
 </script>
 
 <template>
@@ -67,25 +65,20 @@ const emit = defineEmits(['close'])
     destroy-on-close
     draggable
     lock-scroll
-    append-to-body
     v-bind="getBindValue"
-    @close="emit('close')"
   >
     <template #header>
       <div class="flex justify-between">
         <slot name="title">
           {{ title }}
         </slot>
-        <div class="flex items-center">
-          <slot name="btn"></slot>
-          <Icon
-            v-if="fullscreen"
-            :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
-            class="mr-22px cursor-pointer is-hover z-10"
-            color="var(--el-color-info)"
-            @click="toggleFull"
-          />
-        </div>
+        <Icon
+          v-if="fullscreen"
+          :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
+          class="mr-22px cursor-pointer is-hover mt-2px z-10"
+          color="var(--el-color-info)"
+          @click="toggleFull"
+        />
       </div>
     </template>
 

src/components/Echart/src/Echart.vue

@@ -66,7 +66,6 @@ watch(
   (options) => {
     if (echartRef) {
       echartRef?.setOption(options)
-      resizeHandler()
     }
   },
   {

src/components/Editor/src/Editor.vue

@@ -6,7 +6,7 @@ import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 import { ElMessage } from 'element-plus'
 import { useLocaleStore } from '@/store/modules/locale'
-import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
+import { getAccessToken, getTenantId } from '@/utils/auth'
 
 type InsertFnType = (url: string, alt: string, href: string) => void
 
@@ -103,8 +103,7 @@ const editorConfig = computed((): IEditorConfig => {
           headers: {
             Accept: '*',
             Authorization: 'Bearer ' + getAccessToken(),
-            'tenant-id': getTenantId(),
-            'instance-id': getAppId()
+            'tenant-id': getTenantId()
           },
 
           // 跨域是否传递 cookie ，默认为 false
@@ -141,63 +140,6 @@ const editorConfig = computed((): IEditorConfig => {
           customInsert(res: any, insertFn: InsertFnType) {
             insertFn(res.data, 'image', res.data)
           }
-        },
-        ['uploadVideo']: {
-          server: import.meta.env.VITE_UPLOAD_URL,
-          // 单个文件的最大体积限制，默认为 2M
-          maxFileSize: 100 * 1024 * 1024,
-          // 最多可上传几个文件，默认为 100
-          maxNumberOfFiles: 10,
-          // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
-          allowedFileTypes: ['video/*'],
-
-          // 自定义上传参数，例如传递验证的 token 等。参数会被添加到 formData 中，一起上传到服务端。
-          meta: { updateSupport: 0 },
-          // 将 meta 拼接到 url 参数中，默认 false
-          metaWithUrl: true,
-
-          // 自定义增加 http  header
-          headers: {
-            Accept: '*',
-            Authorization: 'Bearer ' + getAccessToken(),
-            'tenant-id': getTenantId(),
-            'instance-id': getAppId()
-          },
-
-          // 跨域是否传递 cookie ，默认为 false
-          withCredentials: true,
-
-          // 超时时间，默认为 10 秒
-          timeout: 10 * 1000, // 5 秒
-
-          // form-data fieldName，后端接口参数名称，默认值wangeditor-uploaded-image
-          fieldName: 'file',
-
-          // 上传之前触发
-          onBeforeUpload(file: File) {
-            console.log(file)
-            return file
-          },
-          // 上传进度的回调函数
-          onProgress(progress: number) {
-            // progress 是 0-100 的数字
-            console.log('progress', progress)
-          },
-          onSuccess(file: File, res: any) {
-            console.log('onSuccess', file, res)
-          },
-          onFailed(file: File, res: any) {
-            alert(res.message)
-            console.log('onFailed', file, res)
-          },
-          onError(file: File, err: any, res: any) {
-            alert(err.message)
-            console.error('onError', file, err, res)
-          },
-          // 自定义插入图片
-          customInsert(res: any, insertFn: InsertFnType) {
-            insertFn(res.data, 'video', res.data)
-          }
         }
       },
       uploadImgShowBase64: true

src/components/Form/src/Form.vue

@@ -51,8 +51,7 @@ export default defineComponent({
     // 表单label宽度
     labelWidth: propTypes.oneOfType([String, Number]).def('auto'),
     // 是否 loading 数据中 add by 芋艿
-    vLoading: propTypes.bool.def(false),
-    inlineBlock: propTypes.bool.def(false)
+    vLoading: propTypes.bool.def(false)
   },
   emits: ['register'],
   setup(props, { slots, expose, emit }) {
@@ -78,10 +77,7 @@ export default defineComponent({
     })
 
     // 对表单赋值
-    const setValues = (data: Recordable = {}, isReset: Boolean = false) => {
-      if (isReset) {
-        formModel.value = initModel(unref(getProps).schema, unref(formModel))
-      }
+    const setValues = (data: Recordable = {}) => {
       formModel.value = Object.assign(unref(formModel), data)
     }
 
@@ -185,7 +181,11 @@ export default defineComponent({
       const slotsMap: Recordable = {
         ...setItemComponentSlots(slots, item?.componentProps?.slots, item.field)
       }
-      if (item?.component !== 'SelectV2' && item?.component !== 'Cascader' && item?.options) {
+      if (
+        item?.component !== 'SelectV2' &&
+        item?.component !== 'Cascader' &&
+        item?.componentProps?.options
+      ) {
         slotsMap.default = () => renderOptions(item)
       }
 
@@ -236,9 +236,6 @@ export default defineComponent({
                   vModel={formModel.value[item.field]}
                   {...(autoSetPlaceholder && setTextPlaceholder(item))}
                   {...setComponentProps(item)}
-                  filterable
-                  format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
-                  value-format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
                   style={baseSty + item.componentProps?.style}
                   // eslint-disable-next-line prettier/prettier
                   {...(notRenderOptions.includes(item?.component as string) && item?.componentProps?.options
@@ -294,7 +291,6 @@ export default defineComponent({
         model={props.isCustom ? props.model : formModel}
         class={prefixCls}
         v-loading={props.vLoading}
-        style={props.inlineBlock ? 'display: inline' : ''}
       >
         {{
           // 如果需要自定义，就什么都不渲染，而是提供默认插槽

src/components/Form/src/components/useRenderCheckbox.tsx

@@ -5,12 +5,12 @@ import { defineComponent } from 'vue'
 export const useRenderCheckbox = () => {
   const renderCheckboxOptions = (item: FormSchema) => {
     // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField
     const Com = (item.component === 'Checkbox' ? ElCheckbox : ElCheckboxButton) as ReturnType<
       typeof defineComponent
     >
-    return item?.options?.map((option) => {
+    return item?.componentProps?.options?.map((option) => {
       const { ...other } = option
       return (
         <Com {...other} label={option[valueAlias || 'value']}>

src/components/Form/src/components/useRenderRadio.tsx

@@ -5,12 +5,12 @@ import { defineComponent } from 'vue'
 export const useRenderRadio = () => {
   const renderRadioOptions = (item: FormSchema) => {
     // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField
     const Com = (item.component === 'Radio' ? ElRadio : ElRadioButton) as ReturnType<
       typeof defineComponent
     >
-    return item?.options?.map((option) => {
+    return item?.componentProps?.options?.map((option) => {
       const { ...other } = option
       return (
         <Com {...other} label={option[valueAlias || 'value']}>

src/components/Form/src/components/useRenderSelect.tsx

@@ -9,12 +9,12 @@ export const useRenderSelect = (slots: Slots) => {
   const renderSelectOptions = (item: FormSchema) => {
     // 如果有别名，就取别名
     const labelAlias = item?.componentProps?.optionsAlias?.labelField
-    return item?.options?.map((option) => {
-      if (option?.length) {
+    return item?.componentProps?.options?.map((option) => {
+      if (option?.options?.length) {
         return (
           <ElOptionGroup label={option[labelAlias || 'label']}>
             {() => {
-              return option?.map((v) => {
+              return option?.options?.map((v) => {
                 return renderSelectOptionItem(item, v)
               })
             }}
@@ -29,8 +29,8 @@ export const useRenderSelect = (slots: Slots) => {
   // 渲染 select option item
   const renderSelectOptionItem = (item: FormSchema, option: ComponentOptions) => {
     // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField
 
     const { label, value, ...other } = option
 

src/components/SSTable/index.vue

@@ -1,14 +1,7 @@
 <template>
   <div>
     <div class="flex">
-      <el-table
-        :data="tableObject.tableList"
-        :row-key="rowkey"
-        :expand-row-keys="expandRowKeys"
-        border
-        style="flex: 1"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table :data="tableObject.tableList" border style="flex: 1">
         <slot></slot>
       </el-table>
       <el-button
@@ -35,7 +28,7 @@
             @end="onDragEnd"
           >
             <template #item="{ element: item }">
-              <el-checkbox :key="item.id" :label="item.id">
+              <el-checkbox :key="item.field" :label="item.field">
                 {{ item.label }}
               </el-checkbox>
             </template>
@@ -46,7 +39,7 @@
     <!-- 分页 -->
     <Pagination
       v-model:limit="pageSize"
-      v-model:page="pageNo"
+      v-model:page="currentPage"
       :total="tableObject.total"
       @pagination="getList"
     />
@@ -55,33 +48,33 @@
 
 <script setup>
 import draggable from 'vuedraggable'
-import * as ClueCacheApi from '@/api/clue/clueCache'
+import { useUserStore } from '@/store/modules/user'
 import { useRoute } from 'vue-router'
+import cache from '@/plugins/cache'
 
 const props = defineProps({
   tableObject: { type: Object, default: () => ({ tableList: [] }) },
-  tableColumns: { type: Array, default: () => [] },
-  rowkey: { type: String, default: 'id' },
-  expandRowKeys: { type: Array, default: () => [] }
+  tableColumns: { type: Array, default: () => [] }
 })
 
-const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])
+const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns'])
 const route = useRoute()
+const { id: userId } = useUserStore().user //取用户ID
 
-const pageNo = ref(props.tableObject?.pageNo || 1)
+const currentPage = ref(props.tableObject?.currentPage || 1)
 
 const pageSize = ref(props.tableObject?.pageSize || 20)
 
 const ColumnSetting = ref()
 const TableColumnPop = ref()
 // 展示在设置里的所有表格列，由于会排序，所以使用新属性，不直接修改原值
-const allColumns = ref([...props.tableColumns])
+const allColumns = ref({})
 // 已勾选的选项
 const checkedColumns = ref([])
 
 // 调用获取数据的接口,分页时需要使用
 function getList({ page, limit }) {
-  emit('update:tableObject', { ...props.tableObject, pageNo: page, pageSize: limit })
+  emit('update:tableObject', { ...props.tableObject, currentPage: page, pageSize: limit })
   nextTick(() => {
     emit('getList')
   })
@@ -92,54 +85,67 @@ const clickSetting = () => {
   unref(TableColumnPop).TableColumnPop?.delayHide?.()
 }
 
-const routeMap = {
-  CluePool: 1,
-  ClueOrder: 2
+// 获取所有的表格列，注意如果本地有缓存使用缓存数据，因为用户可能已对表格列排序，并且不依赖网络请求，可更快渲染表头
+function getAllColumns() {
+  // 1. 先获取缓存表头
+  const localData = getColumn('TableColumnAll')[route.name] || []
+  // 2. 如果有缓存的表头，直接使用，并将新增的标题加入，如果没有缓存，那就得用获取到的表头
+  if (localData && localData) {
+    const newColumns = props.tableColumns.filter(
+      (item) => !localData.some((it) => it.field == item.field)
+    )
+    allColumns.value = [...localData, ...newColumns]
+  } else {
+    allColumns.value = [...props.tableColumns]
+  }
+}
+// 获取缓存的表头
+function getColumn(name = 'shitTable') {
+  return cache.local.get(`${name}-${userId}`) || {}
+}
+// 设置表头缓存
+function setColumn(val, name = 'shitTable') {
+  cache.local.set(`${name}-${userId}`, val)
 }
-
 // 获取用户已勾选的表头
-async function getUserCheckedColumns() {
-  checkedColumns.value = await ClueCacheApi.getClueCache({
-    settingType: 2,
-    model: routeMap[route.name]
-  })
-  // 回显到表格中
+function getUserCheckedColumns() {
+  // 1. 先获取缓存
+  const localData = getColumn('shitTable')[route.name]
+  // 2. 如果有缓存，使用缓存表头，否则使用默认的所有表头
+  if (localData && localData.length) {
+    checkedColumns.value = localData
+  } else {
+    checkedColumns.value = allColumns.value.map((it) => it.field)
+  }
+  // 3. 回显到表格中
   emitColumns()
 }
 
 // 表格列排序
 function onDragEnd() {
-  ClueCacheApi.setClueCache({
-    settingType: 2,
-    model: routeMap[route.name],
-    clueParamId: checkedColumns.value
-  })
-
-  // 表格回显
+  const obj = getColumn('TableColumnAll')
+  obj[route.name] = allColumns.value
+  // 1. 设置缓存
+  setColumn(obj, 'TableColumnAll')
+  // 2. 表格回显
   emitColumns()
 }
 
-function handleSelectionChange(val) {
-  emit('selection-change', val)
-}
-
 // 勾选确认
 function confirm() {
-  ClueCacheApi.setClueCache({
-    settingType: 2,
-    model: routeMap[route.name],
-    clueParamId: checkedColumns.value
-  })
-  // usedSchema.value = allColumns.value.filter((it) => checkedColumns.value.includes(it.id))
+  const obj = getColumn()
+  obj[route.name] = checkedColumns.value
+  setColumn(obj, 'shitTable')
   emitColumns()
 }
 
 // 将表头数据返回至父组件
 function emitColumns() {
-  const arr = allColumns.value.filter((item) => checkedColumns.value.includes(item.id))
+  const arr = allColumns.value.filter((item) => checkedColumns.value.includes(item.field))
   emit('getCheckedColumns', arr)
 }
 
+getAllColumns()
 getUserCheckedColumns()
 
 defineExpose({ getUserCheckedColumns })

src/components/Search/src/Search.vue

@@ -7,10 +7,12 @@ import { findIndex } from '@/utils'
 import { cloneDeep } from 'lodash-es'
 import { FormSchema } from '@/types/form'
 
+import { useUserStore } from '@/store/modules/user'
 import { useRoute } from 'vue-router'
-import * as ClueCacheApi from '@/api/clue/clueCache'
+import cache from '@/plugins/cache'
 
 const route = useRoute()
+const { id: userId } = useUserStore().user //取用户ID
 
 const { t } = useI18n()
 
@@ -31,21 +33,20 @@ const props = defineProps({
     .validate((v: string) => ['left', 'center', 'right'].includes(v))
     .def('center'),
   showLabel: propTypes.bool.def(false),
-  showSearch: propTypes.bool.def(false),
-  showReset: propTypes.bool.def(false),
+  showSearch: propTypes.bool.def(true),
+  showReset: propTypes.bool.def(true),
   // 是否显示伸缩
   expand: propTypes.bool.def(false),
   // 伸缩的界限字段
   expandField: propTypes.string.def(''),
   inline: propTypes.bool.def(true),
-  inlineBlock: propTypes.bool.def(false),
   model: {
     type: Object as PropType<Recordable>,
     default: () => ({})
   }
 })
 
-// const emit = defineEmits(['search', 'reset'])
+const emit = defineEmits(['search', 'reset'])
 
 const visible = ref(true)
 
@@ -59,11 +60,6 @@ const usedSchema = ref([])
 
 const newSchema = computed(() => {
   let schema: FormSchema[] = cloneDeep(usedSchema.value)
-  schema.forEach((item: FormSchema) => {
-    if (item.component == 'TreeSelect') {
-      item.componentProps['check-strictly'] = true
-    }
-  })
   if (props.expand && props.expandField && !unref(visible)) {
     const index = findIndex(schema, (v: FormSchema) => v.field === props.expandField)
     if (index > -1) {
@@ -84,26 +80,37 @@ const newSchema = computed(() => {
   return schema
 })
 
-const routeMap = {
-  CluePool: 1,
-  ClueOrder: 2
-}
-async function initSearch() {
+function initSearch() {
   reset()
-  checkedSchema.value = await ClueCacheApi.getClueCache({
-    settingType: 1,
-    model: routeMap[route.name]
-  })
-  usedSchema.value = props.schema.filter((it) => checkedSchema.value.includes(it.id))
+  // 1. 先获取缓存
+  const localData = getColumn('Schema')[route.name]
+  // 2. 如果有缓存，使用缓存表头，否则使用默认的所有表头
+  if (localData && localData.length) {
+    usedSchema.value = localData
+  } else {
+    const obj = getColumn('Schema')
+    obj[route.name] = [props.schema[0]]
+    setSchema(obj)
+    usedSchema.value = [props.schema[0]]
+  }
+  checkedSchema.value = usedSchema.value.map((it) => it.field)
 }
 
 function changeSearch() {
-  ClueCacheApi.setClueCache({
-    settingType: 1,
-    model: routeMap[route.name],
-    clueParamId: checkedSchema.value
-  })
-  usedSchema.value = props.schema.filter((it) => checkedSchema.value.includes(it.id))
+  const obj = getColumn('Schema')
+  obj[route.name] = props.schema.filter((item) => checkedSchema.value.includes(item.field))
+  setSchema(obj)
+  initSearch()
+}
+
+// 获取缓存的查询条件
+function getColumn(name = 'Schema') {
+  return cache.local.get(`${name}-${userId}`) || {}
+}
+
+// 设置查询条件缓存
+function setSchema(val: Array<Object>, name = 'Schema') {
+  cache.local.set(`${name}-${userId}`, val)
 }
 
 function setSearch() {
@@ -114,34 +121,23 @@ const { register, elFormRef, methods } = useForm({
   model: props.model || {}
 })
 
-// const search = async () => {
-//   await unref(elFormRef)?.validate(async (isValid) => {
-//     if (isValid) {
-//       const { getFormData } = methods
-//       const model = await getFormData()
-//       emit('search', model)
-//     }
-//   })
-// }
+const search = async () => {
+  await unref(elFormRef)?.validate(async (isValid) => {
+    if (isValid) {
+      const { getFormData } = methods
+      const model = await getFormData()
+      emit('search', model)
+    }
+  })
+}
 
 const reset = async () => {
   unref(elFormRef)?.resetFields()
-  // const { getFormData } = methods
-  // const model = await getFormData()
-  // emit('reset', model)
-}
-
-async function getFormModel() {
   const { getFormData } = methods
   const model = await getFormData()
-  return model
+  emit('reset', model)
 }
 
-defineExpose({
-  getFormModel,
-  reset
-})
-
 const bottonButtonStyle = computed(() => {
   return {
     textAlign: props.buttomPosition as unknown as 'left' | 'center' | 'right'
@@ -160,7 +156,6 @@ initSearch()
   <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
   <Form
     :inline="inline"
-    :inlineBlock="inlineBlock"
     :is-col="isCol"
     :is-custom="false"
     isSearch
@@ -173,7 +168,10 @@ initSearch()
   >
     <template #action>
       <div v-if="layout === 'inline'">
-        <ElButton ref="SchemaSetting" @click="setSearch"> 查询设置 </ElButton>
+        <ElButton ref="SchemaSetting" @click="setSearch">
+          <!-- <Icon class="mr-5px" icon="ep:setting" /> -->
+          查询设置
+        </ElButton>
         <el-popover
           ref="SettingPop"
           :virtual-ref="SchemaSetting"
@@ -183,7 +181,7 @@ initSearch()
           virtual-triggering
         >
           <el-checkbox-group v-model="checkedSchema" @change="changeSearch">
-            <el-checkbox v-for="item in schema" :key="item.id" :label="item.id">
+            <el-checkbox v-for="item in schema" :key="item.field" :label="item.field">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
@@ -201,10 +199,10 @@ initSearch()
         </ElButton>
         <!-- add by 芋艿：补充在搜索后的按钮 -->
         <slot name="actionMore"></slot>
-        <!-- <ElButton v-if="expand" text @click="setVisible">
+        <ElButton v-if="expand" text @click="setVisible">
           {{ t(visible ? 'common.shrink' : 'common.expand') }}
-          <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
-        </ElButton> -->
+          <!-- <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" /> -->
+        </ElButton>
       </div>
     </template>
     <template v-for="name in Object.keys($slots)" :key="name" #[name]>

src/components/UploadFile/src/UploadFile.vue

@@ -23,10 +23,10 @@
     >
       <el-button type="primary"><Icon icon="ep:upload-filled" />选取文件</el-button>
       <template v-if="isShowTip" #tip>
-        <div style="font-size: 12px">
+        <div style="font-size: 8px">
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
         </div>
-        <div style="font-size: 12px">
+        <div style="font-size: 8px">
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
         </div>
       </template>
@@ -34,18 +34,23 @@
   </div>
 </template>
 <script setup lang="ts" name="UploadFile">
+import { PropType } from 'vue'
+
 import { propTypes } from '@/utils/propTypes'
-import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
+import { getAccessToken, getTenantId } from '@/utils/auth'
 import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+
 const message = useMessage() // 消息弹窗
 const emit = defineEmits(['update:modelValue'])
 
 const props = defineProps({
-  modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
+  modelValue: {
+    type: Array as PropType<UploadUserFile[]>,
+    required: true
+  },
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
-  // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
-  fileType: propTypes.array.def([]),
+  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   accept: propTypes.string.def('*'),
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
@@ -61,10 +66,8 @@ const fileList = ref<UploadUserFile[]>(props.modelValue)
 const uploadNumber = ref<number>(0)
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
-  'tenant-id': getTenantId(),
-  'instance-id': getAppId()
+  'tenant-id': getTenantId()
 })
-
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {

src/components/UploadFile/src/UploadImg.vue

@@ -55,7 +55,7 @@ import type { UploadProps } from 'element-plus'
 
 import { generateUUID } from '@/utils'
 import { propTypes } from '@/utils/propTypes'
-import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
+import { getAccessToken, getTenantId } from '@/utils/auth'
 
 type FileTypes =
   | 'image/apng'
@@ -96,8 +96,7 @@ const deleteImg = () => {
 
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
-  'tenant-id': getTenantId(),
-  'instance-id': getAppId()
+  'tenant-id': getTenantId()
 })
 
 const editImg = () => {

src/components/UploadFile/src/UploadImgs.vue

@@ -3,12 +3,11 @@
     <el-upload
       v-model:file-list="fileList"
       :accept="fileType.join(',')"
-      :action="uploadUrl"
+      :action="updateUrl"
       :before-upload="beforeUpload"
       :class="['upload', drag ? 'no-border' : '']"
-      :disabled="disabled"
       :drag="drag"
-      :http-request="httpRequest"
+      :headers="uploadHeaders"
       :limit="limit"
       :multiple="true"
       :on-error="uploadError"
@@ -29,7 +28,7 @@
             <Icon icon="ep:zoom-in" />
             <span>查看</span>
           </div>
-          <div v-if="!disabled" class="handle-icon" @click="handleRemove(file)">
+          <div class="handle-icon" @click="handleRemove(file)">
             <Icon icon="ep:delete" />
             <span>删除</span>
           </div>
@@ -46,14 +45,13 @@
     />
   </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" name="UploadImgs" setup>
+import { PropType } from 'vue'
 import type { UploadFile, UploadProps, UploadUserFile } from 'element-plus'
 import { ElNotification } from 'element-plus'
 
 import { propTypes } from '@/utils/propTypes'
-import { useUpload } from './useUpload'
-
-defineOptions({ name: 'UploadImgs' })
+import { getAccessToken, getTenantId } from '@/utils/auth'
 
 const message = useMessage() // 消息弹窗
 
@@ -70,7 +68,11 @@ type FileTypes =
   | 'image/x-icon'
 
 const props = defineProps({
-  modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
+  modelValue: {
+    type: Array as PropType<UploadUserFile[]>,
+    required: true
+  },
+  updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
   drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传（默认为 true）
   disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传（默认为 false）
   limit: propTypes.number.def(5), // 最大图片上传数 ==> 非必传（默认为 5张）
@@ -78,14 +80,27 @@ const props = defineProps({
   fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传（默认为 ["image/jpeg", "image/png", "image/gif"]）
   height: propTypes.string.def('150px'), // 组件高度 ==> 非必传（默认为 150px）
   width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传（默认为 150px）
-  borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
+  borderRadius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
 })
 
-const { uploadUrl, httpRequest } = useUpload()
+const uploadHeaders = ref({
+  Authorization: 'Bearer ' + getAccessToken(),
+  'tenant-id': getTenantId()
+})
 
-const fileList = ref<UploadUserFile[]>([])
-const uploadNumber = ref<number>(0)
-const uploadList = ref<UploadUserFile[]>([])
+const fileList = ref<UploadUserFile[]>()
+// fix: 改为动态监听赋值解决图片回显问题
+watch(
+  () => props.modelValue,
+  (data) => {
+    if (!data) return
+    fileList.value = data
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
 /**
  * @description 文件上传之前判断
  * @param rawFile 上传的文件
@@ -105,60 +120,29 @@ const beforeUpload: UploadProps['beforeUpload'] = (rawFile) => {
       message: `上传图片大小不能超过 ${props.fileSize}M！`,
       type: 'warning'
     })
-  uploadNumber.value++
   return imgType.includes(rawFile.type as FileTypes) && imgSize
 }
 
 // 图片上传成功
 interface UploadEmits {
-  (e: 'update:modelValue', value: string[]): void
+  (e: 'update:modelValue', value: UploadUserFile[]): void
 }
 
 const emit = defineEmits<UploadEmits>()
-const uploadSuccess: UploadProps['onSuccess'] = (res: any): void => {
+const uploadSuccess = (response, uploadFile: UploadFile) => {
+  if (!response) return
+  // TODO 多图上传组件成功后只是把保存成功后的url替换掉组件选图时的文件路径，所以返回的fileList包含的是一个包含文件信息的对象列表
+  uploadFile.url = response.data
+  emit('update:modelValue', fileList.value)
   message.success('上传成功')
-  // 删除自身
-  const index = fileList.value.findIndex((item) => item.response?.data === res.data)
-  fileList.value.splice(index, 1)
-  uploadList.value.push({ name: res.data, url: res.data })
-  if (uploadList.value.length == uploadNumber.value) {
-    fileList.value.push(...uploadList.value)
-    uploadList.value = []
-    uploadNumber.value = 0
-    emitUpdateModelValue()
-  }
 }
 
-// 监听模型绑定值变动
-watch(
-  () => props.modelValue,
-  (val: string | string[]) => {
-    if (!val) {
-      fileList.value = [] // fix：处理掉缓存，表单重置后上传组件的内容并没有重置
-      return
-    }
-
-    fileList.value = [] // 保障数据为空
-    fileList.value.push(
-      ...(val as string[]).map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url }))
-    )
-  },
-  { immediate: true, deep: true }
-)
-// 发送图片链接列表更新
-const emitUpdateModelValue = () => {
-  let result: string[] = fileList.value.map((file) => file.url!)
-  emit('update:modelValue', result)
-}
 // 删除图片
 const handleRemove = (uploadFile: UploadFile) => {
   fileList.value = fileList.value.filter(
     (item) => item.url !== uploadFile.url || item.name !== uploadFile.name
   )
-  emit(
-    'update:modelValue',
-    fileList.value.map((file) => file.url!)
-  )
+  emit('update:modelValue', fileList.value)
 }
 
 // 图片上传错误提示
@@ -232,7 +216,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       padding: 0;
       overflow: hidden;
       border: 1px dashed var(--el-border-color-darker);
-      border-radius: v-bind(borderradius);
+      border-radius: v-bind(borderRadius);
 
       &:hover {
         border: 1px dashed var(--el-color-primary);
@@ -249,7 +233,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       width: v-bind(width);
       height: v-bind(height);
       background-color: transparent;
-      border-radius: v-bind(borderradius);
+      border-radius: v-bind(borderRadius);
     }
 
     .upload-image {
@@ -262,16 +246,16 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       position: absolute;
       top: 0;
       right: 0;
+      box-sizing: border-box;
       display: flex;
+      align-items: center;
+      justify-content: center;
       width: 100%;
       height: 100%;
       cursor: pointer;
       background: rgb(0 0 0 / 60%);
       opacity: 0;
-      box-sizing: border-box;
       transition: var(--el-transition-duration-fast);
-      align-items: center;
-      justify-content: center;
 
       .handle-icon {
         display: flex;

src/components/UploadFile/src/useUpload.ts

@@ -1,93 +0,0 @@
-import * as FileApi from '@/api/infra/file'
-import CryptoJS from 'crypto-js'
-import { UploadRawFile, UploadRequestOptions } from 'element-plus/es/components/upload/src/upload'
-import axios from 'axios'
-
-export const useUpload = () => {
-  // 后端上传地址
-  const uploadUrl = import.meta.env.VITE_UPLOAD_URL
-  // 是否使用前端直连上传
-  const isClientUpload = UPLOAD_TYPE.CLIENT === import.meta.env.VITE_UPLOAD_TYPE
-  // 重写ElUpload上传方法
-  const httpRequest = async (options: UploadRequestOptions) => {
-    // 模式一：前端上传
-    if (isClientUpload) {
-      // 1.1 生成文件名称
-      const fileName = await generateFileName(options.file)
-      // 1.2 获取文件预签名地址
-      const presignedInfo = await FileApi.getFilePresignedUrl(fileName)
-      // 1.3 上传文件（不能使用 ElUpload 的 ajaxUpload 方法的原因：其使用的是 FormData 上传，Minio 不支持）
-      return axios.put(presignedInfo.uploadUrl, options.file).then(() => {
-        // 1.4. 记录文件信息到后端（异步）
-        createFile(presignedInfo, fileName, options.file)
-        // 通知成功，数据格式保持与后端上传的返回结果一致
-        return { data: presignedInfo.url }
-      })
-    } else {
-      // 模式二：后端上传
-      // 重写 el-upload httpRequest 文件上传成功会走成功的钩子，失败走失败的钩子
-      return new Promise((resolve, reject) => {
-        FileApi.updateFile({ file: options.file })
-          .then((res) => {
-            if (res.code === 0) {
-              resolve(res)
-            } else {
-              reject(res)
-            }
-          })
-          .catch((res) => {
-            reject(res)
-          })
-      })
-    }
-  }
-
-  return {
-    uploadUrl,
-    httpRequest
-  }
-}
-
-/**
- * 创建文件信息
- * @param vo 文件预签名信息
- * @param name 文件名称
- * @param file 文件
- */
-function createFile(vo: FileApi.FilePresignedUrlRespVO, name: string, file: UploadRawFile) {
-  const fileVo = {
-    configId: vo.configId,
-    url: vo.url,
-    path: name,
-    name: file.name,
-    type: file.type,
-    size: file.size
-  }
-  FileApi.createFile(fileVo)
-  return fileVo
-}
-
-/**
- * 生成文件名称（使用算法SHA256）
- * @param file 要上传的文件
- */
-async function generateFileName(file: UploadRawFile) {
-  // 读取文件内容
-  const data = await file.arrayBuffer()
-  const wordArray = CryptoJS.lib.WordArray.create(data)
-  // 计算SHA256
-  const sha256 = CryptoJS.SHA256(wordArray).toString()
-  // 拼接后缀
-  const ext = file.name.substring(file.name.lastIndexOf('.'))
-  return `${sha256}${ext}`
-}
-
-/**
- * 上传类型
- */
-enum UPLOAD_TYPE {
-  // 客户端直接上传（只支持S3服务）
-  CLIENT = 'client',
-  // 客户端发送到后端上传
-  SERVER = 'server'
-}

src/config/axios/config.ts

@@ -7,7 +7,7 @@ const config: {
   /**
    * api请求基础路径
    */
-  base_url: import.meta.env.VITE_API_BASEPATH,
+  base_url: 'http://localhost' + import.meta.env.VITE_API_BASEPATH,
   /**
    * 接口成功返回状态码
    */

src/config/axios/index.ts

@@ -5,11 +5,10 @@ import { config } from './config'
 const { default_headers } = config
 
 const request = (option: any) => {
-  const { url, method, params, data, headersType, responseType, isSubmitForm } = option
+  const { url, method, params, data, headersType, responseType } = option
   return service({
     url: url,
     method,
-    isSubmitForm,
     params,
     data,
     responseType: responseType,

src/config/axios/service.ts

@@ -20,7 +20,7 @@ import {
 import errorCode from './errorCode'
 
 import { resetRouter } from '@/router'
-import cache from '@/plugins/cache'
+import { useCache } from '@/hooks/web/useCache'
 
 const { result_code, base_url, request_timeout } = config
 
@@ -62,11 +62,15 @@ service.interceptors.request.use(
     }
     // 设置租户
     const tenantId = getTenantId()
-    if (tenantId) (config as Recordable).headers['tenant-id'] = tenantId
+    if (tenantId) {
+      ;(config as Recordable).headers['tenant-id'] = tenantId
+    }
 
     // 设置实例
     const appId = getAppId()
-    if (appId) (config as Recordable).headers['instance-id'] = appId
+    if (appId) {
+      ;(config as Recordable).headers['instance-id'] = appId
+    }
 
     const params = config.params || {}
     const data = config.data || false
@@ -79,39 +83,27 @@ service.interceptors.request.use(
     }
     // get参数编码
     if (config.method?.toUpperCase() === 'GET' && params) {
-      config.params = {}
-      const paramsStr = qs.stringify(params, { allowDots: true })
-      if (paramsStr) {
-        config.url = config.url + '?' + paramsStr
-      }
-    }
-    // 是否提交表单型的接口，如果是，不要频繁调接口
-    if (config?.isSubmitForm) {
-      const requestObj = {
-        url: config.url,
-        data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-        time: new Date().getTime()
-      }
-      const sessionObj = cache.session.get('sessionObj')
-      if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-        cache.session.set('sessionObj', requestObj)
-      } else {
-        const s_url = sessionObj.url // 请求地址
-        const s_data = sessionObj.data // 请求数据
-        const s_time = sessionObj.time // 请求时间
-        const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交
-        if (
-          s_data === requestObj.data &&
-          requestObj.time - s_time < interval &&
-          s_url === requestObj.url
-        ) {
-          const message = '数据正在处理，请勿重复提交'
-          console.warn(`[${s_url}]: ` + message)
-          return Promise.reject(new Error(message))
-        } else {
-          cache.session.set('sessionObj', requestObj)
+      let url = config.url + '?'
+      for (const propName of Object.keys(params)) {
+        const value = params[propName]
+        if (value !== void 0 && value !== null && typeof value !== 'undefined') {
+          if (typeof value === 'object') {
+            for (const val of Object.keys(value)) {
+              const params = propName + '[' + val + ']'
+              const subPart = encodeURIComponent(params) + '='
+              url += subPart + encodeURIComponent(value[val]) + '&'
+            }
+          } else {
+            url += `${propName}=${encodeURIComponent(value)}&`
+          }
         }
       }
+      // 给 get 请求加上时间戳参数，避免从缓存中拿数据
+      // const now = new Date().getTime()
+      // params = params.substring(0, url.length - 1) + `?_t=${now}`
+      url = url.slice(0, -1)
+      config.params = {}
+      config.url = url
     }
     return config
   },
@@ -187,7 +179,7 @@ service.interceptors.response.use(
         })
       }
     } else if (code === 500) {
-      ElMessage.error(t(msg || 'sys.api.errMsg500'))
+      ElMessage.error(t('sys.api.errMsg500'))
       return Promise.reject(new Error(msg))
     } else if (code === 901) {
       ElMessage.error({
@@ -205,23 +197,8 @@ service.interceptors.response.use(
       if (msg === '无效的刷新令牌') {
         // hard coding：忽略这个提示，直接登出
         console.log(msg)
-      } else if (code == 18888) {
-        return { data }
       } else {
         ElNotification.error({ title: msg })
-        if (code == 403) {
-          ElMessageBox.confirm(`${msg},是否重新登陆`, '提示', {
-            type: 'warning'
-          }).then(() => {
-            // 无访问权限，退出登录
-            const tenantId = cache.local.get('TENANT_ID')
-            const appId = cache.local.get('App_ID')
-            resetRouter() // 重置静态路由表
-            cache.local.clear()
-            removeToken()
-            window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
-          })
-        }
       }
       return Promise.reject('error')
     } else {
@@ -259,15 +236,16 @@ const handleAuthorized = () => {
       confirmButtonText: t('login.relogin'),
       type: 'warning'
     }).then(() => {
-      const tenantId = cache.local.get('TENANT_ID')
-      const appId = cache.local.get('App_ID')
+      const { wsCache } = useCache()
+      const tenantId = wsCache.get('TENANT_ID')
+      const appId = wsCache.get('App_ID')
       resetRouter() // 重置静态路由表
-      cache.local.clear()
+      wsCache.clear()
       removeToken()
       isRelogin.show = false
       // 干掉token后再走一次路由让它过router.beforeEach的校验
       // window.location.href = window.location.href
-      window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
+      window.location.href = `/login?tenantId=${tenantId}&appId=${appId}`
     })
   }
   return Promise.reject(t('sys.api.timeoutMessage'))

src/directives/permission/hasPermi.ts

@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 const { t } = useI18n() // 国际化
 
 export function hasPermi(app: App<Element>) {
   app.directive('hasPermi', (el, binding) => {
+    const { wsCache } = useCache()
     const { value } = binding
     const all_permission = '*:*:*'
-    const permissions = cache.local.get(CACHE_KEY.USER)?.permissions || []
+    const permissions = wsCache.get(CACHE_KEY.USER).permissions
 
     if (value && value instanceof Array && value.length > 0) {
       const permissionFlag = value

src/directives/permission/hasRole.ts

@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 const { t } = useI18n() // 国际化
 
 export function hasRole(app: App<Element>) {
   app.directive('hasRole', (el, binding) => {
+    const { wsCache } = useCache()
     const { value } = binding
     const super_admin = 'admin'
-    const roles = cache.local.get(CACHE_KEY.USER).roles
+    const roles = wsCache.get(CACHE_KEY.USER).roles
 
     if (value && value instanceof Array && value.length > 0) {
       const roleFlag = value

src/hooks/web/useCrudSchemas.ts

@@ -119,8 +119,7 @@ const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): F
         componentProps: comonentProps,
         ...schemaItem.search,
         field: schemaItem.field,
-        label: schemaItem.search?.label || schemaItem.label,
-        id: schemaItem.clueParamId
+        label: schemaItem.search?.label || schemaItem.label
       }
       if (searchSchemaItem.api) {
         searchRequestTask.push(async () => {
@@ -166,8 +165,7 @@ const filterTableSchema = (crudSchema: CrudSchema[]): TableColumn[] => {
         }
         return {
           ...schema.table,
-          ...schema,
-          id: schema.clueParamId
+          ...schema
         }
       }
     }
@@ -229,7 +227,6 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
         value: defaultValue,
         ...schemaItem.form,
         field: schemaItem.field,
-        isRequired: schemaItem.isRequired,
         label: schemaItem.form?.label || schemaItem.label
       }
 

src/hooks/web/useWatermark.ts

@@ -15,14 +15,14 @@ export function useWatermark(appendEl: HTMLElement | null = document.body) {
     clear()
 
     const can = document.createElement('canvas')
-    can.width = 500
+    can.width = 300
     can.height = 240
 
     const cans = can.getContext('2d')
     if (cans) {
       cans.rotate((-20 * Math.PI) / 120)
       cans.font = '15px Vedana'
-      cans.fillStyle = 'rgba(0, 0, 0, 0.05)'
+      cans.fillStyle = 'rgba(0, 0, 0, 0.15)'
       cans.textAlign = 'left'
       cans.textBaseline = 'middle'
       cans.fillText(str, can.width / 20, can.height)

src/layout/components/Message/src/Message.vue

@@ -1,9 +1,6 @@
 <script lang="ts" name="Message" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
-import { useUserStore } from '@/store/modules/user'
-
-const userStore = useUserStore()
 
 const { push } = useRouter()
 const activeName = ref('notice')
@@ -12,27 +9,22 @@ const list = ref<any[]>([]) // 消息列表
 
 // 获得消息列表
 const getList = async () => {
-  const data = await NotifyMessageApi.getUnreadNotifyMessageList({
-    roleId: userStore.getUser?.currentRole
-  })
-  list.value = data.list
+  list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
   // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
   unreadCount.value = 0
 }
 
 // 获得未读消息数
 const getUnreadCount = async () => {
-  NotifyMessageApi.getUnreadNotifyMessageCount({ roleId: userStore.getUser?.currentRole }).then(
-    (data) => {
-      unreadCount.value = data
-    }
-  )
+  NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
+    unreadCount.value = data
+  })
 }
 
 // 跳转我的站内信
 const goMyList = () => {
   push({
-    name: 'NotifyMessage'
+    name: 'MyNotifyMessage'
   })
 }
 
@@ -64,9 +56,10 @@ onUnmounted(() => {
           <div class="message-list">
             <template v-for="item in list" :key="item.id">
               <div class="message-item">
+                <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
                 <div class="message-content">
                   <span class="message-title">
-                    {{ item.title }}
+                    {{ item.templateNickname }}：{{ item.templateContent }}
                   </span>
                   <span class="message-date">
                     {{ formatDate(item.createTime) }}
@@ -101,7 +94,7 @@ onUnmounted(() => {
   .message-item {
     display: flex;
     align-items: center;
-    padding: 5px 0;
+    padding: 20px 0;
     border-bottom: 1px solid var(--el-border-color-light);
 
     &:last-child {
@@ -120,7 +113,6 @@ onUnmounted(() => {
 
       .message-title {
         margin-bottom: 5px;
-        font-weight: bold;
       }
 
       .message-date {

src/layout/components/Setting/src/Setting.vue

@@ -2,9 +2,8 @@
 // import { ElMessage } from 'element-plus'
 // import { useClipboard, useCssVar } from '@vueuse/core'
 import { useCssVar } from '@vueuse/core'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
-import cache from '@/plugins/cache'
 
 import { setCssVar, trim } from '@/utils'
 import { colorIsDark, hexToRGB, lighten } from '@/utils/color'
@@ -13,13 +12,6 @@ import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
 // import InterfaceDisplay from './components/InterfaceDisplay.vue'
 // import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
-import { useWatermark } from '@/hooks/web/useWatermark'
-
-const { setWatermark } = useWatermark()
-
-nextTick(() => {
-  setWatermark('安徽莳松科技有限公司')
-})
 
 const { t } = useI18n()
 const appStore = useAppStore()
@@ -196,16 +188,16 @@ watch(
 
 // 清空缓存
 const clear = () => {
-  cache.local.delete(CACHE_KEY.LAYOUT)
-  cache.local.delete(CACHE_KEY.THEME)
-  cache.local.delete(CACHE_KEY.IS_DARK)
+  const { wsCache } = useCache()
+  wsCache.delete(CACHE_KEY.LAYOUT)
+  wsCache.delete(CACHE_KEY.THEME)
+  wsCache.delete(CACHE_KEY.IS_DARK)
   window.location.reload()
 }
 </script>
 
 <template>
   <div
-    v-if="false"
     :class="prefixCls"
     class="fixed top-[45%] right-0 w-40px h-40px text-center leading-40px bg-[var(--el-color-primary)] cursor-pointer"
     @click="drawer = true"
@@ -213,9 +205,7 @@ const clear = () => {
     <Icon color="#fff" icon="ep:setting" />
   </div>
 
-  <div @click="drawer = true">主题配置</div>
-
-  <ElDrawer v-model="drawer" :z-index="4000" append-to-body direction="rtl" size="350px">
+  <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="350px">
     <template #header>
       <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
     </template>

src/layout/components/Setting/src/components/InterfaceDisplay.vue

@@ -124,6 +124,7 @@ const fixedMenuChange = (show: boolean) => {
 const setWater = () => {
   setWatermark(water.value)
 }
+setWater()
 
 const layout = computed(() => appStore.getLayout)
 

src/layout/components/UserInfo/src/UserInfo.vue

@@ -1,18 +1,17 @@
 <script lang="ts" name="UserInfo" setup>
 import { ElMessageBox } from 'element-plus'
 
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { getTenantId, getAppId } from '@/utils/auth'
-import cache from '@/plugins/cache'
-
-import { Setting } from '@/layout/components/Setting'
 
 const { t } = useI18n()
 
+const { wsCache } = useCache()
+
 const { push, replace } = useRouter()
 
 const userStore = useUserStore()
@@ -23,7 +22,7 @@ const { getPrefixCls } = useDesign()
 
 const prefixCls = getPrefixCls('user-info')
 
-const user = cache.local.get(CACHE_KEY.USER)
+const user = wsCache.get(CACHE_KEY.USER)
 
 const avatar = user.user.avatar ? user.user.avatar : avatarImg
 
@@ -59,10 +58,6 @@ const toProfile = async () => {
     </div>
     <template #dropdown>
       <ElDropdownMenu>
-        <ElDropdownItem>
-          <Icon icon="ep:tools" />
-          <Setting />
-        </ElDropdownItem>
         <ElDropdownItem>
           <Icon icon="ep:tools" />
           <div @click="toProfile">{{ t('common.profile') }}</div>

src/permission.js

@@ -1,6 +1,6 @@
 import router from './router'
 import { isRelogin } from '@/config/axios/service'
-import { getAccessToken, removeToken } from '@/utils/auth'
+import { getAccessToken } from '@/utils/auth'
 import { useTitle } from '@/hooks/web/useTitle'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -8,74 +8,55 @@ import { useDictStoreWithOut } from '@/store/modules/dict'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
 import { getTenantId, getAppId } from '@/utils/auth'
-import cache from '@/plugins/cache'
 
 const { start, done } = useNProgress()
 
 const { loadStart, loadDone } = usePageLoading()
 // 路由不重定向白名单
-const whiteList = [
-  '/login',
-  '/mp-login',
-  '/nm-detail',
-  '/social-login',
-  '/auth-redirect',
-  '/bind',
-  '/register',
-  '/swagger'
-]
+const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/swagger']
 
 // 路由加载前
 router.beforeEach(async (to, from, next) => {
   start()
   loadStart()
-  if (getAppId() && to.query?.appId && getAppId() != to.query?.appId) {
-    removeToken()
-    cache?.local?.delete('appInfo')
-    cache?.local?.delete('roleRouters')
-    cache?.local?.delete('user')
-    cache?.local?.delete('App_ID')
-    next(`/login?tenantId=${to.query?.tenantId}&appId=${to.query?.appId}`)
-  } else {
-    if (getAccessToken()) {
-      if (to.path === '/login') {
-        next({ path: '/' })
-      } else {
-        // 获取所有字典
-        const dictStore = useDictStoreWithOut()
-        const userStore = useUserStoreWithOut()
-        const permissionStore = usePermissionStoreWithOut()
-        if (!dictStore.getIsSetDict) {
-          await dictStore.setDictMap()
-        }
-        if (!userStore.getIsSetUser) {
-          isRelogin.show = true
-          await userStore.setUserInfoAction()
-          isRelogin.show = false
-          // 后端过滤菜单
-          await permissionStore.generateRoutes()
-          permissionStore.getAddRouters.forEach((route) => {
-            router.addRoute(route) // 动态添加可访问路由表
-          })
-          const redirectPath = from.query.redirect || to.path
-          const redirect = decodeURIComponent(redirectPath)
-          const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
-          next(nextData)
-        } else {
-          next()
-        }
-      }
+  if (getAccessToken()) {
+    if (to.path === '/login') {
+      next({ path: '/' })
     } else {
-      if (whiteList.indexOf(to.path) !== -1) {
-        next()
+      // 获取所有字典
+      const dictStore = useDictStoreWithOut()
+      const userStore = useUserStoreWithOut()
+      const permissionStore = usePermissionStoreWithOut()
+      if (!dictStore.getIsSetDict) {
+        await dictStore.setDictMap()
+      }
+      if (!userStore.getIsSetUser) {
+        isRelogin.show = true
+        await userStore.setUserInfoAction()
+        isRelogin.show = false
+        // 后端过滤菜单
+        await permissionStore.generateRoutes()
+        permissionStore.getAddRouters.forEach((route) => {
+          router.addRoute(route) // 动态添加可访问路由表
+        })
+        const redirectPath = from.query.redirect || to.path
+        const redirect = decodeURIComponent(redirectPath)
+        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+        next(nextData)
       } else {
-        const tenantId = getTenantId()
-        const appId = getAppId()
-        if (tenantId && appId) {
-          next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        } else {
-          next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        }
+        next()
+      }
+    }
+  } else {
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      const tenantId = getTenantId()
+      const appId = getAppId()
+      if (tenantId && appId) {
+        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      } else {
+        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
       }
     }
   }

src/plugins/cache/index.js

@@ -26,7 +26,7 @@ const sessionCache = {
     let storage = storageStr ? JSON.parse(storageStr) : {}
     return storage[key]
   },
-  delete(key) {
+  remove(key) {
     if (!sessionStorage) {
       return null
     }
@@ -62,7 +62,7 @@ const localCache = {
     let storage = storageStr ? JSON.parse(storageStr) : {}
     return storage[key]
   },
-  delete(key) {
+  remove(key) {
     if (!localStorage) {
       return null
     }
@@ -73,10 +73,6 @@ const localCache = {
     let storage = storageStr ? JSON.parse(storageStr) : {}
     delete storage[key]
     localStorage.setItem(name, JSON.stringify(storage))
-  },
-  clear() {
-    let storage = {}
-    localStorage.setItem(name, JSON.stringify(storage))
   }
 }
 

src/router/index.ts

@@ -5,7 +5,7 @@ import remainingRouter from './modules/remaining'
 
 // 创建路由实例
 const router = createRouter({
-  history: createWebHistory(import.meta.env.VITE_BASE_PATH), // createWebHashHistory URL带#，createWebHistory URL不带#
+  history: createWebHistory(), // createWebHashHistory URL带#，createWebHistory URL不带#
   strict: true,
   routes: remainingRouter as RouteRecordRaw[],
   scrollBehavior: () => ({ left: 0, top: 0 })

src/router/modules/remaining.ts

@@ -94,8 +94,8 @@ const remainingRouter: AppRouteRecordRaw[] = [
       },
       {
         path: 'notify-message',
-        component: () => import('@/views/Profile/NotifyMessage.vue'),
-        name: 'NotifyMessage',
+        component: () => import('@/views/system/notify/my/index.vue'),
+        name: 'MyNotifyMessage',
         meta: {
           canTo: true,
           hidden: true,
@@ -130,27 +130,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //     }
   //   ]
   // },
-  // {
-  //   path: '/Basic',
-  //   component: Layout,
-  //   name: 'Basic',
-  //   meta: {},
-  //   redirect: '/Basic/menu',
-  //   children: [
-  //     {
-  //       path: 'menu',
-  //       component: () => import('@/views/Basic/Menu/index.vue'),
-  //       name: 'Menu',
-  //       meta: {
-  //         canTo: true,
-  //         hidden: true,
-  //         noTagsView: false,
-  //         icon: 'ep:user',
-  //         title: '菜单管理'
-  //       }
-  //     }
-  //   ]
-  // },
+
   {
     path: '/login',
     component: () => import('@/views/Login/Login.vue'),
@@ -161,16 +141,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
-  {
-    path: '/mp-login',
-    component: () => import('@/views/Login/MPLogin.vue'),
-    name: 'MPLogin',
-    meta: {
-      hidden: true,
-      title: '用户绑定',
-      noTagsView: true
-    }
-  },
   {
     path: '/sso',
     component: () => import('@/views/Login/Login.vue'),
@@ -181,16 +151,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
-  {
-    path: '/nm-detail',
-    component: () => import('@/views/Profile/NotifyMessageDetail.vue'),
-    name: 'NMDetail',
-    meta: {
-      hidden: true,
-      title: '通知详情',
-      noTagsView: true
-    }
-  },
   {
     path: '/403',
     component: () => import('@/views/Error/403.vue'),

src/store/modules/app.ts

@@ -2,12 +2,13 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 import { setCssVar, humpToUnderline } from '@/utils'
 import { ElMessage } from 'element-plus'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ElementPlusSize } from '@/types/elementPlus'
 import { LayoutType } from '@/types/layout'
 import { ThemeTypes } from '@/types/theme'
 import { getAppInfo } from '@/api/login'
-import cache from '@/plugins/cache'
+
+const { wsCache } = useCache()
 
 interface AppState {
   breadcrumb: boolean
@@ -45,7 +46,7 @@ export const useAppStore = defineStore('app', {
       sizeMap: ['default', 'large', 'small'],
       mobile: false, // 是否是移动端
       title: import.meta.env.VITE_APP_TITLE, // 标题
-      appInfo: cache.local.get('appInfo'),
+      appInfo: wsCache.get('appInfo'),
       pageLoading: false, // 路由跳转loading
 
       breadcrumb: true, // 面包屑
@@ -63,12 +64,12 @@ export const useAppStore = defineStore('app', {
       fixedHeader: true, // 固定toolheader
       footer: false, // 显示页脚
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
-      fixedMenu: cache.local.get('fixedMenu') || false, // 是否固定菜单
+      fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
 
-      layout: cache.local.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
-      isDark: cache.local.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
-      currentSize: cache.local.get('default') || 'default', // 组件尺寸
-      theme: cache.local.get(CACHE_KEY.THEME) || {
+      layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
+      isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
+      currentSize: wsCache.get('default') || 'default', // 组件尺寸
+      theme: wsCache.get(CACHE_KEY.THEME) || {
         // 主题色
         elColorPrimary: '#409eff',
         // 左侧菜单边框颜色
@@ -224,7 +225,7 @@ export const useAppStore = defineStore('app', {
       this.greyMode = greyMode
     },
     setFixedMenu(fixedMenu: boolean) {
-      cache.local.set('fixedMenu', fixedMenu)
+      wsCache.set('fixedMenu', fixedMenu)
       this.fixedMenu = fixedMenu
     },
     setPageLoading(pageLoading: boolean) {
@@ -236,7 +237,7 @@ export const useAppStore = defineStore('app', {
         return
       }
       this.layout = layout
-      cache.local.set(CACHE_KEY.LAYOUT, this.layout)
+      wsCache.set(CACHE_KEY.LAYOUT, this.layout)
     },
     setTitle(title: string) {
       this.title = title
@@ -250,18 +251,18 @@ export const useAppStore = defineStore('app', {
         document.documentElement.classList.add('light')
         document.documentElement.classList.remove('dark')
       }
-      cache.local.set(CACHE_KEY.IS_DARK, this.isDark)
+      wsCache.set(CACHE_KEY.IS_DARK, this.isDark)
     },
     setCurrentSize(currentSize: ElementPlusSize) {
       this.currentSize = currentSize
-      cache.local.set('currentSize', this.currentSize)
+      wsCache.set('currentSize', this.currentSize)
     },
     setMobile(mobile: boolean) {
       this.mobile = mobile
     },
     setTheme(theme: ThemeTypes) {
       this.theme = Object.assign(this.theme, theme)
-      cache.local.set(CACHE_KEY.THEME, this.theme)
+      wsCache.set(CACHE_KEY.THEME, this.theme)
     },
     setCssVarTheme() {
       for (const key in this.theme) {
@@ -273,7 +274,7 @@ export const useAppStore = defineStore('app', {
     },
     async setAppInfo(appId: number) {
       const appInfo = await getAppInfo(appId)
-      cache.local.set('appInfo', appInfo)
+      wsCache.set('appInfo', appInfo)
       this.appInfo = appInfo
       return appInfo
     }

src/store/modules/dict.ts

@@ -2,8 +2,8 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 // @ts-ignore
 import { DictDataVO } from '@/api/system/dict/types'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache('sessionStorage')
 import { listSimpleDictData } from '@/api/system/dict/dict.data'
 
 export interface DictValueType {
@@ -28,7 +28,7 @@ export const useDictStore = defineStore('dict', {
   }),
   getters: {
     getDictMap(): Recordable {
-      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
       if (dictMap) {
         this.dictMap = dictMap
       }
@@ -40,7 +40,7 @@ export const useDictStore = defineStore('dict', {
   },
   actions: {
     async setDictMap() {
-      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
       if (dictMap) {
         this.dictMap = dictMap
         this.isSetDict = true
@@ -64,7 +64,7 @@ export const useDictStore = defineStore('dict', {
         })
         this.dictMap = dictDataMap
         this.isSetDict = true
-        cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
+        wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
       }
     },
     getDictByType(type: string) {
@@ -74,7 +74,7 @@ export const useDictStore = defineStore('dict', {
       return this.dictMap[type]
     },
     async resetDict() {
-      cache.session.delete(CACHE_KEY.DICT_CACHE)
+      wsCache.delete(CACHE_KEY.DICT_CACHE)
       const res = await listSimpleDictData()
       // 设置数据
       const dictDataMap = new Map<string, any>()
@@ -94,7 +94,7 @@ export const useDictStore = defineStore('dict', {
       })
       this.dictMap = dictDataMap
       this.isSetDict = true
-      cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
+      wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
     }
   }
 })

src/store/modules/permission.ts

@@ -3,8 +3,9 @@ import { store } from '../index'
 import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
 import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const { wsCache } = useCache()
 
 export interface PermissionState {
   routers: AppRouteRecordRaw[]
@@ -33,8 +34,8 @@ export const usePermissionStore = defineStore('permission', {
     async generateRoutes(): Promise<unknown> {
       return new Promise<void>(async (resolve) => {
         let res: AppCustomRouteRecordRaw[] = []
-        if (cache.local.get(CACHE_KEY.ROLE_ROUTERS)) {
-          res = cache.local.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
+        if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
+          res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
         }
         const routerMap: AppRouteRecordRaw[] = generateRoute(res)
         // 动态路由，404一定要放到最后面

src/store/modules/user.ts

@@ -1,15 +1,15 @@
 import { store } from '../index'
 import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getInfo, loginOut } from '@/api/login'
-import cache from '@/plugins/cache'
+
+const { wsCache } = useCache()
 
 interface UserVO {
   id: number
   avatar: string
   nickname: string
-  currentRole: number
 }
 interface UserInfoVO {
   permissions: string[]
@@ -26,8 +26,7 @@ export const useUserStore = defineStore('admin-user', {
     user: {
       id: 0,
       avatar: '',
-      nickname: '',
-      currentRole: 0
+      nickname: ''
     }
   }),
   getters: {
@@ -50,21 +49,21 @@ export const useUserStore = defineStore('admin-user', {
         this.resetState()
         return null
       }
-      let userInfo = cache.local.get(CACHE_KEY.USER)
-      if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
+      let userInfo = wsCache.get(CACHE_KEY.USER)
+      if (!userInfo) {
         userInfo = await getInfo({})
       }
       this.permissions = userInfo.permissions
       this.roles = userInfo.roles
       this.user = userInfo.user
       this.isSetUser = true
-      cache.local.set(CACHE_KEY.USER, userInfo)
-      cache.local.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
+      wsCache.set(CACHE_KEY.USER, userInfo)
+      wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
     },
     async loginOut() {
       await loginOut()
       removeToken()
-      cache.local.clear()
+      wsCache.clear()
       this.resetState()
     },
     resetState() {
@@ -74,12 +73,11 @@ export const useUserStore = defineStore('admin-user', {
       this.user = {
         id: 0,
         avatar: '',
-        nickname: '',
-        currentRole: 0
+        nickname: ''
       }
     },
     refresh() {
-      cache.local.delete(CACHE_KEY.USER)
+      wsCache.delete(CACHE_KEY.USER)
       this.resetState()
       window.location.href = ''
     }

src/utils/auth.ts

@@ -1,6 +1,8 @@
+import { useCache } from '@/hooks/web/useCache'
 import { TokenType } from '@/api/login/types'
 import { decrypt, encrypt } from '@/utils/jsencrypt'
-import cache from '@/plugins/cache'
+
+const { wsCache } = useCache()
 
 const AccessTokenKey = 'ACCESS_TOKEN'
 const RefreshTokenKey = 'REFRESH_TOKEN'
@@ -8,26 +10,24 @@ const RefreshTokenKey = 'REFRESH_TOKEN'
 // 获取token
 export const getAccessToken = () => {
   // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
-  return cache.local.get(AccessTokenKey)
-    ? cache.local.get(AccessTokenKey)
-    : cache.local.get('ACCESS_TOKEN')
+  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
 }
 
 // 刷新token
 export const getRefreshToken = () => {
-  return cache.local.get(RefreshTokenKey)
+  return wsCache.get(RefreshTokenKey)
 }
 
 // 设置token
 export const setToken = (token: TokenType) => {
-  cache.local.set(RefreshTokenKey, token.refreshToken)
-  cache.local.set(AccessTokenKey, token.accessToken)
+  wsCache.set(RefreshTokenKey, token.refreshToken, { exp: token.expiresTime })
+  wsCache.set(AccessTokenKey, token.accessToken)
 }
 
 // 删除token
 export const removeToken = () => {
-  cache.local.delete(AccessTokenKey)
-  cache.local.delete(RefreshTokenKey)
+  wsCache.delete(AccessTokenKey)
+  wsCache.delete(RefreshTokenKey)
 }
 
 /** 格式化token（jwt格式） */
@@ -47,7 +47,7 @@ export type LoginFormType = {
 }
 
 export const getLoginForm = () => {
-  const loginForm: LoginFormType = cache.local.get(LoginFormKey)
+  const loginForm: LoginFormType = wsCache.get(LoginFormKey)
   if (loginForm) {
     loginForm.password = decrypt(loginForm.password) as string
   }
@@ -56,11 +56,11 @@ export const getLoginForm = () => {
 
 export const setLoginForm = (loginForm: LoginFormType) => {
   loginForm.password = encrypt(loginForm.password) as string
-  cache.local.set(LoginFormKey, loginForm)
+  wsCache.set(LoginFormKey, loginForm, { exp: 30 * 24 * 60 * 60 })
 }
 
 export const removeLoginForm = () => {
-  cache.local.delete(LoginFormKey)
+  wsCache.delete(LoginFormKey)
 }
 
 // ========== 租户相关 ==========
@@ -69,52 +69,52 @@ const TenantIdKey = 'TENANT_ID'
 const TenantNameKey = 'TENANT_NAME'
 
 export const getTenantName = () => {
-  return cache.local.get(TenantNameKey)
+  return wsCache.get(TenantNameKey)
 }
 
 export const setTenantName = (username: string) => {
-  cache.local.set(TenantNameKey, username)
+  wsCache.set(TenantNameKey, username, { exp: 30 * 24 * 60 * 60 })
 }
 
 export const removeTenantName = () => {
-  cache.local.delete(TenantNameKey)
+  wsCache.delete(TenantNameKey)
 }
 
 export const getTenantId = () => {
-  return cache.local.get(TenantIdKey)
+  return wsCache.get(TenantIdKey)
 }
 
 export const setTenantId = (username: string) => {
-  cache.local.set(TenantIdKey, username)
+  wsCache.set(TenantIdKey, username)
 }
 
 export const removeTenantId = () => {
-  cache.local.delete(TenantIdKey)
+  wsCache.delete(TenantIdKey)
 }
 
 const AppIdKey = 'App_ID'
 const AppNameKey = 'App_NAME'
 
 export const getAPPName = () => {
-  return cache.local.get(AppNameKey)
+  return wsCache.get(AppNameKey)
 }
 
 export const setAppName = (name: string) => {
-  cache.local.set(AppNameKey, name)
+  wsCache.set(AppNameKey, name, { exp: 30 * 24 * 60 * 60 })
 }
 
 export const removeAppName = () => {
-  cache.local.delete(AppNameKey)
+  wsCache.delete(AppNameKey)
 }
 
 export const getAppId = () => {
-  return cache.local.get(AppIdKey)
+  return wsCache.get(AppIdKey)
 }
 
 export const setAppId = (id: number) => {
-  cache.local.set(AppIdKey, id)
+  wsCache.set(AppIdKey, id)
 }
 
 export const removeAppId = () => {
-  cache.local.delete(AppIdKey)
+  wsCache.delete(AppIdKey)
 }

src/utils/formatTime.ts

@@ -18,7 +18,7 @@ export function formatDate(date: Date, format?: string): string {
   }
   // 日期存在，则进行格式化
   if (format === undefined) {
-    format = 'YYYY-MM-DD'
+    format = 'YYYY-MM-DD HH:mm:ss'
   }
   return dayjs(date).format(format)
 }

src/utils/index.ts

@@ -209,14 +209,3 @@ export const yuanToFen = (amount: string | number): number => {
 export const fenToYuan = (amount: string | number): number => {
   return Number((Number(amount) / 100).toFixed(2))
 }
-
-export const removeNullField = (obj: Object) => {
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (obj[key] === '' || obj[key] === null || obj[key] == undefined) {
-        delete obj[key]
-      }
-    }
-  }
-  return obj
-}

src/utils/permission.ts

@@ -1,5 +1,4 @@
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 const { t } = useI18n() // 国际化
 
@@ -10,9 +9,10 @@ const { t } = useI18n() // 国际化
  */
 export function checkPermi(value: string[]) {
   if (value && value instanceof Array && value.length > 0) {
+    const { wsCache } = useCache()
     const permissionDatas = value
     const all_permission = '*:*:*'
-    const permissions = cache.local.get(CACHE_KEY.USER).permissions
+    const permissions = wsCache.get(CACHE_KEY.USER).permissions
     const hasPermission = permissions.some((permission) => {
       return all_permission === permission || permissionDatas.includes(permission)
     })
@@ -30,9 +30,10 @@ export function checkPermi(value: string[]) {
  */
 export function checkRole(value: string[]) {
   if (value && value instanceof Array && value.length > 0) {
+    const { wsCache } = useCache()
     const permissionRoles = value
     const super_admin = 'admin'
-    const roles = cache.local.get(CACHE_KEY.USER).roles
+    const roles = wsCache.get(CACHE_KEY.USER).roles
     const hasRole = roles.some((role) => {
       return super_admin === role || permissionRoles.includes(role)
     })

src/views/Basic/Dept/DeptForm.vue

@@ -58,7 +58,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24" :offset="0">
-          <el-form-item label="备注" prop="remark">
+          <el-form-item label="状态" prop="remark">
             <Editor v-model:modelValue="formData.remark" />
           </el-form-item>
         </el-col>
@@ -70,7 +70,7 @@
     </template>
   </Dialog>
 </template>
-<script name="SystemDeptForm" setup>
+<script lang="ts" name="SystemDeptForm" setup>
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
@@ -81,7 +81,6 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
-
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -93,7 +92,7 @@ const formData = ref({
   status: CommonStatusEnum.ENABLE,
   remark: undefined
 })
-const formRules = reactive({
+const formRules = reactive<any>({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
@@ -105,10 +104,10 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
-const userList = ref([]) // 用户列表
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
 /** 打开弹窗 */
-const open = async (type, id) => {
+const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -139,7 +138,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value
+    const data = formData.value as unknown as DeptApi.DeptVO
     if (formType.value === 'create') {
       await DeptApi.createDept(data)
       message.success(t('common.createSuccess'))
@@ -173,7 +172,7 @@ const resetForm = () => {
 const getTree = async () => {
   deptTree.value = []
   const data = await DeptApi.getSimpleDeptList()
-  let dept = { id: 0, name: '顶级部门', children: [] }
+  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }

src/views/Basic/Dept/DialogTarget.vue

@@ -1,133 +0,0 @@
-<template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
-    <el-form ref="formRef" :model="formData" label-width="130px">
-      <el-form-item label="每日跟进指标数">
-        <el-input-number v-model="formData.targetNum" :controls="false" style="width: 150px" />
-      </el-form-item>
-      <el-form-item label="跟进指标生效日期">
-        <el-date-picker
-          v-model="formData.startDate"
-          type="date"
-          placeholder="选择日期时间"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          style="width: 150px"
-        />
-      </el-form-item>
-    </el-form>
-    <el-divider direction="horizontal" content-position="left">成交额指标</el-divider>
-    <el-button class="mb-10px" type="primary" @click="handleAddPrice"> 添加年份 </el-button>
-    <el-table :data="formData.deptSignPriceTargetVOList" border>
-      <el-table-column label="年份" width="120">
-        <template #default="{ row }">
-          <el-date-picker
-            v-model="row.year"
-            type="year"
-            placeholder="选择年份"
-            size="small"
-            format="YYYY"
-            value-format="YYYY"
-            style="width: 100%"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
-        <template #default="{ row }">
-          <el-input-number
-            v-model="row.monthTargetVOList[col - 1].targetPrice"
-            size="small"
-            :controls="false"
-            style="width: 100%"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-    <template #footer>
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-
-<script setup name="DialogTarget">
-import * as DeptApi from '@/api/system/dept'
-
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formData = ref({
-  remark: undefined
-})
-
-/** 打开弹窗 */
-const open = async (deptId) => {
-  dialogVisible.value = true
-  dialogTitle.value = '业绩指标'
-  resetForm()
-  // 修改时，设置数据
-  if (deptId) {
-    formLoading.value = true
-    try {
-      formData.value = await DeptApi.getDeptTarget(deptId)
-      formData.value.deptId = deptId
-      if (formData.value?.deptSignPriceTargetVOList) {
-        formData.value.deptSignPriceTargetVOList.forEach((it) => {
-          it.year = it.year + ''
-        })
-      }
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const formRef = ref() // 表单 Ref
-const submitForm = async () => {
-  // 提交请求
-  formLoading.value = true
-  try {
-    await DeptApi.updateDeptTarget(formData.value)
-    message.success('修改成功')
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    targetNum: undefined,
-    startDate: undefined,
-    deptSignPriceTargetVOList: []
-  }
-  formRef.value?.resetFields()
-}
-
-function handleAddPrice() {
-  const obj = {
-    year: undefined,
-    monthTargetVOList: []
-  }
-  for (let i = 1; i <= 12; i++) {
-    obj.monthTargetVOList.push({
-      month: i,
-      targetPrice: undefined
-    })
-  }
-  if (!formData.value.deptSignPriceTargetVOList) {
-    formData.value.deptSignPriceTargetVOList = []
-  }
-  formData.value.deptSignPriceTargetVOList.push(obj)
-}
-</script>
-
-<style lang="scss" scoped></style>

src/views/Basic/Dept/index.vue

@@ -23,13 +23,9 @@
     <el-table-column prop="name" label="部门名称" />
     <el-table-column prop="leader" label="负责人" width="120" />
     <el-table-column prop="sort" label="排序" width="200" />
-    <el-table-column prop="status" label="状态" width="100">
-      <template #default="{ row }">
-        {{ ['启用', '禁用'][row.status] }}
-      </template>
-    </el-table-column>
+    <el-table-column prop="status" label="状态" width="100" />
     <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
-    <el-table-column label="操作" class-name="fixed-width" width="240">
+    <el-table-column label="操作" class-name="fixed-width" width="160">
       <template #default="scope">
         <el-button
           link
@@ -39,14 +35,6 @@
         >
           修改
         </el-button>
-        <el-button
-          link
-          type="primary"
-          @click="openTarget(scope.row.id)"
-          v-hasPermi="['basic:dept:update']"
-        >
-          业绩指标
-        </el-button>
         <el-button
           link
           type="danger"
@@ -61,13 +49,11 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <DeptForm ref="formRef" @success="getList" />
-  <DialogTarget ref="targetDialogRef" @success="getList" />
 </template>
 <script setup lang="ts" name="SystemDept">
 import { handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import DeptForm from './DeptForm.vue'
-import DialogTarget from './DialogTarget.vue'
 import { dateFormatter } from '@/utils/formatTime'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -107,11 +93,6 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-const targetDialogRef = ref()
-const openTarget = (id: number) => {
-  targetDialogRef.value.open(id)
-}
-
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {

src/views/Basic/GeneralSet/Comp/BSClue.vue

@@ -1,42 +1,18 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <!-- <el-form-item v-if="getConfig('usePhoneConfig')">
+    <el-form-item>
       <template #label>
-        <Tooltip
-          v-if="getConfig('usePhoneConfig').remark"
-          :message="getConfig('usePhoneConfig').remark"
-        />
-        <span>使用外呼</span>
+        <Tooltip message="请联系客服开通或关闭，客服电话:15955599959" />使用外呼
       </template>
-      <el-radio-group
-        v-model="form.usePhoneConfig"
-        :disabled="!getConfig('usePhoneConfig').modifiable"
-      >
-        <el-radio
-          v-for="(item, index) in getConfig('usePhoneConfig').options"
-          :key="index"
-          :label="item.id"
-        >
-          {{ item.name }}
-        </el-radio>
+      <el-radio-group v-model="form.callEnable" disabled>
+        <el-radio :label="1"> 使用 </el-radio>
+        <el-radio :label="0"> 不使用 </el-radio>
       </el-radio-group>
-    </el-form-item> -->
-    <el-form-item v-if="getConfig('showFollowConfig')">
-      <template #label>
-        <Tooltip
-          v-if="getConfig('showFollowConfig').remark"
-          :message="getConfig('showFollowConfig').remark"
-        />
-        <span>跟进信息</span>
-      </template>
-      <el-radio-group v-model="form.showFollowConfig">
-        <el-radio
-          v-for="(item, index) in getConfig('showFollowConfig').options"
-          :key="index"
-          :label="item.id"
-        >
-          {{ item.name }}
-        </el-radio>
+    </el-form-item>
+    <el-form-item label="跟进信息">
+      <el-radio-group v-model="form.followType">
+        <el-radio :label="1"> 展示所有 </el-radio>
+        <el-radio :label="2"> 仅展示本人 </el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item>
@@ -47,42 +23,23 @@
 </template>
 
 <script setup name="BasicSettingClue">
-import * as ConfigApi from '@/api/system/set'
-
 const message = useMessage()
 
-const form = ref({})
-
-const configList = ref([])
-
-function getConfig(val) {
-  return configList.value.find((it) => it.configKey == val)
-}
+const form = ref({
+  followType: 1,
+  callEnable: 1
+})
 
 function getData() {
-  ConfigApi.getConfigList({ module: 100 }).then((data) => {
-    configList.value = data
-    // 获取所有配置项
-    data.map((it) => {
-      form.value[it.configKey] = it.configValue
-    })
-  })
+  form.value = {
+    followType: 1,
+    callEnable: 1
+  }
 }
 
 function onSubmit() {
-  const params = configList.value.map((it) => ({
-    configId: it.configId,
-    configKey: it.configKey,
-    configValue: form.value[it.configKey]
-  }))
-  ConfigApi.updateConfig(params).then(() => {
-    message.success('保存成功')
-  })
+  message.success('保存成功')
 }
-
-onMounted(() => {
-  getData()
-})
 </script>
 
 <style lang="scss" scoped></style>

src/views/Basic/GeneralSet/Comp/BSSalerComission.vue

@@ -1,31 +1,16 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <el-form-item v-if="getConfig('saleCommissionRelateDealConfig')">
-      <template #label>
-        <Tooltip
-          v-if="getConfig('saleCommissionRelateDealConfig').remark"
-          :message="getConfig('saleCommissionRelateDealConfig').remark"
-        />
-        <span>是否关联成交率</span>
-      </template>
-      <el-radio-group
-        v-model="form.saleCommissionRelateDealConfig"
-        @change="form.saleCommissionRelateRulesConfig = []"
-      >
-        <el-radio
-          v-for="(item, index) in getConfig('saleCommissionRelateDealConfig').options"
-          :key="index"
-          :label="item.id"
-        >
-          {{ item.name }}
-        </el-radio>
+    <el-form-item label="是否关联成交率">
+      <el-radio-group v-model="form.withSuccess">
+        <el-radio :label="1"> 是 </el-radio>
+        <el-radio :label="0"> 否 </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="关联规则" v-if="form.saleCommissionRelateDealConfig == 'true'">
+    <el-form-item label="关联规则" v-if="form.withSuccess">
       <div>
-        <el-button @click="form.saleCommissionRelateRulesConfig.push({})">新增规则</el-button>
+        <el-button @click="form.rules.push({})">新增规则</el-button>
         <div
-          v-for="(item, index) in form.saleCommissionRelateRulesConfig"
+          v-for="(item, index) in form.rules"
           :key="index"
           class="mt-10px flex justify-center items-center"
         >
@@ -63,52 +48,22 @@
 </template>
 
 <script setup name="BasicSettingClue">
-import * as ConfigApi from '@/api/system/set'
-
 const message = useMessage()
 
-const form = ref({})
-const configList = ref([])
-
-const jsonArr = ['saleCommissionRelateRulesConfig']
-
-function getConfig(val) {
-  return configList.value.find((it) => it.configKey == val)
-}
+const form = ref({
+  withSuccess: 1,
+  rules: []
+})
 
 function getData() {
-  ConfigApi.getConfigList({ module: 101 }).then((data) => {
-    configList.value = data
-    // 获取所有配置项
-    data.map((it) => {
-      form.value[it.configKey] = it.configValue
-      if (it.configKey == 'saleCommissionRelateRulesConfig') {
-        if (!form.value[it.configKey]) {
-          form.value[it.configKey] = []
-        } else {
-          form.value[it.configKey] = JSON.parse(it.configValue)
-        }
-      }
-    })
-  })
+  form.value = {
+    withSuccess: 1
+  }
 }
 
 function onSubmit() {
-  const params = configList.value.map((it) => ({
-    configId: it.configId,
-    configKey: it.configKey,
-    configValue: jsonArr.includes(it.configKey)
-      ? JSON.stringify(form.value[it.configKey])
-      : form.value[it.configKey]
-  }))
-  ConfigApi.updateConfig(params).then(() => {
-    message.success('保存成功')
-  })
+  message.success('保存成功')
 }
-
-onMounted(() => {
-  getData()
-})
 </script>
 
 <style lang="scss" scoped></style>

src/views/Basic/GeneralSet/index.vue

@@ -4,16 +4,16 @@
       <el-tab-pane label="线索管理" :name="0" v-if="checkPermi(['basic:setting:clue'])">
         <BSClue v-if="tabIndex == 0" />
       </el-tab-pane>
-      <!-- <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
+      <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
         <BSSalerComission v-if="tabIndex == 10" />
-      </el-tab-pane> -->
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script setup name="GeneralSetting">
 import BSClue from './Comp/BSClue.vue'
-// import BSSalerComission from './Comp/BSSalerComission.vue'
+import BSSalerComission from './Comp/BSSalerComission.vue'
 import { checkPermi } from '@/utils/permission'
 
 const tabIndex = ref(0)

src/views/Basic/Library/Comp/DialogLibrary.vue

@@ -1,11 +1,11 @@
 <template>
   <Dialog :title="title" v-model="dialogVisible" width="800px">
-    <el-form v-loading="formLoading" :model="form" ref="formRef" :rules="rules" label-width="100px">
-      <el-form-item label="知识库名称" prop="libName">
-        <el-input v-model="form.libName" placeholder="请输入" />
+    <el-form :model="form" ref="addForm" :rules="rules" label-width="100px">
+      <el-form-item label="知识库名称" prop="name">
+        <el-input v-model="form.name" placeholder="请输入" />
       </el-form-item>
-      <el-form-item label="资源类型" prop="libType">
-        <el-radio-group v-model="form.libType">
+      <el-form-item label="资源类型" prop="type">
+        <el-radio-group v-model="form.type">
           <el-radio :label="1"> 文件 </el-radio>
           <el-radio :label="2"> 纯图片 </el-radio>
           <el-radio :label="3"> 自主编辑 </el-radio>
@@ -18,71 +18,49 @@
     <template #footer>
       <span>
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" :disabled="formLoading" @click="handleSave">保 存</el-button>
+        <el-button type="primary" @click="handleSave">保 存</el-button>
       </span>
     </template>
   </Dialog>
 </template>
 
 <script setup>
-import * as LibraryApi from '@/api/system/library'
-
-const emit = defineEmits(['success'])
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
 const dialogVisible = ref(false) // 弹窗的是否展示
 
 const form = ref()
 const rules = ref({
-  libName: { required: true, message: '名称不可为空', trigger: 'blur' }
+  name: { required: true, message: '名称不可为空', trigger: 'blur' }
 })
 
 const title = ref('')
 
-const formRef = ref()
-const formLoading = ref(false)
-const formType = ref('create')
+const addForm = ref()
 
-const open = (type, val) => {
+const emit = defineEmits(['update'])
+
+const open = (val) => {
   dialogVisible.value = true
-  formType.value = type
   if (val) {
     title.value = '修改知识库'
     form.value = { ...val }
   } else {
     title.value = '新增知识库'
     form.value = {
-      libName: '',
-      libType: 1,
-      remark: undefined,
-      isDefault: false
+      name: '',
+      type: 1,
+      remark: undefined
     }
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-async function handleSave() {
-  // 校验表单
-  if (!formRef.value) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    if (formType.value === 'create') {
-      await LibraryApi.createLibrary(form.value)
-      message.success(t('common.createSuccess'))
-    } else {
-      await LibraryApi.updateLibrary(form.value)
-      message.success(t('common.updateSuccess'))
+function handleSave() {
+  addForm.value.validate((valid) => {
+    if (valid) {
+      emit('update', form.value)
+      dialogVisible.value = false
     }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
+  })
 }
 </script>
 

src/views/Basic/Library/Comp/DialogResource.vue

@@ -1,6 +1,6 @@
 <template>
   <Dialog :title="title" v-model="show" width="800px">
-    <el-form v-loading="formLoading" :model="form" ref="formRef" :rules="rules" label-width="60px">
+    <el-form :model="form" ref="resourceForm" :rules="rules" label-width="60px">
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
           <el-form-item label="标题" prop="title">
@@ -8,19 +8,16 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" :offset="0">
-          <el-form-item label="标签" prop="tags">
+          <el-form-item label="标签" prop="tipList">
             <el-select
-              v-model="form.tags"
+              v-model="form.tipList"
               multiple
               filterable
-              collapse-tags
-              collapse-tags-tooltip
               allow-create
               default-first-option
               :reserve-keyword="false"
               placeholder="请选择标签或输入"
               clearable
-              @change="tipChange"
               style="width: 100%"
             >
               <el-option
@@ -36,10 +33,15 @@
       <el-row :gutter="20">
         <el-col :span="24" :offset="0">
           <el-form-item label="内容" prop="content">
-            <UploadFile v-if="libType == 1" v-model="form.files" :limit="1" :isShowTip="false" />
-            <UploadImg
-              v-else-if="libType == 2"
-              v-model:modelValue="form.files"
+            <UploadFile
+              v-if="form.type == 1"
+              v-model="form.sliderPicUrls"
+              :isShowTip="false"
+              :fileType="[]"
+            />
+            <UploadImgs
+              v-else-if="form.type == 2"
+              v-model:modelValue="form.sliderPicUrls"
               width="100px"
               height="100px"
             />
@@ -58,107 +60,41 @@
     <template #footer>
       <span>
         <el-button @click="show = false">取 消</el-button>
-        <el-button type="primary" :disabled="formLoading" @click="handleSave">保 存</el-button>
+        <el-button type="primary" @click="handleSave">保 存</el-button>
       </span>
     </template>
   </Dialog>
 </template>
 
-<script setup name="DialogResource">
-import * as ResourceApi from '@/api/system/library/resource'
-import { getDictOptions } from '@/utils/dict'
-import * as dictApi from '@/api/system/dict/dict.data'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
+<script setup>
 const show = ref(false)
 const title = ref('')
-const formType = ref('create')
-const libType = ref(1)
-
 const form = ref({})
-const formLoading = ref(false)
-const rules = ref({
-  title: { required: true, message: '标题不可为空', trigger: 'blur' }
-})
+const rules = ref({})
 
-const tipOptions = ref([])
+const tipOptions = ref([{ label: '绿色', value: '绿色' }])
 
-function getOptions() {
-  tipOptions.value = getDictOptions('knowledge_tags')
-}
-
-async function open(type, info, id) {
+function open(type, val) {
   show.value = true
-  title.value = type == 'update' ? '修改资源' : '新增资源'
-  formType.value = type
-  libType.value = info.libType
-  resetForm(info.libId)
-  getOptions()
-  if (id) {
-    formLoading.value = true
-    try {
-      form.value = await ResourceApi.getResource(id)
-    } finally {
-      formLoading.value = false
+  if (val) {
+    title.value = '修改资源'
+    form.value = { ...val, type }
+  } else {
+    title.value = '新增资源'
+    form.value = {
+      type,
+      title: '',
+      tipList: [],
+      sliderPicUrls: [],
+      content: '',
+      remark: null
     }
   }
 }
-
-function resetForm(libId) {
-  form.value = {
-    libId,
-    title: '',
-    tags: [],
-    files: '',
-    content: '',
-    remark: null,
-    isDefault: false
-  }
-}
-
-async function tipChange(val) {
-  const valStr = val.at(-1)
-  if (!tipOptions.value.some((it) => it.value == valStr)) {
-    await dictApi.createDictData({
-      label: valStr,
-      value: valStr,
-      sort: 1,
-      status: 0,
-      dictType: 'knowledge_tags'
-    })
-    tipOptions.value.push({ label: valStr, value: valStr })
-  }
-}
-
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-const formRef = ref()
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-async function handleSave() {
-  // 校验表单
-  if (!formRef.value) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    if (formType.value === 'create') {
-      await ResourceApi.createResource(form.value)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ResourceApi.updateResource(form.value)
-      message.success(t('common.updateSuccess'))
-    }
-    show.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
+function handleSave() {
+  console.log('保存成功')
 }
 </script>
 

src/views/Basic/Library/Comp/ImagePreview.vue

@@ -1,6 +1,7 @@
 <template>
   <teleport v-if="show" to="#app">
     <div class="container">
+      <!-- <Icon class="ep:circle-close close-icon" /> -->
       <el-icon class="close-icon" @click="show = false"><CircleClose /></el-icon>
       <el-drawer
         v-model="showDrawer"
@@ -15,30 +16,22 @@
         <template #header>
           <span style="color: #fff">资源详情</span>
         </template>
-        <div>
-          <div class="flex mb-18px">
-            <div class="w-80px text-light-50">标题：</div>
-            <div class="flex-1 ml-10px text-light-50">{{ info.title }}</div>
-          </div>
-          <div class="flex mb-18px">
-            <div class="w-80px text-light-50">文件名称：</div>
-            <div class="flex-1 ml-10px text-light-50 w-80px" style="word-wrap: break-word">{{
-              info.files
-            }}</div>
-          </div>
-          <div class="flex mb-18px">
-            <div class="w-80px text-light-50">标签：</div>
-            <div class="flex-1 ml-10px w-80px">
-              <el-tag class="mr-5px" v-for="(item, index) in info.tags" :key="index">
-                {{ getDictLabel('knowledge_tags', item) }}
-              </el-tag>
-            </div>
-          </div>
-          <div class="flex mb-18px">
-            <div class="w-80px text-light-50">备注：</div>
-            <div class="flex-1 ml-10px text-light-50">{{ info.remark }}</div>
-          </div>
-        </div>
+        <el-form style="flex: 1" :model="info" label-width="80px" label-position="left">
+          <el-form-item label="标题:">
+            {{ info.title }}
+          </el-form-item>
+          <el-form-item label="文件名称:">
+            {{ info.fileName }}
+          </el-form-item>
+          <el-form-item label="标签:">
+            <el-tag class="mr-5px mb-5px" v-for="(item, index) in info.tipList" :key="index">{{
+              item
+            }}</el-tag>
+          </el-form-item>
+          <el-form-item label="备注:">
+            {{ info.remark }}
+          </el-form-item>
+        </el-form>
         <template #footer>
           <div class="flex justify-between">
             <el-button plain :disabled="imgIndex <= 0" @click="imgIndex--">上一张</el-button>
@@ -49,14 +42,13 @@
         </template>
       </el-drawer>
 
-      <img :src="info.files" :alt="info.files" srcset="" class="width-fit img" />
+      <img :src="info.fileUrl" :alt="info.fileName" srcset="" class="width-fit img" />
       <div class="img-idx">{{ imgIndex + 1 }} / {{ imgList.length }}</div>
     </div>
   </teleport>
 </template>
 
 <script setup>
-import { getDictLabel } from '@/utils/dict'
 import { ElIcon } from 'element-plus'
 import { CircleClose } from '@element-plus/icons-vue'
 

src/views/Basic/Library/index.vue

@@ -3,9 +3,7 @@
     <el-card shadow="always" :body-style="{ padding: '10px' }">
       <div class="flex justify-between items-center" style="width: 400px">
         <div class="text-16px font-bold">知识库名称</div>
-        <el-button type="primary" style="padding: 0px" text @click="openForm('create', null)"
-          >新增</el-button
-        >
+        <el-button type="primary" style="padding: 0px" text @click="handleAdd">新增</el-button>
       </div>
       <div class="border-top-1px mt-10px pt-10px">
         <div
@@ -13,27 +11,24 @@
           v-for="(item, index) in libraryList"
           :key="index"
           :class="{ actived: libraryIndex == index }"
-          @click="handleClickLib(index)"
+          @click="libraryIndex = index"
         >
-          <div class="flex-1 text-14px">{{ item.libName }}</div>
+          <div class="flex-1 text-14px">{{ item.name }}</div>
           <div class="ml-10px">
-            <el-button type="primary" style="padding: 0px" text @click="openForm('update', item)">
-              修改
-            </el-button>
+            <el-button type="primary" style="padding: 0px" text @click="handleUpdate(item)"
+              >修改</el-button
+            >
             <el-button
               type="primary"
               class="ml-10px"
               style="padding: 0px"
               text
-              @click="handleRemove(item.libId)"
+              @click="handleRemove(index)"
+              >删除</el-button
             >
-              删除
-            </el-button>
           </div>
         </div>
         <Pagination
-          small
-          layout="total, prev, pager, next, jumper"
           v-model:limit="pageSize"
           v-model:page="currentPage"
           :total="total"
@@ -41,55 +36,44 @@
         />
       </div>
     </el-card>
-    <el-card
-      v-if="libraryList.length"
-      class="ml-20px"
-      style="flex: 1"
-      shadow="always"
-      :body-style="{ padding: '10px' }"
-    >
+    <el-card class="ml-20px" style="flex: 1" shadow="always" :body-style="{ padding: '10px' }">
       <div class="flex justify-between items-center border-bottom-1px pb-10px mb-20px">
-        <div>【{{ libraryList[libraryIndex].libName }}】资源详情</div>
-        <el-button type="primary" @click="openResource('create', null)">新增资源</el-button>
+        <div>【{{ libraryList[libraryIndex].name }}】资源详情</div>
+        <el-button type="primary" @click="handleAddResource">新增资源</el-button>
       </div>
-      <div v-if="libraryList[libraryIndex].libType == 1">
-        <el-table :data="tableList" border v-loading="loading">
+      <div v-if="libraryList[libraryIndex].type == 1">
+        <el-table :data="tableList" border>
           <el-table-column type="index" width="50" />
           <el-table-column prop="title" label="标题" width="200" />
           <el-table-column label="标签" width="200px">
             <template #default="{ row }">
-              <el-tag v-for="(item, index) in row.tags" :key="index" class="mr-5px">
-                {{ getDictLabel('knowledge_tags', item) }}
-              </el-tag>
+              <el-tag v-for="(item, index) in row.tipList" :key="index" class="mr-5px">{{
+                item
+              }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="files" label="附件">
+          <el-table-column prop="fileName" label="附件">
             <template #default="{ row }">
-              <el-link type="primary" underline target="_blank" @click="handleDownload(row.files)">
-                {{ row.files }}
-              </el-link>
+              <el-link type="primary" underline :href="row.fileUrl" target="_blank">{{
+                row.fileName
+              }}</el-link>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="120px">
             <template #default="{ row, $index }">
-              <el-button
-                type="primary"
-                style="padding: 0"
-                text
-                @click="openResource('update', row.id)"
+              <el-button type="primary" style="padding: 0" text @click="updateResource(row)"
+                >修改</el-button
+              >
+              <el-button type="danger" style="padding: 0" text @click="removeResource($index)"
+                >删除</el-button
               >
-                修改
-              </el-button>
-              <el-button type="danger" style="padding: 0" text @click="removeResource($index)">
-                删除
-              </el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <div v-else-if="libraryList[libraryIndex].libType == 2" class="flex">
+      <div v-else-if="libraryList[libraryIndex].type == 2" class="flex">
         <div v-for="(item, index) in tableList" :key="index" class="mr-10px">
-          <el-image :src="item.files" @click="imagePreview(index)" class="w-150px h-150px" />
+          <el-image :src="item.fileUrl" @click="imagePreview(index)" class="w-150px h-150px" />
           <div class="mt-5px text-center">{{ item.title }}</div>
         </div>
       </div>
@@ -99,24 +83,19 @@
           <el-table-column prop="title" label="标题" />
           <el-table-column label="标签">
             <template #default="{ row }">
-              <el-tag v-for="(item, index) in row.tags" :key="index" class="mr-5px">
-                {{ getDictLabel('knowledge_tags', item) }}
-              </el-tag>
+              <el-tag v-for="(item, index) in row.tipList" :key="index" class="mr-5px">{{
+                item
+              }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="120px">
             <template #default="{ row, $index }">
-              <el-button
-                type="primary"
-                style="padding: 0"
-                text
-                @click="openResource('update', row.infoId)"
+              <el-button type="primary" style="padding: 0" text @click="updateResource(row)"
+                >修改</el-button
+              >
+              <el-button type="danger" style="padding: 0" text @click="removeResource($index)"
+                >删除</el-button
               >
-                修改
-              </el-button>
-              <el-button type="danger" style="padding: 0" text @click="removeResource($index)">
-                删除
-              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -129,31 +108,27 @@
       />
     </el-card>
   </div>
-  <DialogLibrary ref="library" @success="getList" />
-  <DialogResource ref="resourceDialog" @success="getResourceList" />
+  <DialogLibrary ref="library" @update="afterSaveLibrary" />
+  <DialogResource ref="resourceDialog" />
   <ImagePreview ref="imgPreview" />
 </template>
 
-<script setup name="Library">
-import * as LibraryApi from '@/api/system/library/index'
-import * as ResourceApi from '@/api/system/library/resource'
+<script setup>
 import DialogLibrary from './Comp/DialogLibrary.vue'
 import DialogResource from './Comp/DialogResource.vue'
 import ImagePreview from './Comp/ImagePreview.vue'
-import { getDictLabel } from '@/utils/dict'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
 
 const libraryIndex = ref(0)
-const libraryList = ref([])
+const libraryList = ref([
+  { name: '成交案例', id: 1, type: 2 },
+  { name: '公司资质材料', id: 2, type: 1 },
+  { name: '会议纪要', id: 3, type: 3 }
+])
 
 const pageSize = ref(20)
 const currentPage = ref(1)
 const total = ref(0)
 
-const loading = ref(false)
-
 const library = ref()
 const resourceDialog = ref()
 const imgPreview = ref()
@@ -162,80 +137,61 @@ const resourcePageSize = ref(20)
 const resourcePageNum = ref(1)
 const resourceTotal = ref(0)
 
-const tableList = ref([])
-
-function openForm(type, item) {
-  library.value.open(type, item)
-}
-
-async function handleRemove(id) {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await LibraryApi.deleteLibrary(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-async function getList() {
-  const data = await LibraryApi.getLibraryPage({
-    pageNo: currentPage.value,
-    pageSize: pageSize.value
-  })
-  libraryList.value = data.list
-  total.value = data.total
-  handleClickLib(0)
-}
-
-function handleClickLib(index) {
-  libraryIndex.value = index
-  getResourceList()
-}
-
-function handleDownload(href) {
-  if (href) {
-    let a = document.createElement('a')
-    a.download = href //指定下载的文件名
-    a.href = href //  URL对象
-    a.click() // 模拟点击
-    URL.revokeObjectURL(a.href) // 释放URL 对象
+const tableList = ref([
+  {
+    fileUrl:
+      'https://img0.baidu.com/it/u=1033018635,7901815&fm=253&fmt=auto&app=138&f=JPEG?w=750&h=500',
+    fileName: '测试图片1'
+  },
+  {
+    tipList: ['优质材料', '无污染'],
+    fileUrl:
+      'https://img0.baidu.com/it/u=1610680713,975251961&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=750',
+    fileName: '测试图片2'
   }
+])
+
+function handleAdd() {
+  // 新增知识库
+  library.value.open(null)
 }
 
-function openResource(type, id) {
-  resourceDialog.value.open(type, libraryList.value[libraryIndex.value], id)
+function handleUpdate(item) {
+  library.value.open(item)
+}
+
+function handleRemove(index) {
+  libraryList.value.splice(index, 1)
+}
+
+function afterSaveLibrary(val) {
+  libraryList.value.push(val)
+}
+
+function getList() {
+  libraryList.value = []
+}
+
+function handleAddResource() {
+  resourceDialog.value.open(libraryList.value[libraryIndex.value].type, null)
+}
+
+function updateResource(row) {
+  resourceDialog.value.open(libraryList.value[libraryIndex.value].type, row)
 }
 
 function removeResource(index) {
   tableList.value.splice(index, 1)
 }
 
-async function getResourceList() {
-  loading.value = true
-  try {
-    const data = await ResourceApi.getResourcePage({
-      libId: libraryList.value[libraryIndex.value].libId,
-      pageNo: resourcePageNum.value,
-      pageSize: resourcePageSize.value
-    })
-    tableList.value = data.list
-    resourceTotal.value = data.total
-  } finally {
-    loading.value = false
-  }
+function getResourceList() {
+  tableList.value = []
 }
 
 /** 商品图预览 */
 function imagePreview(index) {
   imgPreview.value.open(index, tableList.value)
 }
-
-onMounted(() => {
-  getList()
-})
 </script>
 
 <style lang="scss" scoped>

src/views/Basic/Menu/MenuForm.vue

@@ -7,16 +7,6 @@
       :rules="formRules"
       label-width="100px"
     >
-      <el-form-item label="服务类型" prop="serviceId">
-        <el-select v-model="formData.serviceId" placeholder="选择服务类型" filterable>
-          <el-option
-            v-for="item in props.appList"
-            :key="item.serviceId"
-            :label="item.serviceName"
-            :value="item.serviceId"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="上级菜单">
         <el-tree-select
           v-model="formData.parentId"
@@ -116,18 +106,14 @@
 <script lang="ts" name="SystemMenuForm" setup>
 // import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as MenuApi from '@/api/system/menu'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { CommonStatusEnum, SystemMenuTypeEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
-import cache from '@/plugins/cache'
 
+const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
-const props = defineProps({
-  appList: Object as any
-})
-
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -146,8 +132,7 @@ const formData = ref({
   status: CommonStatusEnum.ENABLE,
   visible: true,
   keepAlive: true,
-  alwaysShow: true,
-  serviceId: undefined
+  alwaysShow: true
 })
 const formRules = reactive({
   name: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
@@ -218,7 +203,7 @@ const submitForm = async () => {
   } finally {
     formLoading.value = false
     // 清空，从而触发刷新
-    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
+    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
   }
 }
 
@@ -248,8 +233,7 @@ const resetForm = () => {
     status: CommonStatusEnum.ENABLE,
     visible: true,
     keepAlive: true,
-    alwaysShow: true,
-    serviceId: undefined
+    alwaysShow: true
   }
   formRef.value?.resetFields()
 }

src/views/Basic/Menu/index.vue

@@ -62,11 +62,6 @@
       <el-table-column :show-overflow-tooltip="true" label="组件路径" prop="component" />
       <el-table-column :show-overflow-tooltip="true" label="组件名称" prop="componentName" />
       <el-table-column label="状态" prop="status" width="80" />
-      <el-table-column label="服务类型" prop="" width="100">
-        <template #default="{ row }">
-          {{ getServiceName(row.serviceId) }}
-        </template>
-      </el-table-column>
       <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button link type="primary" @click="openForm('update', scope.row.id)">
@@ -82,14 +77,14 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <MenuForm ref="formRef" :appList="appList" @success="getList" />
+  <MenuForm ref="formRef" @success="getList" />
 </template>
 <script lang="ts" name="SystemMenu" setup>
 import { handleTree } from '@/utils/tree'
 import * as MenuApi from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -145,7 +140,7 @@ const refreshMenu = async () => {
   try {
     await message.confirm('即将更新缓存刷新浏览器！', '刷新菜单缓存')
     // 清空，从而触发刷新
-    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
+    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
     // 刷新浏览器
     location.reload()
   } catch {}
@@ -165,20 +160,8 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
-const appList = ref([] as any)
-const getOptions = () => {
-  MenuApi.getServiceAppList().then((data) => {
-    appList.value = data
-  })
-}
-
-function getServiceName(serviceId: any) {
-  return appList.value.find((it: any) => it.serviceId == serviceId)?.serviceName
-}
-
 /** 初始化 **/
 onMounted(() => {
-  getOptions()
   getList()
 })
 </script>

src/views/Basic/Role/Comp/ReportDaily.vue

@@ -1,149 +0,0 @@
-<template>
-  <div class="pl-20px pr-20px">
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" v-loading="formLoading">
-      <el-form-item label="开启通知">
-        <el-radio-group v-model="form.status">
-          <el-radio :label="0"> 开启 </el-radio>
-          <el-radio :label="1"> 关闭 </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item label="发送途径">
-        <el-checkbox-group v-model="form.sendType">
-          <el-checkbox v-for="(item, index) in sendTypeOptions" :key="index" :label="item.value">
-            {{ item.label }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item label="发送时间">
-        <el-time-picker
-          v-model="form.sendTime"
-          placeholder="任意时间点"
-          format="HH:mm"
-          value-format="HH:mm"
-        />
-      </el-form-item>
-      <el-form-item label="发送内容">
-        <el-tree
-          ref="treeRef"
-          :data="contentOptions"
-          :props="defaultProps"
-          empty-text="加载中，请稍候"
-          node-key="id"
-          show-checkbox
-          default-expand-all
-          style="width: 100%"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm"> 保 存 </el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script setup name="ReportDaily">
-import * as DaliyReportApi from '@/api/system/role/daliyReport'
-import { defaultProps, handleTree } from '@/utils/tree'
-import { getGeneralSysDictData } from '@/api/system/dict/dict.data'
-
-const message = useMessage() // 消息弹窗
-const props = defineProps({
-  roleId: {
-    type: Number
-  }
-})
-
-const formLoading = ref(false)
-const form = ref({
-  sendItem: []
-})
-
-watch(
-  () => props.roleId,
-  () => {
-    getReportInfo()
-  }
-)
-
-onMounted(() => {
-  init()
-})
-
-const formRef = ref()
-
-const rules = {}
-
-const contentOptions = ref([])
-
-async function init() {
-  getOptions()
-  getReportInfo()
-}
-
-const sendTypeOptions = ref([])
-const treeRef = ref()
-function getOptions() {
-  getGeneralSysDictData('message_send_type').then((data) => {
-    sendTypeOptions.value = data
-  })
-  DaliyReportApi.getDaliyReportContent().then((data) => {
-    contentOptions.value = handleTree(data)
-  })
-}
-
-async function getReportInfo() {
-  try {
-    formLoading.value = true
-    const data = await DaliyReportApi.getRoleDaliyReport(props.roleId)
-    form.value = { ...data }
-
-    if (!form.value.sendType) {
-      form.value.sendType = []
-    }
-
-    if (!form.value.sendTime) {
-      form.value.sendTime = '22:00'
-    }
-
-    if (!form.value.sendItem) {
-      form.value.sendItem = []
-    }
-    treeRef.value.setCheckedKeys([], false)
-    // 设置选中
-    form.value.sendItem.forEach((menuId) => {
-      treeRef.value.setChecked(menuId, true, false)
-    })
-    formLoading.value = false
-  } catch (error) {
-    console.log(error)
-    formLoading.value = false
-  }
-}
-
-/** 提交表单 */
-const submitForm = async () => {
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = {
-      id: form.value.id,
-      roleId: props.roleId,
-      sendType: form.value.sendType,
-      sendTime: form.value.sendTime,
-      status: form.value.status,
-      sendItem: [
-        ...treeRef.value.getCheckedKeys(false), // 获得当前选中节点
-        ...treeRef.value.getHalfCheckedKeys() // 获得半选中的父节点
-      ]
-    }
-    await DaliyReportApi.updateRoleDaliyReport(data)
-    message.success('保存成功')
-    getReportInfo()
-  } finally {
-    formLoading.value = false
-  }
-}
-</script>
-
-<style lang="scss" scoped></style>

src/views/Basic/Role/RoleDataPermissionForm.vue

@@ -107,14 +107,7 @@ const dataScopeOptions = [
 ]
 
 async function getRoleInfo(id) {
-  try {
-    formData.value = await RoleApi.getRole(id)
-    nextTick(() => {
-      treeRef.value.setCheckedKeys(formData.value.dataScopeDeptIds)
-    })
-  } catch (error) {
-    console.log(error)
-  }
+  formData.value = await RoleApi.getRole(id)
 }
 
 /** 提交表单 */

src/views/Basic/Role/index.vue

@@ -75,13 +75,6 @@
             @success="getList"
           />
         </el-tab-pane>
-        <el-tab-pane label="每日快报" :name="4">
-          <ReportDaily
-            v-if="roleOperateIndex == 4"
-            ref="reportDailyRef"
-            :roleId="list[libraryIndex].id"
-          />
-        </el-tab-pane>
       </el-tabs>
     </el-card>
     <!-- 表单弹窗：添加/修改 -->
@@ -93,7 +86,6 @@ import RoleForm from './RoleForm.vue'
 import RoleEmployee from './Comp/RoleEmployee.vue'
 import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
 import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
-import ReportDaily from './Comp/ReportDaily.vue'
 import * as RoleApi from '@/api/system/role'
 
 const message = useMessage() // 消息弹窗