Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd

backend/src/main/resources/views/platform/activity/scoreEnter/index.html

@@ -39,20 +39,29 @@ layout("/layouts/platform_1.html"){
         </div>
     </el-card>
     <el-card shadow="never" class="mt-3">
-        <el-table v-loading="tableLoading" show-overflow-tooltip :data="tableData">
+        <el-table v-loading="tableLoading" show-overflow-tooltip :data="tableData" @cell-click="cellClick">
-            <el-table-column label="队伍" prop="groupName" header-align="center" align="center"
+            <el-table-column label="队伍" prop="groupName" fixed="left" width="100px"></el-table-column>
-                             width="100px"></el-table-column>
 
             <el-table-column v-for="item in itemOptions" :key="item.id" :label="item.name" show-overflow-tooltip
                              width="10%">
                 <template slot="header" slot-scope="scope">
                     <span v-html="formatName(item.name)"></span>
                 </template>
-                <el-table-column label="成绩" min-width="50px"></el-table-column>
+                <el-table-column label="成绩" :prop="item.id+item.name" min-width="50px">
-                <el-table-column label="名次" min-width="50px"></el-table-column>
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row[item.id]['totalScore']"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column label="名次" :prop="item.id+item.name" min-width="50px">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row[item.id]['totalRank']"></el-input>
+                    </template>
+                </el-table-column>
             </el-table-column>
         </el-table>
-        <!--#include("/layouts/pagination.html"){}#-->
+        <el-row type="flex"justify="end" class="mt-3">
+            <el-button type="primary" @click="saveScore">保存</el-button>
+        </el-row>
     </el-card>
 </div>
 
@@ -76,10 +85,12 @@ layout("/layouts/platform_1.html"){
             }
         },
         methods: {
+            // 格式化名称
             formatName(name) {
                 if (!name) return ""
                 return name.match(/.{1,4}/g)?.join("<br>") || ""
             },
+            // 获取活动
             listAct() {
                 $.get("/platform/activity/scoreEnter/list-activity", this.pageForm).then(res => {
                     if (res.code === 0) {
@@ -93,36 +104,62 @@ layout("/layouts/platform_1.html"){
                     }
                 })
             },
-            listGroup() {
+            // 获取队伍
-                $.get("/platform/activity/scoreEnter/list-group/" + this.pageForm.activityId).then(res => {
+            async listGroup() {
-                    if (res.code === 0) {
+                const {
-                        this.groupOptions = res.data
+                    code,
-                        this.buildTableData()
+                    data,
-                    } else {
+                    msg
-                        this.$message.error(res.msg)
+                } = await $.get("/platform/activity/scoreEnter/list-group/" + this.pageForm.activityId)
-                    }
+                if (code === 0) {
-                })
+                    this.groupOptions = data
+                } else {
+                    this.$message.error(msg)
+                }
             },
-            listItem() {
+            // 获取项目
-                $.get("/platform/activity/scoreEnter/list-item/" + this.pageForm.activityId).then(res => {
+            async listItem() {
-                    if (res.code === 0) {
+                const {
-                        this.itemOptions = res.data
+                    code,
-                    } else {
+                    data,
-                        this.$message.error(res.msg)
+                    msg
-                    }
+                } = await $.get("/platform/activity/scoreEnter/list-item/" + this.pageForm.activityId)
-                })
+                if (code === 0) {
+                    this.itemOptions = data
+                } else {
+                    this.$message.error(msg)
+                }
             },
-            activityChange() {
+            // 活动改变
-                this.listGroup()
+            async activityChange() {
-                this.listItem()
+                await this.listGroup()
+                await this.listItem()
+                this.buildTableData()
             },
+            // 构建表格数据
             buildTableData() {
                 this.tableData = this.groupOptions.map((group) => {
-                    return{
+                    const row = {
+                        groupId: group.id,
                         groupName: group.groupName
                     }
+                    this.itemOptions.forEach((item) => {
+                        row[item.id] = {
+                            totalScore: item.totalScore,
+                            totalRank: item.totalRank
+                        }
+                    })
+                    return row
                 })
                 console.log(this.tableData)
+            },
+            // 单元格点击
+            cellClick(row, column){
+                console.log(row, column)
+            },
+            // 保存成绩
+            saveScore(){
+                console.log(this.tableData)
             }
         },
         created() {

frontend/src/App.vue

@@ -1,5 +1,5 @@
 <script>
-import {setupRouterInterceptor, getDefaultWhiteList} from './utils/routerInterceptor'
+import {checkAuth, setupRouterInterceptor, getDefaultWhiteList} from './utils/routerInterceptor'
 
 export default {
   globalData: {
@@ -7,7 +7,9 @@ export default {
   },
   onLaunch: function () {
     console.log('App Launch')
-
+    console.log(process.env.VUE_APP_PLATFORM)
+    // 检查访问页面是否需要登录（不走拦截器 直接从地址栏进入）
+    checkAuth()
     // 初始化路由拦截器
     setupRouterInterceptor(getDefaultWhiteList())
   },

frontend/src/manifest.json

@@ -68,5 +68,11 @@
     "uniStatistics": {
         "enable": false
     },
+    "h5": {
+        "title": "趣味运动会",
+        "router": {
+            "mode": "history"
+        }
+    },
     "vueVersion" : "3"
 }

frontend/src/utils/routerInterceptor.js

@@ -10,6 +10,32 @@ export const setupRouterInterceptor = (whiteList = []) => {
     addNavigationInterceptors(whiteList)
 }
 
+export const checkAuth = () => {
+    debugger
+    if (process.env.VUE_APP_PLATFORM === 'h5' && window.location.pathname !== '/') {
+        const path = window.location.pathname.replace(/^\//, '')
+        if (!getDefaultWhiteList().includes(path)) {
+            const token = uni.getStorageSync('token')
+            if(token){
+                // 获取用户信息
+                const {user} = getApp().globalData
+                if(user == null){
+                    return useRequest().get('/client/auth/info').then(({code, data, msg}) => {
+                        if(code === 0){
+                            getApp().globalData.user = data
+                        }
+                    })
+                }
+            }else{
+                uni.redirectTo({
+                    url: '/pages/login/index'
+                })
+            }
+        }
+    }
+}
+
+
 /**
  * 添加所有导航方法的拦截器
  * @param {Array} whiteList - 白名单页面列表