Merge remote-tracking branch 'origin/main'

src/views/data/dataSearch.vue

@@ -118,7 +118,7 @@ export default {
   created() {
     this.getselect()
     const start = moment()
-      .subtract(365, 'days')
+      .subtract(1, 'days')
       .set({ hour: 0, minute: 0, second: 0 });
     const end = moment()
       .set({ hour: 23, minute: 59, second: 59 });
@@ -192,15 +192,14 @@ export default {
         this.tableParams.startTime = null
         this.tableParams.endTime = null
         this.tableParams.pageNum = 1
-        this.getTableDataList()
       } else {
         this.tableParams.startTime = moment(date[0]).format(this.dateFormat);
         this.tableParams.endTime = moment(date[1]).format(this.dateFormat);
         this.tableParams.pageNum = 1
-        this.getTableDataList()
       }
     },
     getTableDataList() {
+      console.log(this.tableParams)
       tableDataList(this.tableParams).then(res => {
         if (res.code == 200) { 
           this.columns = []

src/views/data/thematicLibrary.vue

@@ -3,8 +3,8 @@
     <a-col :md="24" :sm="1" >
       <div class="table-page-search-wrapper"style="background: #e6e9f1;padding:10px;">
        <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="datatypequeryParam.schemaMass" @change="getTables" style="width: 40%;">
-          <a-select-option v-for="d in dataTypedataSources" :key="d.cnName">
-            {{ d.cnName }}
+          <a-select-option v-for="d in dataTypedataSources" :key="d.enName">
+            {{ d.enName }} {{ d.cnName }}
           </a-select-option>
         </a-select>
       </div>