diff --git a/Dockerfile b/Dockerfile
index d1d3ceb8..020d9543 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx
+FROM nginx:1.20.0
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY dist/  /usr/share/nginx/html/
 COPY replace.sh /
diff --git a/src/assets/common.css b/src/assets/common.css
index e2e8b709..c84b7ec8 100644
--- a/src/assets/common.css
+++ b/src/assets/common.css
@@ -287,19 +287,26 @@ body,
 
 .remote-tab {
     border: 1px solid #EBEEF5 !important;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
 
-.remote-tab .el-tabs__item{
+.remote-tab .el-tabs__item {
     border-bottom: 1px solid #EBEEF5 !important;
     padding: 0 15px;
+    color: #606266 !important;
 }
 
-.remote-tab .el-tabs__content{
+.remote-tab .el-tabs__item.is-active {
+    border-bottom: 1px solid #EBEEF5 !important;
+    padding: 0 15px;
+    color: #409EFF !important;
+}
+
+.remote-tab .el-tabs__content {
     padding: 15px;
     border-left: 1px solid #EBEEF5;
 }
 
-.remote-tab .el-tabs__header{
-    margin-right: 0px!important;
+.remote-tab .el-tabs__header {
+    margin-right: 0px !important;
 }
\ No newline at end of file
diff --git a/src/assets/img/HTC.jpg b/src/assets/img/HTC.jpg
new file mode 100644
index 00000000..384c8edf
Binary files /dev/null and b/src/assets/img/HTC.jpg differ
diff --git a/src/assets/img/Lenovo.jpg b/src/assets/img/Lenovo.jpg
new file mode 100644
index 00000000..2791b01e
Binary files /dev/null and b/src/assets/img/Lenovo.jpg differ
diff --git a/src/components/ElementSelect.vue b/src/components/ElementSelect.vue
index 7dcf9501..7e9cbd2b 100644
--- a/src/components/ElementSelect.vue
+++ b/src/components/ElementSelect.vue
@@ -15,6 +15,21 @@ const pageData = ref({
 });
 const pageSize = ref(10);
 const currentPage = ref(0)
+const findByName = (name) => {
+  props.step.elements[props.index] = null
+  axios.get("/controller/elements/list", {
+    params: {
+      name,
+      projectId: props.projectId,
+      type: props.type,
+      page: 1,
+      pageSize: pageSize.value,
+    }
+  }).then(resp => {
+    pageData.value = resp.data
+    currentPage.value = pageData.value['number'] + 1
+  })
+}
 const findByProjectIdAndEleType = (event, pageNum, pSize) => {
   if (event) {
     props.step.elements[props.index] = null
@@ -46,12 +61,17 @@ onMounted(() => {
       :prop="'elements['+index+']'"
   >
     <el-select
+        filterable
+        remote
+        :remote-method="findByName"
         value-key="id"
         v-model="step.elements[index]"
         :placeholder="place"
+        placeholder="请输入控件名称筛选"
         @visible-change="findByProjectIdAndEleType"
     >
       <el-option
+          v-if="pageData['content']!==null"
           v-for="item in pageData['content']"
           :key="item.id"
           :label="item['eleName']"
@@ -59,6 +79,7 @@ onMounted(() => {
       ></el-option>
       <div style="text-align: center;margin-top: 5px">
         <el-pagination small layout="prev, pager, next"
+                       hide-on-single-page
                        v-model:current-page="currentPage"
                        :total="pageData['totalElements']"
                        :page-size="pageSize"
diff --git a/src/components/RenderStatus.vue b/src/components/RenderStatus.vue
index fe948b6f..3bae4e0f 100644
--- a/src/components/RenderStatus.vue
+++ b/src/components/RenderStatus.vue
@@ -30,6 +30,7 @@ const statusList = {
 const props = defineProps(
     {
       status: String,
+      user: String
     }
 );
 const selObj = statusList[props.status] || {type: 'danger', text: '加载中'}
@@ -37,6 +38,6 @@ const selObj = statusList[props.status] || {type: 'danger', text: '加载中'}
 
 <template>
   <el-tag :type="selObj.type" size="mini" style="float: right">
-    {{ selObj.text }}
+    {{ status === 'DEBUGGING' ? user + " " + selObj.text : selObj.text }}
   </el-tag>
 </template>
\ No newline at end of file
diff --git a/src/views/Devices.vue b/src/views/Devices.vue
index b40f2c26..51b22887 100644
--- a/src/views/Devices.vue
+++ b/src/views/Devices.vue
@@ -52,7 +52,9 @@ const manufacturer = ref([
   "Yulong",
   "LGE",
   "Sony",
-  "GIONEE"
+  "GIONEE",
+  "Lenovo",
+  "HTC"
 ]);
 const statusList = ref([
   {
@@ -295,9 +297,12 @@ const getAllAgents = () => {
     agentList.value = resp.data
   })
 }
-const savePwd = (device) => {
+const saveDetail = (device) => {
   axios
-      .put("/controller/devices/savePwd", {id: device.id, password: device.password}).then((resp) => {
+      .put("/controller/devices/saveDetail", {
+        id: device.id, password: device.password,
+        nickName: device.nickName
+      }).then((resp) => {
     if (resp['code'] === 2000) {
       ElMessage.success({
         message: resp['message'],
@@ -370,7 +375,18 @@ const updateImg = (id, imgUrl) => {
         }
       });
 }
+const getFilterOption = () => {
+  axios
+      .get("/controller/devices/getFilterOption")
+      .then((resp) => {
+        if (resp['code'] === 2000) {
+          cpus.value =resp['data'].cpu
+          sizes.value =resp['data'].size
+        }
+      });
+}
 onMounted(() => {
+  getFilterOption();
   findAll();
   getAllAgents();
 })
@@ -470,7 +486,7 @@ onMounted(() => {
                       :src="getImg(man)"
                   />
                   <img
-                      v-else-if="man === 'Xiaomi' ||man === 'APPLE'|| man==='LGE'"
+                      v-else-if="man === 'Xiaomi' ||man === 'APPLE'|| man==='LGE' || man==='HTC'"
                       style="width: 30px"
                       :src="getImg(man)"
                   />
@@ -562,11 +578,11 @@ onMounted(() => {
             >
               <template #header>
               <span v-if="device.model">{{
-                  device.model.length > 25
-                      ? device.model.substring(0, 17) + "..."
+                  (device['nickName'] && device['nickName'].length > 0)
+                      ? device['nickName']
                       : device.model
                 }}</span>
-                <RenderStatus :status="device.status"></RenderStatus>
+                <RenderStatus :status="device.status" :user="device.user"></RenderStatus>
               </template>
               <el-row>
                 <el-col :span="10">
@@ -597,6 +613,14 @@ onMounted(() => {
                       label-width="70px"
                       style="margin: 0 0 15px 10px"
                   >
+                    <el-form-item label="设备型号" v-if="device.model">
+                      <div>{{
+                          device.model.length > 25
+                              ? device.model.substring(0, 17) + "..."
+                              : device.model
+                        }}
+                      </div>
+                    </el-form-item>
                     <el-form-item label="设备名称">
                       <div>{{ device.name }}</div>
                     </el-form-item>
@@ -609,7 +633,7 @@ onMounted(() => {
                           :src="getImg(device.manufacturer)"
                       />
                       <img
-                          v-else-if="device.manufacturer === 'Xiaomi' ||device.manufacturer === 'APPLE'||device.manufacturer === 'LGE'"
+                          v-else-if="device.manufacturer === 'Xiaomi' ||device.manufacturer === 'APPLE'||device.manufacturer === 'LGE'||device.manufacturer === 'HTC'"
                           style="width: 30px"
                           :src="getImg(device.manufacturer)"
                       />
@@ -629,9 +653,6 @@ onMounted(() => {
                     <el-form-item label="系统版本">
                       <div>{{ device.version }}</div>
                     </el-form-item>
-                    <el-form-item label="分辨率">
-                      <div>{{ device.size }}</div>
-                    </el-form-item>
                     <el-form-item label="所在位置">
                       <div>{{ findAgentById(device.agentId) }}</div>
                     </el-form-item>
@@ -667,6 +688,26 @@ onMounted(() => {
                         >
                       </el-upload>
                     </el-form-item>
+                    <el-form-item label="设备备注">
+                      <el-input
+                          show-word-limit
+                          v-model="device['nickName']"
+                          type="text"
+                          size="mini"
+                          placeholder="输入设备备注信息"
+                          maxlength="30"
+                          style="position: absolute; top: 7px; bottom: 7px"
+                      >
+                        <template #append>
+                          <el-button
+                              size="mini"
+                              @click="saveDetail(device)"
+                          >保存
+                          </el-button
+                          >
+                        </template>
+                      </el-input>
+                    </el-form-item>
                     <el-form-item label="设备名称">
                       <span>{{ device.name }}</span>
                     </el-form-item>
@@ -695,7 +736,7 @@ onMounted(() => {
                         <template #append>
                           <el-button
                               size="mini"
-                              @click="savePwd(device)"
+                              @click="saveDetail(device)"
                           >保存
                           </el-button
                           >
diff --git a/src/views/ProjectIndex.vue b/src/views/ProjectIndex.vue
index bc826199..1af757bf 100644
--- a/src/views/ProjectIndex.vue
+++ b/src/views/ProjectIndex.vue
@@ -269,6 +269,11 @@ const getData = () => {
   })
 }
 onMounted(() => {
+  let chart = echarts.getInstanceByDom(document.getElementById('projectChart'));
+  if (chart == null) {
+    chart = echarts.init(document.getElementById('projectChart'));
+  }
+  chart.dispose();
   const end = moment(new Date()).format("YYYY-MM-DD HH:mm:ss")
   const start = moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 7)).format("YYYY-MM-DD HH:mm:ss")
   times.value = [start, end];
diff --git a/src/views/RemoteEmulator/AndroidRemote.vue b/src/views/RemoteEmulator/AndroidRemote.vue
index 1a5269dc..46de3fda 100644
--- a/src/views/RemoteEmulator/AndroidRemote.vue
+++ b/src/views/RemoteEmulator/AndroidRemote.vue
@@ -11,9 +11,8 @@ import StepLog from '@/components/StepLog.vue';
 import ElementUpdate from '@/components/ElementUpdate.vue';
 import defaultLogo from '@/assets/logo.png';
 import {
-  Aim,
+  Delete,
   Place,
-  FullScreen,
   Download,
   Search,
   SwitchButton,
@@ -52,6 +51,7 @@ const caseList = ref(null);
 const loading = ref(false);
 const device = ref({});
 const agent = ref({});
+const screenUrls = ref([])
 const uploadUrl = ref('');
 const text = ref({content: ''});
 let imgWidth = 0;
@@ -75,8 +75,7 @@ let time = 0;
 let isLongPress = false;
 // let isRotated = 0; // 是否转向 // 0 90 180 270
 let mouseMoveTime = 0;
-const pic = ref('中');
-const fixScreenTor = ref(0);
+const pic = ref('高');
 const elementLoading = ref(false);
 const isShowImg = ref(false);
 const isDriverFinish = ref(false);
@@ -115,6 +114,7 @@ const logcatScroll = ref(null);
 const cmdIsDone = ref(true);
 const uploadLoading = ref(false);
 const location = ref(false);
+const remoteAdbUrl = ref("");
 const logcatFilter = ref({
   level: 'E',
   filter: '',
@@ -231,8 +231,16 @@ const filterNode = (value, data) => {
   return (data.label.indexOf(value) !== -1) ||
       (data.detail['resource-id'] ? data.detail['resource-id'].indexOf(value) !== -1 : false);
 };
-const downloadImg = () => {
-  window.open(imgUrl.value, '_blank');
+const downloadImg = (url) => {
+  let time = new Date().getTime();
+  let link = document.createElement('a');
+  fetch(url).then(res => res.blob()).then(blob => {
+    link.href = URL.createObjectURL(blob);
+    link.download = time + ".jpg";
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  })
 };
 const copy = (value) => {
   try {
@@ -246,17 +254,34 @@ const copy = (value) => {
     });
   }
 };
-const setImgData = (data) => {
-  const img = new Image();
-  if (data === undefined) {
+const removeScreen = () => {
+  screenUrls.value = [];
+}
+const quickCap = () => {
+  if (oldBlob) {
+    const img = new Image();
     const blob = new Blob([oldBlob], {type: 'image/jpeg'});
     const URL = window.URL || window.webkitURL;
     const u = URL.createObjectURL(blob);
-    imgUrl.value = u;
+    screenUrls.value.push(u);
     img.src = u;
   } else {
+    ElMessage.error({
+      message: '快速截图失败！',
+    });
+  }
+}
+const setImgData = (data) => {
+  const img = new Image();
+  if (data) {
     imgUrl.value = data;
     img.src = data;
+  } else {
+    const blob = new Blob([oldBlob], {type: 'image/jpeg'});
+    const URL = window.URL || window.webkitURL;
+    const u = URL.createObjectURL(blob);
+    imgUrl.value = u;
+    img.src = u;
   }
   const canvas = document.getElementById('debugPic');
   img.onload = function () {
@@ -268,7 +293,7 @@ const setImgData = (data) => {
 const openSocket = (host, port, udId, key) => {
   if ('WebSocket' in window) {
     websocket = new WebSocket(
-        'ws://' + host + ':' + port + '/websockets/android/' + udId + '/' + key,
+        'ws://' + host + ':' + port + '/websockets/android/' + udId + '/' + key + '/' + localStorage.getItem('SonicToken'),
     );
     terminalWebsocket = new WebSocket(
         'ws://' + host + ':' + port + '/websockets/terminal/' + udId + '/' + key,
@@ -389,6 +414,12 @@ const websocketOnmessage = (message) => {
     img.src = u;
   } else {
     switch (JSON.parse(message.data)['msg']) {
+      case 'adbkit': {
+        if (JSON.parse(message.data).isEnable) {
+          remoteAdbUrl.value = agent.value['host'] + ":" + JSON.parse(message.data).port
+        }
+        break;
+      }
       case 'rotation': {
         if (directionStatus.value !== -1) {
           loading.value = true;
@@ -535,9 +566,7 @@ const getCurLocation = () => {
     );
     y = (directionStatus.value == 180) ? imgHeight - _y : _y;
   }
-  console.log('xy', {
-    x, y
-  });
+  // console.log('xy', { x, y });
   return ({
     x, y
   })
@@ -689,12 +718,14 @@ const touchstart = async (event) => {
   const debugPic = document.getElementById('debugPic');
   const rect = debugPic.getBoundingClientRect();
   const x = parseInt(
-      (event.clientX - rect.left * (debugPic.width / rect.width)) *
-      (imgWidth / rect.width),
+      (event.clientX - rect.left) * (imgWidth / debugPic.clientWidth)
   );
+  // _x = parseInt(
+  //     (event.clientY - rect.top) *
+  //     (imgWidth / canvas.clientHeight),
+  // );
   const y = parseInt(
-      (event.clientY - rect.top * (debugPic.height / rect.height)) *
-      (imgHeight / rect.height),
+      (event.clientY - rect.top) * (imgHeight / debugPic.clientHeight),
   );
   await nextTick(() => {
     tree['value'].setCurrentKey(
@@ -917,58 +948,6 @@ const scan = (url) => {
       }),
   );
 };
-const fixScreen = (type) => {
-  loading.value = true;
-  location.value = !location.value;
-  let pic;
-  switch (type) {
-    case '低':
-      pic = 'low';
-      break;
-    case '中':
-      pic = 'middle';
-      break;
-    case '高':
-      pic = 'high';
-      break;
-  }
-  if (fixScreenTor.value == 3) {
-    fixScreenTor.value = 0;
-  } else {
-    fixScreenTor.value++;
-  }
-  websocket.send(
-      JSON.stringify({
-        type: 'fixScreen',
-        s: fixScreenTor.value,
-        detail: pic,
-      }),
-  );
-};
-const screen = (type, p) => {
-  if (p !== 'abort') {
-    loading.value = true;
-  }
-  let pic;
-  switch (type) {
-    case '低':
-      pic = 'low';
-      break;
-    case '中':
-      pic = 'middle';
-      break;
-    case '高':
-      pic = 'high';
-      break;
-  }
-  websocket.send(
-      JSON.stringify({
-        type: 'screen',
-        s: p,
-        detail: pic,
-      }),
-  );
-};
 const sendText = (text) => {
   websocket.send(
       JSON.stringify({
@@ -1123,7 +1102,8 @@ onMounted(() => {
           :span="tabPosition == 'left' ? 12 : 24"
           :style="{
             flexBasis: tabPosition == 'left' ? layoutSplitInfo.left + '%' : '',
-             maxWidth: 'none'
+             maxWidth: tabPosition == 'left' ? layoutSplitInfo.left + '%' : '',
+             transition: !isSplitPressing ? 'flex-basis 0.3s,max-width 0.3s' : ''
           }"
       >
         <el-card v-loading="loading"
@@ -1311,38 +1291,6 @@ onMounted(() => {
                     <el-dropdown-menu class="divider" v-loading="loading"
                                       element-loading-background="rgba(255, 255, 255, 1)">
                       <el-button-group>
-<!--                        <el-tooltip-->
-<!--                            effect="dark"-->
-<!--                            content="校准图像"-->
-<!--                            placement="top"-->
-<!--                        >-->
-<!--                          <el-button-->
-<!--                              size="small"-->
-<!--                              type="info"-->
-<!--                              circle-->
-<!--                              @click="fixScreen(pic)"-->
-<!--                          >-->
-<!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-<!--                              <FullScreen/>-->
-<!--                            </el-icon>-->
-<!--                          </el-button>-->
-<!--                        </el-tooltip>-->
-<!--                        <el-tooltip-->
-<!--                            effect="dark"-->
-<!--                            content="校准坐标"-->
-<!--                            placement="top"-->
-<!--                        >-->
-<!--                          <el-button-->
-<!--                              size="small"-->
-<!--                              type="info"-->
-<!--                              circle-->
-<!--                              @click="switchLocation"-->
-<!--                          >-->
-<!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-<!--                              <Aim/>-->
-<!--                            </el-icon>-->
-<!--                          </el-button>-->
-<!--                        </el-tooltip>-->
                         <el-tooltip
                             effect="dark"
                             content="修复黑屏"
@@ -1399,87 +1347,6 @@ onMounted(() => {
                 </el-button>
               </div>
             </el-tooltip>
-            <!--            <el-tooltip-->
-            <!--                :enterable="false"-->
-            <!--                effect="dark"-->
-            <!--                content="设备转向"-->
-            <!--                :placement="tabPosition == 'left' ? 'right' : 'left'"-->
-            <!--                :offset="15"-->
-            <!--            >-->
-            <!--              <div>-->
-            <!--                <el-dropdown-->
-            <!--                    :hide-on-click="false"-->
-            <!--                    trigger="click"-->
-            <!--                    placement="right"-->
-            <!--                    style="margin-top: 4px"-->
-            <!--                >-->
-            <!--                  <el-button-->
-            <!--                      size="small"-->
-            <!--                      type="primary"-->
-            <!--                      circle-->
-            <!--                  >-->
-            <!--                    <el-icon :size="12" style="vertical-align: middle;">-->
-            <!--                      <Wallet/>-->
-            <!--                    </el-icon>-->
-            <!--                  </el-button>-->
-            <!--                  <template #dropdown>-->
-            <!--                    <el-dropdown-menu class="divider" v-loading="loading"-->
-            <!--                                      element-loading-background="rgba(255, 255, 255, 1)">-->
-            <!--                      <el-button-group>-->
-            <!--                        <el-tooltip-->
-            <!--                            effect="dark"-->
-            <!--                            content="左转90度"-->
-            <!--                            placement="top"-->
-            <!--                        >-->
-            <!--                          <el-button-->
-            <!--                              size="small"-->
-            <!--                              type="info"-->
-            <!--                              circle-->
-            <!--                              @click="screen(pic,'sub')"-->
-            <!--                          >-->
-            <!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-            <!--                              <RefreshLeft/>-->
-            <!--                            </el-icon>-->
-            <!--                          </el-button>-->
-            <!--                        </el-tooltip>-->
-            <!--                        <el-tooltip-->
-            <!--                            effect="dark"-->
-            <!--                            content="取消自动旋转"-->
-            <!--                            placement="top"-->
-            <!--                        >-->
-            <!--                          <el-button-->
-            <!--                              size="small"-->
-            <!--                              type="info"-->
-            <!--                              circle-->
-            <!--                              @click="screen(pic,'abort')"-->
-            <!--                          >-->
-            <!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-            <!--                              <Refresh/>-->
-            <!--                            </el-icon>-->
-            <!--                          </el-button>-->
-            <!--                        </el-tooltip>-->
-            <!--                        <el-tooltip-->
-            <!--                            effect="dark"-->
-            <!--                            content="右转90度"-->
-            <!--                            placement="top"-->
-            <!--                        >-->
-            <!--                          <el-button-->
-            <!--                              size="small"-->
-            <!--                              type="info"-->
-            <!--                              circle-->
-            <!--                              @click="screen(pic,'add')"-->
-            <!--                          >-->
-            <!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-            <!--                              <RefreshRight/>-->
-            <!--                            </el-icon>-->
-            <!--                          </el-button>-->
-            <!--                        </el-tooltip>-->
-            <!--                      </el-button-group>-->
-            <!--                    </el-dropdown-menu>-->
-            <!--                  </template>-->
-            <!--                </el-dropdown>-->
-            <!--              </div>-->
-            <!--            </el-tooltip>-->
             <el-tooltip
                 :enterable="false"
                 effect="dark"
@@ -1660,7 +1527,7 @@ onMounted(() => {
           :span="tabPosition == 'left' ? 12 : 24"
           :style="{
             flexBasis: tabPosition == 'left' ?  100 - Number(layoutSplitInfo.left) + '%' : '',
-             maxWidth: 'none'
+             maxWidth: tabPosition == 'left' ?  100 - Number(layoutSplitInfo.left) + '%' : ''
           }"
       >
         <el-tabs
@@ -1672,7 +1539,7 @@ onMounted(() => {
         >
           <el-tab-pane label="远控面板" name="main">
             <el-row :gutter="20">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-card>
                   <template #header>
                     <strong>输入文本</strong>
@@ -1698,22 +1565,43 @@ onMounted(() => {
                   </div>
                 </el-card>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-card>
+                  <template #header>
+                    <strong>远程连接ADB</strong>
+                  </template>
+                  <div v-if="remoteAdbUrl.length>0" style="margin-top: 8px;margin-bottom: 8px">
+                    <el-card :body-style="{backgroundColor:'#303133'}">
+                      <strong style="color: #F2F6FC">adb connect {{ remoteAdbUrl }}</strong>
+                    </el-card>
+                  </div>
+                  <div v-else v-loading="remoteAdbUrl.length===0"
+                       element-loading-spinner="el-icon-lock"
+                       element-loading-background="rgba(255, 255, 255, 1)"
+                       element-loading-text="所在Agent未开启该功能！"
+                       style="margin-top: 8px;margin-bottom: 8px">
+                    <el-card>
+                      <strong>所在Agent未开启该功能！</strong>
+                    </el-card>
+                  </div>
+                </el-card>
+              </el-col>
+              <el-col :span="8">
                 <el-card>
                   <template #header>
                     <strong>录制屏幕（即将开放）</strong>
                   </template>
                   <div style="text-align: center">
-                    <el-button size="mini" type="success" disabled>开始录制</el-button>
-                    <el-button size="mini" type="info" disabled>暂停录制</el-button>
-                    <el-button size="mini" type="danger" disabled>结束录制</el-button>
+                    <el-button size="mini" type="success" disabled>开始</el-button>
+                    <el-button size="mini" type="info" disabled>暂停</el-button>
+                    <el-button size="mini" type="danger" disabled>结束</el-button>
                     <div style="margin-top: 20px">
-                      <el-button size="mini" type="primary" disabled>下载录像</el-button>
+                      <el-button size="mini" type="primary" disabled>生成并下载录像</el-button>
                     </div>
                   </div>
                 </el-card>
               </el-col>
-              <el-col :span="12" style="margin-top: 20px">
+              <el-col :span="12" style="margin-top: 15px">
                 <el-card>
                   <template #header>
                     <strong>扫描二维码</strong>
@@ -1740,7 +1628,7 @@ onMounted(() => {
                   </div>
                 </el-card>
               </el-col>
-              <el-col :span="12" style="margin-top: 20px">
+              <el-col :span="12" style="margin-top: 15px">
                 <el-card>
                   <template #header>
                     <strong>安装APK</strong>
@@ -1790,6 +1678,42 @@ onMounted(() => {
               </el-col>
             </el-row>
           </el-tab-pane>
+          <el-tab-pane label="快速截图" name="screenCap">
+            <el-button type="primary" size="small" @click="quickCap">
+              <el-icon :size="12" style="vertical-align: middle;">
+                <Camera/>
+              </el-icon>
+              截图
+            </el-button>
+            <el-button type="danger" size="small" @click="removeScreen">
+              <el-icon :size="12" style="vertical-align: middle;">
+                <Delete/>
+              </el-icon>
+              清空
+            </el-button>
+            <el-card style="height: 100%;margin-top: 10px" v-if="screenUrls.length===0">
+              <el-empty description="暂无截图"></el-empty>
+            </el-card>
+            <el-row :gutter="20" v-else>
+              <el-col :xs="8"
+                      :sm="8"
+                      :md="8"
+                      :lg="4"
+                      :xl="4" v-for="u in screenUrls" style="margin-top: 10px">
+                <el-card shadow="hover" :body-style="{padding:'10px'}">
+                  <el-image :src="u" :preview-src-list="screenUrls" hide-on-click-modal></el-image>
+                  <div style="text-align: center;margin-top: 5px">
+                    <el-button type="primary" plain size="mini" @click="downloadImg(u)">
+                      <el-icon :size="12" style="vertical-align: middle;">
+                        <Download/>
+                      </el-icon>
+                      保存图片
+                    </el-button>
+                  </div>
+                </el-card>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
           <el-tab-pane label="Terminal" name="terminal">
             <el-alert
                 title="注意事项"
@@ -1984,19 +1908,11 @@ onMounted(() => {
                         :style="
                       'width: 100%;background-image: url(' +
                       imgUrl +
-                      ');background-size:cover;'
+                      ');background-size: 100% 100%;'
                     "
                     >
                       <canvas id="debugPic" @mousedown="touchstart"></canvas>
                     </div>
-                    <div style="text-align: center;margin-top: 10px">
-                      <el-button type="primary" plain size="mini" @click="downloadImg">
-                        <el-icon :size="12" style="vertical-align: middle;">
-                          <Download/>
-                        </el-icon>
-                        保存图片
-                      </el-button>
-                    </div>
                   </el-card>
                   <el-card
                       :body-style="{ padding: '12px' }"
@@ -2391,4 +2307,9 @@ onMounted(() => {
     background-size: 100% 100%;
   }
 }
+
+#debugPic {
+  width: 100%;
+  height: auto;
+}
 </style>
diff --git a/src/views/RemoteEmulator/IOSRemote.vue b/src/views/RemoteEmulator/IOSRemote.vue
index 58edaa91..87941cb5 100644
--- a/src/views/RemoteEmulator/IOSRemote.vue
+++ b/src/views/RemoteEmulator/IOSRemote.vue
@@ -350,9 +350,7 @@ const getCurLocation = () => {
     );
     y = (directionStatus.value == 180) ? imgHeight - _y : _y;
   }
-  console.log('xy', {
-    x, y
-  });
+  // console.log('xy', { x, y });
   return ({
     x, y
   })
@@ -828,8 +826,9 @@ onMounted(() => {
           </template>
           <div style="margin-right: 40px; text-align: center">
             <img
+                v-if="isDriverFinish"
                 id="iosCap"
-                :src="'http://' + agent['host'] + ':'+  agent['port']+'/iosScreen?s_id='+sid"
+                :src="'http://' + agent['host'] + ':'+  sid"
                 width="100%"
                 draggable="false"
                 @mousedown="mousedown"
@@ -1174,76 +1173,7 @@ onMounted(() => {
               </el-col>
             </el-row>
           </el-tab-pane>
-          <el-tab-pane label="Terminal" name="terminal" disabled>
-            <el-alert
-                title="注意事项"
-                type="warning"
-                description="该功能仍处于Beta测试中，暂时屏蔽reboot、rm、su等风险指令"
-                show-icon
-                :closable="false"
-                style="margin-bottom: 10px"
-            />
-            <el-tabs stretch type="border-card">
-              <el-tab-pane label="Shell">
-                <el-card
-                    style="border: 0px"
-                    :body-style="{color:'#FFFFFF',backgroundColor:'#303133',lineHeight:'1.5'}">
-                  <el-scrollbar noresize ref="terScroll" :style="'height:'+terminalHeight+'px;min-height:450px'">
-                    <div v-html="c" v-for="c in cmdOutPut" style="white-space: pre-wrap">
-                    </div>
-                  </el-scrollbar>
-                  <div style="display: flex;margin-top: 10px">
-                    <el-input @keyup.enter="sendCmd" size="mini" v-model="cmdInput" placeholder="输入指令后，点击Send或回车发送">
-                      <template #prepend>{{ cmdUser + ':/ $' }}</template>
-                    </el-input>
-                    <el-button size="mini" @click="sendCmd" :disabled="cmdInput.length===0||!cmdIsDone"
-                               style="margin-left: 5px" type="primary">Send
-                    </el-button>
-                    <el-button size="mini" @click="stopCmd" :disabled="cmdIsDone"
-                               style="margin-left: 5px" type="danger">Stop
-                    </el-button>
-                    <el-button size="mini" @click="clearCmd"
-                               style="margin-left: 5px" type="warning">Clear
-                    </el-button>
-                  </div>
-                </el-card>
-              </el-tab-pane>
-              <el-tab-pane label="Logcat">
-                <el-card
-                    style="border: 0px"
-                    :body-style="{color:'#FFFFFF',backgroundColor:'#303133',lineHeight:'1.5'}">
-                  <div style="display: flex;margin-bottom: 10px">
-                    <el-select size="mini" v-model="logcatFilter.level">
-                      <el-option label="VERBOSE" value="V"></el-option>
-                      <el-option label="DEBUG" value="D"></el-option>
-                      <el-option label="INFO" value="I"></el-option>
-                      <el-option label="WARN" value="W"></el-option>
-                      <el-option label="ERROR" value="E"></el-option>
-                      <el-option label="FATAL" value="F"></el-option>
-                      <el-option label="SILENT" value="S"></el-option>
-                    </el-select>
-                    <el-input style="margin-left: 5px" size="mini" v-model="logcatFilter.filter"
-                              placeholder="请输入输入过滤文本">
-                      <template #prepend>| grep</template>
-                    </el-input>
-                    <el-button size="mini" @click="sendLogcat"
-                               style="margin-left: 5px" type="primary">Search
-                    </el-button>
-                    <el-button size="mini" @click="stopLogcat"
-                               style="margin-left: 5px" type="danger">Stop
-                    </el-button>
-                    <el-button size="mini" @click="clearLogcat"
-                               style="margin-left: 5px" type="warning">Clear
-                    </el-button>
-                  </div>
-                  <el-scrollbar noresize ref="logcatScroll" :style="'height:'+terminalHeight+'px;min-height:450px'">
-                    <div v-html="l" v-for="l in logcatOutPut" style="white-space: pre-wrap">
-                    </div>
-                  </el-scrollbar>
-                </el-card>
-              </el-tab-pane>
-            </el-tabs>
-          </el-tab-pane>
+
           <el-tab-pane label="UI自动化" name="auto" disabled>
             <div v-if="testCase['id']">
               <el-collapse accordion style="margin-bottom: 20px">
@@ -1584,91 +1514,6 @@ onMounted(() => {
               </el-result>
             </el-card>
           </el-tab-pane>
-          <el-tab-pane label="网页调试" name="webview" disabled>
-            <div v-if="isWebView">
-              <div v-if="webViewListDetail.length==0">
-                <el-result icon="info" title="提示" subTitle="暂无webView进程">
-                  <template #extra>
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        :loading="webViewLoading"
-                        @click="getWebViewForward"
-                    >
-                      <el-icon :size="12" style="vertical-align: middle;">
-                        <Search/>
-                      </el-icon>
-                      获取webView进程
-                    </el-button
-                    >
-                  </template>
-                </el-result>
-              </div>
-              <div v-else>
-                <el-button @click="getWebViewForward" :loading="webViewLoading" type="primary" size="mini">
-                  重新获取webView进程
-                </el-button>
-                <el-card style="margin-top: 15px" v-for="web in webViewListDetail" class="device-card"
-                         :body-style="{ padding: '0px 10px 10px 10px' }">
-                  <template #header>
-                    <div>
-                      <div style="display: flex;align-items: center;">
-                        <img :src="getImg('chrome')" width="20"/> <strong style="margin-left: 10px">{{
-                          web['package']
-                        }}
-                        ({{ web['version'] }})</strong>
-                      </div>
-                    </div>
-                  </template>
-                  <el-card :body-style="{ padding: '15px' }" v-for="w in web.children"
-                           style="margin-top: 10px; word-wrap: break-word;overflow: hidden;">
-                    <div style="display: flex;align-items: center;justify-content: space-between">
-                      <div>
-                        <div style="display: flex;align-items: center;">
-                          <img :src="w.favicon" v-if="w.favicon" width="15" style="margin-right: 5px"/>
-                          <strong>{{ w.title.length > 0 ? w.title : '无标题' }}</strong>
-                        </div>
-                        <div style="color: #909399">{{
-                            w.url.length > 50 ? w.url.substring(0, 50) + '...' : w.url
-                          }}
-                        </div>
-                      </div>
-                      <el-button type="primary" size="mini"
-                                 @click="tabWebView(web.port,w.id,(w.title.length > 0 ? w.title : '无标题'))">马上调试
-                      </el-button>
-                    </div>
-                  </el-card>
-                </el-card>
-              </div>
-            </div>
-            <div v-else>
-              <div style="display: flex;align-items: center;">
-                <el-page-header icon="el-icon-arrow-left" @back="switchIsWebView">
-                  <template #title>
-                    <span style="color: #606266">返回</span>
-                  </template>
-                  <template #content>
-                    当前页面：<strong>{{ title }}</strong>
-                  </template>
-                </el-page-header>
-              </div>
-              <el-alert type="info" show-icon style="margin-top: 15px" close-text="Get!">
-                <template #title>
-                  <div style="display: flex;align-items: center;">
-                    <span>如果您的浏览器不兼容该功能，请您及时反馈到</span>
-                    <el-link style="font-size: 13px;margin-left: 5px" type="primary" target="_blank"
-                             href="https://github.com/ZhouYixun/sonic-agent/issues/47">
-                      这里
-                    </el-link>
-                  </div>
-                </template>
-              </el-alert>
-              <iframe v-if="!isWebView"
-                      :style="'border:1px solid #C0C4CC;;width: 100%;height: '+iFrameHeight+'px;margin-top:15px'"
-                      :src="iframeUrl">
-              </iframe>
-            </div>
-          </el-tab-pane>
         </el-tabs>
       </el-col>
     </el-row>
diff --git a/src/views/RemoteEmulator/index.vue b/src/views/RemoteEmulator/index.vue
index dd9c7fd8..2271da8d 100644
--- a/src/views/RemoteEmulator/index.vue
+++ b/src/views/RemoteEmulator/index.vue
@@ -3,10 +3,13 @@ import { nextTick, onBeforeUnmount, onMounted, ref } from 'vue';
 import AndroidRemote from './AndroidRemote.vue';
 import { ElMessage } from 'element-plus';
 
-let isPress = false;
+// let isPress = false;
 let mouseMoveTime = 0;
 let startPosition = { x: 0, y: 0 };
 let parentNode = null;
+
+const isPress = ref(false);
+
 const _layoutSplitInfo = window.localStorage.getItem('layoutSplitInfo');
 const _tabPosition = window.localStorage.getItem('tabPosition');
 
@@ -27,7 +30,7 @@ const layoutSplitInfo = ref(_layoutSplitInfo ?
       last_top: 316,
     });
 const swithLayout = () => {
-  console.log('swithLayout!!', tabPosition.value);
+  // console.log('swithLayout!!', tabPosition.value);
   if (tabPosition.value == 'left') {
     // 变竖屏
     tabPosition.value = 'top';
@@ -47,7 +50,7 @@ const swithLayout = () => {
 };
 const lineMouseup = (event) => {
   // console.log('lineMouseup', event.clientX, event.clientY);
-  isPress = false;
+  isPress.value = false;
   if (tabPosition.value == 'left') {
     layoutSplitInfo.value.last_left = layoutSplitInfo.value.left;
   } else if (tabPosition.value == 'top') {
@@ -56,30 +59,30 @@ const lineMouseup = (event) => {
   saveLastSplitObj();
 };
 const lineMouseleave = (event) => {
-  if (!isPress) {
+  if (!isPress.value) {
     return;
   }
   // console.log('lineMouseleave', event.clientX, event.clientY);
   // 由于左右滑动有可能误触发该事件，所以只处理上下滑动的情况
   if (tabPosition.value == 'top') {
-    isPress = false;
+    isPress.value = false;
     layoutSplitInfo.value.last_top = layoutSplitInfo.value.top;
   }
   saveLastSplitObj();
 };
 const lineMousedown = (event) => {
-  console.log('lineMousedown', event.clientX, event.clientY);
+  // console.log('lineMousedown', event.clientX, event.clientY);
   event.preventDefault();
-  event.stopPropagation();
-  isPress = true;
+  // event.stopPropagation();
+  isPress.value = true;
   startPosition.x = event.clientX;
   startPosition.y = event.clientY;
   parentNode = event.target.parentNode; // 记录分割线的父组件，防止移动的时候变化
 };
 const lineMousemove = (event) => {
   event.preventDefault();
-  event.stopPropagation();
-  if (isPress) {
+  // event.stopPropagation();
+  if (isPress.value) {
     // console.log('lineMousemove', event.clientX, event.clientY);
     if (mouseMoveTime < 2) {
       mouseMoveTime++;
@@ -111,7 +114,7 @@ const handleSplit = (variate) => {
     }
 
     layoutSplitInfo.value.left = layoutSplitInfo.value.last_left + Number(percent);
-    console.log('variate', percent, layoutSplitInfo.value.left);
+    // console.log('variate', percent, layoutSplitInfo.value.left);
   } else if (tabPosition.value == 'top') {
     const rect = parentNode.getBoundingClientRect();
     const percent = variate;
@@ -128,7 +131,7 @@ const handleSplit = (variate) => {
     layoutSplitInfo.value.top = layoutSplitInfo.value.last_top + Number(percent);
     // 直接应用
     canvasRectInfo.value.height = layoutSplitInfo.value.top + 'px';
-    console.log('variate', percent, layoutSplitInfo.value.top);
+    // console.log('variate', percent, layoutSplitInfo.value.top);
   }
 };
 const saveLastSplitObj = () => {
diff --git a/src/views/RemoteEmulator/indexIOS.vue b/src/views/RemoteEmulator/indexIOS.vue
index 7fa2bdf0..e12ae144 100644
--- a/src/views/RemoteEmulator/indexIOS.vue
+++ b/src/views/RemoteEmulator/indexIOS.vue
@@ -21,7 +21,7 @@ const layoutSplitInfo = ref(_layoutSplitInfo ?
     last_top: 316,
 });
 const swithLayout = () => {
-  console.log('swithLayout!!', tabPosition.value);
+  // console.log('swithLayout!!', tabPosition.value);
   if (tabPosition.value == 'left') {
     // 变竖屏
     tabPosition.value = 'top';
@@ -40,7 +40,7 @@ const swithLayout = () => {
   });
 }
 const lineMouseup = (event) => {
-  console.log('lineMouseup', event.clientX, event.clientY);
+  // console.log('lineMouseup', event.clientX, event.clientY);
   isPress = false;
   if (tabPosition.value == 'left') {
     layoutSplitInfo.value.last_left = layoutSplitInfo.value.left;
@@ -63,7 +63,7 @@ const lineMouseleave = (event) => {
   saveLastSplitObj();
 };
 const lineMousedown = (event) => {
-  console.log('lineMousedown', event.clientX, event.clientY);
+  // console.log('lineMousedown', event.clientX, event.clientY);
   event.preventDefault()
   event.stopPropagation()
   isPress = true;
@@ -107,7 +107,7 @@ const handleSplit = (variate) => {
     }
 
     layoutSplitInfo.value.left =  layoutSplitInfo.value.last_left + Number(percent);
-    console.log('variate', percent, layoutSplitInfo.value.left);
+    // console.log('variate', percent, layoutSplitInfo.value.left);
   }
   else if (tabPosition.value == 'top') {
     const rect = parentNode.getBoundingClientRect();
@@ -125,7 +125,7 @@ const handleSplit = (variate) => {
     layoutSplitInfo.value.top =  layoutSplitInfo.value.last_top + Number(percent);
     // 直接应用
     canvasRectInfo.value.height = layoutSplitInfo.value.top + 'px';
-    console.log('variate', percent, layoutSplitInfo.value.top);
+    // console.log('variate', percent, layoutSplitInfo.value.top);
   }
 }
 const saveLastSplitObj = () => {
diff --git a/src/views/Results.vue b/src/views/Results.vue
index 34955978..c1eb94f5 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -35,6 +35,20 @@ const delResult = (id) => {
     }
   })
 }
+const forceStopSuite = (id) => {
+  axios.get("/controller/testSuites/forceStopSuite", {
+    params: {
+      resultId: id
+    }
+  }).then(resp => {
+    if (resp['code'] === 2000) {
+      ElMessage.success({
+        message: resp['message'],
+      });
+      getResultList();
+    }
+  })
+}
 onMounted(() => {
   getResultList()
 })
@@ -93,8 +107,28 @@ onMounted(() => {
         </div>
       </template>
     </el-table-column>
-    <el-table-column fixed="right" label="操作" width="120" align="center">
+    <el-table-column fixed="right" label="操作" width="220" align="center">
       <template #default="scope">
+        <el-popconfirm
+            style="margin-left: 10px"
+            confirmButtonText="确认"
+            cancelButtonText="取消"
+            @confirm="forceStopSuite(scope.row.id)"
+            icon="el-icon-warning"
+            iconColor="red"
+            title="确定中断本次测试吗？"
+        >
+          <template #reference>
+            <el-button
+                :disabled="scope.row.status !== 0"
+                type="warning"
+                size="mini"
+                icon="el-icon-video-pause"
+            >中断
+            </el-button
+            >
+          </template>
+        </el-popconfirm>
         <el-popconfirm
             style="margin-left: 10px"
             confirmButtonText="确认"
diff --git a/vite.config.js b/vite.config.js
index 8d3485e2..c13f9e7f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,5 +1,5 @@
 import { defineConfig } from 'vite';
-import path from 'path';
+import { join } from 'path';
 import vue from '@vitejs/plugin-vue';
 
 // https://vitejs.dev/config/
@@ -7,7 +7,7 @@ export default defineConfig({
   plugins: [vue()],
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, 'src'),
+      '@': join(__dirname, 'src'),
     },
   },
 });