From f2b32fd713bc3a30325ba6a54db035643497ef3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 27 Nov 2023 17:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonalCompScoreController.java          |  27 +++
 .../PersonalCompTotalScoreController.java     |  28 +++
 .../PersonalCompScore.api.ts                  |  64 ++++++
 .../PersonalCompScore.data.ts                 | 157 ++++++++++++++
 .../PersonalCompScoreList.vue                 | 191 +++++++++++++++++
 .../components/PersonalCompScoreForm.vue      |  70 +++++++
 .../components/PersonalCompScoreModal.vue     |  66 ++++++
 .../PersonalCompTotalScore.api.ts             |  64 ++++++
 .../PersonalCompTotalScore.data.ts            | 100 +++++++++
 .../PersonalCompTotalScoreList.vue            | 196 ++++++++++++++++++
 .../components/PersonalCompTotalScoreForm.vue |  70 +++++++
 .../PersonalCompTotalScoreModal.vue           |  66 ++++++
 12 files changed, 1099 insertions(+)
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScore.api.ts
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScore.data.ts
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScoreList.vue
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/components/PersonalCompScoreForm.vue
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/components/PersonalCompScoreModal.vue
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScore.api.ts
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScore.data.ts
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScoreList.vue
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/components/PersonalCompTotalScoreForm.vue
 create mode 100644 jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/components/PersonalCompTotalScoreModal.vue

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompScoreController.java
index 47a05488..17c3cae0 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompScoreController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompScoreController.java
@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.annualScore.entity.PersonalCompScore;
 import org.jeecg.modules.demo.annualScore.service.IPersonalCompScoreService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +75,31 @@ public class PersonalCompScoreController extends JeecgController<PersonalCompSco
         return Result.OK(pageList);
     }
 
+    /**
+     * 分页列表查询(学生端)
+     *
+     * @param personalCompScore
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "个人比赛积分-分页列表查询")
+    @ApiOperation(value = "个人比赛积分-分页列表查询", notes = "个人比赛积分-分页列表查询")
+    @GetMapping(value = "/liststu")
+    public Result<IPage<PersonalCompScore>> liststu(PersonalCompScore personalCompScore,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        QueryWrapper<PersonalCompScore> queryWrapper = QueryGenerator.initQueryWrapper(personalCompScore, req.getParameterMap());
+        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        queryWrapper.eq("work_on",user.getUsername());
+        Page<PersonalCompScore> page = new Page<PersonalCompScore>(pageNo, pageSize);
+        IPage<PersonalCompScore> pageList = personalCompScoreService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
     /**
      * 添加
      *
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java
index c6774685..8c34e5ff 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java
@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.annualScore.entity.PersonalCompTotalScore;
 import org.jeecg.modules.demo.annualScore.service.IPersonalCompTotalScoreService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +59,32 @@ public class PersonalCompTotalScoreController extends JeecgController<PersonalCo
         return Result.OK(pageList);
     }
 
+
+
+    /**
+     * 分页列表查询(学生端)
+     *
+     * @param personalCompTotalScore
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "个人总积分-分页列表查询")
+    @ApiOperation(value = "个人总积分-分页列表查询", notes = "个人总积分-分页列表查询")
+    @GetMapping(value = "/liststu")
+    public Result<IPage<PersonalCompTotalScore>> liststu(PersonalCompTotalScore personalCompTotalScore,
+                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                               HttpServletRequest req) {
+        QueryWrapper<PersonalCompTotalScore> queryWrapper = QueryGenerator.initQueryWrapper(personalCompTotalScore, req.getParameterMap());
+        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        queryWrapper.eq("work_on",user.getUsername());
+        Page<PersonalCompTotalScore> page = new Page<PersonalCompTotalScore>(pageNo, pageSize);
+        IPage<PersonalCompTotalScore> pageList = personalCompTotalScoreService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加
      *
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScore.api.ts b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScore.api.ts
new file mode 100644
index 00000000..40fc77a6
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScore.api.ts
@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/annualScore/personalCompScore/liststu',
+  save='/annualScore/personalCompScore/add',
+  edit='/annualScore/personalCompScore/edit',
+  deleteOne = '/annualScore/personalCompScore/delete',
+  deleteBatch = '/annualScore/personalCompScore/deleteBatch',
+  importExcel = '/annualScore/personalCompScore/importExcel',
+  exportXls = '/annualScore/personalCompScore/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScore.data.ts b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScore.data.ts
new file mode 100644
index 00000000..3f1575b4
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScore.data.ts
@@ -0,0 +1,157 @@
+import {BasicColumn, FormSchema} from '/@/components/Table';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '年度',
+    align: "center",
+    dataIndex: 'annualId_dictText'
+  },
+  {
+    title: '年度比赛',
+    align: "center",
+    dataIndex: 'annualCompId_dictText'
+  },
+  {
+    title: '年度比赛项目',
+    align: "center",
+    dataIndex: 'annualCompP_dictText'
+  },
+  {
+    title: '所属院系',
+    align: "center",
+    dataIndex: 'depet_dictText'
+  },
+  {
+    title: '姓名',
+    align: "center",
+    dataIndex: 'name'
+  },
+  {
+    title: '学号',
+    align: "center",
+    dataIndex: 'workOn'
+  },
+  {
+    title: '个人积分',
+    align: "center",
+    dataIndex: 'score',
+  },
+  // {
+  //  title: '备注',
+  //  align:"center",
+  //  dataIndex: 'remark'
+  // },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "年度",
+    field: 'annualId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "annual,annual_name,id"
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "年度比赛项目",
+    field: 'annualCompP',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "annual_comp_point,obj_name,id"
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "院系",
+    field: 'depet',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "sys_depart,depart_name,id"
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "学号",
+    field: 'workOn',
+    // component: 'JDictSelectTag',
+    // componentProps: {
+    //   dictCode: "sys_user,work_no,work_no"
+    // },
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "姓名",
+    field: 'name',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  // {
+  //   label: "年度比赛",
+  //   field: 'annualCompId',
+  //   component: 'JDictSelectTag',
+  //   componentProps: {
+  //     dictCode: "annual_comp,name,id"
+  //   },
+  //   colProps: {span: 6},
+  // },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '学号',
+    field: 'workOn',
+    component: 'Input',
+    // readonly:true
+  },
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '年度',
+    field: 'annualId',
+    component: 'Input',
+  },
+  {
+    label: '年度比赛',
+    field: 'annualCompId',
+    component: 'Input',
+  },
+  {
+    label: '年度比赛项目',
+    field: 'annualCompP',
+    component: 'Input',
+    // componentProps: { readOnly: true },
+  },
+  {
+    label: '个人积分',
+    field: 'score',
+    component: 'InputNumber',
+    // isFieldEditable: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
+];
+
+
+/**
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScoreList.vue b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScoreList.vue
new file mode 100644
index 00000000..ced3a244
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/PersonalCompScoreList.vue
@@ -0,0 +1,191 @@
+<template>
+  <div>
+    <!--查询区域-->
+<!--    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+&lt;!&ndash;          <a-col :lg="8">&ndash;&gt;
+&lt;!&ndash;            <a-form-item label="院系" name="depet">&ndash;&gt;
+&lt;!&ndash;              <j-dict-select-tag placeholder="请选择院系" v-model:value="queryParam.depet" dictCode="sys_dept,dept_name,id"/>&ndash;&gt;
+&lt;!&ndash;            </a-form-item>&ndash;&gt;
+&lt;!&ndash;          </a-col>&ndash;&gt;
+          <a-col :lg="8">
+            <a-form-item label="年度" name="annal_id">
+              <j-dict-select-tag placeholder="请选择年度" v-model:value="queryParam.annal_id" dictCode="annual,annual_name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="名称" name="name">
+              <a-input placeholder="请输入名称" v-model:value="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>-->
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+<!--          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>-->
+<!--          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>-->
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+<!--        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />-->
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PersonalCompScoreModal @register="registerModal" @success="handleSuccess"></PersonalCompScoreModal>
+  </div>
+</template>
+
+<script lang="ts" name="annualScore-personalCompScore" setup>
+import {ref, computed, unref, reactive} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import PersonalCompScoreModal from './components/PersonalCompScoreModal.vue'
+  import {columns, searchFormSchema} from './PersonalCompScore.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './PersonalCompScore.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import {useRouter} from "vue-router";
+  const checkedKeys = ref<Array<string | number>>([]);
+  // const router = useRouter();
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+
+
+//注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '个人比赛积分',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              //labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToNumber: [
+              ],
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+            },
+        beforeFetch: (params) => {
+          return Object.assign(params, queryParam);
+        },
+      },
+       exportConfig: {
+            name:"个人比赛积分",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         // {
+         //   label: '编辑',
+         //   onClick: handleEdit.bind(null, record),
+         // },
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+           }
+         }
+       ]
+   }
+
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/components/PersonalCompScoreForm.vue b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/components/PersonalCompScoreForm.vue
new file mode 100644
index 00000000..6722077b
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/components/PersonalCompScoreForm.vue
@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../PersonalCompScore.data';
+    import {saveOrUpdate} from '../PersonalCompScore.api';
+
+    export default defineComponent({
+        name: "PersonalCompScoreForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/annualScore/personalCompScore/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/components/PersonalCompScoreModal.vue b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/components/PersonalCompScoreModal.vue
new file mode 100644
index 00000000..ead9e22d
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/persoanlCompScore/components/PersonalCompScoreModal.vue
@@ -0,0 +1,66 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form';
+    import {formSchema} from '../PersonalCompScore.data';
+    import {saveOrUpdate} from '../PersonalCompScore.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        //labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScore.api.ts b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScore.api.ts
new file mode 100644
index 00000000..e65774a1
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScore.api.ts
@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/annualScore/personalCompTotalScore/liststu',
+  save='/annualScore/personalCompTotalScore/add',
+  edit='/annualScore/personalCompTotalScore/edit',
+  deleteOne = '/annualScore/personalCompTotalScore/delete',
+  deleteBatch = '/annualScore/personalCompTotalScore/deleteBatch',
+  importExcel = '/annualScore/personalCompTotalScore/importExcel',
+  exportXls = '/annualScore/personalCompTotalScore/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScore.data.ts b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScore.data.ts
new file mode 100644
index 00000000..4a8d6b1d
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScore.data.ts
@@ -0,0 +1,100 @@
+import {BasicColumn, FormSchema} from '/@/components/Table';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '院系',
+    align: "center",
+    dataIndex: 'depet_dictText'
+  },
+  {
+    title: '姓名',
+    align: "center",
+    dataIndex: 'name'
+  },
+  {
+    title: '学号',
+    align: "center",
+    dataIndex: 'workOn'
+  },
+  {
+    title: '总积分',
+    align: "center",
+    dataIndex: 'score'
+  },
+  // {
+  //  title: '描述',
+  //  align:"center",
+  //  dataIndex: 'remark'
+  // },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "院系",
+    field: 'depet',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "sys_depart,depart_name,id"
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "学号",
+    field: 'workOn',
+    component: 'Input',
+    // component: 'JDictSelectTag',
+    // componentProps:{
+    //   dictCode:"sys_user,work_no,work_no"
+    // },
+    colProps: {span: 6},
+  },
+  {
+    label: "姓名",
+    field: 'name',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '学号',
+    field: 'workOn',
+    component: 'Input',
+    dynamicDisabled: true
+  },
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+    dynamicDisabled: true
+  },
+  {
+    label: '总积分',
+    field: 'score',
+    component: 'InputNumber',
+    dynamicDisabled: true
+  },
+  {
+    label: '描述',
+    field: 'remark',
+    component: 'Input',
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
+];
+
+
+/**
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScoreList.vue b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScoreList.vue
new file mode 100644
index 00000000..5eb2a84f
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/PersonalCompTotalScoreList.vue
@@ -0,0 +1,196 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+<!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增-->
+<!--        </a-button>-->
+<!--        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
+        </a-button>-->
+<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">-->
+<!--          导入-->
+<!--        </j-upload-button>-->
+<!--        <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--          <template #overlay>-->
+<!--            <a-menu>-->
+<!--              <a-menu-item key="1" @click="batchHandleDelete">-->
+<!--                <Icon icon="ant-design:delete-outlined"></Icon>-->
+<!--                删除-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </template>-->
+<!--          <a-button>批量操作-->
+<!--            <Icon icon="mdi:chevron-down"></Icon>-->
+<!--          </a-button>-->
+<!--        </a-dropdown>-->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined"
+                  size="small" @click="downloadFile(text)">下载
+        </a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PersonalCompTotalScoreModal @register="registerModal"
+                                 @success="handleSuccess"></PersonalCompTotalScoreModal>
+  </div>
+</template>
+
+<script lang="ts" name="annualScore-personalCompTotalScore" setup>
+import {ref} from 'vue';
+import {BasicTable, TableAction} from '/@/components/Table';
+import {useModal} from '/@/components/Modal';
+import {useListPage} from '/@/hooks/system/useListPage'
+import PersonalCompTotalScoreModal from './components/PersonalCompTotalScoreModal.vue'
+import {columns, searchFormSchema} from './PersonalCompTotalScore.data';
+import {
+  batchDelete,
+  deleteOne,
+  getExportUrl,
+  getImportUrl,
+  list
+} from './PersonalCompTotalScore.api';
+import {downloadFile} from '/@/utils/common/renderUtils';
+
+const checkedKeys = ref<Array<string | number>>([]);
+//注册model
+const [registerModal, {openModal}] = useModal();
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '个人总积分',
+    api: list,
+    columns,
+    canResize: false,
+    formConfig: {
+      //labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      showAdvancedButton: true,
+      fieldMapToNumber: [],
+      fieldMapToTime: [],
+    },
+    actionColumn: {
+      width: 120,
+      fixed: 'right'
+    },
+  },
+  exportConfig: {
+    name: "个人总积分",
+    url: getExportUrl,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+})
+
+const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  openModal(true, {
+    isUpdate: false,
+    showFooter: true,
+  });
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: true,
+  });
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: false,
+  });
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({id: record.id}, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    // {
+    //   label: '编辑',
+    //   onClick: handleEdit.bind(null, record),
+    // }
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }
+  ]
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ]
+}
+
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/components/PersonalCompTotalScoreForm.vue b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/components/PersonalCompTotalScoreForm.vue
new file mode 100644
index 00000000..5112b89c
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/components/PersonalCompTotalScoreForm.vue
@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../PersonalCompTotalScore.data';
+    import {saveOrUpdate} from '../PersonalCompTotalScore.api';
+    
+    export default defineComponent({
+        name: "PersonalCompTotalScoreForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/annualScore/personalCompTotalScore/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/components/PersonalCompTotalScoreModal.vue b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/components/PersonalCompTotalScoreModal.vue
new file mode 100644
index 00000000..ed4dd110
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/stu/annualScore/personalCompTotalScore/components/PersonalCompTotalScoreModal.vue
@@ -0,0 +1,66 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../PersonalCompTotalScore.data';
+    import {saveOrUpdate} from '../PersonalCompTotalScore.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        //labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>
\ No newline at end of file