Merge branch 'dev' of https://github.com/wenjianzhang/go-admin-ui into dev

Author: wenjianzhang

src/components/Screenfull/index.vue

@@ -22,13 +22,13 @@ export default {
   },
   methods: {
     click() {
-      if (!screenfull.enabled) {
-        this.$message({
-          message: 'you browser can not work',
-          type: 'warning'
-        })
-        return false
-      }
+      // if (!screenfull.enabled) {
+      //   this.$message({
+      //     message: 'you browser can not work',
+      //     type: 'warning'
+      //   })
+      //   return false
+      // }
       screenfull.toggle()
     },
     change() {

src/views/sysjob/index.vue

@@ -4,7 +4,7 @@
     <BasicLayout>
       <template #wrapper>
         <el-card class="box-card">
-          <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+          <el-form ref="queryForm" :model="queryParams" :inline="true" label-position="left" label-width="68px">
             <el-form-item label="名称" prop="jobName">
               <el-input
                 v-model="queryParams.jobName"
@@ -188,7 +188,7 @@
           />
 
           <!-- 添加或修改对话框 -->
-          <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+          <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="700px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="120px">
               <el-row>
                 <el-col :span="12">

src/views/sysjob/log.vue

@@ -8,21 +8,21 @@
       </el-form-item>
     </el-form>
     <el-row ref="log" :gutter="10" class="mb8">
-      <ul
-        style="
+      <el-scrollbar style="height:500px">
+        <ul
+          style="
     background-color: black;
     color: cornflowerblue;
     line-height: 25px;
     padding-top: 15px;
-    margin: 0;
-    min-height: 500px;
-"
-      >
-        <li v-for="arr in arrs">
+    margin: 0;"
+        >
+          <li v-for="(item,index) in arrs" :key="index">
 
-          {{ arr }}
-        </li>
-      </ul>
+            {{ item }}
+          </li>
+        </ul>
+      </el-scrollbar>
     </el-row>
   </div>