yangjun
/
dbsd_tjbbfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-07-09 09:02:58 +08:00
parent 15bafee757
commit 53106e2a5f
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
View File

@ -1386,11 +1386,11 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
" axisLabel:{color:'#000', fontSize: 24,fontFamily:'仿宋', formatter: function (value) {let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;} } },\n" + " axisLabel:{color:'#000', fontSize: 24,fontFamily:'仿宋', formatter: function (value) {let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;} } },\n" +
" series: [ " + " series: [ " +
" { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' }, emphasis: { focus: 'series' },\n" + " { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' }, emphasis: { focus: 'series' },\n" +
" data: "+ JSONObject.toJSONString(zytjpj21)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" + " data: "+ JSONObject.toJSONString(zytjpj21)+", barWidth: 45, itemStyle: { color: '#447f' } },\n" +
" { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' }, emphasis: { focus: 'series' },\n" + " { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' }, emphasis: { focus: 'series' },\n" +
" data: "+JSONObject.toJSONString(zytjpj22)+", barWidth: 45, itemStyle: { color: '#008ac8' } },\n" + " data: "+JSONObject.toJSONString(zytjpj22)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
" { name: '一般', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" + " { name: '一般', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" +
" data: "+JSONObject.toJSONString(zytjpj23)+", barWidth: 45,itemStyle: {color: '#57b8e7'}}," + " data: "+JSONObject.toJSONString(zytjpj23)+", barWidth: 45,itemStyle: {color: '#008ac8'}}," +
" { name: '比较不符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" + " { name: '比较不符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" +
" data: "+JSONObject.toJSONString(zytjpj24)+", barWidth: 45,itemStyle: {color: '#57b8e7'}}," + " data: "+JSONObject.toJSONString(zytjpj24)+", barWidth: 45,itemStyle: {color: '#57b8e7'}}," +
" { name: '非常不符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" + " { name: '非常不符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" +
@ -1540,7 +1540,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
zyfwyzc11[i] = Integer.valueOf(par.getTj1()); zyfwyzc11[i] = Integer.valueOf(par.getTj1());
zyfwyzc12[i] = Integer.valueOf(par.getTj2()); zyfwyzc12[i] = Integer.valueOf(par.getTj2());
if(100 - Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) >0){ if(100 - Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) >0){
zyfwyzc13[i] = 100-Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) ; zyfwyzc13[i] = Integer.valueOf(par.getTj3()) ;
}else{ }else{
zyfwyzc13[i] = 0; zyfwyzc13[i] = 0;
} }
@ -1561,13 +1561,13 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
" axisLabel:{color:'#000', fontSize: 24,fontFamily:'仿宋', formatter: function (value) {let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;} } },\n" + " axisLabel:{color:'#000', fontSize: 24,fontFamily:'仿宋', formatter: function (value) {let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;} } },\n" +
" series: [ " + " series: [ " +
" { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' }, emphasis: { focus: 'series' },\n" + " { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' }, emphasis: { focus: 'series' },\n" +
" data: "+ JSONObject.toJSONString(zyfwyzc11)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" + " data: "+JSONObject.toJSONString(zyfwyzc11)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
" { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' }, emphasis: { focus: 'series' },\n" + " { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' }, emphasis: { focus: 'series' },\n" +
" data: "+JSONObject.toJSONString(zyfwyzc12)+", barWidth: 45, itemStyle: { color: '#008ac8' } },\n" + " data: "+JSONObject.toJSONString(zyfwyzc12)+", barWidth: 45, itemStyle: { color: '#008ac8' } },\n" +
" { name: '一般', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" + " { name: '一般', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" +
" data: "+JSONObject.toJSONString(zyfwyzc13)+", barWidth: 45,itemStyle: {color: '#57b8e7'}}," + " data: "+JSONObject.toJSONString(zyfwyzc13)+", barWidth: 45,itemStyle: {color: '#57b8e7'}}," +
" { name: '比较不符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" + " { name: '比较不符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 15,fontFamily:'仿宋' },emphasis: {focus: 'series'},\n" +
" data: "+JSONObject.toJSONString(zyfwyzc14)+", barWidth: 45,itemStyle: {color: '#beedf8'}}," + " data: "+JSONObject.toJSONString(zyfwyzc14)+", barWidth: 45,itemStyle: {color: '#beedf8'}}," +
"]}"; "]}";
String zyfwyzc1Img = WebDriverUtil.getImgByte500(zyfwyzc1ImgOptions); String zyfwyzc1Img = WebDriverUtil.getImgByte500(zyfwyzc1ImgOptions);
@ -2035,7 +2035,12 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
kclxydTjfxDdt1[i] = Integer.valueOf(par.getTj1()); kclxydTjfxDdt1[i] = Integer.valueOf(par.getTj1());
kclxydTjfxDdt2[i] = Integer.valueOf(par.getTj2()); kclxydTjfxDdt2[i] = Integer.valueOf(par.getTj2());
kclxydTjfxDdt3[i] = Integer.valueOf(par.getTj3()); kclxydTjfxDdt3[i] = Integer.valueOf(par.getTj3());
kclxydTjfxDdt4[i] = Integer.valueOf(par.getTj4()); // kclxydTjfxDdt4[i] = Integer.valueOf(par.getTj4());
if(100 - Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) - Integer.valueOf(par.getTj3()) >0){
kclxydTjfxDdt4[i] = Integer.valueOf(par.getTj4());
}else{
kclxydTjfxDdt4[i] = 0;
}
if(100 - Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) - Integer.valueOf(par.getTj3()) - Integer.valueOf(par.getTj4())>0){ if(100 - Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) - Integer.valueOf(par.getTj3()) - Integer.valueOf(par.getTj4())>0){
kclxydTjfxDdt5[i] = 100-Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) - Integer.valueOf(par.getTj3()) - Integer.valueOf(par.getTj4()); kclxydTjfxDdt5[i] = 100-Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) - Integer.valueOf(par.getTj3()) - Integer.valueOf(par.getTj4());
}else{ }else{
@ -2486,7 +2491,12 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
BlTeacherAnswer par = jxnlpjTjtList.get(i); BlTeacherAnswer par = jxnlpjTjtList.get(i);
jxnlpjFcfh[i] = Integer.valueOf(par.getTj1()); jxnlpjFcfh[i] = Integer.valueOf(par.getTj1());
jxnlpjBjfh[i] = Integer.valueOf(par.getTj2()); jxnlpjBjfh[i] = Integer.valueOf(par.getTj2());
jxnlpjYb[i] = Integer.valueOf(par.getTj3()); if(100-Integer.valueOf(par.getTj1())-Integer.valueOf(par.getTj2()) > 0){
jxnlpjYb[i] = 100-Integer.valueOf(par.getTj1())-Integer.valueOf(par.getTj2());
}else{
jxnlpjYb[i] = 0;
}
// jxnlpjYb[i] = Integer.valueOf(par.getTj3());
jxnlpjName[i] = par.getLsname(); jxnlpjName[i] = par.getLsname();
} }
//堆叠图 //堆叠图

4
jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue
View File

@ -61,7 +61,7 @@
<div v-if="current == 1" style="padding: 20px;"> <div v-if="current == 1" style="padding: 20px;">
<a-col :span="24" class="shuoming"> <a-col :span="24" class="shuoming">
<span>温馨提示：点击导入后选择数据模板进行导入！{{formData.id}}</span> <span>温馨提示：点击导入后选择数据模板进行导入！</span>
</a-col> </a-col>
<span style="text-align: center;"> <span style="text-align: center;">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls($event, { id: formData.id})">导入</j-upload-button> <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls($event, { id: formData.id})">导入</j-upload-button>
@ -72,7 +72,7 @@
<a-spin tip="报告生成中，请等待，生成完成后自动关闭页面..."> <a-spin tip="报告生成中，请等待，生成完成后自动关闭页面...">
</a-spin> </a-spin>
</div> </div>
<span>生成时间预计1分钟</span> <span>生成时间预计1分钟</span>
</div> </div>
<div class="steps-action" style="text-align: center;"> <div class="steps-action" style="text-align: center;">