From aad05accc15b56e9e74da5931edfd0b19882bce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Mon, 20 Jun 2022 15:39:18 +0800
Subject: [PATCH 1/9] fix: 275767

---
 web/src/apps/linkis/module/ECM/index.vue            |  2 +-
 .../apps/linkis/module/resourceManagement/index.vue | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/src/apps/linkis/module/ECM/index.vue b/web/src/apps/linkis/module/ECM/index.vue
index d9cffa6539..59cbb58fe6 100644
--- a/web/src/apps/linkis/module/ECM/index.vue
+++ b/web/src/apps/linkis/module/ECM/index.vue
@@ -240,7 +240,7 @@ export default {
         }
         return data;
       }
-      return  v && (v.cores !== undefined || v.memonry !== undefined || v.instance !== undefined) ? `${calcCompany(v.cores)}cores,${calcCompany(v.memory, true)}G,${calcCompany(v.instance)}apps` : ''
+      return  v && (v.cores !== undefined || v.memory !== undefined || v.instance !== undefined) ? `${calcCompany(v.cores)}cores,${calcCompany(v.memory, true)}G,${calcCompany(v.instance)}apps` : ''
     }
   },
   created() {
diff --git a/web/src/apps/linkis/module/resourceManagement/index.vue b/web/src/apps/linkis/module/resourceManagement/index.vue
index ba1104849f..21a34ed953 100644
--- a/web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/web/src/apps/linkis/module/resourceManagement/index.vue
@@ -121,19 +121,19 @@
           <span>{{`${row.engineType}:${row.instance}`}}</span>
         </template>
         <template slot-scope="{row}" slot="usedResource">
-          <span>{{`${calcCompany(row.resource.usedResource)}`}}</span>
+          <span>{{`${calcCompany(row.resource.usedResource ? row.resource.usedResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
         </template>
         <template slot-scope="{row}" slot="lockedResource">
-          <span>{{`${calcCompany(row.resource.lockedResource)}`}}</span>
+          <span>{{`${calcCompany(row.resource.lockedResource ? row.resource.lockedResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
         </template>
         <template slot-scope="{row}" slot="maxResource">
-          <span>{{`${calcCompany(row.resource.maxResource)}`}}</span>
+          <span>{{`${calcCompany(row.resource.maxResource ? row.resource.maxResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
         </template>
         <template slot-scope="{row}" slot="leftResource">
-          <span>{{`${calcCompany(row.resource.leftResource)}`}}</span>
+          <span>{{`${calcCompany(row.resource.leftResource ? row.resource.leftResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
         </template>
         <template slot-scope="{row}" slot="minResource">
-          <span>{{`${calcCompany(row.resource.minResource)}`}}</span>
+          <span>{{`${calcCompany(row.resource.minResource ? row.resource.minResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
         </template>
         <template slot-scope="{row}" slot="startTime">
           <span>{{ timeFormat(row) }}</span>
@@ -538,8 +538,7 @@ export default {
         }
         return data;
       }
-      console.log(resource);
-      return  resource && (resource.cores !== undefined || resource.memonry !== undefined || resource.instance !== undefined) ? `${calcCompanyToData(resource.cores)}cores,${calcCompanyToData(resource.memory, true)}G,${calcCompanyToData(resource.instance)}apps` : ''
+      return resource && (resource.cores !== undefined || resource.memory !== undefined || resource.instance !== undefined) ? `${calcCompanyToData(resource.cores)}cores,${calcCompanyToData(resource.memory, true)}G,${calcCompanyToData(resource.instance)}apps` : ''
     },
     calcCompanyAdmin(row, field, type, yarn) {
       let data = ' -- '

From e8b23ba075027933837615d05fdfc03439d08b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Tue, 21 Jun 2022 16:21:41 +0800
Subject: [PATCH 2/9] add: 2227 requirements

---
 web/src/apps/linkis/components/tag/index.vue  |   2 +-
 web/src/apps/linkis/i18n/common/en.json       |   1 +
 web/src/apps/linkis/i18n/common/zh.json       |   1 +
 .../module/resourceManagement/engineConn.vue  | 480 ++++++++++++++++++
 .../module/resourceManagement/index.scss      |  50 ++
 .../module/resourceManagement/index.vue       |  10 +-
 .../linkis/module/resourceManagement/log.vue  | 141 +++++
 .../module/resourceManagement/search.vue      | 160 ++++++
 web/src/apps/linkis/router.js                 |  12 +-
 web/src/apps/linkis/view/linkis/index.vue     |  20 +-
 10 files changed, 866 insertions(+), 11 deletions(-)
 create mode 100644 web/src/apps/linkis/module/resourceManagement/engineConn.vue
 create mode 100644 web/src/apps/linkis/module/resourceManagement/log.vue
 create mode 100644 web/src/apps/linkis/module/resourceManagement/search.vue

diff --git a/web/src/apps/linkis/components/tag/index.vue b/web/src/apps/linkis/components/tag/index.vue
index 1492a81f37..b242453ce7 100644
--- a/web/src/apps/linkis/components/tag/index.vue
+++ b/web/src/apps/linkis/components/tag/index.vue
@@ -35,7 +35,7 @@
         :color="item.modifiable ? 'primary' : 'default'"
         @on-close="handleClose2"
         @on-change="handleTagChange"
-      >{{ item.key }}-{{ item.value }}
+      >{{ item.key }}{{ item.key ? '-' : '' }}{{ item.value }}
       </Tag>
       <!-- 编辑标签 -->
       <div class="addAndCancel" v-else>
diff --git a/web/src/apps/linkis/i18n/common/en.json b/web/src/apps/linkis/i18n/common/en.json
index ffc24132c3..630d3df17c 100644
--- a/web/src/apps/linkis/i18n/common/en.json
+++ b/web/src/apps/linkis/i18n/common/en.json
@@ -142,6 +142,7 @@
           "children": {
             "globalHistory": "Global History",
             "resource": "Resource Manager",
+            "resourceEngineConnList": "History Engine List",
             "setting": "Settings",
             "dateReport": "Global Variables",
             "globalValiable": "Frequently Asked",
diff --git a/web/src/apps/linkis/i18n/common/zh.json b/web/src/apps/linkis/i18n/common/zh.json
index 5161d55431..bf38defec8 100644
--- a/web/src/apps/linkis/i18n/common/zh.json
+++ b/web/src/apps/linkis/i18n/common/zh.json
@@ -144,6 +144,7 @@
                     "children": {
                         "globalHistory": "全局历史",
                         "resource": "资源管理",
+                        "resourceEngineConnList": "历史引擎信息",
                         "setting": "参数配置",
                         "dateReport": "全局变量",
                         "globalValiable": "常见问题",
diff --git a/web/src/apps/linkis/module/resourceManagement/engineConn.vue b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
new file mode 100644
index 0000000000..84398f986b
--- /dev/null
+++ b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -0,0 +1,480 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<template>
+  <div :style="{height: '100%'}">
+    <div v-show="!showviewlog" class="ecmEngine">
+      <Search :statusList="statusList" :ownerList="ownerList" :engineTypes="engineTypes" @search="search" @stop="stopAll" :stopbtn="true" />
+      <Spin
+        v-if="loading"
+        size="large"
+        fix/>
+      <Table class="table-content ecm-engine-table" border :width="tableWidth" :columns="columns" :data="pageDatalist" @on-selection-change="selctionChange">
+        <template slot-scope="{row}" slot="serviceInstance">
+          <span>{{row.serviceInstance}}</span>
+        </template>
+        <template slot-scope="{row}" slot="usedResource">
+          <!-- 后台未做返回时的处理，下面几个可按照处理 -->
+          <span v-if="row.usedResource">{{`${calcCompany(row.usedResource.cores)}cores,${calcCompany(row.usedResource.memory, true)}G,${calcCompany(row.usedResource.instance)}apps`}}</span>
+          <span v-else>Null cores,Null G</span>
+        </template>
+        <!-- <template slot-scope="{row}" slot="maxResource">
+          <span>Linkis:({{`${calcCompany(row.minResource.cores)}cores,${calcCompany(row.minResource.memory, true)}G`}})</span>
+        </template> -->
+        <!-- <template slot-scope="{row}" slot="minResource">
+          <span>Linkis:({{`${calcCompany(row.maxResource.cores)}cores,${calcCompany(row.maxResource.memory, true)}G`}})</span>
+        </template> -->
+        <template slot-scope="{row}" slot="labelValue" >
+          <div class="tag-box">
+            <Tooltip v-for="(item, index) in row.labelValue.split(',')" :key="index" :content="`${item}`" placement="top">
+              <Tag class="tag-item" type="border" color="primary">{{`${item}`}}</Tag>
+            </Tooltip>
+          </div>
+        </template>
+        <template slot-scope="{row}" slot="usedTime">
+          <span>{{ timeFormat(row) }}</span>
+        </template>
+      </Table>
+      <div class="page-bar">
+        <Page
+          ref="page"
+          :total="this.tableData.length"
+          :page-size-opts="page.sizeOpts"
+          :page-size="page.pageSize"
+          :current="page.pageNow"
+          class-name="page"
+          size="small"
+          show-total
+          show-sizer
+          :prev-text="$t('message.linkis.previousPage')" :next-text="$t('message.linkis.nextPage')"
+          @on-change="change"
+          @on-page-size-change="changeSize" />
+      </div>
+      <Modal
+        @on-ok="submitTagEdit"
+        :title="$t('message.linkis.tagEdit')"
+        v-model="isTagEdit"
+        :mask-closable="false">
+        <Form :model="formItem" :label-width="80">
+          <FormItem :label="`${$t('message.linkis.instanceName')}`">
+            <Input disabled v-model="formItem.serviceInstance" ></Input>
+          </FormItem>
+          <FormItem class="addTagClass" :label="`${$t('message.linkis.tableColumns.label')}：`">
+            <WbTag :tagList="formItem.labelValue" :selectList="keyList" @addEnter="addEnter"></WbTag>
+          </FormItem>
+        </Form>
+      </Modal>
+    </div>
+    <ViewLog ref="logPanel" v-show="showviewlog" @back="showviewlog = false" />
+  </div>
+</template>
+<script>
+import api from '@/common/service/api';
+import moment from "moment";
+import Search from './search.vue';
+import WbTag from '@/apps/linkis/components/tag';
+import ViewLog from './log'
+export default {
+  name: 'engineConn',
+  data() {
+    return {
+      showviewlog: false,
+      loading: false,
+      healthyStatusList: [],
+      ownerList: [],
+      engineTypes: [],
+      keyList: [],
+      statusList: [],
+      formItem: {
+        serviceInstance: '',
+        labelValue: [],
+        emStatus: '',
+      },
+      tagTitle: [],
+      applicationList: {},
+      addTagForm: { // 新增标签的form表单
+        key: '',
+        value: ''
+      },
+      isShowTable: false,
+      addTagFormRule: { // 验证规则
+        key: [
+          { required: true, message: this.$t('message.linkis.keyTip'), trigger: 'blur' }
+        ]
+      },
+      tableData: [],
+      allEngines: [],
+      tableWidth: 0,
+      // 开启标签修改弹框
+      isTagEdit: false,
+      page: {
+        totalSize: 0,
+        sizeOpts: [15, 30, 45],
+        pageSize: 15,
+        pageNow: 1
+      },
+      columns: [
+        {
+          type: 'selection',
+          width: 60,
+          align: 'center'
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.engineInstance'),
+          key: 'serviceInstance',
+          minWidth: 150,
+          className: 'table-project-column',
+          slot: 'serviceInstance'
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.engineType'),
+          key: 'engineType',
+          minWidth: 100,
+          className: 'table-project-column'
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.label'),
+          key: 'labelValue',
+          minWidth: 300,
+          className: 'table-project-column',
+          slot: 'labelValue'
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.usedResources'),
+          key: 'usedResource',
+          className: 'table-project-column',
+          slot: 'usedResource',
+          minWidth: 150,
+        },
+        /* {
+          title: this.$t('message.linkis.tableColumns.maximumAvailableResources'),
+          key: 'maxResource',
+          slot: 'maxResource',
+          className: 'table-project-column',
+          minWidth: 150,
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.minimumAvailableResources'),
+          key: 'minResource',
+          slot: 'minResource',
+          minWidth: 150,
+          className: 'table-project-column',
+        }, */
+        {
+          title: this.$t('message.linkis.tableColumns.requestApplicationName'),
+          key: 'createUser',
+          className: 'table-project-column',
+          minWidth: 150,
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.startTime'),
+          key: 'usedTime',
+          className: 'table-project-column',
+          slot: 'usedTime',
+          minWidth: 150,
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.control.title'),
+          key: 'action',
+          width: '215',
+          align: 'center',
+          render: (h, params) => {
+            return h('div', [
+              h('Button', {
+                props: {
+                  size: 'small'
+                },
+                style: {
+                  marginRight: '5px'
+                },
+                on: {
+                  click: () => {
+                    this.showviewlog = true
+                    this.$refs.logPanel.getLogs(0, {
+                      applicationName: "linkis-cg-engineconn",
+                      emInstance: params.row.ecmInstance,
+                      instance: params.row.serviceInstance,
+                    })
+                  }
+                }
+              }, this.$t('message.linkis.viewlog')),
+              h('Button', {
+                props: {
+                  type: 'error',
+                  size: 'small'
+                },
+                style: {
+                  marginRight: '5px'
+                },
+                on: {
+                  click: () => {
+                    this.$Modal.confirm({
+                      title: this.$t('message.linkis.stop'),
+                      content: this.$t('message.linkis.stopEngineTip'),
+                      onOk: () => {
+                        let data = [];
+                        data.push({
+                          engineInstance: params.row.serviceInstance,
+                        });
+                        api.fetch(`/linkisManager/rm/enginekill`, data).then(() => {
+                          this.initExpandList();
+                          this.$Message.success({
+                            background: true,
+                            content: 'Stop Success！！'
+                          });
+                        }).catch((err) => {
+                          console.err(err)
+                        });
+                      }
+                    })
+                  }
+                }
+              }, this.$t('message.linkis.stop')),
+              h('Button', {
+                props: {
+                  type: 'primary',
+                  size: 'small'
+                },
+                on: {
+                  click: () => {
+                    this.isTagEdit = true;
+                    let obj = {};
+                    obj.serviceInstance = params.row.serviceInstance;
+                    obj.labelValue = params.row.labelValue.split(',').map((item) => {
+                      return {
+                        // key: '',
+                        value: item,
+                      }
+                    })
+                    obj.emStatus = params.row.nodeStatus;
+                    this.formItem = Object.assign(this.formItem, obj)
+                  }
+                }
+              }, this.$t('message.linkis.tagEdit'))
+            ]);
+          }
+        }
+      ],
+    }
+  },
+  components: {
+    Search,
+    WbTag,
+    ViewLog
+  },
+  computed: {
+    pageDatalist() {// 展示的数据
+      return this.tableData.filter((item, index) => {
+        return (this.page.pageNow - 1) * this.page.pageSize <= index && index < this.page.pageNow * this.page.pageSize;
+      })
+    }
+  },
+  created() {
+    this.initExpandList();
+    // 获取状态信息列表
+    this.getListAllNodeHealthyStatus();
+    this.getSearchStatus();
+    this.getKeyList();
+  },
+  methods: {
+    stopAll() {
+      if (this.selection && this.selection.length) {
+        let data = [];
+        this.selection.forEach(row => {
+          data.push({
+            engineInstance: row.serviceInstance,
+          });
+        })
+        this.$Message.success('In Stoping');
+        api.fetch(`/linkisManager/rm/enginekill`, data).then(() => {
+          this.initExpandList();
+          this.$Message.success({
+            background: true,
+            content: 'Stop Success！！'
+          });
+        }).catch((err) => {
+          console.err(err)
+        });
+      } else {
+        this.$Message.warning(this.$t('message.linkis.noselection'));
+      }
+    },
+    selctionChange(selection) {
+      this.selection = selection
+    },
+    // 刷新进度条
+    refreshResource() {
+      this.initExpandList();
+    },
+    // 初始化引擎列表
+    async initExpandList() {
+      // 获取引擎数据
+      this.loading = true;
+      try {
+        let url = '/linkisManager/ecinfo/ecrHistoryList?';
+        if (this.page.pageNow) url += `pageNow=${this.page.pageNow}&`
+        if (this.page.pageSize) url += `pageSize=${this.page.pageSize}`
+        let engines = await api.fetch(url, 'get') || {};
+        // 获取使用的引擎资源列表
+        let enginesList = engines.engineList || [];
+        this.allEngines = [ ...enginesList ];
+        this.tableData = [ ...enginesList ];
+        this.ownerList = [];
+        this.engineTypes = []
+        enginesList.forEach(item => {
+          if (this.ownerList.indexOf(item.createUser) === -1) {
+            this.ownerList.push(item.createUser)
+          }
+          if (this.engineTypes.indexOf(item.engineType) === -1) {
+            this.engineTypes.push(item.engineType)
+          }
+        })
+        this.loading = false;
+      } catch (err) {
+        console.log(err)
+        this.loading = false;
+      }
+    },
+    // 获取所有可修改的labelKey
+    getKeyList() {
+      api.fetch('/microservice/modifiableLabelKey', 'get').then((res) => {
+        let list = res.keyList || [];
+        this.keyList = list.map(item => {
+          return {
+            lable: item,
+            value: item
+          }
+        })
+      })
+    },
+    // 获取所有可修改的状态信息
+    async getListAllNodeHealthyStatus() {
+      try {
+        let healthyStatusList = await api.fetch('/linkisManager/listAllECMHealthyStatus', { onlyEditable: true }, 'get') || {};
+        let list = healthyStatusList.nodeStatus || [];
+        this.healthyStatusList = [...list];
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 获取搜索的状态列表
+    async getSearchStatus() {
+      try {
+        let statusList = await api.fetch('/linkisManager/listAllNodeHealthyStatus', 'get') || {};
+        let list = statusList.nodeStatus || [];
+        this.statusList = [...list];
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 添加tag
+    addEnter (key, value) {
+      this.formItem.labelValue.push({ key, value });
+
+    },
+    //  提交修改
+    submitTagEdit() {
+      let param = JSON.parse(JSON.stringify(this.formItem));
+      param.instance = param.serviceInstance
+      delete param.serviceInstance
+      let tempLabelValue = ''
+      param.labelValue.forEach((item, index) => {
+        if (index === 0) {
+          tempLabelValue += item.value
+        } else {
+          tempLabelValue += ',' + item.value
+        }
+      })
+      param.labelValue = tempLabelValue
+      api.fetch('/linkisManager/modifyEngineInfo', param, 'put').then(() => {
+        this.isTagEdit = false;
+        this.$Message.success(this.$t('message.linkis.editedSuccess'));
+        this.refreshResource(); // 刷新
+      }).catch(() => {
+        this.isTagEdit = false;
+      })
+    },
+    // 切换分页
+    change(val) {
+      this.page.pageNow = val;
+    },
+    // 页容量变化
+    changeSize(val) {
+      this.page.pageSize = val;
+      this.page.pageNow = 1;
+    },
+    // 搜索
+    search(e) {
+      let url = '/linkisManager/ecinfo/ecrHistoryList?';
+      if (e.instance) url += `instance=${e.instance}&`
+      if (e.owner) url += `creator=${e.owner}&`
+      if (e.shortcut[0]) url += `startDate=${moment(new Date(e.shortcut[0])).format('YYYY-MM-DD HH:mm:ss')}&`
+      if (e.shortcut[1]) {
+        if (moment(new Date(e.shortcut[1])).format('YYYY-MM-DD HH:mm:ss') === moment(new Date(e.shortcut[0])).format('YYYY-MM-DD HH:mm:ss')) {
+          // 如果起始时间选的是同一天，则endDate要加到第二天的零点
+          url += `endDate=${moment(new Date(e.shortcut[1]).getTime() + 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')}&`
+        } else {
+          url += `startDate=${moment(new Date(e.shortcut[1])).format('YYYY-MM-DD HH:mm:ss')}&`
+        }
+      }
+      if (e.engineType) url += `engineType=${e.engineType}&`
+      if (this.page.pageNow) url += `pageNow=${this.page.pageNow}&`
+      if (this.page.pageSize) url += `pageSize=${this.page.pageSize}`
+      api.fetch(url,'get').then((res)=>{
+        this.tableData=res.engineList
+      })
+
+      this.page.pageNow = 1;
+      this.page.totalSize = this.tableData.length;
+    },
+    // 时间格式转换
+    timeFormat(row) {
+      return moment(new Date(row.usedTime)).format('YYYY-MM-DD HH:mm:ss')
+    },
+    calcCompany(num, isCompany = false) {
+      let data = num > 0 ? num : 0;
+      if(isCompany) {
+        return data / 1024 / 1024 / 1024;
+      }
+      return data;
+    }
+  }
+}
+</script>
+
+<style src="./index.scss" lang="scss" scoped></style>
+
+<style lang="scss">
+.ecm-engine-table {
+  border: 0;
+  height: calc(100% - 110px);
+  overflow: auto;
+
+  .ivu-table:before {
+    height: 0
+  }
+  
+  .ivu-table:after {
+    width: 0
+  }
+
+  .ivu-table {
+    height: auto;
+    border: 1px solid #dcdee2;
+  }
+}
+</style>
diff --git a/web/src/apps/linkis/module/resourceManagement/index.scss b/web/src/apps/linkis/module/resourceManagement/index.scss
index 98ac37560c..d4506a774d 100644
--- a/web/src/apps/linkis/module/resourceManagement/index.scss
+++ b/web/src/apps/linkis/module/resourceManagement/index.scss
@@ -88,3 +88,53 @@ td.table-project-column {
 .label-critical {
   color: $error-color
 }
+
+
+.table-content {
+  // width: 100% !important;
+  margin-top: 15px;
+  .latestVersion {
+    padding:  0 10px;
+    background-color: #169bd5;
+    border-radius: $border-radius-small;
+    overflow: hidden;
+    display: inline-block;
+  }
+}
+td.table-name-column {
+  .workflow-name {
+    color: $primary-color;
+    cursor: pointer;
+  }
+}
+/deep/.table-project-column {
+  text-align: center;
+  .ivu-table-cell {
+    display: inline-block;
+    padding: 0 10px!important;
+  }
+}
+td.table-project-column {
+  color: $success-color;
+}
+.page-bar {
+  text-align: center;
+  padding: 10px 0;
+}
+/deep/.addTagClass {
+  position: relative;
+  z-index: 99;
+}
+.ecm, .ecmEngine {
+  height: 100%;
+  overflow: hidden;
+  /deep/ .ivu-tag {
+    max-width: 140px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  /deep/ .ivu-tooltip-inner {
+    max-width: 100%;
+  }
+}
diff --git a/web/src/apps/linkis/module/resourceManagement/index.vue b/web/src/apps/linkis/module/resourceManagement/index.vue
index 21a34ed953..23fb527c67 100644
--- a/web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/web/src/apps/linkis/module/resourceManagement/index.vue
@@ -121,19 +121,19 @@
           <span>{{`${row.engineType}:${row.instance}`}}</span>
         </template>
         <template slot-scope="{row}" slot="usedResource">
-          <span>{{`${calcCompany(row.resource.usedResource ? row.resource.usedResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
+          <span>{{`${calcCompany(row.resource.usedResource)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="lockedResource">
-          <span>{{`${calcCompany(row.resource.lockedResource ? row.resource.lockedResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
+          <span>{{`${calcCompany(row.resource.lockedResource)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="maxResource">
-          <span>{{`${calcCompany(row.resource.maxResource ? row.resource.maxResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
+          <span>{{`${calcCompany(row.resource.maxResource)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="leftResource">
-          <span>{{`${calcCompany(row.resource.leftResource ? row.resource.leftResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
+          <span>{{`${calcCompany(row.resource.leftResource)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="minResource">
-          <span>{{`${calcCompany(row.resource.minResource ? row.resource.minResource.DriverAndYarnResource.loadInstanceResource : {})}`}}</span>
+          <span>{{`${calcCompany(row.resource.minResource)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="startTime">
           <span>{{ timeFormat(row) }}</span>
diff --git a/web/src/apps/linkis/module/resourceManagement/log.vue b/web/src/apps/linkis/module/resourceManagement/log.vue
new file mode 100644
index 0000000000..e0be670496
--- /dev/null
+++ b/web/src/apps/linkis/module/resourceManagement/log.vue
@@ -0,0 +1,141 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~ 
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~ 
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<template>
+  <div style="position:relative">
+    <Tabs @on-click="onClickTabs" :value="tabName">
+      <TabPane name="stdout" label="stdout"></TabPane>
+      <TabPane name="stderr" label="stderr"></TabPane>
+    </Tabs>
+    <Button class="backButton" type="primary" @click="back">{{$t('message.linkis.back')}}</Button>
+    <log :logs="logs" :scriptViewState="scriptViewState"/>
+    <Page
+      ref="page"
+      :total="page.totalSize"
+      :page-size="page.pageSize"
+      :current="page.pageNow"
+      class-name="page engine-log-page"
+      size="small"
+      :prev-text="$t('message.linkis.previousPage')" :next-text="$t('message.linkis.nextPage')"
+      @on-change="change"/>
+  </div>
+</template>
+<script>
+import api from '@/common/service/api';
+import log from '@/components/consoleComponent/log.vue'
+import elementResizeEvent from '@/common/helper/elementResizeEvent';
+export default {
+  components: {
+    log
+  },
+  data() {
+    return {
+      tabName: 'stdout',
+      page: {
+        totalSize: 0,
+        pageSize: 1000,
+        pageNow: 1,
+      },
+      logs: {
+        all: ''
+      },
+      scriptViewState: {
+        bottomContentHeight: window.innerHeight - 353
+      }
+    };
+  },
+  computed: {
+  },
+  created() {
+
+  },
+  mounted() {
+    window.addEventListener("resize", this.resize);
+    elementResizeEvent.bind(this.$el, this.resize);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.resize);
+    elementResizeEvent.unbind(this.$el);
+  },
+  methods: {
+    // 切换分页
+    change(val) {
+      this.page.pageNow = val;
+      this.getLogs((val - 1) * this.page.pageSize)
+    },
+    async getLogs(fromLine, param) {
+      if (param) {
+        this.param = param
+      }
+      if (this.param) {
+        const params = {
+          applicationName: this.param.applicationName,
+          emInstance: this.param.emInstance,
+          instance: this.param.instance,
+          parameters: {
+            pageSize: 1000,
+            fromLine,
+            logType: this.tabName
+          }
+        }
+        let res = await api.fetch('/linkisManager/openEngineLog', params, 'post') || {};
+        if (res && res.result) {
+          if (res.result.rows < 1000) { // 最后一页
+            this.page.totalSize = this.page.pageNow * 1000
+          } else {
+            this.page.totalSize = (this.page.pageNow + 1) * 1000
+          }
+          this.logs = {
+            all: res.result.logs ? res.result.logs.join('\n') : ''
+          }
+        }
+      }
+    },
+    resize() {
+      this.scriptViewState = {
+        bottomContentHeight: window.innerHeight - 353
+      }
+    },
+    onClickTabs(name) {
+      this.tabName = name
+      this.page.pageNow = 1
+      this.getLogs(0)
+    },
+    back() {
+      this.$emit('back')
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+ .backButton {
+  position: absolute;
+  top: -2px;
+  right: 20px;
+}
+.page {
+  text-align: center
+}
+</style>
+<style>
+.engine-log-page .ivu-page-item, .engine-log-page .ivu-page-item-jump-prev {
+  display: none;
+}
+.engine-log-page li.ivu-page-next {
+  padding-left: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/web/src/apps/linkis/module/resourceManagement/search.vue b/web/src/apps/linkis/module/resourceManagement/search.vue
new file mode 100644
index 0000000000..e39f5dd57f
--- /dev/null
+++ b/web/src/apps/linkis/module/resourceManagement/search.vue
@@ -0,0 +1,160 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<template>
+  <Form :model="searchBar" :rules="ruleInline" inline>
+    <FormItem prop="instance" :label="`${$t('message.linkis.instanceName')}`">
+      <Input :maxlength="50" v-model="searchBar.instance" :placeholder="$t('message.linkis.instanceName')"/>
+    </FormItem>
+    <FormItem prop="owner" :label="$t('message.linkis.initiator')" >
+      <Select  v-model="searchBar.owner" style="width:200px" clearable>
+        <Option
+          v-for="(item) in ownerList"
+          :label="item"
+          :value="item"
+          :key="item"/>
+      </Select>
+    </FormItem>
+    <FormItem prop="shortcut" :label="$t('message.linkis.formItems.date.label')">
+      <DatePicker
+        :transfer="true"
+        class="datepicker"
+        :options="shortcutOpt"
+        v-model="searchBar.shortcut"
+        type="daterange"
+        placement="bottom-start"
+        format="yyyy-MM-dd"
+        :placeholder="$t('message.linkis.formItems.date.placeholder')"
+        style="width: 190px"
+        :editable="false"
+      />
+    </FormItem>
+    <FormItem prop="engineType" :label="$t('message.linkis.tableColumns.engineType')" >
+      <Select  v-model="searchBar.engineType" style="width:200px" clearable>
+        <Option
+          v-for="(item) in engineTypes"
+          :label="item"
+          :value="item"
+          :key="item"/>
+      </Select>
+    </FormItem>
+    <FormItem>
+      <Button type="primary" @click="search">
+        {{ $t('message.linkis.search') }}
+      </Button>
+      <Button v-if="stopbtn" type="error" @click="stop"  style="margin-left:20px">
+        {{ $t('message.linkis.stop') }}
+      </Button>
+    </FormItem>
+  </Form>
+
+</template>
+<script>
+
+export default {
+  components: {
+  },
+  props: {
+    statusList: {
+      type: Array,
+      default: () => []
+    },
+    ownerList: {
+      type: Array,
+      default: () => []
+    },
+    engineTypes: {
+      type: Array,
+      default: () => []
+    },
+    stopbtn: {
+      type: Boolean
+    }
+  },
+  data() {
+    const today = new Date(new Date().toLocaleDateString())
+    return {
+      ruleInline: {},
+      searchBar: {
+        instance: "",
+        engineType: "",
+        owner: "",
+        shortcut: [today, today]
+      },
+      shortcutOpt: {
+        shortcuts: [
+          {
+            text: this.$t('message.linkis.shortcuts.week'),
+            value() {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+              return [start, end]
+            }
+          },
+          {
+            text: this.$t('message.linkis.shortcuts.month'),
+            value() {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+              return [start, end]
+            }
+          },
+          {
+            text: this.$t('message.linkis.shortcuts.threeMonths'),
+            value() {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+              return [start, end]
+            }
+          }
+        ]
+      },
+    };
+  },
+  computed: {
+  },
+  created() {
+
+  },
+  mounted() {
+
+  },
+  activated() {
+  },
+  methods: {
+    search() {
+      this.$emit("search", this.searchBar)
+    },
+    stop() {
+      this.$emit("stop")
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+  .ivu-form {
+    display: flex;
+    .ivu-form-item {
+      display: flex;
+      margin-right: 30px;
+      flex: none;
+    }
+  }
+</style>
diff --git a/web/src/apps/linkis/router.js b/web/src/apps/linkis/router.js
index 13b04ccc0c..52f4906d2c 100644
--- a/web/src/apps/linkis/router.js
+++ b/web/src/apps/linkis/router.js
@@ -65,8 +65,16 @@ export default [
         title: 'resource',
         publicPage: true,
       },
-    },
-    {
+    }, {
+      name: 'resourceEngineConnList',
+      path: 'resourceEngineConnList',
+      component: () =>
+        import('./module/resourceManagement/engineConn.vue'),
+      meta: {
+        title: '历史引擎信息',
+        publicPage: true,
+      },
+    }, {
       name: 'setting',
       path: 'setting',
       component: () =>
diff --git a/web/src/apps/linkis/view/linkis/index.vue b/web/src/apps/linkis/view/linkis/index.vue
index cf6a9beeca..d8b835784c 100644
--- a/web/src/apps/linkis/view/linkis/index.vue
+++ b/web/src/apps/linkis/view/linkis/index.vue
@@ -59,7 +59,7 @@
       <div
         class="content-body-side-right">
         <div class="content-body-side-right-title">
-          <Breadcrumb>
+          <Breadcrumb v-if="$route.name !== 'resource' && $route.name !== 'resourceEngineConnList'">
             <BreadcrumbItem :to="skipPath"><Icon v-if="skipPath" type="ios-arrow-back" size="16" color="#338cf0"></Icon>{{ breadcrumbSecondName }}</BreadcrumbItem>
             <BreadcrumbItem v-if="$route.name === 'viewHistory'">{{ $route.query.taskID }}</BreadcrumbItem>
             <template v-if="$route.name === 'EngineConnList'">
@@ -67,6 +67,10 @@
               <BreadcrumbItem>EngineConnList</BreadcrumbItem>
             </template>
           </Breadcrumb>
+          <Tabs v-if="$route.name === 'resource' || $route.name === 'resourceEngineConnList'" value="resource" @on-click="clickResourceTab" class="resource-tab">
+            <Tab-pane name="resource" :label="$t('message.linkis.sideNavList.function.children.resource')" href="/resource"></Tab-pane>
+            <Tab-pane name="resourceEngineConnList" :label="$t('message.linkis.sideNavList.function.children.resourceEngineConnList')" href="/ecm"></Tab-pane>
+          </Tabs>
         </div>
         <div
           class="content-body-side-right-content">
@@ -169,7 +173,10 @@ export default {
           workspaceId: this.$route.query.workspaceId
         },
       });
-    }
+    },
+    clickResourceTab(value) {
+      this.$router.push(`/console/${value}`)
+    },
   },
   beforeRouteEnter(to, from, next) {
     if (to.name === 'FAQ' && from.name === 'Home') {
@@ -203,4 +210,11 @@ export default {
     color: #338cf0;
   }
 </style>
-
+<style lang="scss">
+.resource-tab {
+  top: -6px;
+  .ivu-tabs-bar {
+    border-bottom: 0;
+  }
+}
+</style>
\ No newline at end of file

From cc35266669449c5efc1dadab16af53ea3838a8a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Thu, 23 Jun 2022 16:49:15 +0800
Subject: [PATCH 3/9] upd: delete stop and edit operaion in History Engine List
 page

---
 web/src/apps/linkis/module/ECM/index.scss     |  3 +
 .../module/resourceManagement/engineConn.vue  | 81 +------------------
 .../module/resourceManagement/index.scss      |  3 +
 .../module/resourceManagement/search.vue      |  3 -
 4 files changed, 9 insertions(+), 81 deletions(-)

diff --git a/web/src/apps/linkis/module/ECM/index.scss b/web/src/apps/linkis/module/ECM/index.scss
index eda67170dc..528d366f62 100644
--- a/web/src/apps/linkis/module/ECM/index.scss
+++ b/web/src/apps/linkis/module/ECM/index.scss
@@ -54,6 +54,9 @@ td.table-project-column {
 .ecm, .ecmEngine {
   height: 100%;
   overflow: hidden;
+  .ivu-form {
+    overflow-x: auto;
+  }
   /deep/ .ivu-tag {
     max-width: 140px;
     overflow: hidden;
diff --git a/web/src/apps/linkis/module/resourceManagement/engineConn.vue b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
index 84398f986b..721e4bab25 100644
--- a/web/src/apps/linkis/module/resourceManagement/engineConn.vue
+++ b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -18,7 +18,7 @@
 <template>
   <div :style="{height: '100%'}">
     <div v-show="!showviewlog" class="ecmEngine">
-      <Search :statusList="statusList" :ownerList="ownerList" :engineTypes="engineTypes" @search="search" @stop="stopAll" :stopbtn="true" />
+      <Search :statusList="statusList" :ownerList="ownerList" :engineTypes="engineTypes" @search="search" :stopbtn="true" />
       <Spin
         v-if="loading"
         size="large"
@@ -136,7 +136,7 @@ export default {
         {
           title: this.$t('message.linkis.tableColumns.engineInstance'),
           key: 'serviceInstance',
-          minWidth: 150,
+          minWidth: 160,
           className: 'table-project-column',
           slot: 'serviceInstance'
         },
@@ -190,7 +190,7 @@ export default {
         {
           title: this.$t('message.linkis.tableColumns.control.title'),
           key: 'action',
-          width: '215',
+          width: '100',
           align: 'center',
           render: (h, params) => {
             return h('div', [
@@ -212,59 +212,6 @@ export default {
                   }
                 }
               }, this.$t('message.linkis.viewlog')),
-              h('Button', {
-                props: {
-                  type: 'error',
-                  size: 'small'
-                },
-                style: {
-                  marginRight: '5px'
-                },
-                on: {
-                  click: () => {
-                    this.$Modal.confirm({
-                      title: this.$t('message.linkis.stop'),
-                      content: this.$t('message.linkis.stopEngineTip'),
-                      onOk: () => {
-                        let data = [];
-                        data.push({
-                          engineInstance: params.row.serviceInstance,
-                        });
-                        api.fetch(`/linkisManager/rm/enginekill`, data).then(() => {
-                          this.initExpandList();
-                          this.$Message.success({
-                            background: true,
-                            content: 'Stop Success！！'
-                          });
-                        }).catch((err) => {
-                          console.err(err)
-                        });
-                      }
-                    })
-                  }
-                }
-              }, this.$t('message.linkis.stop')),
-              h('Button', {
-                props: {
-                  type: 'primary',
-                  size: 'small'
-                },
-                on: {
-                  click: () => {
-                    this.isTagEdit = true;
-                    let obj = {};
-                    obj.serviceInstance = params.row.serviceInstance;
-                    obj.labelValue = params.row.labelValue.split(',').map((item) => {
-                      return {
-                        // key: '',
-                        value: item,
-                      }
-                    })
-                    obj.emStatus = params.row.nodeStatus;
-                    this.formItem = Object.assign(this.formItem, obj)
-                  }
-                }
-              }, this.$t('message.linkis.tagEdit'))
             ]);
           }
         }
@@ -291,28 +238,6 @@ export default {
     this.getKeyList();
   },
   methods: {
-    stopAll() {
-      if (this.selection && this.selection.length) {
-        let data = [];
-        this.selection.forEach(row => {
-          data.push({
-            engineInstance: row.serviceInstance,
-          });
-        })
-        this.$Message.success('In Stoping');
-        api.fetch(`/linkisManager/rm/enginekill`, data).then(() => {
-          this.initExpandList();
-          this.$Message.success({
-            background: true,
-            content: 'Stop Success！！'
-          });
-        }).catch((err) => {
-          console.err(err)
-        });
-      } else {
-        this.$Message.warning(this.$t('message.linkis.noselection'));
-      }
-    },
     selctionChange(selection) {
       this.selection = selection
     },
diff --git a/web/src/apps/linkis/module/resourceManagement/index.scss b/web/src/apps/linkis/module/resourceManagement/index.scss
index d4506a774d..0da010e02f 100644
--- a/web/src/apps/linkis/module/resourceManagement/index.scss
+++ b/web/src/apps/linkis/module/resourceManagement/index.scss
@@ -128,6 +128,9 @@ td.table-project-column {
 .ecm, .ecmEngine {
   height: 100%;
   overflow: hidden;
+  .ivu-form {
+    overflow-x: auto;
+  }
   /deep/ .ivu-tag {
     max-width: 140px;
     overflow: hidden;
diff --git a/web/src/apps/linkis/module/resourceManagement/search.vue b/web/src/apps/linkis/module/resourceManagement/search.vue
index e39f5dd57f..3e51cc8140 100644
--- a/web/src/apps/linkis/module/resourceManagement/search.vue
+++ b/web/src/apps/linkis/module/resourceManagement/search.vue
@@ -56,9 +56,6 @@
       <Button type="primary" @click="search">
         {{ $t('message.linkis.search') }}
       </Button>
-      <Button v-if="stopbtn" type="error" @click="stop"  style="margin-left:20px">
-        {{ $t('message.linkis.stop') }}
-      </Button>
     </FormItem>
   </Form>
 

From 9d0f712dd1ee9c8ae72a1151029b5e0e142bb63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Wed, 29 Jun 2022 16:20:20 +0800
Subject: [PATCH 4/9] fix: bug

---
 web/src/apps/linkis/module/ECM/index.scss          |  3 ---
 web/src/apps/linkis/module/ECM/search.vue          |  3 ++-
 .../module/resourceManagement/engineConn.vue       | 14 +++++---------
 .../linkis/module/resourceManagement/index.scss    |  3 ---
 .../apps/linkis/module/resourceManagement/log.vue  |  4 +++-
 .../linkis/module/resourceManagement/search.vue    |  7 ++++---
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/web/src/apps/linkis/module/ECM/index.scss b/web/src/apps/linkis/module/ECM/index.scss
index 528d366f62..eda67170dc 100644
--- a/web/src/apps/linkis/module/ECM/index.scss
+++ b/web/src/apps/linkis/module/ECM/index.scss
@@ -54,9 +54,6 @@ td.table-project-column {
 .ecm, .ecmEngine {
   height: 100%;
   overflow: hidden;
-  .ivu-form {
-    overflow-x: auto;
-  }
   /deep/ .ivu-tag {
     max-width: 140px;
     overflow: hidden;
diff --git a/web/src/apps/linkis/module/ECM/search.vue b/web/src/apps/linkis/module/ECM/search.vue
index 9021f4e74b..732e24f696 100644
--- a/web/src/apps/linkis/module/ECM/search.vue
+++ b/web/src/apps/linkis/module/ECM/search.vue
@@ -115,7 +115,8 @@ export default {
     display: flex;
     .ivu-form-item {
       display: flex;
-      margin-right: 30px;
+      margin-right: 8px;
+      margin-bottom: 8px;
       flex: none;
     }
   }
diff --git a/web/src/apps/linkis/module/resourceManagement/engineConn.vue b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
index 721e4bab25..e9e2d4695c 100644
--- a/web/src/apps/linkis/module/resourceManagement/engineConn.vue
+++ b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -25,19 +25,13 @@
         fix/>
       <Table class="table-content ecm-engine-table" border :width="tableWidth" :columns="columns" :data="pageDatalist" @on-selection-change="selctionChange">
         <template slot-scope="{row}" slot="serviceInstance">
-          <span>{{row.serviceInstance}}</span>
+          <span>{{row.serviceInstance ? row.serviceInstance : '-'}}</span>
         </template>
         <template slot-scope="{row}" slot="usedResource">
           <!-- 后台未做返回时的处理，下面几个可按照处理 -->
           <span v-if="row.usedResource">{{`${calcCompany(row.usedResource.cores)}cores,${calcCompany(row.usedResource.memory, true)}G,${calcCompany(row.usedResource.instance)}apps`}}</span>
-          <span v-else>Null cores,Null G</span>
+          <span v-else>-</span>
         </template>
-        <!-- <template slot-scope="{row}" slot="maxResource">
-          <span>Linkis:({{`${calcCompany(row.minResource.cores)}cores,${calcCompany(row.minResource.memory, true)}G`}})</span>
-        </template> -->
-        <!-- <template slot-scope="{row}" slot="minResource">
-          <span>Linkis:({{`${calcCompany(row.maxResource.cores)}cores,${calcCompany(row.maxResource.memory, true)}G`}})</span>
-        </template> -->
         <template slot-scope="{row}" slot="labelValue" >
           <div class="tag-box">
             <Tooltip v-for="(item, index) in row.labelValue.split(',')" :key="index" :content="`${item}`" placement="top">
@@ -46,7 +40,7 @@
           </div>
         </template>
         <template slot-scope="{row}" slot="usedTime">
-          <span>{{ timeFormat(row) }}</span>
+          <span>{{ row.usedTime ? timeFormat(row) : '-' }}</span>
         </template>
       </Table>
       <div class="page-bar">
@@ -208,6 +202,8 @@ export default {
                       applicationName: "linkis-cg-engineconn",
                       emInstance: params.row.ecmInstance,
                       instance: params.row.serviceInstance,
+                      ticketId: params.row.ticketId,
+                      logDirSuffix: params.row.logDirSuffix,
                     })
                   }
                 }
diff --git a/web/src/apps/linkis/module/resourceManagement/index.scss b/web/src/apps/linkis/module/resourceManagement/index.scss
index 0da010e02f..d4506a774d 100644
--- a/web/src/apps/linkis/module/resourceManagement/index.scss
+++ b/web/src/apps/linkis/module/resourceManagement/index.scss
@@ -128,9 +128,6 @@ td.table-project-column {
 .ecm, .ecmEngine {
   height: 100%;
   overflow: hidden;
-  .ivu-form {
-    overflow-x: auto;
-  }
   /deep/ .ivu-tag {
     max-width: 140px;
     overflow: hidden;
diff --git a/web/src/apps/linkis/module/resourceManagement/log.vue b/web/src/apps/linkis/module/resourceManagement/log.vue
index e0be670496..1b619b08a8 100644
--- a/web/src/apps/linkis/module/resourceManagement/log.vue
+++ b/web/src/apps/linkis/module/resourceManagement/log.vue
@@ -89,7 +89,9 @@ export default {
           parameters: {
             pageSize: 1000,
             fromLine,
-            logType: this.tabName
+            logType: this.tabName,
+            logDirSuffix: this.param.logDirSuffix,
+            ticketId: this.param.ticketId
           }
         }
         let res = await api.fetch('/linkisManager/openEngineLog', params, 'post') || {};
diff --git a/web/src/apps/linkis/module/resourceManagement/search.vue b/web/src/apps/linkis/module/resourceManagement/search.vue
index 3e51cc8140..e6f245582d 100644
--- a/web/src/apps/linkis/module/resourceManagement/search.vue
+++ b/web/src/apps/linkis/module/resourceManagement/search.vue
@@ -21,7 +21,7 @@
       <Input :maxlength="50" v-model="searchBar.instance" :placeholder="$t('message.linkis.instanceName')"/>
     </FormItem>
     <FormItem prop="owner" :label="$t('message.linkis.initiator')" >
-      <Select  v-model="searchBar.owner" style="width:200px" clearable>
+      <Select  v-model="searchBar.owner" style="width:100px" clearable>
         <Option
           v-for="(item) in ownerList"
           :label="item"
@@ -44,7 +44,7 @@
       />
     </FormItem>
     <FormItem prop="engineType" :label="$t('message.linkis.tableColumns.engineType')" >
-      <Select  v-model="searchBar.engineType" style="width:200px" clearable>
+      <Select  v-model="searchBar.engineType" style="width:80px" clearable>
         <Option
           v-for="(item) in engineTypes"
           :label="item"
@@ -150,7 +150,8 @@ export default {
     display: flex;
     .ivu-form-item {
       display: flex;
-      margin-right: 30px;
+      margin-right: 8px;
+      margin-bottom: 8px;
       flex: none;
     }
   }

From d45ef23792be819c6b47aff871ec5c1311377662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Thu, 30 Jun 2022 17:51:34 +0800
Subject: [PATCH 5/9] fix: engineConn page, pgae bug

---
 .../module/resourceManagement/engineConn.vue  | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/web/src/apps/linkis/module/resourceManagement/engineConn.vue b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
index e9e2d4695c..9ae7dc7ba4 100644
--- a/web/src/apps/linkis/module/resourceManagement/engineConn.vue
+++ b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -18,12 +18,12 @@
 <template>
   <div :style="{height: '100%'}">
     <div v-show="!showviewlog" class="ecmEngine">
-      <Search :statusList="statusList" :ownerList="ownerList" :engineTypes="engineTypes" @search="search" :stopbtn="true" />
+      <Search ref="search" :statusList="statusList" :ownerList="ownerList" :engineTypes="engineTypes" @search="search" :stopbtn="true" />
       <Spin
         v-if="loading"
         size="large"
         fix/>
-      <Table class="table-content ecm-engine-table" border :width="tableWidth" :columns="columns" :data="pageDatalist" @on-selection-change="selctionChange">
+      <Table class="table-content ecm-engine-table" border :width="tableWidth" :columns="columns" :data="tableData" @on-selection-change="selctionChange">
         <template slot-scope="{row}" slot="serviceInstance">
           <span>{{row.serviceInstance ? row.serviceInstance : '-'}}</span>
         </template>
@@ -46,7 +46,7 @@
       <div class="page-bar">
         <Page
           ref="page"
-          :total="this.tableData.length"
+          :total="page.totalSize"
           :page-size-opts="page.sizeOpts"
           :page-size="page.pageSize"
           :current="page.pageNow"
@@ -219,13 +219,6 @@ export default {
     WbTag,
     ViewLog
   },
-  computed: {
-    pageDatalist() {// 展示的数据
-      return this.tableData.filter((item, index) => {
-        return (this.page.pageNow - 1) * this.page.pageSize <= index && index < this.page.pageNow * this.page.pageSize;
-      })
-    }
-  },
   created() {
     this.initExpandList();
     // 获取状态信息列表
@@ -252,6 +245,7 @@ export default {
         let engines = await api.fetch(url, 'get') || {};
         // 获取使用的引擎资源列表
         let enginesList = engines.engineList || [];
+        this.page.totalSize = engines.totalPage ? engines.totalPage : enginesList.length;
         this.allEngines = [ ...enginesList ];
         this.tableData = [ ...enginesList ];
         this.ownerList = [];
@@ -332,11 +326,13 @@ export default {
     // 切换分页
     change(val) {
       this.page.pageNow = val;
+      this.$refs.search.search();
     },
     // 页容量变化
     changeSize(val) {
       this.page.pageSize = val;
       this.page.pageNow = 1;
+      this.$refs.search.search();
     },
     // 搜索
     search(e) {
@@ -357,10 +353,8 @@ export default {
       if (this.page.pageSize) url += `pageSize=${this.page.pageSize}`
       api.fetch(url,'get').then((res)=>{
         this.tableData=res.engineList
+        this.page.totalSize = res.totalPage ? res.totalPage : this.page.totalSize;
       })
-
-      this.page.pageNow = 1;
-      this.page.totalSize = this.tableData.length;
     },
     // 时间格式转换
     timeFormat(row) {

From 175e2c381853ee3fe27d28c5fe77caf2f2b6df7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Tue, 5 Jul 2022 11:13:25 +0800
Subject: [PATCH 6/9] fix: 281727, 281686

---
 web/src/apps/linkis/module/datasource/index.vue              | 2 +-
 web/src/apps/linkis/module/resourceManagement/engineConn.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/apps/linkis/module/datasource/index.vue b/web/src/apps/linkis/module/datasource/index.vue
index c093bad890..6f884fc101 100644
--- a/web/src/apps/linkis/module/datasource/index.vue
+++ b/web/src/apps/linkis/module/datasource/index.vue
@@ -503,7 +503,7 @@ export default {
       })
     },
     openVersionList(row) {
-      this.currentSourceData = row
+      this.currentSourceData = JSON.parse(JSON.stringify(row))
       this.getVersionListBySourceId()
       this.showVersionList = true
     },
diff --git a/web/src/apps/linkis/module/resourceManagement/engineConn.vue b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
index 9ae7dc7ba4..6e2da0946d 100644
--- a/web/src/apps/linkis/module/resourceManagement/engineConn.vue
+++ b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -345,7 +345,7 @@ export default {
           // 如果起始时间选的是同一天，则endDate要加到第二天的零点
           url += `endDate=${moment(new Date(e.shortcut[1]).getTime() + 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')}&`
         } else {
-          url += `startDate=${moment(new Date(e.shortcut[1])).format('YYYY-MM-DD HH:mm:ss')}&`
+          url += `endDate=${moment(new Date(e.shortcut[1])).format('YYYY-MM-DD HH:mm:ss')}&`
         }
       }
       if (e.engineType) url += `engineType=${e.engineType}&`

From 632634b5dc9bfa0538f692985ebd624823fcb84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Thu, 7 Jul 2022 14:15:34 +0800
Subject: [PATCH 7/9] fix: ecm and resourceManagement, bottom blank and
 resource data bug

---
 web/src/apps/linkis/module/ECM/log.vue         |  5 ++++-
 .../module/globalHistoryManagement/index.scss  |  2 +-
 .../linkis/module/resourceManagement/index.vue | 18 +++++++++---------
 .../linkis/module/resourceManagement/log.vue   |  5 ++++-
 web/src/components/consoleComponent/log.vue    |  3 +++
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/web/src/apps/linkis/module/ECM/log.vue b/web/src/apps/linkis/module/ECM/log.vue
index e0be670496..23e28b4f38 100644
--- a/web/src/apps/linkis/module/ECM/log.vue
+++ b/web/src/apps/linkis/module/ECM/log.vue
@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div style="position:relative">
+  <div class="log" style="position:relative">
     <Tabs @on-click="onClickTabs" :value="tabName">
       <TabPane name="stdout" label="stdout"></TabPane>
       <TabPane name="stderr" label="stderr"></TabPane>
@@ -122,6 +122,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.log {
+  height: 100%;
+}
  .backButton {
   position: absolute;
   top: -2px;
diff --git a/web/src/apps/linkis/module/globalHistoryManagement/index.scss b/web/src/apps/linkis/module/globalHistoryManagement/index.scss
index 0e25d5618f..1e201eb159 100644
--- a/web/src/apps/linkis/module/globalHistoryManagement/index.scss
+++ b/web/src/apps/linkis/module/globalHistoryManagement/index.scss
@@ -91,7 +91,7 @@
     }
 }
 .workbench-log-view {
-    height: 100%;
+    height: calc(100% - 76px) !important;
     .log-tools {
         height: 36px;
         line-height: 36px;
diff --git a/web/src/apps/linkis/module/resourceManagement/index.vue b/web/src/apps/linkis/module/resourceManagement/index.vue
index 23fb527c67..ea8adfcb27 100644
--- a/web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/web/src/apps/linkis/module/resourceManagement/index.vue
@@ -143,25 +143,25 @@
     <template v-if="isAdminModel">
       <Table class="table-content" border :width="tableWidth" :columns="admincolumns" :data="adminTableData">
         <template slot-scope="{row}" slot="usedResource">
-          <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores')},${calcCompanyAdmin(row, 'usedResource', 'memory')},${calcCompanyAdmin(row, 'usedResource', 'instances')}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores')},${calcCompanyAdmin(row, 'usedResource', 'memory')},${calcCompanyAdmin(row, 'usedResource', 'instance')}`}}</span>
         </template>
         <template slot-scope="{row}" slot="lockedResource">
-          <span>{{`${calcCompanyAdmin(row, 'lockedResource', 'cores')},${calcCompanyAdmin(row, 'lockedResource', 'memory')},${calcCompanyAdmin(row, 'lockedResource', 'instances')}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'lockedResource', 'cores')},${calcCompanyAdmin(row, 'lockedResource', 'memory')},${calcCompanyAdmin(row, 'lockedResource', 'instance')}`}}</span>
         </template>
         <template slot-scope="{row}" slot="maxResource">
-          <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores')},${calcCompanyAdmin(row, 'maxResource', 'memory')},${calcCompanyAdmin(row, 'maxResource', 'instances')}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores')},${calcCompanyAdmin(row, 'maxResource', 'memory')},${calcCompanyAdmin(row, 'maxResource', 'instance')}`}}</span>
         </template>
         <template slot-scope="{row}" slot="leftResource">
-          <span :class="'label-'+row.loadResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores')},${calcCompanyAdmin(row, 'leftResource', 'memory')},${calcCompanyAdmin(row, 'leftResource', 'instances')}`}}</span>
+          <span :class="'label-'+row.loadResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores')},${calcCompanyAdmin(row, 'leftResource', 'memory')},${calcCompanyAdmin(row, 'leftResource', 'instance')}`}}</span>
         </template>
         <template slot-scope="{row}" slot="yarnUsedResource">
-          <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores', true)},${calcCompanyAdmin(row, 'usedResource', 'memory', true)},${calcCompanyAdmin(row, 'usedResource', 'instances', true)}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores', true)},${calcCompanyAdmin(row, 'usedResource', 'memory', true)},${calcCompanyAdmin(row, 'usedResource', 'instance', true)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="yarnMaxResource">
-          <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores', true)},${calcCompanyAdmin(row, 'maxResource', 'memory', true)},${calcCompanyAdmin(row, 'maxResource', 'instances', true)}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores', true)},${calcCompanyAdmin(row, 'maxResource', 'memory', true)},${calcCompanyAdmin(row, 'maxResource', 'instance', true)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="yarnLeftResource">
-          <span :class="'label-'+row.queueResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores', true)},${calcCompanyAdmin(row, 'leftResource', 'memory', true)},${calcCompanyAdmin(row, 'leftResource', 'instances', true)}`}}</span>
+          <span :class="'label-'+row.queueResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores', true)},${calcCompanyAdmin(row, 'leftResource', 'memory', true)},${calcCompanyAdmin(row, 'leftResource', 'instance', true)}`}}</span>
         </template>
       </Table>
       <div class="page-bar">
@@ -545,7 +545,7 @@ export default {
       if (row.resourceType === 'LoadInstance') {
         if (!yarn) {
           data = row[field][type]
-          if (type === 'instances' && data === undefined) {
+          if (type === 'instance' && data === undefined) {
             data = row[field]['instance']
           }
         }
@@ -563,7 +563,7 @@ export default {
       if (data !== ' -- ') {
         if (type === 'memory') {
           data = data + 'G'
-        } else if (type === 'instances') {
+        } else if (type === 'instance') {
           data = data + 'apps'
         } else {
           data = data + 'cores'
diff --git a/web/src/apps/linkis/module/resourceManagement/log.vue b/web/src/apps/linkis/module/resourceManagement/log.vue
index 1b619b08a8..0f0d499c83 100644
--- a/web/src/apps/linkis/module/resourceManagement/log.vue
+++ b/web/src/apps/linkis/module/resourceManagement/log.vue
@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div style="position:relative">
+  <div class="log" style="position:relative">
     <Tabs @on-click="onClickTabs" :value="tabName">
       <TabPane name="stdout" label="stdout"></TabPane>
       <TabPane name="stderr" label="stderr"></TabPane>
@@ -124,6 +124,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.log {
+  height: 100%;
+}
  .backButton {
   position: absolute;
   top: -2px;
diff --git a/web/src/components/consoleComponent/log.vue b/web/src/components/consoleComponent/log.vue
index 9608b30111..4c983111fe 100644
--- a/web/src/components/consoleComponent/log.vue
+++ b/web/src/components/consoleComponent/log.vue
@@ -199,6 +199,9 @@ export default {
 @import '@/common/style/variables.scss';
   .workbench-log-view {
     height: 100%;
+    .we-editor {
+      height: calc(100% - 36px) !important;
+    }
     .log-tools {
       height: 36px;
       line-height: 36px;

From 989aacf587a5a5ed02a6e55c5aac042d39ee932f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Fri, 8 Jul 2022 17:30:28 +0800
Subject: [PATCH 8/9] fix: bug

---
 web/src/apps/linkis/module/ECM/search.vue                   | 2 +-
 .../apps/linkis/module/resourceManagement/engineConn.vue    | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/web/src/apps/linkis/module/ECM/search.vue b/web/src/apps/linkis/module/ECM/search.vue
index 732e24f696..09e89b7cad 100644
--- a/web/src/apps/linkis/module/ECM/search.vue
+++ b/web/src/apps/linkis/module/ECM/search.vue
@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <Form :model="searchBar" :rules="ruleInline" inline>
+  <Form :model="searchBar" :rules="ruleInline" inline @submit.native.prevent>
     <FormItem prop="instance" :label="`${$t('message.linkis.instanceName')}`">
       <Input :maxlength="50" v-model="searchBar.instance" :placeholder="$t('message.linkis.instanceName')"/>
     </FormItem>
diff --git a/web/src/apps/linkis/module/resourceManagement/engineConn.vue b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
index 6e2da0946d..901a4c35df 100644
--- a/web/src/apps/linkis/module/resourceManagement/engineConn.vue
+++ b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -249,14 +249,12 @@ export default {
         this.allEngines = [ ...enginesList ];
         this.tableData = [ ...enginesList ];
         this.ownerList = [];
-        this.engineTypes = []
+        let data = await api.fetch('/configuration/engineType', 'get')
+        this.engineTypes = data && data.engineType ? data.engineType : []
         enginesList.forEach(item => {
           if (this.ownerList.indexOf(item.createUser) === -1) {
             this.ownerList.push(item.createUser)
           }
-          if (this.engineTypes.indexOf(item.engineType) === -1) {
-            this.engineTypes.push(item.engineType)
-          }
         })
         this.loading = false;
       } catch (err) {

From 2c6ff5c31c66e3f0be9c160ff5696f0e862d482e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liveipooli=28=E6=9D=8E=E4=B8=BA=29?= <liveipooli@webank.com>
Date: Mon, 11 Jul 2022 10:57:53 +0800
Subject: [PATCH 9/9] fix: 282598

---
 web/src/apps/linkis/i18n/common/en.json       |  1 +
 web/src/apps/linkis/i18n/common/zh.json       |  1 +
 .../module/resourceManagement/engineConn.vue  | 13 +++---------
 .../module/resourceManagement/search.vue      | 20 +++++++------------
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/web/src/apps/linkis/i18n/common/en.json b/web/src/apps/linkis/i18n/common/en.json
index 630d3df17c..9a28f0cad2 100644
--- a/web/src/apps/linkis/i18n/common/en.json
+++ b/web/src/apps/linkis/i18n/common/en.json
@@ -20,6 +20,7 @@
       "fold": "Fold",
       "jumpPage": "Please check in the jump page...",
       "initiator": "Created From",
+      "inputOwnerHint": "Please input owner",
       "find": "Find",
       "errorCode": "Error code",
       "errorDescription": "Error description",
diff --git a/web/src/apps/linkis/i18n/common/zh.json b/web/src/apps/linkis/i18n/common/zh.json
index bf38defec8..8cb191b8c3 100644
--- a/web/src/apps/linkis/i18n/common/zh.json
+++ b/web/src/apps/linkis/i18n/common/zh.json
@@ -18,6 +18,7 @@
             "addTags": "添加标签",
             "find": "查询",
             "initiator": "创建者",
+            "inputOwnerHint": "请输入创建者",
             "jumpPage": "请在跳转页面查看……",
             "editedSuccess": "修改成功",
             "errorCode": "错误码",
diff --git a/web/src/apps/linkis/module/resourceManagement/engineConn.vue b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
index 901a4c35df..40bdf06374 100644
--- a/web/src/apps/linkis/module/resourceManagement/engineConn.vue
+++ b/web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -18,7 +18,7 @@
 <template>
   <div :style="{height: '100%'}">
     <div v-show="!showviewlog" class="ecmEngine">
-      <Search ref="search" :statusList="statusList" :ownerList="ownerList" :engineTypes="engineTypes" @search="search" :stopbtn="true" />
+      <Search ref="search" :statusList="statusList" :engineTypes="engineTypes" @search="search" :stopbtn="true" :page="page" />
       <Spin
         v-if="loading"
         size="large"
@@ -89,7 +89,6 @@ export default {
       showviewlog: false,
       loading: false,
       healthyStatusList: [],
-      ownerList: [],
       engineTypes: [],
       keyList: [],
       statusList: [],
@@ -248,14 +247,8 @@ export default {
         this.page.totalSize = engines.totalPage ? engines.totalPage : enginesList.length;
         this.allEngines = [ ...enginesList ];
         this.tableData = [ ...enginesList ];
-        this.ownerList = [];
         let data = await api.fetch('/configuration/engineType', 'get')
         this.engineTypes = data && data.engineType ? data.engineType : []
-        enginesList.forEach(item => {
-          if (this.ownerList.indexOf(item.createUser) === -1) {
-            this.ownerList.push(item.createUser)
-          }
-        })
         this.loading = false;
       } catch (err) {
         console.log(err)
@@ -324,13 +317,13 @@ export default {
     // 切换分页
     change(val) {
       this.page.pageNow = val;
-      this.$refs.search.search();
+      this.$refs.search.search(true);
     },
     // 页容量变化
     changeSize(val) {
       this.page.pageSize = val;
       this.page.pageNow = 1;
-      this.$refs.search.search();
+      this.$refs.search.search(true);
     },
     // 搜索
     search(e) {
diff --git a/web/src/apps/linkis/module/resourceManagement/search.vue b/web/src/apps/linkis/module/resourceManagement/search.vue
index e6f245582d..88852ea763 100644
--- a/web/src/apps/linkis/module/resourceManagement/search.vue
+++ b/web/src/apps/linkis/module/resourceManagement/search.vue
@@ -21,13 +21,7 @@
       <Input :maxlength="50" v-model="searchBar.instance" :placeholder="$t('message.linkis.instanceName')"/>
     </FormItem>
     <FormItem prop="owner" :label="$t('message.linkis.initiator')" >
-      <Select  v-model="searchBar.owner" style="width:100px" clearable>
-        <Option
-          v-for="(item) in ownerList"
-          :label="item"
-          :value="item"
-          :key="item"/>
-      </Select>
+      <Input :maxlength="50" v-model="searchBar.owner" style="width:100px" clearable :placeholder="$t('message.linkis.inputOwnerHint')"/>
     </FormItem>
     <FormItem prop="shortcut" :label="$t('message.linkis.formItems.date.label')">
       <DatePicker
@@ -53,7 +47,7 @@
       </Select>
     </FormItem>
     <FormItem>
-      <Button type="primary" @click="search">
+      <Button type="primary" @click="search(false)">
         {{ $t('message.linkis.search') }}
       </Button>
     </FormItem>
@@ -70,16 +64,15 @@ export default {
       type: Array,
       default: () => []
     },
-    ownerList: {
-      type: Array,
-      default: () => []
-    },
     engineTypes: {
       type: Array,
       default: () => []
     },
     stopbtn: {
       type: Boolean
+    },
+    page: {
+      type: Object
     }
   },
   data() {
@@ -136,7 +129,8 @@ export default {
   activated() {
   },
   methods: {
-    search() {
+    search(isChangingPage) {
+      if (!isChangingPage) this.page.pageNow = 1
       this.$emit("search", this.searchBar)
     },
     stop() {