更新图表穿透

.gitignore

@@ -8,3 +8,5 @@ logs/jeecgboot-2023-11-03.1.log
 logs/jeecgboot-2023-11-03.1.html
 logs/jeecgboot-2023-11-03.0.html
 logs/jeecgboot-2023-11-03.0.log
+logs/jeecgboot-2023-11-04.0.log
+logs/jeecgboot-2023-11-04.0.html

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/controller/QcQyxxController.java

@@ -963,6 +963,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         map.put("SUMSSXZDX", qcSsgqzysytdqkService.getMap(queryWrapperBydxss).get("sumssxzdx"));
         map.put("SUMSZXZDX", Double.parseDouble(qcSsgqzysytdqkService.getMap(queryWrapperBydxsz).get("sumszxzdx").toString()) * 0.0015);
         /*上报地块面积*/
+        System.out.println(map);
         return Result.OK(map);
     }
 
@@ -1280,7 +1281,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper2.select("count(SYS_ORG_CODE) as \"value\"");
         queryWrapper2.likeRight("SYS_ORG_CODE", "A03");
         queryWrapper2.eq("SFSB", 3);
-        queryWrapper2.eq("tdsyxz","闲置,低效土地" );
+        queryWrapper2.eq("tdsyxz","闲置低效土地" );
         Map map2 = qcSsgqzysytdqkService.getMap(queryWrapper2);
         QueryWrapper queryWrapper3 = new QueryWrapper<>();
 

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/mapper/xml/QcQyxxMapper.xml

@@ -233,7 +233,7 @@
                             from QC_SSGQZYSYTDQK a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
-                            where TDSYXZ = '闲置,低效土地'
+                            where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A04%'
                               and sfsb = 3
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
@@ -253,7 +253,7 @@
                             from QC_SSGQZYSYTDQK a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
-                            where TDSYXZ = '闲置,低效土地'
+                            where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A03%'
                               and sfsb = 3
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2

BIZ/jeecg-boot-module-zrzyqc/target/classes/org/jeecg/modules/zrzyqc/qyxx/mapper/xml/QcQyxxMapper.xml

@@ -233,7 +233,7 @@
                             from QC_SSGQZYSYTDQK a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
-                            where TDSYXZ = '闲置,低效土地'
+                            where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A04%'
                               and sfsb = 3
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
@@ -253,7 +253,7 @@
                             from QC_SSGQZYSYTDQK a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
-                            where TDSYXZ = '闲置,低效土地'
+                            where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A03%'
                               and sfsb = 3
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2

UI2/src/components/OneMap/BasicMap.vue

@@ -666,7 +666,16 @@ export default {
 
             }
           } else if (actionId == "showAll") {
-            window.open('http://localhost:59196/?startscene=scene_'+this.resData.vr, '_blank')
+            if(this.resData.vr == null){
+              this.$message.warn("全景图片不存在！")
+
+            }else {
+              window.open('http://localhost:59196/?startscene=scene_'+this.resData.vr, '_blank')
+            }
+
+          }else{
+            this.$message.warn("该地块未上报信息！")
+
           }
           /*  if (attributes.WJBH == "东区国用(2016)第197号") {
               window.open('https://vr.justeasy.cn/view/16id9258237l1652-1692581652.html', '_blank')

UI2/src/views/tj/compoent/BarDobuleData.vue

@@ -12,14 +12,12 @@ export default {
   name: "BarData",
   data() {
     return {
-      a:[],
-      b:[]
+      a: [],
+      b: []
     }
   },
   props: {
-    resultXData: {
-
-    },
+    resultXData: {},
     titleText: {
       type: String,
     }
@@ -30,9 +28,9 @@ export default {
     }, 1000)*/
   },
   watch: {
-    resultXData:{
-        handler(newVal){
-        this.resultYData=newVal
+    resultXData: {
+      handler(newVal) {
+        this.resultYData = newVal
         this.getPie()
       }
 
@@ -41,91 +39,95 @@ export default {
   methods: {
     getPie() {
       var _this = this
+
       // 绘制图表
-     /* this.$nextTick(() => {*/
-        var option = {
-          title: {
-            text: this.titleText,
-            x: 'left',              //标题位置
-            // textStyle: { //标题内容的样式
-            //   color: '#000',
-            //   fontStyle: 'normal',
-            //   fontWeight: 100,
-            //   fontSize: 16 //主题文字字体大小，默认为18px
-            // },
-          },
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-              type: 'shadow'
-            }
-          },
-          grid: {
-            left: '3%',
-            right: '4%',
-            bottom: '3%',
-            containLabel: true
-          },
-          xAxis: [
-            {
-              type: 'category',
-              data: this.resultYData.name,
-              axisTick: {
-                alignWithLabel: true
-              },
-              axisLabel: {
-                interval: 0,
-                rotate: 20
-              }
+      /* this.$nextTick(() => {*/
+      var option = {
+        title: {
+          text: this.titleText,
+          x: 'left',              //标题位置
+          // textStyle: { //标题内容的样式
+          //   color: '#000',
+          //   fontStyle: 'normal',
+          //   fontWeight: 100,
+          //   fontSize: 16 //主题文字字体大小，默认为18px
+          // },
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: this.resultYData.name,
+            axisTick: {
+              alignWithLabel: true
+            },
+            axisLabel: {
+              interval: 0,
+              rotate: 20
             }
-          ],
-          legend: {
-            top: '5%', // 控制 板块控制器的位置
-            right: 'center',
-            // icon: 'rect',//形状  类型包括 circle，rect,line，roundRect，triangle，diamond，pin，arrow，none
-            // itemWidth: 10,  // 设置宽度
-            // itemHeight: 4, // 设置高度
-            itemGap: 40, // 设置两个legend之间的间距
+          }
+        ],
+        legend: {
+          top: '5%', // 控制 板块控制器的位置
+          right: 'center',
+          // icon: 'rect',//形状  类型包括 circle，rect,line，roundRect，triangle，diamond，pin，arrow，none
+          // itemWidth: 10,  // 设置宽度
+          // itemHeight: 4, // 设置高度
+          itemGap: 40, // 设置两个legend之间的间距
+        },
+        yAxis: [
+          {
+            type: 'value',
+            name: "单位（亩）",
+          }
+        ],
+        series: [
+          {
+            name: '实际占用土地面积',
+            type: 'bar',
+            barWidth: 20,
+            symbolSize: 8,
+            label: {
+              show: true,
+              position: 'top',
+            },
+            data: this.resultYData.value
           },
-          yAxis: [
-            {
-              type: 'value',
-              name: "单位（亩）",
-            }
-          ],
-          series: [
-            {
-              name: '实际占用土地面积',
-              type: 'bar',
-              barWidth: 20,
-              symbolSize: 8,
-              label: {
-                show: true,
-                position:'top',
-              },
-              data: this.resultYData.value
+          {
+            name: '闲置低效土地面积',
+            type: 'bar',
+            symbolSize: 8,
+            barWidth: 20,
+            label: {
+              show: true,
+              position: 'top',
             },
-            {
-              name: '闲置低效土地面积',
-              type: 'bar',
-              symbolSize: 8,
-              barWidth: 20,
-              label: {
-                show: true,
-                position:'top',
-              },
-              data: this.resultYData.value2
-            }
-          ]
+            data: this.resultYData.value2
+          }
+        ]
 
-        }
+      }
 
-        // 使用刚指定的配置项和数据显示图表。
-        var myChart = echarts.init(this.$refs.dom)
-        myChart.setOption(option)
-        /*window.addEventListener("resize", myChart.resize);*/
+      // 使用刚指定的配置项和数据显示图表。
+      var myChart = echarts.init(this.$refs.dom)
+      myChart.on('click', (params) => {
+        _this.$emit('visible', {xzqh: params.name});
+      })
+      myChart.setOption(option)
+      /*window.addEventListener("resize", myChart.resize);*/
 
-    //  })
+      //  })
 
     }
   },

UI2/src/views/tj/sjtjModules.vue

@@ -106,7 +106,7 @@
 <!--        </a-col>-->
         <a-col :sm="24" :md="12" :xl="24">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <BarDobuleData style="width: 1600px" :titleText=this.BarTitleBysjzymj2 :result-x-data="resBarSzData"></BarDobuleData>
+            <BarDobuleData style="width: 1600px" :titleText=this.BarTitleBysjzymj2 :result-x-data="resBarSzData" @visible="visibleInfo"></BarDobuleData>
           </a-card>
         </a-col>
       </a-row>
@@ -165,7 +165,7 @@
         </a-col>
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <BarDobuleData :titleText=this.BarTitleBysjzymj :result-x-data="resBarSsData"></BarDobuleData>
+            <BarDobuleData :titleText=this.BarTitleBysjzymj :result-x-data="resBarSsData" @visible="visibleInfoXzqh"></BarDobuleData>
           </a-card>
         </a-col>
 
@@ -217,6 +217,7 @@ import WaterWorld from "@views/tj/compoent/WaterWorld";
 import NightingaleCharData from "@views/tj/compoent/NightingaleCharData";
 import {getAction} from "@api/manage";
 import QcSsgqzysytdqkListBySs from "@views/qcsb/QcSsgqzysytdqkList_tj"
+import {initDictOptions} from '@/components/dict/JDictSelectUtil'
 
 
 import QcSsgqzysytdqkListBySz from "@views/sydwqcsb/QcSsgqzysytdqkList_tj"
@@ -322,12 +323,25 @@ export default {
       this.visible = false
       this.visibleSz = false
     },
-    visibleInfo(params) {
-      this.param=params
-      this.visible = true
+    visibleInfoXzqh(params) {
+      initDictOptions("xq").then(res=>{
+        for (const re of res.result) {
+          if(re.text==params.xzqh){
+            this.param={xzqh:re.value}
+            this.visible = true
+          }
+        }
+      })
+
+      // this.param=params
+      // this.visible = true
 
       // this.$router.push({ name:'qcsb-qcSsgqzysytdqk-list', query:{sfsb:3} });
     },
+    visibleInfo(params){
+      this.param=params
+      this.visible = true
+    },
 
     getAreaData() {
       getAction("/qcsb.qyxx/qcQyxx/sbdkmj").then(res => {
@@ -336,7 +350,7 @@ export default {
           this.SUMSSXZDX = res.result.SUMSSXZDX.toFixed(2);
           this.SUMSZXZDX = res.result.SUMSZXZDX.toFixed(2);
           this.SUMSZ = res.result.SUMSZ.toFixed(2);
-          console.log(6666666666,res.result)
+
         }
       })
     },
@@ -453,7 +467,6 @@ export default {
           this.resWordDataZy = parseFloat(res.result[1].value / res.result[3].value);
           this.resWordDataXz = parseFloat(res.result[2].value / res.result[3].value);
 
-          console.log(2222222222, this.resWordDataCz)
         }
       })
     },