Merge branch 'gn2.3' into debug

src/views/BI_manage/components/SelectChart.vue

@@ -87,6 +87,7 @@
 
 <script>
 import { mychartInterface } from '@/api/api.js';
+import { dataBaseInterface } from '@/api/api.js';
 import chartRelevanceApi from '@/api/modules/chartRelevanceApi';
 import { fittingEquationInterface,statisticFeatureInterface,crossVarietyInterface } from '@/api/modules/chartRelevanceApi';
 import futuresInterface from '@/api/modules/futuresBaseApi';
@@ -138,7 +139,7 @@ export default {
       };
 
        const apiMap = {
-        1: mychartInterface.publicList,
+        1: dataBaseInterface.chartSearchByEs,
         3: chartRelevanceApi.getChartList,
         6: fittingEquationInterface.getChartList,
         7: statisticFeatureInterface.getChartList,

src/views/mychart_manage/components/chooseChart.vue

@@ -96,6 +96,7 @@
 
 <script>
 import { mychartInterface } from '@/api/api.js';
+import { dataBaseInterface } from '@/api/api.js';
 import addMyClassifyDia from '@/views/dataEntry_manage/components/addMyClassifyDia';
 import chartRelevanceApi from '@/api/modules/chartRelevanceApi';
 import { fittingEquationInterface,statisticFeatureInterface,crossVarietyInterface } from '@/api/modules/chartRelevanceApi';
@@ -143,8 +144,15 @@ export default {
         IsShowMe: this.isShowMe
       };
 
+      //  res = await dataBaseInterface.chartSearchByEs({
+      //       PageSize: this.public_page_size,
+      //       CurrentIndex: this.public_page_no,
+      //       ClassifyId: this.default_classify || 0,
+      //       Keyword: this.search_txt
+      //     })
+
       const apiMap = {
-        1: mychartInterface.publicList,
+        1: dataBaseInterface.chartSearchByEs,
         2: futuresInterface.searchChart,
         3: chartRelevanceApi.getChartList,
         6: fittingEquationInterface.getChartList,