main
significative 5 months ago
commit da1b5e68c2
  1. 1
      jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
  2. 32
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
  3. 51
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsHomePageController.java
  4. 19
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/entity/CmsArticle.java
  5. 30
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scoresta/controller/ScoreStaController.java
  6. 29
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java
  7. BIN
      jeecgboot-vue3-master/src/assets/images/mainHome/2641675928551_3.png
  8. BIN
      jeecgboot-vue3-master/src/assets/images/mainHome/div.png
  9. 13
      jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
  10. 30
      jeecgboot-vue3-master/src/views/cms/admin/articel/CmsArticle.data.ts
  11. 72
      jeecgboot-vue3-master/src/views/cms/admin/subweside/Subweside.api.ts
  12. 118
      jeecgboot-vue3-master/src/views/cms/admin/subweside/Subweside.data.ts
  13. 226
      jeecgboot-vue3-master/src/views/cms/admin/subweside/SubwesideList.vue
  14. 26
      jeecgboot-vue3-master/src/views/cms/admin/subweside/Subweside_menu_insert.sql
  15. 187
      jeecgboot-vue3-master/src/views/cms/admin/subweside/components/SubwesideForm.vue
  16. 75
      jeecgboot-vue3-master/src/views/cms/admin/subweside/components/SubwesideModal.vue
  17. 10
      jeecgboot-vue3-master/src/views/demo/main-home/components/homePage/index.vue
  18. 4
      jeecgboot-vue3-master/src/views/demo/main-home/components/matchEvaluation/components/MCh.vue
  19. 4
      jeecgboot-vue3-master/src/views/demo/main-home/index.vue
  20. 8
      jeecgboot-vue3-master/src/views/topic/Topic.api.ts
  21. 292
      jeecgboot-vue3-master/src/views/topic/TopicList5.vue

@ -98,6 +98,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码
filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码
filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除
filterChainDefinitionMap.put("/cms/front/**", "anon"); //cms不拦截
//CMS门户
filterChainDefinitionMap.put("/cms/front/**","anon");

@ -16,8 +16,10 @@ import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.cms.entity.CmsArticle;
import org.jeecg.modules.demo.cms.entity.CmsColumn;
import org.jeecg.modules.demo.cms.entity.Subweside;
import org.jeecg.modules.demo.cms.service.ICmsArticleService;
import org.jeecg.modules.demo.cms.service.ICmsColumnService;
import org.jeecg.modules.demo.cms.service.ISubwesideService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@ -27,6 +29,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Description: 文章
@ -44,6 +48,9 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
@Autowired
private ICmsColumnService cmsColumnService;
@Autowired
private ISubwesideService subwesideService;
/**
* 分页列表查询
*
@ -85,6 +92,18 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
cmsArticle.setPublishTime(new Date());
cmsArticle.setStatus("1");
// }
QueryWrapper<Subweside> subwesideQueryWrapper = new QueryWrapper<>();
subwesideQueryWrapper.in("compadminid", principal.getId());
List<Subweside> subwesideList = subwesideService.list(subwesideQueryWrapper);
if (!subwesideList.isEmpty()) {
List<String> subnames = subwesideList.stream()
.map(Subweside::getSubname) // 将每个Subweside对象映射到其subname字段
.collect(Collectors.toList()); // 收集结果到List<String>
String joinedString = String.join(", ", subnames);
cmsArticle.setSource("来自子站:"+joinedString);
}else {
cmsArticle.setSource("");
}
cmsArticleService.save(cmsArticle);
return Result.OK("添加成功!");
}
@ -111,10 +130,23 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
// @RequiresPermissions("cms:cms_article:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody CmsArticle cmsArticle) {
LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
CmsColumn cmsColumn = cmsColumnService.getById(cmsArticle.getColumnId());
if (!ObjectUtils.isEmpty(cmsColumn)) {
cmsArticle.setColumnName(cmsColumn.getName());
}
QueryWrapper<Subweside> subwesideQueryWrapper = new QueryWrapper<>();
subwesideQueryWrapper.in("compadminid", principal.getId());
List<Subweside> subwesideList = subwesideService.list(subwesideQueryWrapper);
if (!subwesideList.isEmpty()) {
List<String> subnames = subwesideList.stream()
.map(Subweside::getSubname) // 将每个Subweside对象映射到其subname字段
.collect(Collectors.toList()); // 收集结果到List<String>
String joinedString = String.join(", ", subnames);
cmsArticle.setSource("来自子站:"+joinedString);
}else {
cmsArticle.setSource("");
}
cmsArticleService.updateById(cmsArticle);
return Result.OK("编辑成功!");
}

@ -63,8 +63,57 @@ public class CmsHomePageController /*extends JeecgController<CmsColumn, ICmsColu
public Result<?> getByArticleTitle(CmsArticle cmsArticle, HttpServletRequest req) {
List<CmsArticle> list = cmsArticleService.list(new LambdaQueryWrapper<CmsArticle>()
.eq(CmsArticle::getStatus, "1")
.eq(CmsArticle::getTitle, cmsArticle.getTitle())
.eq(CmsArticle::getId, cmsArticle.getId())
.orderByDesc(CmsArticle::getPublishTime));
return Result.OK(list);
}
@ApiOperation(value = "用于首页的新闻资讯", notes = "新闻资讯")
@GetMapping(value = "/getindexnew")
public Result<?> getindexnew(CmsArticle cmsArticle,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CmsArticle> queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap());
queryWrapper.eq("status", "1");
queryWrapper.eq("column_id", "1717099205205401602");
queryWrapper.last("order by publish_time desc");
Page<CmsArticle> page = new Page<CmsArticle>(pageNo, pageSize);
IPage<CmsArticle> pageList = cmsArticleService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ApiOperation(value = "用于首页的竞赛导航", notes = "竞赛导航")
@GetMapping(value = "/getindexcomp")
public Result<?> getindexcomp(CmsArticle cmsArticle,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CmsArticle> queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap());
queryWrapper.eq("status", "1");
queryWrapper.eq("column_id", "1712301393339650049");
queryWrapper.last("order by publish_time desc");
Page<CmsArticle> page = new Page<CmsArticle>(pageNo, pageSize);
IPage<CmsArticle> pageList = cmsArticleService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ApiOperation(value = "用于首页的研究成果", notes = "研究成果")
@GetMapping(value = "/getindexaward")
public Result<?> getindexaward(CmsArticle cmsArticle,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CmsArticle> queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap());
queryWrapper.eq("status", "1");
queryWrapper.eq("column_id", "1717099355382456322");
queryWrapper.last("order by publish_time desc");
Page<CmsArticle> page = new Page<CmsArticle>(pageNo, pageSize);
IPage<CmsArticle> pageList = cmsArticleService.page(page, queryWrapper);
return Result.OK(pageList);
}
}

@ -110,4 +110,23 @@ public class CmsArticle implements Serializable {
@Excel(name = "源url", width = 15)
@ApiModelProperty(value = "源url")
private String originUrl;
/**文章图片*/
@Excel(name = "文章图片", width = 15)
@ApiModelProperty(value = "文章图片")
private java.lang.String comimg;
/**文章文件*/
@Excel(name = "文章文件", width = 15)
@ApiModelProperty(value = "文章文件")
private java.lang.String comfile;
/**文章来源*/
@Excel(name = "文章来源", width = 15, dictTable = "subweside", dicText = "subname", dicCode = "id")
@Dict(dictTable = "subweside", dicText = "subname", dicCode = "id")
@ApiModelProperty(value = "文章来源")
private java.lang.String artfrom;
/**简介*/
@Excel(name = "简介", width = 15)
@ApiModelProperty(value = "简介")
private java.lang.String info;
}

@ -126,6 +126,36 @@ public class ScoreStaController extends JeecgController<ScoreSta, IScoreStaServi
return Result.OK("添加成功!");
}
/**
* 添加题目对应的评分标准
*
* @return
*/
@AutoLog(value = "添加题目对应的评分标准-添加")
@ApiOperation(value="添加题目对应的评分标准-添加", notes="添加题目对应的评分标准-添加")
//@RequiresPermissions("scoresta:score_sta:add")
@GetMapping(value = "/addScoreSta")
public Result<String> addScoreSta(@RequestParam(name="topicid",required=true) String topicid,@RequestParam(name="acpid",required=true) String acpid,HttpServletRequest req) {
ScoreSta scoreSta = new ScoreSta();
QueryWrapper<ScoreSta> queryWrapper = QueryGenerator.initQueryWrapper(scoreSta, req.getParameterMap());
queryWrapper.eq("annual_compid",acpid);
queryWrapper.eq("topicid",topicid);
List<ScoreSta> list = scoreStaService.list(queryWrapper);
if(list.size()==0){
AnnualCompPoint annualCompPoint = annualCompPointService.getById(acpid);
AnnualComp annualComp = annualCompService.getById(annualCompPoint.getAnnualCompId());
scoreSta.setAnnualId(annualComp.getAnnualid());
scoreSta.setAnnalComp(annualComp.getId());
scoreSta.setAnnualCompid(acpid);
scoreSta.setTopicid(topicid);
scoreStaService.save(scoreSta);
return Result.OK(scoreSta.getId());
}else{
return Result.OK(list.get(0).getId());
}
}
/**
* 编辑
*

@ -233,6 +233,35 @@ public class TopicController extends JeecgController<Topic, ITopicService> {
return Result.OK(list);
}
@ApiOperation(value = "题目评分标准", notes = "题目评分标准-分页列表查询")
@GetMapping(value = "/list5")
public Result<IPage<Topic>> list5(@RequestParam(name="acpid",required=true) String acpid,Topic topic,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
/* LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String orgCode = user.getOrgCode();
topic.setSysOrgCode(orgCode);*/
QueryWrapper<Topic> queryWrapper = QueryGenerator.initQueryWrapper(topic, req.getParameterMap());
queryWrapper.eq("annual_compid",acpid);
Page<Topic> page = new Page<Topic>(pageNo, pageSize);
IPage<Topic> pageList = topicService.page(page, queryWrapper);
if(pageList.getRecords().size()==0){
Topic topic1 = new Topic();
topic1.setAnnualCompid(acpid);
AnnualCompPoint annualCompPoint = annualCompPointService.getById(acpid);
topic1.setNumber("ZC");
topic1.setName(annualCompPoint.getObjName());
topic1.setStatus(2);
topic1.setIsopen("Y");
topicService.save(topic1);
IPage<Topic> pageList1 = topicService.page(page, queryWrapper);
return Result.OK(pageList1);
}else {
return Result.OK(pageList);
}
}
@PostMapping(value = "/select")
public Result<String> select(@RequestBody Topic topic) {
QueryWrapper<Topic> queryWrapper= new QueryWrapper<>();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 KiB

After

Width:  |  Height:  |  Size: 997 KiB

@ -199,6 +199,15 @@
query: {annualCompPointId: record.id}
});
}
/**
* 评分标准
*/
function pfbz(record: Recordable) {
router.push({
path: '/topic/topic/list5',
query: {acpid: record.id}
});
}
/**
* 个人积分汇总
@ -365,6 +374,10 @@
label: '作品管理',
onClick: workManage.bind(null, record),
});
actions.unshift({
label: '评分标准',
onClick: pfbz.bind(null, record),
});
// if (record.requireUploadWorks === 'Y' && record.annualCompState === "2") {
// actions.unshift({
// label: '',

@ -123,6 +123,36 @@ export const formSchema: FormSchema[] = [
field: 'originUrl',
component: 'Input',
},
{
label: '文章图片',
field: 'comimg',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '文章文件',
field: 'comfile',
component: 'JUpload',
componentProps:{
},
},
{
label: '简介',
field: 'info',
component: 'InputTextArea',
},
/* {
label: '文章来源',
field: 'artfrom',
component: 'JSearchSelect',
componentProps:{
dict: "subweside,subname,id"
},
},*/
// TODO 主键隐藏字段,目前写死为ID
{
label: '',

@ -0,0 +1,72 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/subweside/subweside/list',
save='/subweside/subweside/add',
edit='/subweside/subweside/edit',
deleteOne = '/subweside/subweside/delete',
deleteBatch = '/subweside/subweside/deleteBatch',
importExcel = '/subweside/subweside/importExcel',
exportXls = '/subweside/subweside/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 });
/**
*
* @param params
* @param handleSuccess
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
* @param handleSuccess
*/
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
* @param isUpdate
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}

@ -0,0 +1,118 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '名称',
align: "center",
dataIndex: 'subname'
},
{
title: '所属比赛',
align: "center",
dataIndex: 'comp'
},
/* {
title: '比赛管理员',
align: "center",
dataIndex: 'compadmin'
},*/
{
title: '比赛管理员',
align: "center",
dataIndex: 'compadminid_dictText'
},
/* {
title: '比赛负责部门',
align: "center",
dataIndex: 'compdep'
},*/
{
title: '比赛负责部门',
align: "center",
dataIndex: 'compdepid_dictText'
},
/* {
title: '所属比赛',
align: "center",
dataIndex: 'compid_dictText'
},*/
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '名称',
field: 'subname',
component: 'Input',
},
{
label: '所属比赛',
field: 'comp',
component: 'JPopup',
componentProps: ({ formActionType }) => {
const {setFieldsValue} = formActionType;
return{
setFieldsValue:setFieldsValue,
code:"findsubwebside",
fieldConfig: [
{ source: 'uid', target: 'compadminid' },
{ source: 'realname', target: 'compadmin' },
{ source: 'did', target: 'compdepid' },
{ source: 'depart_name', target: 'compdep' },
{ source: 'comp_name', target: 'comp' },
{ source: 'id', target: 'compid' },
],
multi:true
}
},
},
/* {
label: '比赛管理员',
field: 'compadmin',
component: 'Input',
},*/
{
label: '比赛管理员',
field: 'compadminid',
component: 'JSearchSelect',
componentProps:{
dict: "sys_user,realname,id"
},
},
/* {
label: '比赛负责部门',
field: 'compdep',
component: 'Input',
},*/
{
label: '比赛负责部门',
field: 'compdepid',
component: 'JSearchSelect',
componentProps:{
dict: "sys_depart,depart_name,id"
},
},
{
label: '所属比赛',
field: 'compid',
component: 'JSearchSelect',
componentProps:{
dict: "comp,comp_name,id"
},
},
// TODO 主键隐藏字段,目前写死为ID
{
label: '',
field: 'id',
component: 'Input',
show: false,
},
];

@ -0,0 +1,226 @@
<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">
</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>
<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)" :dropDownActions="getDropDownAction(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>
<!-- 表单区域 -->
<SubwesideModal ref="registerModal" @success="handleSuccess"></SubwesideModal>
</div>
</template>
<script lang="ts" name="subweside-subweside" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns } from './Subweside.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Subweside.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import SubwesideModal from './components/SubwesideModal.vue'
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
import JPopup from '/@/components/Form/src/jeecg/components/JPopup.vue';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '子站管理',
api: list,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "子站管理",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs: { span: 24 },
sm: { span: 7 },
});
const wrapperCol = reactive({
xs: { span: 24 },
sm: { span: 16 },
});
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
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),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
/**
* popup组件值改变事件
*/
function setFieldsValue(map) {
Object.keys(map).map((key) => {
queryParam[key] = map[key];
});
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
width: calc(50% - 15px);
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
}
</style>

@ -0,0 +1,26 @@
-- 注意:该页面对应的前台目录为views/subweside文件夹下
-- 如果你想更改到其他目录,请修改sql中component字段对应的值
INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
VALUES ('2024070804382940240', NULL, '子站管理', '/subweside/subwesideList', 'subweside/SubwesideList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-07-08 16:38:24', NULL, NULL, 0);
-- 权限控制sql
-- 新增
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024070804382940241', '2024070804382940240', '添加子站管理', NULL, NULL, 0, NULL, NULL, 2, 'subweside:subweside:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-07-08 16:38:24', NULL, NULL, 0, 0, '1', 0);
-- 编辑
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024070804382940242', '2024070804382940240', '编辑子站管理', NULL, NULL, 0, NULL, NULL, 2, 'subweside:subweside:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-07-08 16:38:24', NULL, NULL, 0, 0, '1', 0);
-- 删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024070804382940243', '2024070804382940240', '删除子站管理', NULL, NULL, 0, NULL, NULL, 2, 'subweside:subweside:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-07-08 16:38:24', NULL, NULL, 0, 0, '1', 0);
-- 批量删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024070804382940244', '2024070804382940240', '批量删除子站管理', NULL, NULL, 0, NULL, NULL, 2, 'subweside:subweside:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-07-08 16:38:24', NULL, NULL, 0, 0, '1', 0);
-- 导出excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024070804382940245', '2024070804382940240', '导出excel_子站管理', NULL, NULL, 0, NULL, NULL, 2, 'subweside:subweside:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-07-08 16:38:24', NULL, NULL, 0, 0, '1', 0);
-- 导入excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024070804382940246', '2024070804382940240', '导入excel_子站管理', NULL, NULL, 0, NULL, NULL, 2, 'subweside:subweside:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-07-08 16:38:24', NULL, NULL, 0, 0, '1', 0);

@ -0,0 +1,187 @@
<template>
<a-spin :spinning="confirmLoading">
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-col :span="24">
<a-form-item label="名称" v-bind="validateInfos.subname">
<a-input v-model:value="formData.subname" placeholder="请输入名称" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="所属比赛" v-bind="validateInfos.comp">
<j-popup
placeholder="请选择所属比赛"
v-model:value="formData.comp"
code="findsubwebside"
:fieldConfig="[
{ source: 'uid', target: 'compadminid' },
{ source: 'realname', target: 'compadmin' },
{ source: 'did', target: 'compdepid' },
{ source: 'depart_name', target: 'compdep' },
{ source: 'comp_name', target: 'comp' },
{ source: 'id', target: 'compid' },
]"
:multi="true"
:setFieldsValue="setFieldsValue"
:disabled="disabled" />
</a-form-item>
</a-col>
<!-- <a-col :span="24">
<a-form-item label="比赛管理员" v-bind="validateInfos.compadmin">
<a-input v-model:value="formData.compadmin" placeholder="请输入比赛管理员" :disabled="disabled"></a-input>
</a-form-item>
</a-col>-->
<a-col :span="24">
<a-form-item label="比赛管理员" v-bind="validateInfos.compadminid">
<j-search-select v-model:value="formData.compadminid" dict="sys_user,realname,id" :disabled="disabled" />
</a-form-item>
</a-col>
<!-- <a-col :span="24">
<a-form-item label="比赛负责部门" v-bind="validateInfos.compdep">
<a-input v-model:value="formData.compdep" placeholder="请输入比赛负责部门" :disabled="disabled"></a-input>
</a-form-item>
</a-col>-->
<a-col :span="24">
<a-form-item label="比赛负责部门" v-bind="validateInfos.compdepid">
<j-search-select v-model:value="formData.compdepid" dict="sys_depart,depart_name,id" :disabled="disabled" />
</a-form-item>
</a-col>
<!-- <a-col :span="24">
<a-form-item label="所属比赛" v-bind="validateInfos.compid">
<j-search-select v-model:value="formData.compid" dict="comp,comp_name,id" :disabled="disabled" />
</a-form-item>
</a-col>-->
</a-row>
</a-form>
</a-spin>
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
import JPopup from '/@/components/Form/src/jeecg/components/JPopup.vue';
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../Subweside.api';
import { Form } from 'ant-design-vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: ()=>{} },
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
subname: '',
comp: '',
compadmin: '',
compadminid: '',
compdep: '',
compdepid: '',
compid: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
//
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return false;
}else{
return true;
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
//
Object.assign(formData, record);
});
}
/**
* 提交数据
*/
async function submitForm() {
//
await validate();
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//
for (let data in model) {
//
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
/**
* popup组件值改变事件
*/
function setFieldsValue(map) {
Object.keys(map).map((key) => {
formData[key] = map[key];
});
}
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
min-height: 500px !important;
overflow-y: auto;
padding: 24px 24px 24px 24px;
}
</style>

@ -0,0 +1,75 @@
<template>
<a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<SubwesideForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></SubwesideForm>
</a-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import SubwesideForm from './SubwesideForm.vue'
const title = ref<string>('');
const width = ref<number>(800);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
visible.value = true;
nextTick(() => {
registerForm.value.add();
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style>
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>

@ -49,10 +49,10 @@
</ul>
</div>
</div>
<div class="if-item" v-if="activeNavNew.text === navNews[1].text">待定...</div>
<!-- <div class="if-item" v-if="activeNavNew.text === navNews[1].text">待定...</div>
<div class="if-item" v-if="activeNavNew.text === navNews[2].text">待定...</div>
<div class="if-item" v-if="activeNavNew.text === navNews[3].text">待定...</div>
<div class="if-item" v-if="activeNavNew.text === navNews[4].text">待定...</div>
<div class="if-item" v-if="activeNavNew.text === navNews[4].text">待定...</div>-->
<div class="look-more">
<span>查看更多>></span>
@ -174,10 +174,10 @@ import { ref } from 'vue';
const navNews = [
{ img: n.Frame, text: '全部' },
{ img: n.Frame1, text: '通知公告' },
/* { img: n.Frame1, text: '' },
{ img: n.Frame2, text: '赛事咨讯' },
{ img: n.Frame3, text: '活动速递' },
{ img: n.Frame4, text: '政策文件' },
{ img: n.Frame4, text: '政策文件' },*/
]
const activeNavNew = ref(navNews[0])
@ -460,4 +460,4 @@ const activeNavNew = ref(navNews[0])
box-shadow: 1px 3px 5px 0px #ccc;
}
}
</style>
</style>

@ -6,7 +6,7 @@
<RouterLink to="/main-home">首页</RouterLink>
</div>
<div class="item">成果展示</div>
<div class="item">优秀毕业生</div>
<!-- <div class="item">优秀毕业生</div>-->
</div>
</div>
</div>
@ -388,4 +388,4 @@ a {
}
}
}
</style>
</style>

@ -4,7 +4,7 @@
<div class="header-box">
<div class="nav-center">
<div class="title">
河南省大学生学科竞赛综合管理平台
大数据双创应用竞赛管理系统
</div>
<div class="nav-content">
<div class="nav-box">
@ -439,4 +439,4 @@ function hanRou(item: item, i: number) {
justify-content: space-between;
align-items: center;
}
</style>
</style>

@ -8,6 +8,7 @@ enum Api {
list1 = '/topic/topic/list1',
list2 = '/topic/topic/list2',
list3 = '/topic/topic/list3',
list5 = '/topic/topic/list5',
select = '/topic/topic/select',
save = '/topic/topic/add',
edit = '/topic/topic/edit',
@ -15,6 +16,12 @@ enum Api {
deleteBatch = '/topic/topic/deleteBatch',
importExcel = '/topic/topic/importExcel',
exportXls = '/topic/topic/exportXls',
addScoreSta = '/scoresta/scoreSta/addScoreSta',
}
export const addScoreSta = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.addScoreSta;
return defHttp.get({ url: url, params }, { isTransformResponse: false });
}
/**
@ -36,6 +43,7 @@ export const list = (params) => defHttp.get({url: Api.list, params});
export const list1 = (params) => defHttp.get({url: Api.list1, params});
export const list2 = (params) => defHttp.get({url: Api.list2, params});
export const list3 = (params) => defHttp.get({url: Api.list3, params});
export const list5 = (params) => defHttp.get({url: Api.list5, params});
export const Update = (params) => defHttp.post({url: Api.edit, params});
export const select = (params) => defHttp.post({url: Api.select, params});

@ -0,0 +1,292 @@
<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">
<a-col :lg="8">
<a-form-item label="年度比赛项目" name="annualCompid">
<j-search-select
placeholder="请选择年度比赛项目"
v-model:value="queryParam.annualCompid" dict="annual_comp_point,obj_name,id"
/>
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="题目名称">
<j-input placeholder="请输入题目名称" v-model:value="queryParam.name"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="8">
<a-form-item label="题目状态" name="status">
<j-dict-select-tag placeholder="请选择题目状态" v-model:value="queryParam.status" dictCode="topic_status"/>
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="开关" name="isopen">
<j-dict-select-tag placeholder="请选择开关" v-model:value="queryParam.isopen" dictCode="is_open" />
</a-form-item>
</a-col>
</template>
<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 @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</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>-->
<!--&lt;!&ndash; <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>&ndash;&gt;-->
<!--&lt;!&ndash; <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>&ndash;&gt;-->
<!-- <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>
<!-- 表单区域 -->
<TopicModal ref="registerModal" @success="handleSuccess"></TopicModal>
<TopicModal1 ref="registerModal1" @success="handleSuccess"></TopicModal1>
</div>
</template>
<script lang="ts" name="topic-topic" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns } from './Topic.data';
import {
list5,
deleteOne,
batchDelete,
getImportUrl,
getExportUrl,
saveOrUpdate,
Update,
addScoreSta
} from './Topic.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import TopicModal from './components/TopicModal.vue'
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
import TopicModal1 from "/@/views/topic/components/TopicModal1.vue";
import { useRoute,useRouter } from 'vue-router';
const route = useRoute();
const router = useRouter();
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const registerModal1 = ref();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '评分标准',
api: list5,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 160,
fixed: 'right',
},
beforeFetch: (params) => {
return Object.assign(params, {acpid:route.query.acpid});
},
},
exportConfig: {
name: "评分标准",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs: { span: 24 },
sm: { span: 7 },
});
const wrapperCol = reactive({
xs: { span: 24 },
sm: { span: 16 },
});
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
function handleEdit1(record: Recordable) {
// registerModal.value.disableSubmit = false;
// if (record.status===1)
record.status=2;
Update(record)
reload()
}
async function handleEdit2(record: Recordable) {
// if (record.status===1)
let topicid = record.id;
let acpid = route.query.acpid;
await addScoreSta({topicid:topicid,acpid:acpid}, false)
.then((res) => {
if (res.success) {
console.log(res.result)
let id =res.result;
router.push({ path: '/scorestapoint/ScoreStaPointList', query: {id} })
}
});
}
function handleEdit3(record: Recordable) {
registerModal1.value.disableSubmit = true;
registerModal1.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
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) {
const actions = [
{
label: '评分标准',
onClick: handleEdit2.bind(null, record),
},
/* {
label: '详情',
onClick: handleDetail.bind(null, record),
}*/
];
return actions;
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
/**
* popup组件值改变事件
*/
function setFieldsValue(map) {
Object.keys(map).map((key) => {
queryParam[key] = map[key];
});
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
width: calc(50% - 15px);
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
}
</style>
Loading…
Cancel
Save