fix: fix and new feature

2024-01-27 00:43:09 +08:00
parent 31f3fb6309
commit a284ad7ba2
10 changed files with 236 additions and 149 deletions
--- a/src/views/Config/Global/FaceConfig.vue
+++ b/src/views/Config/Global/FaceConfig.vue
@@ -1,7 +1,6 @@
 <script setup lang='ts'>
 import { ref, watch, onMounted } from 'vue'
 import useStore from '@/store'
-import { filterData } from '@/utils'
 import { storeToRefs } from 'pinia'
 import { themeChange } from 'theme-change';
 import zod from 'zod';
@@ -69,10 +68,8 @@ const resetPersonLayout = () => {
            return
        }
        const allPersonList = alreadyPersonList.value.concat(notPersonList.value)
-        const newList = filterData(allPersonList, rowCountValue.value)
-
-        const newAlreadyPersonList = newList.slice(0, alreadyLen)
-        const newNotPersonList = newList.slice(alreadyLen, notLen + alreadyLen)
+        const newAlreadyPersonList = allPersonList.slice(0, alreadyLen)
+        const newNotPersonList = allPersonList.slice(alreadyLen, notLen + alreadyLen)
        personConfig.deleteAllPerson()
        personConfig.addNotPersonList(newNotPersonList)
        personConfig.addAlreadyPersonList(newAlreadyPersonList, null)
@@ -238,11 +235,6 @@ onMounted(() => {
                </div>
                <input type="number" v-model="cardSizeValue.width" placeholder="Type here"
                    class="w-full max-w-xs input input-bordered" />
-                <div class="help">
-                    <span class="text-sm text-red-400 help-text" v-if="formErr.rowCount">
-                        {{ formErr.rowCount }}
-                    </span>
-                </div>
            </div>
            <div>
                <div class="label">
@@ -250,11 +242,6 @@ onMounted(() => {
                </div>
                <input type="number" v-model="cardSizeValue.height" placeholder="Type here"
                    class="w-full max-w-xs input input-bordered" />
-                <div class="help">
-                    <span class="text-sm text-red-400 help-text" v-if="formErr.rowCount">
-                        {{ formErr.rowCount }}
-                    </span>
-                </div>
            </div>
        </label>
        <label class="w-full max-w-xs mb-10 form-control">
--- a/src/views/Config/Person/PersonAll.vue
+++ b/src/views/Config/Person/PersonAll.vue
@@ -6,27 +6,23 @@ import { IPersonConfig } from '@/types/storeType';
 import { storeToRefs } from 'pinia'
 import * as XLSX from 'xlsx'
 import { readFileBinary } from '@/utils/file'
-import { filterData, addOtherInfo } from '@/utils'
+import { addOtherInfo } from '@/utils'
 import DaiysuiTable from '@/components/DaiysuiTable/index.vue'

 const personConfig = useStore().personConfig
-const globalConfig = useStore().globalConfig
 const { getAllPersonList: allPersonList, getAlreadyPersonList: alreadyPersonList } = storeToRefs(personConfig)
-const { getRowCount: rowCount } = storeToRefs(globalConfig)
 const limitType = '.xlsx,.xls'
-const excelData = ref<any[]>([])
 // const personList = ref<any[]>([])

-const resetDataDialog=ref()
-const delAllDataDialog=ref()
+const resetDataDialog = ref()
+const delAllDataDialog = ref()

 const handleFileChange = async (e: Event) => {
    let dataBinary = await readFileBinary(((e.target as HTMLInputElement).files as FileList)[0]!)
    let workBook = XLSX.read(dataBinary, { type: 'binary', cellDates: true })
    let workSheet = workBook.Sheets[workBook.SheetNames[0]]
-    excelData.value = XLSX.utils.sheet_to_json(workSheet)
-    const uploadData = filterData(excelData.value, rowCount.value)
-    const allData = addOtherInfo(uploadData);
+    const excelData = XLSX.utils.sheet_to_json(workSheet)
+    const allData = addOtherInfo(excelData);
    personConfig.resetPerson()
    personConfig.addNotPersonList(allData)
 }
@@ -47,8 +43,8 @@ const exportData = () => {
            data[i].isWin = '否'
        }
        // 格式化数组为
-        data[i].prizeTime=data[i].prizeTime.join(',')
-        data[i].prizeName=data[i].prizeName.join(',')
+        data[i].prizeTime = data[i].prizeTime.join(',')
+        data[i].prizeName = data[i].prizeName.join(',')
    }
    let dataString = JSON.stringify(data)
    dataString = dataString
@@ -159,7 +155,7 @@ onMounted(() => {
        </div>
    </dialog>
    <div class="min-w-1000px">
-        
+
        <h2>人员管理</h2>
        <div class="flex gap-3">
            <button class="btn btn-error btn-sm" @click="delAllDataDialog.showModal()">全部删除</button>
--- a/src/views/Config/Prize/PrizeConfig.vue
+++ b/src/views/Config/Prize/PrizeConfig.vue
@@ -64,27 +64,43 @@ const selectPrize = (item: IPrizeConfig) => {
    }
 }

-const changePrizeStatus=(item:IPrizeConfig)=>{
-    if(item.isUsed==true){
-        item.isUsedCount=0;
-        if(item.separateCount&&item.separateCount.countList.length){
-            item.separateCount.countList.forEach((countItem:any)=>{
-                countItem.isUsedCount=0;
-            })
-        }
-    }
-    else{
-        item.isUsedCount=item.count;
-        if(item.separateCount&&item.separateCount.countList.length){
-            item.separateCount.countList.forEach((countItem:any)=>{
-                countItem.isUsedCount=countItem.count;
-            })
-        }
-    }
-    item.isUsed=!item.isUsed
+const changePrizeStatus = (item: IPrizeConfig) => {
+    // if (item.isUsed == true) {
+    //     item.isUsedCount = 0;
+    //     if (item.separateCount && item.separateCount.countList.length) {
+    //         item.separateCount.countList.forEach((countItem: any) => {
+    //             countItem.isUsedCount = 0;
+    //         })
+    //     }
+    // }
+    // else {
+    //     item.isUsedCount = item.count;
+    //     if (item.separateCount && item.separateCount.countList.length) {
+    //         item.separateCount.countList.forEach((countItem: any) => {
+    //             countItem.isUsedCount = countItem.count;
+    //         })
+    //     }
+    // }
+    item.isUsed?item.isUsedCount=0:item.isUsedCount=item.count;
+    item.separateCount.countList = []
+    item.isUsed = !item.isUsed
 }
-const clearSelectedPrize = (value:any) => {
-    selectedPrize.value!.separateCount.countList=value;
+
+const changePrizePerson = (item: IPrizeConfig) => {
+    let indexPrize = -1;
+    for (let i = 0; i < prizeList.value.length; i++) {
+        if (prizeList.value[i].id == item.id) {
+            indexPrize = i;
+            break;
+        }
+    }
+    if (indexPrize > -1) {
+        prizeList.value[indexPrize].separateCount.countList = []
+        prizeList.value[indexPrize].isUsed?prizeList.value[indexPrize].isUsedCount=prizeList.value[indexPrize].count:prizeList.value[indexPrize].isUsedCount=0
+    }
+}
+const submitData = (value: any) => {
+    selectedPrize.value!.separateCount.countList = value;
    selectedPrize.value = null
 }
 const resetDefault = () => {
@@ -176,9 +192,9 @@ watch(() => prizeList.value, (val: IPrizeConfig[]) => {
                    <div class="label">
                        <span class="label-text">抽奖人数</span>
                    </div>
-                    <input type="number" v-model="item.count" placeholder="获奖人数"
+                    <input type="number" v-model="item.count" placeholder="获奖人数" @change="changePrizePerson(item)"
                        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">
+                    <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>
@@ -193,8 +209,7 @@ watch(() => prizeList.value, (val: IPrizeConfig[]) => {
                    <div class="label">
                        <span class="label-text">已抽取</span>
                    </div>
-                    <input type="checkbox" :checked="item.isUsed"
-                        @change="changePrizeStatus(item)"
+                    <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">
@@ -217,11 +232,12 @@ watch(() => prizeList.value, (val: IPrizeConfig[]) => {
                            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>
+                                <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>
@@ -238,7 +254,7 @@ watch(() => prizeList.value, (val: IPrizeConfig[]) => {
            </li>
        </ul>
        <EditSeparateDialog :totalNumber="selectedPrize?.count" :separated-number="selectedPrize?.separateCount.countList"
-            @clearData="clearSelectedPrize" />
+            @submitData="submitData" />
    </div>
 </template>

--- a/src/views/Home/PrizeList.vue
+++ b/src/views/Home/PrizeList.vue
@@ -5,6 +5,9 @@ import useStore from '@/store'

 import ImageSync from '@/components/ImageSync/index.vue'
 import defaultPrizeImage from '@/assets/images/龙.png'
+import { IPrizeConfig } from '../../types/storeType';
+
+import EditSeparateDialog from '@/components/NumberSeparate/EditSeparateDialog.vue'

 const prizeConfig = useStore().prizeConfig
 const globalConfig = useStore().globalConfig
@@ -16,6 +19,7 @@ const prizeListRef = ref()
 const prizeListContainerRef = ref()

 const temporaryPrizeRef = ref()
+const selectedPrize = ref<IPrizeConfig | null>()
 // 获取prizeListRef高度
 const getPrizeListHeight = () => {
    let height = 200;
@@ -45,8 +49,44 @@ const submitTemporaryPrize = () => {
    temporaryPrize.value.id=new Date().getTime().toString()
    prizeConfig.setCurrentPrize(temporaryPrize.value)
 }
+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 submitData = (value: any) => {
+    selectedPrize.value!.separateCount.countList = value;
+    selectedPrize.value = null
+}
+const changePersonCount=()=>{
+    temporaryPrize.value.separateCount.countList=[]
+}
+const setCurrentPrize=()=>{
+for(let i=0;i<localPrizeList.value.length;i++){
+    if(localPrizeList.value[i].isUsedCount<localPrizeList.value[i].count){
+        prizeConfig.setCurrentPrize(localPrizeList.value[i])
+        
+return
+    }
+}
+}
 onMounted(() => {
    prizeListContainerRef.value.style.height = getPrizeListHeight() + 'px'
+    setCurrentPrize()
 })
 </script>

@@ -75,7 +115,7 @@ onMounted(() => {
                        <div class="label">
                            <span class="label-text">获奖人数</span>
                        </div>
-                        <input type="number" v-model="temporaryPrize.count" placeholder="获奖人数"
+                        <input type="number" v-model="temporaryPrize.count" @change="changePersonCount" placeholder="获奖人数"
                            class="max-w-xs input-sm input input-bordered" />
                    </label>
                    <label class="flex w-full max-w-xs">
@@ -85,14 +125,26 @@ onMounted(() => {
                        <input disabled type="number" v-model="temporaryPrize.isUsedCount" placeholder="获奖人数"
                            class="max-w-xs input-sm input input-bordered" />
                    </label>
-                    <label class="flex w-full max-w-xs">
-                        <div class="label">
-                            <span class="label-text">已抽取</span>
-                        </div>
-                        <input type="checkbox" :checked="temporaryPrize.isUsed"
-                            @change="temporaryPrize.isUsed ? (() => { temporaryPrize.isUsed = false; temporaryPrize.isUsedCount = 0 })() : (() => { temporaryPrize.isUsed = true; temporaryPrize.isUsedCount = temporaryPrize.count })()"
-                            class="mt-2 border-solid checkbox checkbox-secondary border-1" />
-                    </label>
+                    <label class="flex w-full max-w-xs" v-if="temporaryPrize.separateCount">
+                    <div class="label">
+                        <span class="label-text">单次抽取个数</span>
+                    </div>
+                    <div class="flex justify-start h-full" @click="selectPrize(temporaryPrize)">
+                        <ul class="flex flex-wrap w-full h-full gap-1 p-0 pt-1 m-0 cursor-pointer"
+                            v-if="temporaryPrize.separateCount.countList.length">
+                            <li class="relative flex items-center justify-center w-8 h-8 bg-slate-600/60 separated"
+                                v-for="se in temporaryPrize.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>
+                </label>
                    <label class="flex w-full max-w-xs">
                        <div class="label">
                            <span class="label-text">图片</span>
@@ -115,7 +167,8 @@ onMounted(() => {
                </div>
            </div>
        </dialog>
-
+        <EditSeparateDialog :totalNumber="selectedPrize?.count" :separated-number="selectedPrize?.separateCount.countList"
+            @submitData="submitData" />
        <div ref="prizeListContainerRef">
            <div class="h-20 w-72" :class="temporaryPrize.isShow ? 'current-prize' : ''" v-if="temporaryPrize.isShow">
                <div class="relative flex flex-row items-center justify-between w-full h-full shadow-xl card bg-base-100">
@@ -195,10 +248,7 @@ onMounted(() => {
                        </div>
                    </div>
                </div>
-
-
            </transition>
-
        </div>

        <transition name="prize-operate" :appear="true">
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -68,16 +68,18 @@ function initTableData() {
        return
    }
    const totalCount = rowCount.value * 7
-    tableData.value = JSON.parse(JSON.stringify(allPersonList.value))
-    const tableDataLength = tableData.value.length
-    if (tableDataLength < totalCount) {
-        const repeatCount = Math.ceil(totalCount / tableDataLength)
+    const orginPersonData = JSON.parse(JSON.stringify(allPersonList.value))
+    const orginPersonLength = orginPersonData.length
+    if (orginPersonLength < totalCount) {
+        const repeatCount = Math.ceil(totalCount / orginPersonLength)
        // 复制数据
        for (let i = 0; i < repeatCount; i++) {
-            tableData.value = tableData.value.concat(JSON.parse(JSON.stringify(tableData.value)))
+            tableData.value = tableData.value.concat(JSON.parse(JSON.stringify(orginPersonData)))
        }
    }
-
+    else{
+        tableData.value=orginPersonData.slice(0, totalCount)
+    }
    tableData.value = filterData(tableData.value.slice(0, totalCount), rowCount.value)
 }
 const init = () => {
@@ -354,9 +356,11 @@ const enterLottery = async () => {
        randomBallData()
    }
    if (patternList.value.length) {
-        patternList.value.forEach((item: number) => {
-            objects.value[item - 1].element.style.backgroundColor = rgba(cardColor.value, Math.random() * 0.5 + 0.25)
-        })
+        for(let i=0;i<patternList.value.length;i++){
+            if(i<rowCount.value*7){
+                objects.value[patternList.value[i]-1].element.style.backgroundColor = rgba(cardColor.value, Math.random() * 0.5 + 0.25)
+            }
+        }
    }
    canOperate.value = false
    await transform(targets.sphere, 1000)
@@ -391,27 +395,15 @@ const startLottery = () => {

        return;
    }
-    currentStatus.value = 2
-    rollBall(10, 3000)
-}
-
-const stopLottery = async () => {
-    if (!canOperate.value) {
-        return
-    }
-    clearInterval(intervalTimer.value)
-    intervalTimer.value = null
-    canOperate.value = false
-    rollBall(0, 1)
    luckyCount.value = 10
    // 自定义抽奖个数
-    
+
    let leftover = currentPrize.value.count - currentPrize.value.isUsedCount
-    const customCount=currentPrize.value.separateCount
-    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
+    const customCount = currentPrize.value.separateCount
+    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
                break;
            }
        }
@@ -424,6 +416,25 @@ const stopLottery = async () => {
            personPool.value.splice(randomIndex, 1)
        }
    }
+    toast.open({
+        message: `现在抽取${currentPrize.value.name} ${leftover}人`,
+        type:'default',
+        position: 'top-right',
+        duration: 8000
+    })
+    currentStatus.value = 2
+    rollBall(10, 3000)
+}
+
+const stopLottery = async () => {
+    if (!canOperate.value) {
+        return
+    }
+    clearInterval(intervalTimer.value)
+    intervalTimer.value = null
+    canOperate.value = false
+    rollBall(0, 1)
+
    const windowSize = { width: window.innerWidth, height: window.innerHeight }
    luckyTargets.value.forEach((person: IPersonConfig, index: number) => {
        let cardIndex = selectCard(luckyCardList.value, tableData.value.length, person.id)
@@ -465,11 +476,11 @@ const continueLottery = async () => {
        return
    }

-    const customCount=currentPrize.value.separateCount
-    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
+    const customCount = currentPrize.value.separateCount
+    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
                break;
            }
        }
@@ -576,7 +587,7 @@ const listenKeyboard = () => {
        if (e.keyCode === 27 && currentStatus.value === 3) {
            quitLottery()
        }
-        if(e.keyCode!==32){
+        if (e.keyCode !== 32) {
            return
        }
        switch (currentStatus.value) {