Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop

src/views/login/index.vue

@@ -22,7 +22,7 @@
               </n-input>
             </n-form-item>
             <n-form-item path="password">
-              <n-input v-model:value="loginForm.password" type="password" placeholder="请输入用户名">
+              <n-input v-model:value="loginForm.password" type="password" placeholder="请输入密码">
                 <template #prefix>
                   <img src="@/assets/icon/password.png" alt="">
                 </template>
@@ -140,6 +140,8 @@ export default {
   background-color: #fff;
   display: flex;
   border-radius: 20px;
+  position: relative;
+  z-index: 10;
   .container__left{
     width: 50%;
     align-self: stretch;

src/views/task-manage/all-task/tools/form.js

@@ -65,7 +65,7 @@ export const form = reactive({
     executionStartTime: [{ required: true, type: 'date', message: '请选择巡检时间', trigger: ['blur', 'change'] }]
   },
   formItem: [
-    { type: 'input', key: 'name', label: '任务名称' },
+    { type: 'input', key: 'name', label: '任务名称', props: { maxlength: 100 }},
     { type: 'select', key: 'inspectionType', label: '巡检方式', props: { options: TASK_MODE }},
     { type: 'select', key: 'airportId', label: '巡检机场', props: { options: airOptions }},
     { type: 'select', key: 'inspectionLine', label: '巡检路线', props: { options: lineOptions }},

src/views/task-manage/all-task/tools/table.js

@@ -169,7 +169,8 @@ const data = reactive({
                 text: true,
                 type: 'primary'
               },
-              auth: 'basic_list'
+              auth: 'basic_list',
+              show: row.status === 1
             },
             {
               label: '立即执行',