modify style.

orion-ops-vue/src/router/index.js

@@ -195,18 +195,26 @@ const routes = [
         name: 'BatchExecList',
         meta: {
           requireAuth: true,
-          title: '批量执行'
+          title: '执行记录'
         },
         component: () => import('../views/exec/BatchExecList')
       },
       {
         path: '/batch/exec/add',
         name: 'BatchExecAdd',
+        meta: {
+          requireAuth: true,
+          title: '批量执行'
+        },
         component: () => import('../views/exec/AddBatchExecTask')
       },
       {
         path: '/batch/upload',
         name: 'BatchUploadFile',
+        meta: {
+          requireAuth: true,
+          title: '批量上传'
+        },
         component: () => import('../views/exec/BatchUploadFile')
       },
       {

orion-ops-vue/src/views/app/AppConfig.vue

@@ -8,7 +8,7 @@
           <div class="app-basic-form-wrapper">
             <a-spin :spinning="loading">
               <!-- 表单 -->
-              <AddAppForm ref="basicForm" :layout="{ labelCol: { span: 3 }, wrapperCol: { span: 21 }}"/>
+              <AddAppForm ref="basicForm" :layout="{ labelCol: { span: 4 }, wrapperCol: { span: 20 }}"/>
               <div class="app-basic-form-footer">
                 <a-button type="primary" @click="updateBasic">修改</a-button>
               </div>
@@ -112,7 +112,7 @@ export default {
 
   .app-basic-form-wrapper {
     padding: 16px 16px 8px 16px;
-    width: 550px;
+    width: 580px;
 
     /deep/ .ant-row.ant-form-item {
       margin-bottom: 18px;

orion-ops-vue/src/views/app/AppList.vue

@@ -10,7 +10,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="5">
-            <a-form-model-item label="标签" prop="tag">
+            <a-form-model-item label="标识" prop="tag">
               <a-input v-model="query.tag" allowClear/>
             </a-form-model-item>
           </a-col>
@@ -82,10 +82,8 @@
         </template>
         <!-- tag -->
         <template v-slot:tag="record">
-          <span class="span-blue pointer">
-            <a-tag color="#5C7CFA">
-              {{ record.tag }}
-            </a-tag>
+          <span class="span-blue">
+            {{ record.tag }}
           </span>
         </template>
         <!-- 配置 -->
@@ -199,7 +197,7 @@ const columns = [
     sorter: (a, b) => a.name.localeCompare(b.name)
   },
   {
-    title: '标签',
+    title: '唯一标识',
     key: 'tag',
     scopedSlots: { customRender: 'tag' },
     sorter: (a, b) => a.tag.localeCompare(b.tag)

orion-ops-vue/src/views/app/AppProfile.vue

@@ -10,7 +10,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="5">
-            <a-form-model-item label="标签" prop="tag">
+            <a-form-model-item label="标识" prop="tag">
               <a-input v-model="query.tag" allowClear/>
             </a-form-model-item>
           </a-col>
@@ -48,9 +48,9 @@
                size="middle">
         <!-- tag -->
         <template v-slot:tag="record">
-          <a-tag color="#5C7CFA">
+          <span class="span-blue">
             {{ record.tag }}
-          </a-tag>
+          </span>
         </template>
         <!-- 审核 -->
         <template v-slot:releaseAudit="record">
@@ -106,7 +106,7 @@ const columns = [
     sorter: (a, b) => a.name.localeCompare(b.name)
   },
   {
-    title: '标签',
+    title: '唯一标识',
     key: 'tag',
     ellipsis: true,
     width: 150,

orion-ops-vue/src/views/exec/BatchExecList.vue

@@ -229,7 +229,7 @@ const columns = [
     title: '执行命令',
     key: 'command',
     ellipsis: true,
-    width: 260,
+    width: 220,
     scopedSlots: { customRender: 'command' }
   },
   {
@@ -255,14 +255,14 @@ const columns = [
     width: 120,
     sorter: (a, b) => (a.used || 0) - (b.exitCode || 0)
   },
-  {
-    title: '执行用户',
-    dataIndex: 'username',
-    key: 'username',
-    width: 120,
-    ellipsis: true,
-    sorter: (a, b) => a.username.localeCompare(b.username)
-  },
+  // {
+  //   title: '执行用户',
+  //   dataIndex: 'username',
+  //   key: 'username',
+  //   width: 120,
+  //   ellipsis: true,
+  //   sorter: (a, b) => a.username.localeCompare(b.username)
+  // },
   {
     title: '创建时间',
     key: 'createTime',

orion-ops-vue/src/views/exec/BatchUploadFile.vue

@@ -344,7 +344,6 @@ export default {
         if (body.type === 10) {
           // 添加
           const file = JSON.parse(body.body)
-          file.downloadUrl = null
           this.transferList.unshift(file)
         } else if (body.type === 20) {
           // 速率
@@ -386,6 +385,7 @@ export default {
     },
     abortUpload() {
       this.checkData = null
+      this.notifyClient && this.notifyClient.close()
       this.notifyClient = null
       this.token = null
       this.fileTokenList = []

orion-ops-vue/src/views/machine/MachineList.vue

@@ -10,7 +10,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="5">
-            <a-form-model-item label="标签" prop="tag">
+            <a-form-model-item label="标识" prop="tag">
               <a-input v-model="query.tag" allowClear/>
             </a-form-model-item>
           </a-col>
@@ -95,9 +95,9 @@
         </template>
         <!-- tag -->
         <template v-slot:tag="record">
-          <a-tag v-if="record.tag" color="#5C7CFA">
+          <span class="span-blue">
             {{ record.tag }}
-          </a-tag>
+          </span>
         </template>
         <!-- 主机 -->
         <template v-slot:host="record">
@@ -239,7 +239,7 @@ const columns = [
     scopedSlots: { customRender: 'name' }
   },
   {
-    title: '标签',
+    title: '唯一标识',
     key: 'tag',
     width: 150,
     sorter: (a, b) => a.tag.localeCompare(b.tag),
@@ -437,7 +437,7 @@ export default {
       if (record.id === 1) {
         this.$message.error('宿主机不支持该操作')
       } else {
-        const label = status === 1 ? '启用' : '停用'
+        const label = record.status === 1 ? '停用' : '启用'
         const pending = this.$message.loading(`正在${label}...`)
         this.$api.updateMachineStatus({
           idList: [record.id],

orion-ops-vue/src/views/machine/MachineSftp.vue

@@ -60,7 +60,7 @@ export default {
       if (filterMachines.length) {
         this.currentMachine = filterMachines[0]
       } else {
-        this.$message.error('未查询到机器信息')
+        this.$message.error('机器未启用或不存在')
         return
       }
       this.machineId = id