1. 调整部分展示样式

package-lock.json

@@ -15380,22 +15380,22 @@
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
             "inherits": "2",
-            "minimatch": "^3.0.4",
+            "minimatch": "^3.1.1",
             "once": "^1.3.0",
             "path-is-absolute": "^1.0.0"
           }
         },
         "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -17153,12 +17153,12 @@
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",

src/views/modules/datasource/sql-execute.vue

@@ -16,14 +16,14 @@
 
 <script>
 export default {
-  data() {
+  data () {
     return {
       sqlContent: '',
       executeResult: []
     }
   },
   methods: {
-    execute() {
+    execute () {
       this.$http.post('/database/executeSql?sql=' + this.sqlContent).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
@@ -38,7 +38,7 @@ export default {
       })
     }
   },
-  mounted() {
+  mounted () {
 
   }
 }

src/views/modules/datasource/syssqllog-detail.vue

+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="日志名称" prop="sqlLogName">
+          <el-input disabled v-model="dataForm.sqlLogName"></el-input>
+      </el-form-item>
+<!--          <el-form-item label="执行IP" prop="sqlLogIp">-->
+<!--          <el-input v-model="dataForm.sqlLogIp" placeholder="执行IP"></el-input>-->
+<!--      </el-form-item>-->
+          <el-form-item label="执行时间" prop="sqlExecuteTime">
+          <el-input disabled v-model="dataForm.sqlExecuteTime"></el-input>
+      </el-form-item>
+          <el-form-item label="状态" prop="status">
+          <el-input disabled v-model="dataForm.status"></el-input>
+      </el-form-item>
+          <el-form-item label="备注" prop="remark">
+          <el-input disabled v-model="dataForm.remark"></el-input>
+      </el-form-item>
+      <el-form-item label="SQL内容" prop="sqlLogContent">
+        <el-input readonly type="textarea" :autosize="{ minRows: 2 }" v-model="dataForm.sqlLogContent"></el-input>
+      </el-form-item>
+      <el-form-item label="SQL结果" prop="sqlLogResult">
+        <el-input readonly type="textarea" v-model="dataForm.sqlLogResult"></el-input>
+      </el-form-item>
+          </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('关闭') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        sqlLogName: '',
+        sqlLogContent: '',
+        sqlLogResult: '',
+        sqlLogIp: '',
+        sqlExecuteTime: '',
+        status: '',
+        remark: '',
+        creator: '',
+        createDate: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        sqlLogName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sqlLogContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sqlLogResult: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sqlLogIp: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sqlExecuteTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        status: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/datasource/syssqllog/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    }
+    // ,
+    // 表单提交
+    // dataFormSubmitHandle: debounce(function () {
+    //   this.$refs['dataForm'].validate((valid) => {
+    //     if (!valid) {
+    //       return false
+    //     }
+    //     this.$http[!this.dataForm.id ? 'post' : 'put']('/datasource/syssqllog/', this.dataForm).then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg)
+    //       }
+    //       this.$message({
+    //         message: this.$t('prompt.success'),
+    //         type: 'success',
+    //         duration: 500,
+    //         onClose: () => {
+    //           this.visible = false
+    //           this.$emit('refreshDataList')
+    //         }
+    //       })
+    //     }).catch(() => {})
+    //   })
+    // }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>

src/views/modules/datasource/syssqllog.vue

@@ -8,12 +8,12 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
-        <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('datasource:syssqllog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
+<!--        <el-form-item>-->
+<!--          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item>-->
+<!--          <el-button v-if="$hasPermission('datasource:syssqllog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
+<!--        </el-form-item>-->
         <el-form-item>
           <el-button v-if="$hasPermission('datasource:syssqllog:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
@@ -28,7 +28,7 @@
         <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('datasource:syssqllog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('datasource:syssqllog:info')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('详情') }}</el-button>
             <el-button v-if="$hasPermission('datasource:syssqllog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
@@ -43,7 +43,7 @@
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <Detail v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></Detail>
     </div>
   </el-card>
 </template>
@@ -51,6 +51,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './syssqllog-add-or-update'
+import Detail from './syssqllog-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -68,7 +69,8 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    Detail
   }
 }
 </script>