fix(gunRule): 发枪预约联调优化

src/main/webapp/WEB-INF/views/cmpt/gunRule.jsp

@@ -163,6 +163,9 @@
                                                         <n-button type="primary" @click="search(false)" v-if="activeMenu!=menuOptions[0].value">
                                                             搜索
                                                         </n-button>
+                                                        <n-button v-if="activeMenu!=menuOptions[0].value" @click="exportEnroll">
+                                                            导出名单
+                                                        </n-button>
                                                     </div>
                                                 </n-card>
 
@@ -200,7 +203,7 @@
                                                         <n-form-item label="组别名称" path="roadName">
                                                             <div class="flex flex-col">
                                                                 <n-input v-model:value="gunRuleValue.roadName" placeholder="请输入组别名称" />
-                                                                <n-gradient-text type="warning">组别名仅支持数字和字母，并且不可重复</n-gradient-text>
+                                                                <n-gradient-text type="warning">注：组别名仅支持数字和字母，并且不可重复</n-gradient-text>
                                                             </div>
                                                         </n-form-item>
                                                         <n-form-item label="出发日期" path="startTime">
@@ -231,15 +234,13 @@
                                                         :pagination="false"
                                                         :bordered="true"/>
                                                 </n-card>
-                                                <n-card title="'选手列表" :bordered="false" v-if="activeMenu!=menuOptions[0].value">
+                                                <n-card title="选手列表" :bordered="false" v-if="activeMenu!=menuOptions[0].value">
                                                     <template #header-extra>
                                                         <n-space>
                                                             <!-- <n-button type="error">
                                                                 清空名单
                                                             </n-button> -->
-                                                            <n-button @click="exportEnroll">
-                                                                导出名单
-                                                            </n-button>
+                                                            
                                                             <n-button @click="randomAssign">
                                                                 随机分配
                                                             </n-button>
@@ -463,6 +464,8 @@
                                     const DELETE_RULE = ECC_BASE_URL + "/api-pick/v1/delete-rule?"
                                     const DELETE_WAVE_RULE = ECC_BASE_URL + "/api-pick/v1/delete-wave-reserve?"
                                     const IMPORT_MARK_ENROLL = ECC_BASE_URL + "/api-pick/v1/import-mark-enroll"
+                                    // 导出名单
+                                    const EXPORT_ENROLL = ECC_BASE_URL + "/api-pick/v1/export-markno-enroll"
                                     // 下载导入名单
                                     const DOWNLOAD_IMPORT_LIST = "https://geexekimgoss-sxk.oss-cn-hangzhou.aliyuncs.com/gk/common/markNoSelect/%E9%80%89%E5%8F%B7%E5%90%8D%E5%8D%95%E8%A1%A8%E6%A8%A1%E7%89%88v1.xlsx"
 
@@ -705,7 +708,7 @@
                                             // 下载导入名单
                                             const downloadImportList = () => {
                                                 // 在新窗口打卡
-                                                window.open(DOWNLOAD_IMPORT_LIST)
+                                                window.location.href = DOWNLOAD_IMPORT_LIST
                                             }
                                             // 随机分配
                                             const randomAssign = async () => {
@@ -717,8 +720,12 @@
                                             }
                                             // 导出名单
                                             const exportEnroll = async () => {
-                                                // 调用浏览器自带的confirm弹框
-
+                                                const confirm = window.confirm('将导出所有组别的名单？')
+                                                if (!confirm) {
+                                                    return
+                                                }
+                                                const gtCmptId = getCId()
+                                                window.location.href = EXPORT_ENROLL + '?cmptId=' + gtCmptId
                                             }
                                             /***---------------- 人员列表 end -----------------*/
                                             /***---------------- 发枪规则 start -----------------*/