修改bug

target/classes/mapping/cquery/SysLogCQuery.xml

@@ -12,11 +12,11 @@
         <if test="loginID!='' and loginID!=null">
             and us.loginID like Concat('%',#{loginID},'%')
         </if>
-        <if test="startDate != null">
-            and l.logTime <![CDATA[ >= ]]> #{startDate}
+        <if test="endDate != null">
+            and l.logTime <![CDATA[ >= ]]> STR_TO_DATE(#{startDate},'%Y-%m-%d')
         </if>
-        <if test="startDate != null ">
-            and l.logTime <![CDATA[ < ]]> date_add(#{startDate}, interval 1 day)
+        <if test="endDate != null ">
+            and l.logTime <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day)
         </if>
         <if test="idList!=null and idList.size>0">
             and l.logID in

vue/src/components/basic/query/display-chart-bar.vue

@@ -5,12 +5,13 @@
 <script lang="ts">
   import {defineComponent, computed} from 'vue';
   import * as echarts from "echarts";
+  import {v4 as uuidv4} from 'uuid';
 
   export  default defineComponent ({
     props:{
       bases : [] as any,
       measures : [] as any,
-      wheres : [] as any
+      wheres : [] as any,
     },
     name : 'DisplayChartBar',
     data() {
@@ -20,7 +21,7 @@
         chartStyle: { width: "100%", height: "400px" },
         chart : null as any,
         serieType : 'bar',
-        id : Date.now()
+        id :  uuidv4()
       }
     },
     setup(props, context){
@@ -36,7 +37,6 @@
       const wheres = computed(() => {
         return props.wheres ? props.wheres : []
       });
-
       return{
         bases, measures, wheres
       }
@@ -124,7 +124,7 @@
           let sender=this.chart;
           setTimeout(function () {
             sender.resize();
-          }, 100);
+          }, 500);
         }
       },
       resize: function (){

vue/src/views/query/index.vue

@@ -106,16 +106,16 @@
               <DisplayTable ref="display" :bases="formState.bases" :measures="formState.measures"
                             @displayChange="onDisplayChange"></DisplayTable>
             </a-tab-pane>
-            <a-tab-pane key="2" tab="柱状图" forceRender="true" style="width: 100%;">
-              <DisplayChartBar ref="displayChartBar" :bases="formState.bases"
+            <a-tab-pane key="2" tab="柱状图"  forceRender="true" style="width: 100%;">
+              <DisplayChartBar ref="displayChartBar"  :bases="formState.bases"
                                :measures="formState.measures"></DisplayChartBar>
             </a-tab-pane>
-            <a-tab-pane key="3" tab="曲线图" forceRender="true" style="width: 100%;">
-              <DisplayChartLine ref="displayChartLine" :bases="formState.bases"
+            <a-tab-pane key="3" tab="曲线图"  forceRender="true" style="width: 100%;">
+              <DisplayChartLine ref="displayChartLine"  :bases="formState.bases"
                                 :measures="formState.measures"></DisplayChartLine>
             </a-tab-pane>
-            <a-tab-pane key="4" tab="条形图" forceRender="true" style="width: 100%;">
-              <DisplayChartYbar ref="displayChartYbar" :bases="formState.bases"
+            <a-tab-pane key="4" tab="条形图"  forceRender="true" style="width: 100%;">
+              <DisplayChartYbar ref="displayChartYbar"  :bases="formState.bases"
                                 :measures="formState.measures"></DisplayChartYbar>
             </a-tab-pane>
           </a-tabs>
@@ -438,6 +438,7 @@ export default defineComponent({
 .query-index-table {
   flex-grow: 1;
   display: flex;
+  width:100%;
 }
 
 .query-index-tabs {