From 53106e2a5fcb5a720668b68d99bf7b3b3210527a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 9 Jul 2024 09:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BlTeacherAnswerServiceImpl.java      | 26 +++++++++++++------
 .../components/BlTeacherInfoV2Form.vue        |  4 +--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
index d8f5864..65765f6 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
@@ -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" +
                 "  series: [ " +
                 "    { 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" +
-                "      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" +
-                "      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" +
                 "       data: "+JSONObject.toJSONString(zytjpj24)+", barWidth: 45,itemStyle: {color: '#57b8e7'}}," +
                 "    { 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());
             zyfwyzc12[i] = Integer.valueOf(par.getTj2());
             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{
                 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" +
                 "  series: [ " +
                 "    { 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" +
                 "      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" +
                 "      data: "+JSONObject.toJSONString(zyfwyzc13)+", barWidth: 45,itemStyle: {color: '#57b8e7'}}," +
                 "    { 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);
@@ -2035,7 +2035,12 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
             kclxydTjfxDdt1[i] = Integer.valueOf(par.getTj1());
             kclxydTjfxDdt2[i] = Integer.valueOf(par.getTj2());
             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){
                 kclxydTjfxDdt5[i] = 100-Integer.valueOf(par.getTj1()) - Integer.valueOf(par.getTj2()) - Integer.valueOf(par.getTj3()) - Integer.valueOf(par.getTj4());
             }else{
@@ -2486,7 +2491,12 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
             BlTeacherAnswer par = jxnlpjTjtList.get(i);
             jxnlpjFcfh[i] = Integer.valueOf(par.getTj1());
             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();
         }
         //堆叠图
diff --git a/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue b/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue
index d16802a..25a89c6 100644
--- a/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue
+++ b/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue
@@ -61,7 +61,7 @@
       <div v-if="current == 1" style="padding: 20px;">
         
         <a-col :span="24" class="shuoming">
-          <span>温馨提示：点击导入后选择数据模板进行导入！{{formData.id}}</span>
+          <span>温馨提示：点击导入后选择数据模板进行导入！</span>
         </a-col>
         <span style="text-align: center;">
           <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>
         </div>
-        
+
         <span>生成时间预计1分钟</span>
       </div>
       <div class="steps-action" style="text-align: center;">