no message

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

@@ -1171,13 +1171,16 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     private Result<?> getResult(List<HashMap<String, Object>> list) {
         List names = new ArrayList<>();
         List values = new ArrayList<>();
+        List codes = new ArrayList<>();
         Map<String, Object> res = new HashMap<>();
         for (HashMap<String, Object> map : list) {
             names.add(map.get("name"));
             values.add(map.get("value"));
+            codes.add(map.get("code"));
         }
         res.put("name", names);
         res.put("value", values);
+        res.put("code",codes);
         System.out.println(res);
 
         return Result.OK(res);

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

@@ -210,13 +210,13 @@
 <!--        GROUP BY SUBSTR(a.xzqh, 0, 4), b.SJXZQHMC ORDER BY count(SUBSTR(a.xzqh, 0, 4)) DESC-->
     </select>
     <select id="sjyttjss" resultType="map">
-        select count(a.sjyt) as "value", b.name as "name"
+        select count(a.sjyt) as "value", b.name as "name",b.id as "code"
         from QC_SSGQZYSYTDQK a
                  LEFT JOIN SYS_CATEGORY b
                            on a.sjyt = b.id
         where a.SYS_ORG_CODE like 'A04%'
           and sfsb = 3
-        GROUP BY b.name
+        GROUP BY b.name,b.id
     </select>
     <select id="ssdkmj" resultType="map">
         select VA as "value", NA as "name", VA2 as "value2"

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

@@ -210,13 +210,13 @@
 <!--        GROUP BY SUBSTR(a.xzqh, 0, 4), b.SJXZQHMC ORDER BY count(SUBSTR(a.xzqh, 0, 4)) DESC-->
     </select>
     <select id="sjyttjss" resultType="map">
-        select count(a.sjyt) as "value", b.name as "name"
+        select count(a.sjyt) as "value", b.name as "name",b.id as "code"
         from QC_SSGQZYSYTDQK a
                  LEFT JOIN SYS_CATEGORY b
                            on a.sjyt = b.id
         where a.SYS_ORG_CODE like 'A04%'
           and sfsb = 3
-        GROUP BY b.name
+        GROUP BY b.name,b.id
     </select>
     <select id="ssdkmj" resultType="map">
         select VA as "value", NA as "name", VA2 as "value2"

UI2/src/components/OneMap/widgets/QueryTool.vue

@@ -24,7 +24,7 @@
               否
             </a-select-option>
           </a-select>
-          <a-select v-if="this.queryList.includes('SY')" @pressEnter='handleSearch' v-model='keyword' style='width:76%;margin-top: 3%'>
+          <a-select v-else-if="this.queryList.includes('SY')"  @pressEnter='handleSearch' v-model='keyword' style='width:76%;margin-top: 3%'>
             <a-select-option value='出让'>
               出让
             </a-select-option>
@@ -32,7 +32,7 @@
               划拨
             </a-select-option>
             <a-select-option value='转让'>
-              正常使用
+              转让
             </a-select-option>
             <a-select-option value='作价出资'>
                作价出资

UI2/src/views/qcsb/QcSsgqzysytdqkList_tj.vue

@@ -39,6 +39,11 @@
               <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="实际用途">
+              <j-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途"/>
+            </a-form-item>
+          </a-col>
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="土地使用现状">

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

@@ -6,6 +6,7 @@
 
 <script>
 import * as echarts from "echarts";
+import {loadCategoryData} from '@/api/api';
 
 
 export default {
@@ -14,14 +15,13 @@ export default {
     return {
       a: [],
       b: [],
+      sjyt: [],
     }
   },
   props: {
-    resultXData: {
-
-    },
-    seriesName:{
-      type:String,
+    resultXData: {},
+    seriesName: {
+      type: String,
     },
     titleText: {
       type: String,
@@ -31,14 +31,18 @@ export default {
     },
   },
   mounted() {
+    this.initDictConfig()
     /*setTimeout(() => {
       this.getPie();
     }, 1000)*/
   },
+  created() {
+
+  },
   watch: {
     resultXData: {
       handler(newVal) {
-        this.$nextTick(function() {
+        this.$nextTick(function () {
           this.resultYData = newVal
           this.getPie()
         })
@@ -49,9 +53,16 @@ export default {
     },
   },
   methods: {
-
+    initDictConfig() {
+      loadCategoryData({code: 'A04'}).then((res) => {
+        if (res.success) {
+          this.sjyt = res.result
+          console.log(77777777777, this.sjyt)
+        }
+      })
+    },
     getPie() {
-      var _this= this;
+      var _this = this;
       // 绘制图表
       /* this.$nextTick(() => {*/
       var option = {
@@ -145,14 +156,15 @@ export default {
 
       // 使用刚指定的配置项和数据显示图表。
       var myChart = echarts.init(this.$refs.dom)
-      myChart.on('click',(params)=>{
-        _this.$emit('visible',{sjyt:params.data.name});
+      myChart.on('click', (params) => {
+        for (const param of this.sjyt) {
+          if (param.title == params.name){
+            _this.$emit('visible', {sjyt: param.value});
+          }
 
+        }
       })
       myChart.setOption(option)
-      /*window.addEventListener("resize", myChart.resize);*/
-
-      //  })
 
     }
   },

UI2/src/views/tj/sjtjModules.vue

@@ -167,7 +167,7 @@
             <a-col :sm="24" :md="12" :xl="24">
               <!--              <a-card style="margin-bottom: 1rem;width:100%;height: 20rem">-->
               <BarTdsjyt :titleText=this.BarTitleBysz :result-x-data="this.resYData"   :dw="this.dw2"
-                       :seriesName="'地块数量'"></BarTdsjyt>
+                       :seriesName="'地块数量'"@visible="visibleInfo"> </BarTdsjyt>
               <!--              </a-card>-->
             </a-col>
           </a-card>
@@ -218,6 +218,7 @@
 
 <script>
 import mapData from "@views/tj/compoent/map3Data";
+
 import PieData from "@views/tj/compoent/PieData";
 import PieQdfsMj from "@views/tj/compoent/PieQdfsMj";
 import DoughnutData from "@views/tj/compoent/DoughnutData";
@@ -370,8 +371,7 @@ export default {
       // this.$router.push({ name:'qcsb-qcSsgqzysytdqk-list', query:{sfsb:3} });
     },
     visibleInfo(params){
-      initDictOptions("A04").then(res=>{
-      })
+     console.log(99,params)
       this.param=params
       this.visible = true
     },
@@ -482,7 +482,6 @@ export default {
       getAction("/qcsb.qyxx/qcQyxx/ssdtdktj").then(res => {
         if (res.code == 200) {
           this.resMapSsData = res.result
-          console.log(555555555, this.resMapSsData)
         }
       })
     },