Browse Source

no message

Administrator 1 year ago
parent
commit
e0fdbff5ee

+ 6 - 0
.gitignore

@@ -0,0 +1,6 @@
+logs/jeecgboot-2023-11-02.0.html
+logs/jeecgboot-2023-11-02.0.log
+logs/error-log.html
+logs/jeecgboot-2023-11-02.1.html
+logs/jeecgboot-2023-11-01.0.html
+logs/jeecgboot-2023-11-01.0.log

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

@@ -184,7 +184,7 @@
 
 
     <select id="dtdktj" resultType="map" parameterType="String">
     <select id="dtdktj" resultType="map" parameterType="String">
 
 
-        select count(b.sjxzqhdm) as "value", b.SJXZQHMC as "name",
+        select count(b.sjxzqhdm) as "value", b.SJXZQHMC as "name",b.SJXZQHDM as "xzqhdm",
         <if test="orgCode=='A04'">
         <if test="orgCode=='A04'">
             sum(SJZYTDMJ_M) as "value2"
             sum(SJZYTDMJ_M) as "value2"
         </if>
         </if>

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

@@ -184,7 +184,7 @@
 
 
     <select id="dtdktj" resultType="map" parameterType="String">
     <select id="dtdktj" resultType="map" parameterType="String">
 
 
-        select count(b.sjxzqhdm) as "value", b.SJXZQHMC as "name",
+        select count(b.sjxzqhdm) as "value", b.SJXZQHMC as "name",b.SJXZQHDM as "xzqhdm",
         <if test="orgCode=='A04'">
         <if test="orgCode=='A04'">
             sum(SJZYTDMJ_M) as "value2"
             sum(SJZYTDMJ_M) as "value2"
         </if>
         </if>

+ 2 - 0
UI2/src/views/qcsb/QcSsgqzysytdqkList_tj.vue

@@ -285,6 +285,7 @@ export default {
     searchQuery() {
     searchQuery() {
 
 
       this.changes = '1'
       this.changes = '1'
+      debugger
       this.loadData(1);
       this.loadData(1);
       // 点击查询清空列表选中行
       // 点击查询清空列表选中行
       // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
       // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
@@ -297,6 +298,7 @@ export default {
         return
         return
       }
       }
       this.queryParam = this.param
       this.queryParam = this.param
+
       //加载数据 若传入参数1则加载第一页的内容
       //加载数据 若传入参数1则加载第一页的内容
       if (arg === 1) {
       if (arg === 1) {
         this.ipagination.current = 1;
         this.ipagination.current = 1;

+ 1 - 1
UI2/src/views/tj/sjtjModules.vue

@@ -135,7 +135,7 @@
         <a-col :sm="24" :md="12" :xl="6">
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
             <DoughnutData :titleText="this.titleByszs" :result-data="this.DoughnutData2"
             <DoughnutData :titleText="this.titleByszs" :result-data="this.DoughnutData2"
-                          :pie-color="this.color"></DoughnutData>
+                          :pie-color="this.color" @visible="visibleInfo"></DoughnutData>
           </a-card>
           </a-card>
         </a-col>
         </a-col>
         <!--        <a-col :sm="24" :md="12" :xl="12">
         <!--        <a-col :sm="24" :md="12" :xl="12">