Merge branch 'debug' of http://8.136.199.33:3000/eta_gn_front/eta_front into debug

src/views/BI_manage/index.vue

@@ -400,7 +400,7 @@ export default {
       position: absolute;
       right: 20px;
       top: 14px;
-      border-left: 1px solid $border-color;
+      /*border-left: 1px solid $border-color;*/
       padding-left: 10px;
     }
   }

src/views/knowledge_manage/components/classifyDia.vue

@@ -59,7 +59,7 @@
 								<!-- 删除目录 -->
                 <el-popconfirm
                   title="确认删除该分类吗？"
-                  @confirm="handleRemoveNode"
+                  @onConfirm="handleRemoveNode(data)"
                 >
                   <img
                     slot="reference"

src/views/knowledge_manage/components/importFileDia.vue

@@ -41,7 +41,13 @@
         </el-form-item>
 
         <el-form-item prop="source" label="来源">
-          <el-select
+          <el-input 
+            v-model="eventForm.source" 
+            placeholder="请输入来源"
+            style="width:80%"
+            clearable
+          />
+          <!-- <el-select
               v-model="eventForm.source"
               placeholder="请选择来源"
               size="medium"
@@ -54,7 +60,7 @@
                 :label="item" 
                 :value="item" 
               />
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item prop="tagId" label="标签">
           <el-select
@@ -124,7 +130,7 @@ export default {
       if(!nval) return 
 
       this.getClassifyList();
-      this.getSourceList();
+      // this.getSourceList();
       this.getTagsList();
     }
   },

src/views/knowledge_manage/edit.vue

@@ -33,7 +33,12 @@
         </el-form-item>
 
         <el-form-item prop="source">
-          <el-select
+          <el-input 
+            v-model="eventForm.source" 
+            placeholder="请输入来源"
+            clearable
+          />
+          <!-- <el-select
               v-model="eventForm.source"
               placeholder="请选择来源"
               size="medium"
@@ -45,7 +50,7 @@
                 :label="item" 
                 :value="item" 
               />
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item prop="tagId">
           <el-select
@@ -188,7 +193,7 @@ export default {
   },
   mounted(){
     this.getClassifyList()
-    this.getSourceList()
+    // this.getSourceList()
     this.getTagsList()
 
     this.id && this.getEventDetail()

src/views/knowledge_manage/list.vue

@@ -184,8 +184,8 @@
 
         <div style="height:35px;margin: 20px 0;">
           <m-page
-            :page_no="pageNo"
-            :pageSize="pageSize"
+            :page_no="filterForm.pageNo"
+            :pageSize="filterForm.pageSize"
             :total="total"
             @handleCurrentChange="pageChange"
           />
@@ -247,7 +247,7 @@ export default {
     },
     tableColums() {
       return [
-        { label: '开始时间',key: 'CreateTime' },
+        { label: '开始时间',key: 'StartTime' },
         { label: '标题',key: 'Title',minwidthsty:'150px' },
         { label: '来源',key: 'SourceFrom' },
         { label: '分类',key: 'ClassifyFullName' },

src/views/system_manage/dataRefreshSetting.vue

@@ -33,7 +33,7 @@
                 
                 <el-input :placeholder="$t('SystemManage.DataRefresh.indicator_name')" prefix-icon="el-icon-search" clearable
                     v-model="selectOption.keyWord" @input="selectOptionChange('keyWord')"
-                    v-if="![34,11].includes(Source)&&Source"></el-input>
+                    ></el-input>
                 
             </div>
             <div class="table-box" v-if="hasSelectOption">
@@ -272,7 +272,7 @@ export default {
     data() {
         return {
             settingTab:'time',
-            Source:'',
+            Source:0,
             SourceList:[],
             SubSource:'',
             SubSourceList:[],
@@ -291,7 +291,7 @@ export default {
                 sortType:'',//升序降序
                 sortParam:'',//排序字段
             },
-            hasSelectOption:false,
+            hasSelectOption: true,
             selectOptionLoading:false,
 
             
@@ -324,7 +324,7 @@ export default {
             statusSourceList:[],
             statusEdbClassifyList:[],
             searchParams:{
-                Source:'',
+                Source:0,
                 Status:'',
                 Frequency:'',
                 SysUserId:'',
@@ -444,11 +444,11 @@ export default {
             this.isSetTimeDialogShow = true
             if(isDefault){
                 //判断数据源是否选择
-                if(!this.Source){
-                    // this.$message.warning("请选择数据源")
-                    this.$message.warning(this.$t('SystemManage.DataRefresh.select_source_pld'))
-                    return
-                }
+                // if(!this.Source){
+                //     // this.$message.warning("请选择数据源")
+                //     this.$message.warning(this.$t('SystemManage.DataRefresh.select_source_pld'))
+                //     return
+                // }
                 /* if(this.SubSourceList.length&&!this.SubSource){
                     this.$message.warning("$t('SystemManage.DataRefresh.complete_data_source')")
                     return
@@ -537,7 +537,7 @@ export default {
             const source = this.SourceList.find(i=>i.Source===this.Source)||{Child:[]}
             this.SubSourceList = source.Child
             this.SubSource=''
-            this.hasSelectOption = ![34,11].includes(this.Source)
+            this.hasSelectOption = true
             if(this.hasSelectOption){
                 this.resetSelect()
                 this.tableData = []
@@ -568,7 +568,7 @@ export default {
         },
         //获取分类列表
         async getClassifyList(){
-            if(!this.Source) return 
+            // if(!this.Source) return 
             const res = await dataRefreshInterface.getClassifyList({
                 Source:Number(this.Source)
             })
@@ -589,7 +589,7 @@ export default {
             //获取终端编码列表
             await this.getClassifyList()
             //获取分类列表
-            await this.getTerminalCodeList()
+            // await this.getTerminalCodeList()
             this.selectOptionLoading = false
         },
         //切换数据源时重置表格选项
@@ -1094,8 +1094,10 @@ export default {
         },
     },
     mounted(){
-        this.getSourceList()
+        // this.getSourceList()
         this.getUserList()
+        this.getTableData('optionChange')
+        this.getSelectOption()
     }
 };
 </script>