王家东 10 months ago
parent 0f8397fe03
commit bd2b99a89a
  1. 2
      jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
  2. 11
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompController.java
  3. 6
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompService.java
  4. 14
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompServiceImpl.java
  5. 1
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/IAnnualCompPointService.java
  6. 9
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/controller/CompSystemBigScreenController.java
  7. 83
      jeecgboot-vue3-master/src/views/dashboard/Analysis/components/BdcTabCard.vue
  8. 4
      jeecgboot-vue3-master/src/views/dashboard/Analysis/components/ChartGroupCard.vue
  9. 1
      jeecgboot-vue3-master/src/views/dashboard/Analysis/components/props.ts
  10. 15
      jeecgboot-vue3-master/src/views/dashboard/Analysis/data.js
  11. 23
      jeecgboot-vue3-master/src/views/dashboard/Analysis/homePage/IndexBdc.vue
  12. 4
      jeecgboot-vue3-master/src/views/dashboard/Analysis/index.vue

@ -138,7 +138,7 @@ public class ShiroConfig {
//filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面 //filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面
//filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试 //filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试
filterChainDefinitionMap.put("/comp/bigScreen/**", "anon");//比赛大屏 filterChainDefinitionMap.put("/comp/bigScreen/**", "anon");//比赛大屏
filterChainDefinitionMap.put("/admin/inde/**", "anon");//比赛大屏 filterChainDefinitionMap.put("/admin/inde/inde", "anon");//比赛大屏
//websocket排除 //websocket排除
filterChainDefinitionMap.put("/websocket/**", "anon");//系统通知和公告 filterChainDefinitionMap.put("/websocket/**", "anon");//系统通知和公告

@ -1,11 +1,13 @@
package org.jeecg.modules.demo.annualCompIntface.controller; package org.jeecg.modules.demo.annualCompIntface.controller;
import io.lettuce.core.ScriptOutputType;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect;
import org.jeecg.modules.demo.annualCompIntface.service.AnnconalCompService; import org.jeecg.modules.demo.annualCompIntface.service.AnnconalCompService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map; import java.util.Map;
@Api(tags = "组委会首页") @Api(tags = "组委会首页")
@ -31,4 +34,12 @@ public class AnnconalCompController
Map<String, Object> result = annconalCompService.inde(); Map<String, Object> result = annconalCompService.inde();
return Result.ok(result); return Result.ok(result);
} }
@ApiOperation(value = "管理员首页", notes = "管理员首页")
@GetMapping(value = "/studentindex")
public Result studentindex(HttpServletRequest req) {
List<PersonalAbilityEvaluationCollect> result = annconalCompService.studentindex();
System.out.println(result);
return Result.ok(result);
}
} }

@ -1,7 +1,13 @@
package org.jeecg.modules.demo.annualCompIntface.service; package org.jeecg.modules.demo.annualCompIntface.service;
import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect;
import java.util.List;
import java.util.Map; import java.util.Map;
public interface AnnconalCompService { public interface AnnconalCompService {
Map<String, Object> inde(); Map<String, Object> inde();
List<PersonalAbilityEvaluationCollect> studentindex();
} }

@ -3,6 +3,10 @@ package org.jeecg.modules.demo.annualCompIntface.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation;
import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect;
import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService;
import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationService;
import org.jeecg.modules.demo.annual.entity.Annual; import org.jeecg.modules.demo.annual.entity.Annual;
import org.jeecg.modules.demo.annual.service.IAnnualService; import org.jeecg.modules.demo.annual.service.IAnnualService;
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
@ -41,6 +45,8 @@ public class AnnconalCompServiceImpl implements AnnconalCompService{
@Autowired @Autowired
private IAnnualCompetitionProjectRegistrationService annualCompetitionProjectRegistrationService; private IAnnualCompetitionProjectRegistrationService annualCompetitionProjectRegistrationService;
@Autowired
private IPersonalAbilityEvaluationCollectService personalAbilityEvaluationService;
@Override @Override
@ -112,4 +118,12 @@ public class AnnconalCompServiceImpl implements AnnconalCompService{
return resultMap; return resultMap;
} }
@Override
public List<PersonalAbilityEvaluationCollect> studentindex() {
LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
String username=user.getUsername();
List<PersonalAbilityEvaluationCollect> personalAbilityEvaluations = personalAbilityEvaluationService.list(new LambdaQueryWrapper<PersonalAbilityEvaluationCollect>().in(PersonalAbilityEvaluationCollect::getWorkOn, "2340330327"));
return personalAbilityEvaluations;
}
} }

@ -2,6 +2,7 @@ package org.jeecg.modules.demo.annualCompPoint.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation;
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -44,4 +45,12 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
return Result.ok(result); return Result.ok(result);
} }
//学生的首页
@GetMapping(value = "/studentindex")
public Result<?> studentindex(){
return Result.OK("qwq");
}
} }

@ -2,50 +2,12 @@
<a-card :loading="loading" :bordered="false" :body-style="{ padding: '0' }"> <a-card :loading="loading" :bordered="false" :body-style="{ padding: '0' }">
<div class="salesCard"> <div class="salesCard">
<a-tabs default-active-key="1" size="large" :tab-bar-style="{ marginBottom: '24px', paddingLeft: '16px' }"> <a-tabs default-active-key="1" size="large" :tab-bar-style="{ marginBottom: '24px', paddingLeft: '16px' }">
<template #rightExtra> <a-tab-pane loading="true" tab="能力分布" key="1">
<div class="extra-wrapper">
<div class="extra-item">
<a>今日</a>
<a>本周</a>
<a>本月</a>
<a>本年</a>
</div>
<a-range-picker :style="{ width: '256px' }" />
</div>
</template>
<a-tab-pane loading="true" tab="受理监管" key="1">
<a-row> <a-row>
<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24"> <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
<Bar :chartData="barData" :option="{ title: { text: '受理量统计', textStyle: { fontWeight: 'lighter' } } }" height="40vh" /> <Bar :chartData="barData" :option="{ title: { text: '能力分布', textStyle: { fontWeight: 'lighter' } } }" height="40vh" />
</a-col>
<a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
<QuickNav :loading="loading" class="enter-y" :bordered="false" :body-style="{ padding: 0 }" />
</a-col>
</a-row>
</a-tab-pane>
<a-tab-pane tab="交互监管" key="2">
<a-row>
<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
<BarMulti
:chartData="barMultiData"
:option="{ title: { text: '平台与部门交互量统计', textStyle: { fontWeight: 'lighter' } } }"
height="40vh"
/>
</a-col>
<a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
<QuickNav :loading="loading" class="enter-y" :bordered="false" :body-style="{ padding: 0 }" />
</a-col>
</a-row>
</a-tab-pane>
<a-tab-pane tab="存储监管" key="3">
<a-row>
<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24" style="display: flex">
<Gauge :chartData="{ name: 'C盘', value: 70 }" height="30vh"></Gauge>
<Gauge :chartData="{ name: 'D盘', value: 50 }" height="30vh"></Gauge>
</a-col>
<a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
<QuickNav :loading="loading" class="enter-y" :bordered="false" :body-style="{ padding: 0 }" />
</a-col> </a-col>
</a-row> </a-row>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
@ -54,10 +16,10 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue'; import { ref } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import Bar from '/@/components/chart/Bar.vue'; import Bar from '/@/components/chart/Bar.vue';
import BarMulti from '/@/components/chart/BarMulti.vue'; const ruleBaseURL = '/admin/inde/';
import Gauge from '/@/components/chart/Gauge.vue'; const url = ruleBaseURL + 'studentindex';
import QuickNav from './QuickNav.vue';
defineProps({ defineProps({
loading: { loading: {
@ -65,21 +27,26 @@
}, },
}); });
const rankList = [];
for (let i = 0; i < 7; i++) {
rankList.push({
name: '白鹭岛 ' + (i + 1) + ' 号店',
total: 1234.56 - i * 100,
});
}
const barData = []; const barData = [];
for (let i = 0; i < 12; i += 1) { const getOrderNum = () => {
defHttp.get({ url }, { isTransformResponse: false }).then((res) => {
//
if (res.success) {
for (let i = 0; i < res.result.length; i += 1){
barData.push({ barData.push({
name: `${i + 1}`, name :res.result[i].capacityName,
value: Math.floor(Math.random() * 1000) + 200, value: res.result[i].value,
}); })
/* console.log("---------------------")
console.log(barData)
console.log("---------------------")*/
} }
}
});
};
const barMultiData = []; const barMultiData = [];
for (let j = 0; j < 2; j++) { for (let j = 0; j < 2; j++) {
for (let i = 0; i < 12; i += 1) { for (let i = 0; i < 12; i += 1) {
@ -90,6 +57,10 @@
}); });
} }
} }
// setup getOrderNum
getOrderNum();
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

@ -69,7 +69,7 @@
}); });
const option = ref({ xAxis: { show: false, boundaryGap: false }, yAxis: { show: false, boundaryGap: false, max: 220 } }); const option = ref({ xAxis: { show: false, boundaryGap: false }, yAxis: { show: false, boundaryGap: false, max: 220 } });
const chartData = ref([ /*const chartData = ref([
{ {
name: '1月', name: '1月',
value: 50, value: 50,
@ -94,7 +94,7 @@
name: '6月', name: '6月',
value: 120, value: 120,
}, },
]); ]);*/
const dataList = computed(() => (props.type === 'dbc' ? bdcCardList : chartCardList)); const dataList = computed(() => (props.type === 'dbc' ? bdcCardList : chartCardList));

@ -14,3 +14,4 @@ export const basicProps = {
default: '280px', default: '280px',
}, },
}; };

@ -34,21 +34,20 @@ export const growCardList = [
]; ];
export const chartCardList = [ export const chartCardList = [
{ {
title: '总销售额', title: '个人总分',
icon: 'visit-count|svg', /*icon: 'visit-count|svg',*/
total: 126560, total: 126560,
value: 234.56,
footer: '日均销售额',
}, },
{ /* {
title: '订单量', title: '订单量',
icon: 'total-sales|svg', icon: 'total-sales|svg',
value: 1234, value: 1234,
total: 8846, total: 8846,
color: 'blue', color: 'blue',
footer: '日订单量', footer: '日订单量',
}, },*/
{ /* {
title: '支付笔数', title: '支付笔数',
icon: 'download-count|svg', icon: 'download-count|svg',
value: 60, value: 60,
@ -60,7 +59,7 @@ export const chartCardList = [
title: '运营活动效果', title: '运营活动效果',
icon: 'transaction|svg', icon: 'transaction|svg',
total: 78, total: 78,
}, },*/
]; ];
export const bdcCardList = [ export const bdcCardList = [
{ {

@ -9,14 +9,14 @@
<template #rightExtra> <template #rightExtra>
<div class="extra-wrapper"> <div class="extra-wrapper">
<a-radio-group v-model:value="indexRegisterType" @change="changeRegisterType"> <a-radio-group v-model:value="indexRegisterType" @change="changeRegisterType">
<a-radio-button value="转移登记">转移登记</a-radio-button> <a-radio-button value="个人">个人</a-radio-button>
<a-radio-button value="抵押登记">抵押登记</a-radio-button> <a-radio-button value="团队">团队</a-radio-button>
<a-radio-button value="">所有</a-radio-button> <a-radio-button value="">所有</a-radio-button>
</a-radio-group> </a-radio-group>
</div> </div>
</template> </template>
<a-tab-pane tab="业务流程限时监管" key="1"> <a-tab-pane tab="参加的比赛项目" key="1">
<a-table <a-table
:dataSource="dataSource" :dataSource="dataSource"
size="default" size="default"
@ -35,21 +35,6 @@
</template> </template>
</a-table> </a-table>
</a-tab-pane> </a-tab-pane>
<a-tab-pane loading="true" tab="业务节点限时监管" key="2">
<a-table
:dataSource="dataSource1"
size="default"
rowKey="reBizCode"
:columns="table1.columns"
:pagination="ipagination1"
@change="tableChange1"
>
<template #flowRate="{ text, record, index }">
<span style="color: red">{{ record.flowRate }}小时</span>
</template>
</a-table>
</a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>
</a-col> </a-col>
@ -61,8 +46,6 @@
import { Progress } from 'ant-design-vue'; import { Progress } from 'ant-design-vue';
import ChartGroupCard from '../components/ChartGroupCard.vue'; import ChartGroupCard from '../components/ChartGroupCard.vue';
import BdcTabCard from '../components/BdcTabCard.vue'; import BdcTabCard from '../components/BdcTabCard.vue';
import LineMulti from '/@/components/chart/LineMulti.vue';
import HeadInfo from '/@/components/chart/HeadInfo.vue';
import { table, table1 } from '../data'; import { table, table1 } from '../data';
const loading = ref(true); const loading = ref(true);

@ -3,7 +3,7 @@
<IndexChart v-if="indexStyle === 1"></IndexChart> <IndexChart v-if="indexStyle === 1"></IndexChart>
<IndexBdc v-if="indexStyle == 2"></IndexBdc> <IndexBdc v-if="indexStyle == 2"></IndexBdc>
<IndexTask v-if="indexStyle == 3"></IndexTask> <IndexTask v-if="indexStyle == 3"></IndexTask>
<div style="width: 100%; text-align: right; margin-top: 20px"> <div style="width: 100%; text-align: right; margin-top: 20px;display: none">
请选择首页样式 请选择首页样式
<a-radio-group v-model:value="indexStyle"> <a-radio-group v-model:value="indexStyle">
<a-radio :value="0">默认</a-radio> <a-radio :value="0">默认</a-radio>
@ -20,5 +20,5 @@
import IndexBdc from './homePage/IndexBdc.vue'; import IndexBdc from './homePage/IndexBdc.vue';
import IndexTask from './homePage/IndexTask.vue'; import IndexTask from './homePage/IndexTask.vue';
const indexStyle = ref(0); const indexStyle = ref(2);
</script> </script>

Loading…
Cancel
Save