全局公共配置参数

src/router/index.ts

@@ -92,6 +92,14 @@ export const initMainRouter = async () => {
         ]).then(async ([u]) => {
             if (u.roles.some(v => ['ZBY', 'ZBGL'].includes(v.permissionValue))) {
                 setRouters()
+                store.dispatch('app/LOAD_PUBLIC_CONFIG', {key: 'sign.begin.time'})
+                store.dispatch('app/LOAD_PUBLIC_CONFIG', {key: 'sign.remind.time'})
+                store.dispatch('app/LOAD_PUBLIC_CONFIG', {key: 'sign.end.time'})
+                store.dispatch('app/LOAD_PUBLIC_CONFIG', {key: 'log.submit.time'})
+                store.dispatch('app/LOAD_PUBLIC_CONFIG', {key: 'log.remind.time'})
+                store.dispatch('app/LOAD_PUBLIC_CONFIG', {key: 'week.submit.date'})
+                store.dispatch('app/LOAD_PUBLIC_CONFIG', {key: 'week.submit.time'})
+                store.dispatch('app/LOAD_PUBLIC_CONFIG', {key: 'week.remind.time'})
             } else {
                 ElMessage({
                     duration: 0,

src/store/modules/app.ts

@@ -2,6 +2,7 @@ import {getUserInfo} from "@/api/modules/account";
 import {getSignTime} from "@/api/modules/sign";
 import {ElMessage} from "element-plus";
 import {getSeatDutyPersonSearch} from "@/api/modules/seat";
+import {getConfigConfigKey, editConfigEditConfigKey} from "@/api/modules/config";
 import * as Handle from "@/views/staging/common/handle";
 import {YMD, YMDHms} from '@/utils/util'
 
@@ -14,7 +15,17 @@ const state = {
 	timestamp: new Date().getTime(),
 	weekStart: 6,	//	日历起始日期，周六
 	weeklySubmitDay: 5,	// 周报提交日期，周五
-	dutyInfo: {}
+	dutyInfo: {},
+	publicConfig: {
+		'sign.begin.time': '',
+		'sign.remind.time': '',
+		'sign.end.time': '',
+		'log.submit.time': '',
+		'log.remind.time': '',
+		'week.submit.date': '',
+		'week.submit.time': '',
+		'week.remind.time': '',
+	}
 }
 
 const getters = {
@@ -79,6 +90,9 @@ const mutations = {
 	SET_DUTY_INFO(state: any, data: any) {
 		state.dutyInfo = data
 	},
+	SET_PUBLIC_CONFIG(state: any, {data, key}) {
+		state.publicConfig[key] = data
+	},
 }
 
 const actions = {
@@ -120,6 +134,35 @@ const actions = {
 			}
 		})
 	},
+	LOAD_PUBLIC_CONFIG({ commit }: any, {key, value}) {
+		const initKey = (k, resolve) => {
+			getConfigConfigKey(k).then((res) => {
+				if (res.code === 200) {
+					commit('SET_PUBLIC_CONFIG', {key: k, data: res.message})
+					resolve(res.message)
+				} else {
+					ElMessage.error(res.message)
+				}
+			})
+		}
+		return new Promise((resolve, reject) => {
+			if (value) {
+				editConfigEditConfigKey({
+					configKey: key,
+					configValue: value
+				}).then(res => {
+					if (res.code === 200) {
+						ElMessage.success(res.message)
+						initKey(key, resolve)
+					} else {
+						ElMessage.error(res.message)
+					}
+				})
+			} else {
+				initKey(key, resolve)
+			}
+		})
+	},
 }
 
 export default {

src/views/system/daily-manage/detail.vue

@@ -108,7 +108,8 @@ export default defineComponent({
               if (res.data?.id) {
                 setFormByInfo(res.data)
               } else {
-                const diff = new Date(store.state.app.timestamp).getHours() < 12 ? (1000 * 60 * 60 * 24) : 0
+                const submitHour = new Date(`2000-01-01 ${store.state.app.publicConfig['log.submit.time']}`).getHours()
+                const diff = new Date(store.state.app.timestamp).getHours() < submitHour ? (1000 * 60 * 60 * 24) : 0
                 state.cusDetail = {
                   dutyTime: that.$util.YMD(new Date(store.state.app.timestamp).getTime() - diff),
                   submitter: store.state.app.userInfo.displayName,

src/views/system/public-configuration/index.vue

@@ -82,15 +82,16 @@
         <div class="block-content">
           <div class="item">
             <div class="item-label">截止提交时间:</div>
-            <div class="item-form">
+            <div class="item-form week">
               <div class="col" v-loading="loading['week.submit.date']">
-                <CusFormColumn
-                    :span="24"
-                    link="select"
-                    v-model:param="form['week.submit.date']"
-                    :options="$store.state.dictionary.configWeekSubmitDateList"
-                    :clearable="false"
-                    @change="editKey('week.submit.date')"/>
+                {{$store.state.dictionary.configWeekSubmitDateMap.get(form['week.submit.date'])}}
+<!--                <CusFormColumn-->
+<!--                    :span="24"-->
+<!--                    link="select"-->
+<!--                    v-model:param="form['week.submit.date']"-->
+<!--                    :options="$store.state.dictionary.configWeekSubmitDateList"-->
+<!--                    :clearable="false"-->
+<!--                    @change="editKey('week.submit.date')"/>-->
               </div>
              <div class="col" v-loading="loading['week.submit.time']">
                <CusFormColumn
@@ -176,15 +177,7 @@ export default defineComponent({
     }
     const initKey = (key) => {
       state.loading[key] = true
-      state.form[key] = ''
-      that.$api.getConfigConfigKey(key).then(res => {
-        if (res.code === 200) {
-          state.form[key] = res.message
-        } else {
-          ElMessage.error(res.message)
-        }
-        state.loading[key] = false
-      }).catch(() => {
+      store.dispatch('app/LOAD_PUBLIC_CONFIG', key).then(res => {
         state.loading[key] = false
       })
     }
@@ -192,31 +185,18 @@ export default defineComponent({
       //  select onChange方法有延迟，为了兼容time和select，加个延时
       setTimeout(() => {
         state.loading[key] = true
-        that.$api.editConfigEditConfigKey({
-          configKey: key,
-          configValue: state.form[key]
+        store.dispatch('app/LOAD_PUBLIC_CONFIG', {
+          key: key,
+          value: state.form[key]
         }).then(res => {
-          if (res.code === 200) {
-            ElMessage.success(res.message)
-            initKey(key)
-          } else {
-            ElMessage.error(res.message)
-          }
-        }).catch(() => {
+          state.form[key] = JSON.parse(JSON.stringify(store.state.app.publicConfig[key]))
           state.loading[key] = false
         })
       }, 100)
     }
     onMounted(() => {
       initDictionary()
-      initKey('sign.begin.time')
-      initKey('sign.remind.time')
-      initKey('sign.end.time')
-      initKey('log.submit.time')
-      initKey('log.remind.time')
-      initKey('week.submit.date')
-      initKey('week.submit.time')
-      initKey('week.remind.time')
+      state.form = JSON.parse(JSON.stringify(store.state.app.publicConfig))
     })
     return {
       ...toRefs(state),
@@ -273,8 +253,15 @@ export default defineComponent({
           display: flex;
           align-items: center;
           justify-content: space-between;
-          >div {
-            width: calc((100% - 10px) / 2);
+          &.week {
+            .col:first-child {
+              width: 80px;
+              line-height: 34px;
+              align-self: flex-start;
+            }
+            .col:last-child {
+              width: calc(100% - 80px);
+            }
           }
         }
       }