From 6ae32114a68dab74fd183668791e8e9df840713a Mon Sep 17 00:00:00 2001
From: "ex_zhangwenlei@exiot.cmcc" <15196725410@139.com>
Date: Wed, 24 Jan 2024 22:37:09 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E9=85=8D=E7=BD=AE=E5=8D=95?=
 =?UTF-8?q?=E6=AC=A1=E6=8A=BD=E5=A5=96=E4=B8=AA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components.d.ts                           |   2 +
 .../NumberSeparate/EditSeparateDialog.vue     | 102 ++++++++++++++
 src/components/NumberSeparate/index.vue       |  87 ++++++++++++
 src/store/data.ts                             |  51 +++++--
 src/types/storeType.ts                        |  71 +++++-----
 src/views/Config/Person/PersonAll.vue         |   2 +
 src/views/Config/Person/PersonAlready.vue     |   2 +
 src/views/Config/Prize/PrizeConfig.vue        | 128 ++++++++++++++----
 src/views/Config/Readme/index.vue             |   2 +-
 src/views/Demo/index.vue                      |  16 ++-
 src/views/Home/index.vue                      |  35 +++--
 tailwind.config.js                            |   3 +
 12 files changed, 413 insertions(+), 88 deletions(-)
 create mode 100644 src/components/NumberSeparate/EditSeparateDialog.vue
 create mode 100644 src/components/NumberSeparate/index.vue

diff --git a/src/components.d.ts b/src/components.d.ts
index bdba1f1..9c49508 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -8,8 +8,10 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     DaiysuiTable: typeof import('./components/DaiysuiTable/index.vue')['default']
+    EditSeparateDialog: typeof import('./components/NumberSeparate/EditSeparateDialog.vue')['default']
     HelloWorld: typeof import('./components/HelloWorld.vue')['default']
     ImageSync: typeof import('./components/ImageSync/index.vue')['default']
+    NumberSeparate: typeof import('./components/NumberSeparate/index.vue')['default']
     PlayMusic: typeof import('./components/PlayMusic/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
diff --git a/src/components/NumberSeparate/EditSeparateDialog.vue b/src/components/NumberSeparate/EditSeparateDialog.vue
new file mode 100644
index 0000000..936efb2
--- /dev/null
+++ b/src/components/NumberSeparate/EditSeparateDialog.vue
@@ -0,0 +1,102 @@
+<script setup lang='ts'>
+import { ref, watch, onMounted, toRefs } from 'vue'
+import { Separate } from '@/types/storeType'
+
+
+const props = defineProps({
+    totalNumber: {
+        type: Number,
+        default: 0
+    },
+    separatedNumber: {
+        type: Array<Separate>,
+        default: []
+    }
+})
+
+const emits = defineEmits(['clearData'])
+
+const separatedNumberRef = ref()
+const { separatedNumber, totalNumber } = toRefs(props)
+const scaleList = ref<number[]>([])
+const editScale = (item: number) => {
+    if (item == totalNumber.value) {
+        return
+    }
+    if (scaleList.value.includes(item)) {
+        const index = scaleList.value.indexOf(item)
+        scaleList.value.splice(index, 1)
+        separatedNumber.value.splice(index, 1)
+    }
+    else {
+        scaleList.value.push(item)
+        scaleList.value.sort((a, b) => a - b)
+    }
+}
+const clearData = () => {
+    separatedNumberRef.value.close()
+    emits('clearData')
+}
+watch(scaleList, (val: number[]) => {
+    separatedNumber.value = []
+    for (let i = 1; i < scaleList.value.length; i++) {
+        separatedNumber.value[i-1] = {
+            id: i.toString(),
+            count: val[i] - val[i - 1],
+            isUsedCount:0,
+        }
+    }
+}, { deep: true })
+
+watch(totalNumber, (val) => {
+    if (val <= 0) {
+        return
+    }
+    separatedNumberRef.value.showModal()
+    scaleList.value = new Array(separatedNumber.value.length + 1).fill(totalNumber.value)
+    console.log('code line-56 \n\r😀 scaleList.value:\n\r',scaleList.value);
+    for (let i = separatedNumber.value.length - 1; i >= 0; i--) {
+        scaleList.value[i] = scaleList.value[i + 1] - separatedNumber.value[i].count
+    }
+    if(scaleList.value[0]!==0){
+        scaleList.value.unshift(0)
+    }
+    
+    console.log('code line-56 \n\r😀 scaleList.value:\n\r',scaleList.value);
+})
+onMounted(() => {
+    // 阻止esc事件
+    document.addEventListener('keydown', (e) => {
+        if (e.key === 'Escape') {
+            e.preventDefault()
+        }
+    })
+})
+</script>
+
+<template>
+    <dialog id="my_modal_1" ref="separatedNumberRef" class="z-50 overflow-hidden border-none modal">
+        <div class="overflow-hidden modal-box">
+            <h3 class="pb-6 text-lg font-bold">提示!</h3>
+            <p class="pb-8">单次抽取只能抽取10位</p>
+            <div class="flex justify-between px-3 text-center separated-number">
+                <div v-for="item in props.totalNumber" :key="item"
+                    class="relative flex flex-col items-center cursor-pointer">
+                    <div class="absolute mb-12 text-center tooltip -top-5 hover:text-lg" data-tip="左键切割右键取消"
+                        @click.left="editScale(item)">
+                        <span> {{ item }}</span>
+                    </div>
+                    <div class="text-center" :class="scaleList.includes(item) ? 'text-red-500 font-extrabold' : ''">|</div>
+                </div>
+            </div>
+            <div class="modal-action">
+                <form method="dialog">
+                    <!-- if there is a button in form, it will close the modal -->
+                    <button class="btn" @click="clearData">关闭</button>
+                </form>
+            </div>
+        </div>
+    </dialog>
+</template>
+
+<style lang='scss' scoped></style>
diff --git a/src/components/NumberSeparate/index.vue b/src/components/NumberSeparate/index.vue
new file mode 100644
index 0000000..0d1c257
--- /dev/null
+++ b/src/components/NumberSeparate/index.vue
@@ -0,0 +1,87 @@
+<script setup lang='ts'>
+import { Separate } from '@/types/storeType'
+import { ref, onMounted, watch, toRefs } from 'vue';
+const props = defineProps({
+    totalNumber: {
+        type: Number,
+        default: 0
+    },
+    separatedNumber: {
+        type: Array<Separate>,
+        default: []
+    }
+})
+const separatedNumberRef = ref()
+const { separatedNumber, totalNumber } = toRefs(props)
+const scaleList = ref<number[]>([])
+const openEdit = () => {
+    console.log('openedit',separatedNumberRef.value)
+    separatedNumberRef.value.showModal()
+}
+
+const addScale = (item: number) => {
+    if (scaleList.value.includes(item)) {
+        return
+    }
+    scaleList.value.push(item)
+    scaleList.value.sort((a, b) => a - b)
+}
+const delScale = (item: number) => {
+    if (!scaleList.value.includes(item)) {
+        return
+    }
+    scaleList.value.splice(scaleList.value.indexOf(item), 1)
+}
+watch(scaleList, (val: number[]) => {
+    separatedNumber.value = []
+    for (let i = 1; i < scaleList.value.length; i++) {
+        separatedNumber.value[i - 1] = {
+            id: i.toString(),
+            isUsed: false,
+            num: val[i]-val[i-1]
+        }
+    }
+}, { deep: true })
+onMounted(() => {
+    scaleList.value = new Array(separatedNumber.value.length + 1).fill(totalNumber.value)
+    for (let i = separatedNumber.value.length - 1; i >= 0; i--) {
+        scaleList.value[i] = scaleList.value[i + 1] - separatedNumber.value[i].num
+    }
+})
+</script>
+
+<template>
+    <ul class="flex flex-wrap w-full h-full gap-1 cursor-pointer" @click="openEdit">
+        <li class="flex items-center justify-center w-8 h-8 bg-slate-900/60 separated" v-for="item in separatedNumber"
+            :key="item.id">
+            <span>{{ item.num }}</span>
+        </li>
+    </ul>
+    <dialog id="my_modal_1" ref="separatedNumberRef" class="z-50 overflow-hidden border-none modal">
+        <div class="overflow-hidden modal-box">
+            <h3 class="pb-12 text-lg font-bold">提示!</h3>
+            <div class="flex justify-between px-3 text-center separated-number">
+                <div v-for="item in props.totalNumber" :key="item"
+                    class="relative flex flex-col items-center cursor-pointer">
+                    <div class="absolute mb-12 text-center tooltip -top-5 hover:text-lg" data-tip="左键切割右键取消"
+                        @click.left="addScale(item)" @click.right.prevent="delScale(item)">
+                        <span> {{ item }}</span>
+                    </div>
+                    <div class="text-center" :class="scaleList.includes(item) ? 'text-red-500' : ''">|</div>
+                </div>
+            </div>
+            <div class="modal-action">
+                <form method="dialog">
+                    <!-- if there is a button in form, it will close the modal -->
+                    <button class="btn">退出</button>
+                </form>
+            </div>
+        </div>
+    </dialog>
+</template>
+
+<style lang='scss' scoped>
+.separated-number {
+    border-bottom: 1px solid;
+}
+</style>
diff --git a/src/store/data.ts b/src/store/data.ts
index 1ea35bc..41c61f7 100644
--- a/src/store/data.ts
+++ b/src/store/data.ts
@@ -1,5 +1,4 @@
 import { IPrizeConfig, IPersonConfig } from '@/types/storeType';
-import * as dayjs from 'dayjs'
 export const defaultPersonList = <IPersonConfig[]>
     [
         { uid: 'U100156001', name: '朱厚熜', department: '皇室', identity: '万岁爷', x: 1, y: 1, id: 0, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156002', name: '朱载垕', department: '皇室', identity: '裕王', x: 2, y: 1, id: 1, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156003', name: '朱翊钧 ', department: '皇室', identity: '裕王世子', x: 3, y: 1, id: 2, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156004', name: '严嵩', department: '内阁', identity: '首辅', x: 4, y: 1, id: 3, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156005', name: '徐阶', department: '内阁', identity: '次辅、户部尚书', x: 5, y: 1, id: 4, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156006', name: '张居正', department: '内阁', identity: '阁臣、兵部侍郞', x: 6, y: 1, id: 5, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156007', name: '高拱', department: '内阁', identity: '阁臣、户部侍郞', x: 7, y: 1, id: 6, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156008', name: '严世蕃', department: '内阁', identity: '吏部侍郞', x: 8, y: 1, id: 7, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156009', name: '胡宗宪', department: '大臣', identity: '浙直总督', x: 9, y: 1, id: 8, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156010', name: '戚继光', department: '大臣', identity: '都督佥事', x: 10, y: 1, id: 9, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156011', name: '高瀚文', department: '大臣', identity: '杭州知府', x: 11, y: 1, id: 10, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156012', name: '赵贞吉', department: '大臣', identity: '江苏巡抚', x: 12, y: 1, id: 11, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156013', name: '海瑞', department: '大臣', identity: '淳安知县', x: 13, y: 1, id: 12, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156014', name: '何茂才', department: '大臣', identity: '浙江布政使兼按察使', x: 14, y: 1, id: 13, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156015', name: '郑泌昌', department: '大臣', identity: '浙江巡抚', x: 15, y: 1, id: 14, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156016', name: '王用汲', department: '大臣', identity: '建德知县', x: 16, y: 1, id: 15, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156017', name: '谭纶', department: '大臣', identity: '浙直总督府参军', x: 17, y: 1, id: 16, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156018', name: '朱七', department: '大臣', identity: '北镇抚司', x: 1, y: 2, id: 17, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156019', name: '罗龙文', department: '大臣', identity: '通政使司通政使', x: 2, y: 2, id: 18, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156020', name: '马宁远', department: '大臣', identity: '杭州知府', x: 3, y: 2, id: 19, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156021', name: '田有禄 ', department: '大臣', identity: '淳安县丞', x: 4, y: 2, id: 20, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156022', name: '周云逸', department: '大臣', identity: '钦天监监正', x: 5, y: 2, id: 21, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156023', name: '蒋千户', department: '大臣', identity: '浙江按察使司', x: 6, y: 2, id: 22, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156024', name: '徐千户', department: '大臣', identity: '浙江按察使司', x: 7, y: 2, id: 23, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156025', name: '王牢头 ', department: '大臣', identity: '牢头', x: 8, y: 2, id: 24, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156026', name: '赵班头', department: '大臣', identity: '班头', x: 9, y: 2, id: 25, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156027', name: '吕芳', department: '太监', identity: '掌印太监', x: 10, y: 2, id: 26, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156028', name: '杨金水', department: '太监', identity: '织造局', x: 11, y: 2, id: 27, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156029', name: '陈洪', department: '太监', identity: '首席秉笔太监', x: 12, y: 2, id: 28, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156030', name: '黄锦', department: '太监', identity: '秉笔太监', x: 13, y: 2, id: 29, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156031', name: '李玄', department: '太监', identity: '新安江河道监管', x: 14, y: 2, id: 30, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156032', name: '冯保', department: '太监', identity: '世子大伴', x: 15, y: 2, id: 31, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156033', name: '李时珍', department: '江湖', identity: '名医', x: 16, y: 2, id: 32, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156034', name: '沈一石 ', department: '江湖', identity: '商人', x: 17, y: 2, id: 33, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156035', name: '井上十四郎', department: '江湖', identity: '倭寇', x: 1, y: 3, id: 34, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }, { uid: 'U100156036', name: '芸娘', department: '江湖', x: 2, y: 3, id: 35, isWin: false, createTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', updateTime: 'Tue Jan 09 2024 23:20:07 GMT+0800 (China Standard Time)', prizeName: [], prizeTime: [], prizeId: [] }]
@@ -65,17 +64,29 @@ export const defaultMusicList = [
 export const defaultPrizeList = <IPrizeConfig[]>[
     {
         id: '001',
-        name: '一等奖',
+        name: '三等奖',
         sort: 1,
         isAll: false,
-        count: 1,
+        count: 12,
         isUsedCount: 0,
         picture: {
-            id: '0',
-            name: '一等奖',
-            url: 'https://24years.top/resource/image/image1.png'
+            id: '2',
+            name: '三等奖',
+            url: 'https://24years.top/resource/image/image3.png'
         },
-        desc: '一等奖',
+        separateCount: {
+            enable: true,
+            countList: [{
+                id: '0',
+                count: 6,
+                isUsedCount: 0,
+            }, {
+                id: '1',
+                count: 6,
+                isUsedCount: 0,
+            }]
+        },
+        desc: '三等奖',
         isShow: true,
         isUsed: false,
         frequency: 1,
@@ -92,6 +103,10 @@ export const defaultPrizeList = <IPrizeConfig[]>[
             name: '二等奖',
             url: 'https://24years.top/resource/image/image2.png'
         },
+        separateCount: {
+            enable: false,
+            countList: []
+        },
         desc: '二等奖',
         isShow: true,
         isUsed: false,
@@ -99,17 +114,21 @@ export const defaultPrizeList = <IPrizeConfig[]>[
     },
     {
         id: '003',
-        name: '三等奖',
+        name: '一等奖',
         sort: 3,
         isAll: false,
         count: 1,
         isUsedCount: 0,
         picture: {
-            id: '2',
-            name: '三等奖',
-            url: 'https://24years.top/resource/image/image3.png'
+            id: '0',
+            name: '一等奖',
+            url: 'https://24years.top/resource/image/image1.png'
         },
-        desc: '三等奖',
+        separateCount: {
+            enable: false,
+            countList: []
+        },
+        desc: '一等奖',
         isShow: true,
         isUsed: false,
         frequency: 1,
@@ -126,6 +145,10 @@ export const defaultPrizeList = <IPrizeConfig[]>[
             name: '超级奖',
             url: 'https://24years.top/resource/image/image4.png'
         },
+        separateCount: {
+            enable: false,
+            countList: []
+        },
         desc: '超级大奖',
         isShow: true,
         isUsed: false,
@@ -143,6 +166,10 @@ export const defaultPrizeList = <IPrizeConfig[]>[
             name: '特别奖',
             url: 'https://24years.top/resource/image/image5.png'
         },
+        separateCount: {
+            enable: false,
+            countList: []
+        },
         desc: '特别奖',
         isShow: true,
         isUsed: false,
diff --git a/src/types/storeType.ts b/src/types/storeType.ts
index 90631c4..9ab7682 100644
--- a/src/types/storeType.ts
+++ b/src/types/storeType.ts
@@ -2,42 +2,51 @@ export interface IPersonConfig {
     id: number;
     uid: string;
     name: string;
-    department:string;
-    identity:string;
-    isWin:boolean;
-    x:number;
-    y:number
+    department: string;
+    identity: string;
+    isWin: boolean;
+    x: number;
+    y: number
     createTime: string;
     updateTime: string;
-    prizeName:string[];
-    prizeId:string[];
+    prizeName: string[];
+    prizeId: string[];
     prizeTime: string[];
 }
-export interface IPrizeConfig {
-    id: number|string;
-    name:string;
-    sort:number;
-    isAll:boolean;
-    count:number;
-    isUsedCount:number,
-    picture:{
-        id:string|number,
-        name:string,
-        url:string
-    };
-    desc:string;
-    isShow:boolean;
-    isUsed:boolean,
-    frequency:number;
+export type Separate = {
+    id: string,
+    count: number,
+    isUsedCount: number,
 }
-export interface IMusic{
-    id:string,
-    name:string,
-    url:string,
+export interface IPrizeConfig {
+    id: number | string;
+    name: string;
+    sort: number;
+    isAll: boolean;
+    count: number;
+    isUsedCount: number,
+    picture: {
+        id: string | number,
+        name: string,
+        url: string
+    };
+    separateCount: {
+        enable: boolean,
+        countList: Separate[],
+    };
+    desc: string;
+    isShow: boolean;
+    isUsed: boolean,
+    frequency: number;
+}
+export interface IMusic {
+    id: string,
+    name: string,
+    url: string,
 }
 
-export interface IImage{
-    id:string,
-    name:string,
-    url:string,
+export interface IImage {
+    id: string,
+    name: string,
+    url: string,
 }
diff --git a/src/views/Config/Person/PersonAll.vue b/src/views/Config/Person/PersonAll.vue
index 34d862a..649bf17 100644
--- a/src/views/Config/Person/PersonAll.vue
+++ b/src/views/Config/Person/PersonAll.vue
@@ -159,6 +159,8 @@ onMounted(() => {
         </div>
     </dialog>
     <div class="min-w-1000px">
+        
+        <h2>人员管理</h2>
         <div class="flex gap-3 justify-">
             <button class="btn btn-error btn-sm" @click="delAllDataDialog.showModal()">全部删除</button>
             <div class="tooltip tooltip-bottom" data-tip="下载文件后，请在excel中填写数据，并保存为xlsx格式">
diff --git a/src/views/Config/Person/PersonAlready.vue b/src/views/Config/Person/PersonAlready.vue
index 4023866..625ab72 100644
--- a/src/views/Config/Person/PersonAlready.vue
+++ b/src/views/Config/Person/PersonAlready.vue
@@ -105,6 +105,8 @@ const tableColumnsDetail = [
 
 <template>
     <div class="overflow-y-auto">
+        
+        <h2>已中奖人员管理</h2>
         <div class="flex items-center justify-start gap-10">
             <!-- <button class="btn btn-error btn-sm" @click="deleteAll">全部删除</button> -->
             <div>
diff --git a/src/views/Config/Prize/PrizeConfig.vue b/src/views/Config/Prize/PrizeConfig.vue
index 3b63c23..b679a75 100644
--- a/src/views/Config/Prize/PrizeConfig.vue
+++ b/src/views/Config/Prize/PrizeConfig.vue
@@ -4,6 +4,7 @@ import useStore from '@/store'
 import { IPrizeConfig } from '@/types/storeType'
 import { storeToRefs } from 'pinia'
 import localforage from 'localforage'
+import EditSeparateDialog from '@/components/NumberSeparate/EditSeparateDialog.vue'
 
 const imageDbStore = localforage.createInstance({
     name: 'imgStore'
@@ -15,6 +16,9 @@ const { getPrizeConfig: localPrizeList, getCurrentPrize: currentPrize } = storeT
 const { getImageList: localImageList } = storeToRefs(globalConfig)
 const prizeList = ref(localPrizeList)
 const imgList = ref<any[]>([])
+
+const selectedPrize = ref<IPrizeConfig | null>()
+
 const addPrize = () => {
     const defaultPrizeCOnfig: IPrizeConfig = {
         id: new Date().getTime().toString(),
@@ -22,12 +26,16 @@ const addPrize = () => {
         sort: 0,
         isAll: false,
         count: 1,
-        isUsedCount:0,
+        isUsedCount: 0,
         picture: {
             id: '',
             name: '',
             url: ''
         },
+        separateCount: {
+            enable: false,
+            countList: []
+        },
         desc: '',
         isUsed: false,
         isShow: true,
@@ -35,6 +43,49 @@ const addPrize = () => {
     }
     prizeConfig.addPrizeConfig(defaultPrizeCOnfig)
 }
+
+const selectPrize = (item: IPrizeConfig) => {
+    selectedPrize.value = item
+    selectedPrize.value.isUsedCount = 0
+    selectedPrize.value.isUsed = false
+
+    if (selectedPrize.value.separateCount.countList.length > 1) {
+        return
+    }
+    selectedPrize.value.separateCount = {
+        enable: true,
+        countList: [
+            {
+                id: '0',
+                count: item.count,
+                isUsedCount: 0,
+            }
+        ]
+    }
+}
+
+const changePrizeStatus=(item:IPrizeConfig)=>{
+    if(item.isUsed==true){
+        item.isUsedCount=0;
+        if(item.separateCount.countList.length){
+            item.separateCount.countList.forEach((countItem:any)=>{
+                countItem.isUsedCount=0;
+            })
+        }
+    }
+    else{
+        item.isUsedCount=item.count;
+        if(item.separateCount.countList.length){
+            item.separateCount.countList.forEach((countItem:any)=>{
+                countItem.isUsedCount=countItem.count;
+            })
+        }
+    }
+    item.isUsed=!item.isUsed
+}
+const clearSelectedPrize = () => {
+    selectedPrize.value = null
+}
 const resetDefault = () => {
     prizeConfig.resetDefault()
 }
@@ -70,9 +121,10 @@ const delAll = async () => {
 onMounted(() => {
     getImageDbStore()
 })
-watch(() => prizeList.value, (val:IPrizeConfig[]) => {
+watch(() => prizeList.value, (val: IPrizeConfig[]) => {
     prizeConfig.setPrizeConfig(val)
 }, { deep: true })
+
 </script>
 
 <template>
@@ -84,7 +136,14 @@ watch(() => prizeList.value, (val:IPrizeConfig[]) => {
             <button class="btn btn-error btn-sm" @click="delAll">全部删除</button>
 
         </div>
-        <ul>
+        <div role="alert" class="w-full my-4 alert alert-info">
+            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="w-6 h-6 stroke-current shrink-0">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                    d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+            </svg>
+            <span>进行操作可能会重置数据，请谨慎操作</span>
+        </div>
+        <ul class="p-0 m-0">
             <li v-for="item in prizeList" :key="item.id" class="flex gap-10"
                 :class="currentPrize.id == item.id ? 'border-1 border-dotted rounded-xl' : null">
                 <label class="max-w-xs mb-10 form-control">
@@ -97,38 +156,43 @@ watch(() => prizeList.value, (val:IPrizeConfig[]) => {
                             :class="prizeList.indexOf(item) == prizeList.length - 1 ? 'opacity-0 cursor-default' : ''"></svg-icon>
                     </div>
                 </label>
-                <label class="w-full max-w-xs mb-10 form-control">
+                <label class="w-1/2 max-w-xs mb-10 form-control">
                     <div class="label">
                         <span class="label-text">名称</span>
                     </div>
                     <input type="text" v-model="item.name" placeholder="名称"
                         class="w-full max-w-xs input-sm input input-bordered" />
                 </label>
-                <label class="w-full max-w-xs mb-10 form-control">
+                <label class="w-1/2 max-w-xs mb-10 form-control">
                     <div class="label">
-                        <span class="label-text">是否全员参加</span>
+                        <span class="label-text">全员参加</span>
                     </div>
                     <input type="checkbox" :checked="item.isAll" @change="item.isAll = !item.isAll"
                         class="mt-2 border-solid checkbox checkbox-secondary border-1" />
                 </label>
-                <label class="w-full max-w-xs mb-10 form-control">
+                <label class="w-1/2 max-w-xs mb-10 form-control">
                     <div class="label">
-                        <span class="label-text">获奖人数</span>
+                        <span class="label-text">抽奖人数</span>
                     </div>
                     <input type="number" v-model="item.count" placeholder="获奖人数"
-                        class="w-full max-w-xs input-sm input input-bordered" />
+                        class="w-full max-w-xs p-0 m-0 input-sm input input-bordered" />
+                    <div class="tooltip tooltip-bottom" :data-tip="'已抽取:'+item.isUsedCount + '/' + item.count">
+                        <progress class="w-full progress" :value="item.isUsedCount" :max="item.count"></progress>
+                    </div>
                 </label>
-                <label class="w-full max-w-xs mb-10 form-control">
+                <!-- <label class="w-1/2 max-w-xs mb-10 form-control">
                     <div class="label">
                         <span class="label-text">已获奖人数</span>
                     </div>
-                    <input disabled type="number" v-model="item.isUsedCount" placeholder="获奖人数" class="w-full max-w-xs input-sm input input-bordered" />
-                </label>
-                <label class="w-full max-w-xs mb-10 form-control">
+                    <input disabled type="number" v-model="item.isUsedCount" placeholder="获奖人数"
+                        class="w-full max-w-xs input-sm input input-bordered" />
+                </label> -->
+                <label class="w-1/2 max-w-xs mb-10 form-control">
                     <div class="label">
                         <span class="label-text">已抽取</span>
                     </div>
-                    <input type="checkbox" :checked="item.isUsed"  @change="item.isUsed?(()=>{item.isUsed=false;item.isUsedCount=0})():(()=>{item.isUsed=true;item.isUsedCount=item.count})()"
+                    <input type="checkbox" :checked="item.isUsed"
+                        @change="changePrizeStatus(item)"
                         class="mt-2 border-solid checkbox checkbox-secondary border-1" />
                 </label>
                 <label class="w-full max-w-xs mb-10 form-control">
@@ -136,28 +200,31 @@ watch(() => prizeList.value, (val:IPrizeConfig[]) => {
                         <span class="label-text">图片</span>
                     </div>
                     <select class="w-full max-w-xs select select-warning select-sm" v-model="item.picture">
-                      
-                        
-                        <option v-if="item.picture.id" :value="{id:'',name:'',url:''}"><span>❌</span></option>
+                        <option v-if="item.picture.id" :value="{ id: '', name: '', url: '' }"><span>❌</span></option>
                         <option disabled selected>选择一张图片</option>
                         <option v-for="picItem in localImageList" :key="picItem.id" :value="picItem">{{ picItem.name }}
                         </option>
                     </select>
                 </label>
-                <!-- <label class="w-full max-w-xs mb-10 form-control">
+                <label class="w-full max-w-xs mb-10 form-control">
                     <div class="label">
-                        <span class="label-text">展示在主界面</span>
+                        <span class="label-text">单次抽取个数</span>
                     </div>
-                    <input type="checkbox" :checked="item.isShow" @change="item.isShow = !item.isShow"
-                        class="mt-2 border-solid checkbox checkbox-secondary border-1" />
-                </label> -->
-                <!-- <label class="w-full max-w-xs mb-10 form-control">
-                    <div class="label">
-                        <span class="label-text">抽取次数</span>
+                    <div class="flex justify-start w-full h-full" @click="selectPrize(item)">
+                        <ul class="flex flex-wrap w-full h-full gap-1 p-0 pt-1 m-0 cursor-pointer"
+                            v-if="item.separateCount.countList.length">
+                            <li class="relative flex items-center justify-center w-8 h-8 bg-slate-600/60 separated"
+                                v-for="se in item.separateCount.countList" :key="se.id">
+                                <div class="flex items-center justify-center w-full h-full tooltip" :data-tip="'已抽取:'+se.isUsedCount + '/' + se.count">
+                                <div class="absolute left-0 z-50 h-full bg-blue-300/80"
+                                    :style="`width:${se.isUsedCount * 100 / se.count}%`"></div>
+                                <span>{{ se.count }}</span>
+                            </div>
+                            </li>
+                        </ul>
+                        <button v-else class="btn btn-secondary btn-xs">设置</button>
                     </div>
-                    <input type="text" v-model="item.frequency" placeholder="抽取次数"
-                        class="w-full max-w-xs input-sm input input-bordered" />
-                </label> -->
+                </label>
                 <label class="w-full max-w-xs mb-10 form-control">
                     <div class="label">
                         <span class="label-text">操作</span>
@@ -168,6 +235,9 @@ watch(() => prizeList.value, (val:IPrizeConfig[]) => {
                 </label>
             </li>
         </ul>
-</div></template>
+        <EditSeparateDialog :totalNumber="selectedPrize?.count" :separated-number="selectedPrize?.separateCount.countList"
+            @clearData="clearSelectedPrize" />
+    </div>
+</template>
 
 <style lang='scss' scoped></style>
diff --git a/src/views/Config/Readme/index.vue b/src/views/Config/Readme/index.vue
index fc172c4..983613b 100644
--- a/src/views/Config/Readme/index.vue
+++ b/src/views/Config/Readme/index.vue
@@ -17,7 +17,7 @@ onMounted(() => {
 </script>
 
 <template>
-<div class="mb-10 ml-3">
+<div class="w-3/4 mb-10 ml-3">
     <div class="markdown-body" v-dompurify-html="readmeHtml"></div>
 </div>
 </template>
diff --git a/src/views/Demo/index.vue b/src/views/Demo/index.vue
index 88c6719..38aca13 100644
--- a/src/views/Demo/index.vue
+++ b/src/views/Demo/index.vue
@@ -1,12 +1,24 @@
 <script setup lang='ts'>
+import NumberSeparate from '@/components/NumberSeparate/index.vue'
+import {ref} from 'vue'
 
-import StarsBackground from '../../components/StarsBackground/index.vue'
+const total=ref(12)
+const sep=ref([
+    {id:'0',num:3,isUsed:false},
+    {id:'1',num:4,isUsed:false},
+    {id:'2',num:2,isUsed:false},
+    {id:'3',num:3,isUsed:false},
+])
 
+const printPoo=()=>{
+    console.log(sep.value)
+}
 </script>
 
 <template>
 <div>
-    <StarsBackground></StarsBackground>
+    <NumberSeparate :totalNumber="total" :separatedNumber="sep"></NumberSeparate>
+    <button class="btn btn-error" @click="printPoo">打印</button>
 </div>
 </template>
 
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index 2279fa4..da10be3 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -403,21 +403,20 @@ const stopLottery = async () => {
     intervalTimer.value = null
     canOperate.value = false
     rollBall(0, 1)
-    // 抽奖池是否为全体人员
-    // 每次最多抽十个
     luckyCount.value = 10
-    const leftover = currentPrize.value.count - currentPrize.value.isUsedCount
-    leftover < luckyCount.value ? luckyCount.value = leftover : luckyCount
-    if (personPool.value.length < leftover) {
-        toast.open({
-            message: '抽奖人数不够',
-            type: 'warning',
-            position: 'top-right',
-            duration: 10000
-        })
-
-        return;
+    // 自定义抽奖个数
+    
+    let leftover = currentPrize.value.count - currentPrize.value.isUsedCount
+    const customCount=currentPrize.value.separateCount
+    if(customCount.enable&&customCount.countList.length>0){
+        for(let i=0;i<customCount.countList.length;i++){
+            if(customCount.countList[i].isUsedCount<customCount.countList[i].count){
+                leftover=customCount.countList[i].count-customCount.countList[i].isUsedCount
+                break;
+            }
+        }
     }
+    leftover < luckyCount.value ? luckyCount.value = leftover : luckyCount
     for (let i = 0; i < luckyCount.value; i++) {
         if (personPool.value.length > 0) {
             const randomIndex = Math.round(Math.random() * (personPool.value.length - 1))
@@ -465,6 +464,16 @@ const continueLottery = async () => {
     if (!canOperate.value) {
         return
     }
+
+    const customCount=currentPrize.value.separateCount
+    if(customCount.enable&&customCount.countList.length>0){
+        for(let i=0;i<customCount.countList.length;i++){
+            if(customCount.countList[i].isUsedCount<customCount.countList[i].count){
+                customCount.countList[i].isUsedCount+= luckyCount.value
+                break;
+            }
+        }
+    }
     currentPrize.value.isUsedCount += luckyCount.value
     luckyCount.value = 0
     if (currentPrize.value.isUsedCount >= currentPrize.value.count) {
diff --git a/tailwind.config.js b/tailwind.config.js
index 14c1c36..136b8fc 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -4,6 +4,9 @@ module.exports = {
     corePlugins: {
         preflight: false
     },
+    theme: {
+        
+      },
     content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
     plugins: [require('@tailwindcss/typography'), require('daisyui')],
     daisyui: {

From 00655fa3fd386a4d2afed117b3f61d6e23e483a0 Mon Sep 17 00:00:00 2001
From: "ex_zhangwenlei@exiot.cmcc" <15196725410@139.com>
Date: Wed, 24 Jan 2024 22:55:08 +0800
Subject: [PATCH 2/4] feat: add reset all data in global config

---
 src/store/data.ts                      | 10 +---
 src/store/globalConfig.ts              | 61 ++++++++++---------
 src/store/personConfig.ts              |  6 +-
 src/store/prizeConfig.ts               | 82 +++++++++++++++-----------
 src/views/Config/Global/FaceConfig.vue | 28 ++++++++-
 src/views/Config/Person/PersonAll.vue  |  6 +-
 6 files changed, 111 insertions(+), 82 deletions(-)

diff --git a/src/store/data.ts b/src/store/data.ts
index 41c61f7..4acac7c 100644
--- a/src/store/data.ts
+++ b/src/store/data.ts
@@ -76,15 +76,7 @@ export const defaultPrizeList = <IPrizeConfig[]>[
         },
         separateCount: {
             enable: true,
-            countList: [{
-                id: '0',
-                count: 6,
-                isUsedCount: 0,
-            }, {
-                id: '1',
-                count: 6,
-                isUsedCount: 0,
-            }]
+            countList: []
         },
         desc: '三等奖',
         isShow: true,
diff --git a/src/store/globalConfig.ts b/src/store/globalConfig.ts
index d115fbc..ea58c13 100644
--- a/src/store/globalConfig.ts
+++ b/src/store/globalConfig.ts
@@ -1,14 +1,14 @@
 import { defineStore } from 'pinia';
-import { defaultMusicList,defaultImageList,defaultPatternList } from './data'
-import {IMusic,IImage} from '@/types/storeType';
+import { defaultMusicList, defaultImageList, defaultPatternList } from './data'
+import { IMusic, IImage } from '@/types/storeType';
 // import { IPrizeConfig } from '@/types/storeType';
 export const useGlobalConfig = defineStore('global', {
     state() {
         return {
             globalConfig: {
                 rowCount: 17,
-                isSHowPrizeList:true,
-                topTitle:'大明内阁六部御前奏对',
+                isSHowPrizeList: true,
+                topTitle: '大明内阁六部御前奏对',
                 theme: {
                     name: 'dark',
                     detail: { primary: '#0f5fd3' },
@@ -16,17 +16,17 @@ export const useGlobalConfig = defineStore('global', {
                     cardWidth: 140,
                     cardHeight: 200,
                     textColor: '#ffffff',
-                    luckyCardColor:'#ECB1AC',
+                    luckyCardColor: '#ECB1AC',
                     textSize: 30,
-                    patternColor:'#1b66c9',
-                    patternList:defaultPatternList as number[],
+                    patternColor: '#1b66c9',
+                    patternList: defaultPatternList as number[],
                 },
                 musicList: defaultMusicList as IMusic[],
-                imageList:defaultImageList as IImage[],
+                imageList: defaultImageList as IImage[],
             },
             currentMusic: {
-                item:defaultMusicList[0],
-                paused:true,
+                item: defaultMusicList[0],
+                paused: true,
             },
         };
     },
@@ -71,11 +71,11 @@ export const useGlobalConfig = defineStore('global', {
             return state.globalConfig.theme.textSize;
         },
         // 获取图案颜色
-        getPatterColor(state){
+        getPatterColor(state) {
             return state.globalConfig.theme.patternColor;
         },
         // 获取图案列表
-        getPatternList(state){
+        getPatternList(state) {
             return state.globalConfig.theme.patternList;
         },
         // 获取音乐列表
@@ -164,10 +164,10 @@ export const useGlobalConfig = defineStore('global', {
             }
         },
         // 设置当前播放音乐
-        setCurrentMusic(musicItem: IMusic,paused:boolean=true) {
-            this.currentMusic={
-                item:musicItem,
-                paused:paused,
+        setCurrentMusic(musicItem: IMusic, paused: boolean = true) {
+            this.currentMusic = {
+                item: musicItem,
+                paused: paused,
             }
         },
         // 重置音乐列表
@@ -179,7 +179,7 @@ export const useGlobalConfig = defineStore('global', {
             this.globalConfig.musicList = [] as IMusic[];
         },
         // 添加图片
-        addImage(image:IImage){
+        addImage(image: IImage) {
             for (let i = 0; i < this.globalConfig.imageList.length; i++) {
                 if (this.globalConfig.imageList[i].name === image.name) {
                     return;
@@ -211,29 +211,28 @@ export const useGlobalConfig = defineStore('global', {
         // 重置所有配置
         reset() {
             this.globalConfig = {
-                rowCount: 12,
-                topTitle:'大明内阁六部御前奏对',
-                isSHowPrizeList:true,
+                rowCount: 17,
+                isSHowPrizeList: true,
+                topTitle: '大明内阁六部御前奏对',
                 theme: {
                     name: 'dark',
                     detail: { primary: '#0f5fd3' },
-                    cardColor: 'rgba(0, 255, 255)',
-                    luckyCardColor:'#ECB1AC',
-                    cardWidth: 200,
-                    cardHeight: 140,
+                    cardColor: '#ff79c6',
+                    cardWidth: 140,
+                    cardHeight: 200,
                     textColor: '#ffffff',
+                    luckyCardColor: '#ECB1AC',
                     textSize: 30,
                     patternColor: '#1b66c9',
-                    patternList:defaultPatternList,
-
+                    patternList: defaultPatternList as number[],
                 },
                 musicList: defaultMusicList as IMusic[],
-                imageList:defaultImageList as IImage[],
+                imageList: defaultImageList as IImage[],
             },
-            this.currentMusic= {
-                item:defaultMusicList[0] as IMusic,
-                paused:true,
-            }
+                this.currentMusic = {
+                    item: defaultMusicList[0],
+                    paused: true,
+                }
         }
     },
     persist: {
diff --git a/src/store/personConfig.ts b/src/store/personConfig.ts
index c891d61..7029d2f 100644
--- a/src/store/personConfig.ts
+++ b/src/store/personConfig.ts
@@ -30,8 +30,8 @@ export const usePersonConfig = defineStore('person', {
             const data = state.personConfig.allPersonList.filter((item: IPersonConfig) => {
                 return !item.prizeId.includes(currentPrize.id as string);
             });
-            
-return data
+
+            return data
         },
         // 获取已中奖人员名单
         getAlreadyPersonList(state) {
@@ -99,7 +99,7 @@ return data
                 }
             }
             for (let i = 0; i < alreadyPersonListLength; i++) {
-                this.personConfig.alreadyPersonList = this.personConfig.alreadyPersonList.filter((item: IPersonConfig) => 
+                this.personConfig.alreadyPersonList = this.personConfig.alreadyPersonList.filter((item: IPersonConfig) =>
                     item.id !== person.id
                 )
             }
diff --git a/src/store/prizeConfig.ts b/src/store/prizeConfig.ts
index 52ad2c3..5642139 100644
--- a/src/store/prizeConfig.ts
+++ b/src/store/prizeConfig.ts
@@ -8,33 +8,41 @@ export const usePrizeConfig = defineStore('prize', {
                 prizeList: defaultPrizeList,
                 currentPrize: {
                     id: '001',
-                    name: '一等奖',
+                    name: '三等奖',
                     sort: 1,
-                    isAll: true,
-                    count: 1,
-                    isUsedCount:0,
+                    isAll: false,
+                    count: 12,
+                    isUsedCount: 0,
                     picture: {
-                        id: '0',
-                        name: '一等奖',
-                        url: 'https://24years.top/resource/image/image1.png'
+                        id: '2',
+                        name: '三等奖',
+                        url: 'https://24years.top/resource/image/image3.png'
                     },
-                    desc: '一等奖',
+                    separateCount: {
+                        enable: true,
+                        countList: []
+                    },
+                    desc: '三等奖',
                     isShow: true,
                     isUsed: false,
                     frequency: 1,
                 } as IPrizeConfig,
-                temporaryPrize:{
+                temporaryPrize: {
                     id: '',
                     name: '',
                     sort: 0,
                     isAll: false,
                     count: 1,
-                    isUsedCount:0,
+                    isUsedCount: 0,
                     picture: {
                         id: '-1',
                         name: '',
                         url: ''
                     },
+                    separateCount: {
+                        enable: true,
+                        countList: []
+                    },
                     desc: '',
                     isShow: false,
                     isUsed: false,
@@ -50,7 +58,7 @@ export const usePrizeConfig = defineStore('prize', {
         },
         // 获取奖品列表
         getPrizeConfig(state) {
-return state.prizeConfig.prizeList;
+            return state.prizeConfig.prizeList;
         },
         // 根据id获取配置
         getPrizeConfigById(state) {
@@ -63,7 +71,7 @@ return state.prizeConfig.prizeList;
             return state.prizeConfig.currentPrize;
         },
         // 获取临时的奖项
-        getTemporaryPrize(state){
+        getTemporaryPrize(state) {
             return state.prizeConfig.temporaryPrize;
         },
 
@@ -83,16 +91,16 @@ return state.prizeConfig.prizeList;
         },
         // 更新奖项数据
         updatePrizeConfig(prizeConfigItem: IPrizeConfig) {
-            const prizeListLength=this.prizeConfig.prizeList.length;
-            if(prizeConfigItem.isUsed&&prizeListLength){
-                for(let i=0;i<prizeListLength;i++){
-                    if(!this.prizeConfig.prizeList[i].isUsed){
+            const prizeListLength = this.prizeConfig.prizeList.length;
+            if (prizeConfigItem.isUsed && prizeListLength) {
+                for (let i = 0; i < prizeListLength; i++) {
+                    if (!this.prizeConfig.prizeList[i].isUsed) {
                         this.setCurrentPrize(this.prizeConfig.prizeList[i]);
                         break;
                     }
                 }
             }
-            else{
+            else {
                 return
             }
             this.resetTemporaryPrize()
@@ -107,19 +115,19 @@ return state.prizeConfig.prizeList;
         },
         // 设置临时奖项
         setTemporaryPrize(prizeItem: IPrizeConfig) {
-            if(prizeItem.isShow==false){
-                for(let i=0;i<this.prizeConfig.prizeList.length;i++){
-                    if(this.prizeConfig.prizeList[i].isUsed==false){
+            if (prizeItem.isShow == false) {
+                for (let i = 0; i < this.prizeConfig.prizeList.length; i++) {
+                    if (this.prizeConfig.prizeList[i].isUsed == false) {
                         this.setCurrentPrize(this.prizeConfig.prizeList[i]);
-                        
-break
+
+                        break
                     }
                 }
                 this.resetTemporaryPrize()
-                
-return
+
+                return
             }
-            
+
             this.prizeConfig.temporaryPrize = prizeItem
         },
         // 重置临时奖项
@@ -130,7 +138,7 @@ return
                 sort: 0,
                 isAll: false,
                 count: 1,
-                isUsedCount:0,
+                isUsedCount: 0,
                 picture: {
                     id: '-1',
                     name: '',
@@ -148,22 +156,26 @@ return
                 prizeList: defaultPrizeList,
                 currentPrize: {
                     id: '001',
-                    name: '一等奖',
+                    name: '三等奖',
                     sort: 1,
-                    isAll: true,
-                    count: 1,
-                    isUsedCount:0,
+                    isAll: false,
+                    count: 12,
+                    isUsedCount: 0,
                     picture: {
-                        id: '0',
-                        name: '一等奖',
-                        url: 'https://24years.top/resource/image/image1.png'
+                        id: '2',
+                        name: '三等奖',
+                        url: 'https://24years.top/resource/image/image3.png'
                     },
-                    desc: '一等奖',
+                    separateCount: {
+                        enable: true,
+                        countList: []
+                    },
+                    desc: '三等奖',
                     isShow: true,
                     isUsed: false,
                     frequency: 1,
                 } as IPrizeConfig,
-                temporaryPrize:{} as IPrizeConfig
+                temporaryPrize: {} as IPrizeConfig
             }
         }
     },
diff --git a/src/views/Config/Global/FaceConfig.vue b/src/views/Config/Global/FaceConfig.vue
index dc799e9..69a9f93 100644
--- a/src/views/Config/Global/FaceConfig.vue
+++ b/src/views/Config/Global/FaceConfig.vue
@@ -13,10 +13,11 @@ import PatternSetting from './components/PatternSetting.vue'
 
 const globalConfig = useStore().globalConfig
 const personConfig = useStore().personConfig
+const prizeConfig= useStore().prizeConfig
 const { getTopTitle: topTitle, getTheme: localTheme, getPatterColor: patternColor, getPatternList: patternList, getCardColor: cardColor, getLuckyColor: luckyCardColor, getTextColor: textColor, getCardSize: cardSize, getTextSize: textSize, getRowCount: rowCount, getIsShowPrizeList: isShowPrizeList } = storeToRefs(globalConfig)
 const { getAlreadyPersonList: alreadyPersonList, getNotPersonList: notPersonList } = storeToRefs(personConfig)
 const colorPickerRef = ref()
-
+const resetDataDialogRef=ref()
 interface ThemeDaType {
     [key: string]: any
 }
@@ -87,6 +88,14 @@ const resetPattern = () => {
     globalConfig.resetPatternList()
 }
 
+const resetData=()=>{
+    globalConfig.reset();
+    personConfig.reset();
+    prizeConfig.resetDefault();
+    // 刷新页面
+    window.location.reload()
+}
+
 // const handleChangeShowFields = (fieldItem: any) => {
 //     formData.value.showField.map((item) => {
 //         if (item.label === fieldItem.label) {
@@ -144,7 +153,24 @@ onMounted(() => {
 </script>
 
 <template>
+     <dialog id="my_modal_1" ref="resetDataDialogRef" class="border-none modal">
+        <div class="modal-box">
+            <h3 class="text-lg font-bold">提示!</h3>
+            <p class="py-4">该操作会重置所有数据，是否继续？</p>
+            <div class="modal-action">
+                <form method="dialog" class="flex gap-3">
+                    <!-- if there is a button in form, it will close the modal -->
+                    <button class="btn" @click="resetDataDialogRef.close()">取消</button>
+                    <button class="btn" @click="resetData">确定</button>
+                </form>
+            </div>
+        </div>
+    </dialog>
     <div>
+        <h2>全局配置</h2>
+        <div class="mb-8">
+            <button class="btn btn-sm btn-primary" @click="resetDataDialogRef.showModal()">重置所有数据</button>
+        </div>
         <label class="flex flex-row items-center w-full gap-24 mb-10 form-control">
             <div class="">
                 <div class="label">
diff --git a/src/views/Config/Person/PersonAll.vue b/src/views/Config/Person/PersonAll.vue
index 649bf17..646f4ab 100644
--- a/src/views/Config/Person/PersonAll.vue
+++ b/src/views/Config/Person/PersonAll.vue
@@ -135,7 +135,7 @@ onMounted(() => {
     <dialog id="my_modal_1" ref="resetDataDialog" class="border-none modal">
         <div class="modal-box">
             <h3 class="text-lg font-bold">提示!</h3>
-            <p class="py-4">该操作会重置所有人员数据，是否继续？</p>
+            <p class="py-4">该操作会清空人员中奖信息，是否继续？</p>
             <div class="modal-action">
                 <form method="dialog" class="flex gap-3">
                     <!-- if there is a button in form, it will close the modal -->
@@ -161,7 +161,7 @@ onMounted(() => {
     <div class="min-w-1000px">
         
         <h2>人员管理</h2>
-        <div class="flex gap-3 justify-">
+        <div class="flex gap-3">
             <button class="btn btn-error btn-sm" @click="delAllDataDialog.showModal()">全部删除</button>
             <div class="tooltip tooltip-bottom" data-tip="下载文件后，请在excel中填写数据，并保存为xlsx格式">
                 <a class="no-underline btn btn-secondary btn-sm" download="人口登记表.xlsx" target="_blank"
@@ -180,7 +180,7 @@ onMounted(() => {
                 <!-- <button class="btn btn-primary btn-sm">上传excel</button> -->
 
             </div>
-            <button class="btn btn-error btn-sm" @click="resetDataDialog.showModal()">重置数据</button>
+            <button class="btn btn-error btn-sm" @click="resetDataDialog.showModal()">重置人员数据</button>
             <button class="btn btn-accent btn-sm" @click="exportData">导出结果</button>
             <div>
                 <span>中奖人数：</span>

From f1a56a80c9323df8b363eced1ea236b3f1fbfe30 Mon Sep 17 00:00:00 2001
From: "ex_zhangwenlei@exiot.cmcc" <15196725410@139.com>
Date: Wed, 24 Jan 2024 23:01:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E5=8E=9F=E6=9C=89?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E9=85=8D=E7=BD=AE=E5=8D=95=E6=AC=A1=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E4=BA=BA=E6=95=B0=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Config/Person/PersonAll.vue  | 2 +-
 src/views/Config/Prize/PrizeConfig.vue | 6 +++---
 src/views/Home/index.vue               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/Config/Person/PersonAll.vue b/src/views/Config/Person/PersonAll.vue
index 646f4ab..4467056 100644
--- a/src/views/Config/Person/PersonAll.vue
+++ b/src/views/Config/Person/PersonAll.vue
@@ -174,7 +174,7 @@ onMounted(() => {
                         <input type="file" class="" id="explore" style="display: none" @change="handleFileChange"
                             :accept="limitType" />
 
-                        <span class="btn btn-primary btn-sm">上传文件</span>
+                        <span class="btn btn-primary btn-sm">导入人员数据</span>
                     </div>
                 </label>
                 <!-- <button class="btn btn-primary btn-sm">上传excel</button> -->
diff --git a/src/views/Config/Prize/PrizeConfig.vue b/src/views/Config/Prize/PrizeConfig.vue
index b679a75..15cf0f7 100644
--- a/src/views/Config/Prize/PrizeConfig.vue
+++ b/src/views/Config/Prize/PrizeConfig.vue
@@ -67,7 +67,7 @@ const selectPrize = (item: IPrizeConfig) => {
 const changePrizeStatus=(item:IPrizeConfig)=>{
     if(item.isUsed==true){
         item.isUsedCount=0;
-        if(item.separateCount.countList.length){
+        if(item.separateCount&&item.separateCount.countList.length){
             item.separateCount.countList.forEach((countItem:any)=>{
                 countItem.isUsedCount=0;
             })
@@ -75,7 +75,7 @@ const changePrizeStatus=(item:IPrizeConfig)=>{
     }
     else{
         item.isUsedCount=item.count;
-        if(item.separateCount.countList.length){
+        if(item.separateCount&&item.separateCount.countList.length){
             item.separateCount.countList.forEach((countItem:any)=>{
                 countItem.isUsedCount=countItem.count;
             })
@@ -206,7 +206,7 @@ watch(() => prizeList.value, (val: IPrizeConfig[]) => {
                         </option>
                     </select>
                 </label>
-                <label class="w-full max-w-xs mb-10 form-control">
+                <label class="w-full max-w-xs mb-10 form-control" v-if="item.separateCount">
                     <div class="label">
                         <span class="label-text">单次抽取个数</span>
                     </div>
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index da10be3..4dd30ba 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -408,7 +408,7 @@ const stopLottery = async () => {
     
     let leftover = currentPrize.value.count - currentPrize.value.isUsedCount
     const customCount=currentPrize.value.separateCount
-    if(customCount.enable&&customCount.countList.length>0){
+    if(customCount&&customCount.enable&&customCount.countList.length>0){
         for(let i=0;i<customCount.countList.length;i++){
             if(customCount.countList[i].isUsedCount<customCount.countList[i].count){
                 leftover=customCount.countList[i].count-customCount.countList[i].isUsedCount
@@ -466,7 +466,7 @@ const continueLottery = async () => {
     }
 
     const customCount=currentPrize.value.separateCount
-    if(customCount.enable&&customCount.countList.length>0){
+    if(customCount&&customCount.enable&&customCount.countList.length>0){
         for(let i=0;i<customCount.countList.length;i++){
             if(customCount.countList[i].isUsedCount<customCount.countList[i].count){
                 customCount.countList[i].isUsedCount+= luckyCount.value

From 80bcc5a5dcef03d273cffa739fc509889cb35c7e Mon Sep 17 00:00:00 2001
From: "ex_zhangwenlei@exiot.cmcc" <15196725410@139.com>
Date: Wed, 24 Jan 2024 23:09:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/components.d.ts                           |  1 -
 .../NumberSeparate/EditSeparateDialog.vue     |  3 -
 src/components/NumberSeparate/index.vue       | 87 -------------------
 src/views/Demo/index.vue                      | 17 +---
 5 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 src/components/NumberSeparate/index.vue

diff --git a/package.json b/package.json
index 178a827..689dd56 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "log-lottery",
     "private": true,
-    "version": "0.0.1",
+    "version": "0.0.2",
     "type": "module",
     "license": "MIT",
     "scripts": {
diff --git a/src/components.d.ts b/src/components.d.ts
index 9c49508..5f0a8a5 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -11,7 +11,6 @@ declare module 'vue' {
     EditSeparateDialog: typeof import('./components/NumberSeparate/EditSeparateDialog.vue')['default']
     HelloWorld: typeof import('./components/HelloWorld.vue')['default']
     ImageSync: typeof import('./components/ImageSync/index.vue')['default']
-    NumberSeparate: typeof import('./components/NumberSeparate/index.vue')['default']
     PlayMusic: typeof import('./components/PlayMusic/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
diff --git a/src/components/NumberSeparate/EditSeparateDialog.vue b/src/components/NumberSeparate/EditSeparateDialog.vue
index 936efb2..db56006 100644
--- a/src/components/NumberSeparate/EditSeparateDialog.vue
+++ b/src/components/NumberSeparate/EditSeparateDialog.vue
@@ -54,15 +54,12 @@ watch(totalNumber, (val) => {
     }
     separatedNumberRef.value.showModal()
     scaleList.value = new Array(separatedNumber.value.length + 1).fill(totalNumber.value)
-    console.log('code line-56 \n\r😀 scaleList.value:\n\r',scaleList.value);
     for (let i = separatedNumber.value.length - 1; i >= 0; i--) {
         scaleList.value[i] = scaleList.value[i + 1] - separatedNumber.value[i].count
     }
     if(scaleList.value[0]!==0){
         scaleList.value.unshift(0)
     }
-    
-    console.log('code line-56 \n\r😀 scaleList.value:\n\r',scaleList.value);
 })
 onMounted(() => {
     // 阻止esc事件
diff --git a/src/components/NumberSeparate/index.vue b/src/components/NumberSeparate/index.vue
deleted file mode 100644
index 0d1c257..0000000
--- a/src/components/NumberSeparate/index.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<script setup lang='ts'>
-import { Separate } from '@/types/storeType'
-import { ref, onMounted, watch, toRefs } from 'vue';
-const props = defineProps({
-    totalNumber: {
-        type: Number,
-        default: 0
-    },
-    separatedNumber: {
-        type: Array<Separate>,
-        default: []
-    }
-})
-const separatedNumberRef = ref()
-const { separatedNumber, totalNumber } = toRefs(props)
-const scaleList = ref<number[]>([])
-const openEdit = () => {
-    console.log('openedit',separatedNumberRef.value)
-    separatedNumberRef.value.showModal()
-}
-
-const addScale = (item: number) => {
-    if (scaleList.value.includes(item)) {
-        return
-    }
-    scaleList.value.push(item)
-    scaleList.value.sort((a, b) => a - b)
-}
-const delScale = (item: number) => {
-    if (!scaleList.value.includes(item)) {
-        return
-    }
-    scaleList.value.splice(scaleList.value.indexOf(item), 1)
-}
-watch(scaleList, (val: number[]) => {
-    separatedNumber.value = []
-    for (let i = 1; i < scaleList.value.length; i++) {
-        separatedNumber.value[i - 1] = {
-            id: i.toString(),
-            isUsed: false,
-            num: val[i]-val[i-1]
-        }
-    }
-}, { deep: true })
-onMounted(() => {
-    scaleList.value = new Array(separatedNumber.value.length + 1).fill(totalNumber.value)
-    for (let i = separatedNumber.value.length - 1; i >= 0; i--) {
-        scaleList.value[i] = scaleList.value[i + 1] - separatedNumber.value[i].num
-    }
-})
-</script>
-
-<template>
-    <ul class="flex flex-wrap w-full h-full gap-1 cursor-pointer" @click="openEdit">
-        <li class="flex items-center justify-center w-8 h-8 bg-slate-900/60 separated" v-for="item in separatedNumber"
-            :key="item.id">
-            <span>{{ item.num }}</span>
-        </li>
-    </ul>
-    <dialog id="my_modal_1" ref="separatedNumberRef" class="z-50 overflow-hidden border-none modal">
-        <div class="overflow-hidden modal-box">
-            <h3 class="pb-12 text-lg font-bold">提示!</h3>
-            <div class="flex justify-between px-3 text-center separated-number">
-                <div v-for="item in props.totalNumber" :key="item"
-                    class="relative flex flex-col items-center cursor-pointer">
-                    <div class="absolute mb-12 text-center tooltip -top-5 hover:text-lg" data-tip="左键切割右键取消"
-                        @click.left="addScale(item)" @click.right.prevent="delScale(item)">
-                        <span> {{ item }}</span>
-                    </div>
-                    <div class="text-center" :class="scaleList.includes(item) ? 'text-red-500' : ''">|</div>
-                </div>
-            </div>
-            <div class="modal-action">
-                <form method="dialog">
-                    <!-- if there is a button in form, it will close the modal -->
-                    <button class="btn">退出</button>
-                </form>
-            </div>
-        </div>
-    </dialog>
-</template>
-
-<style lang='scss' scoped>
-.separated-number {
-    border-bottom: 1px solid;
-}
-</style>
diff --git a/src/views/Demo/index.vue b/src/views/Demo/index.vue
index 38aca13..0b1c04e 100644
--- a/src/views/Demo/index.vue
+++ b/src/views/Demo/index.vue
@@ -1,24 +1,9 @@
 <script setup lang='ts'>
-import NumberSeparate from '@/components/NumberSeparate/index.vue'
-import {ref} from 'vue'
-
-const total=ref(12)
-const sep=ref([
-    {id:'0',num:3,isUsed:false},
-    {id:'1',num:4,isUsed:false},
-    {id:'2',num:2,isUsed:false},
-    {id:'3',num:3,isUsed:false},
-])
-
-const printPoo=()=>{
-    console.log(sep.value)
-}
 </script>
 
 <template>
 <div>
-    <NumberSeparate :totalNumber="total" :separatedNumber="sep"></NumberSeparate>
-    <button class="btn btn-error" @click="printPoo">打印</button>
+    <button class="btn btn-error">打印</button>
 </div>
 </template>