代码更新

lms/nladmin-ui/src/views/generator/config.vue

@@ -34,8 +34,8 @@
           </div>
           <el-form size="mini" label-width="90px">
             <el-table v-loading="loading" :data="data" :max-height="tableHeight" size="mini" style="width: 100%;margin-bottom: 15px">
-              <el-table-column prop="columnName" label="字段名称" />
-              <el-table-column prop="columnType" label="字段类型" />
+              <el-table-column prop="column_name" label="字段名称" />
+              <el-table-column prop="column_type" label="字段类型" />
               <el-table-column prop="remark" label="字段描述">
                 <template slot-scope="scope">
                   <el-input v-model="data[scope.$index].remark" size="mini" class="edit-input" />
@@ -43,22 +43,34 @@
               </el-table-column>
               <el-table-column align="center" label="必填" width="70px">
                 <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].notNull" />
+                  <el-checkbox
+                    v-model="data[scope.$index].not_null"
+                    true-label="1"
+                    false-label="0"
+                  />
                 </template>
               </el-table-column>
               <el-table-column align="center" label="列表" width="70px">
                 <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].listShow" />
+                  <el-checkbox
+                    v-model="data[scope.$index].list_show"
+                    true-label="1"
+                    false-label="0"
+                  />
                 </template>
               </el-table-column>
               <el-table-column align="center" label="表单" width="70px">
                 <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].formShow" />
+                  <el-checkbox
+                    v-model="data[scope.$index].form_show"
+                    true-label="1"
+                    false-label="0"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="表单类型">
                 <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].formType" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                  <el-select v-model="data[scope.$index].form_type" filterable class="edit-input" clearable size="mini" placeholder="请选择">
                     <el-option
                       label="文本框"
                       value="Input"
@@ -84,7 +96,7 @@
               </el-table-column>
               <el-table-column label="查询方式">
                 <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].queryType" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                  <el-select v-model="data[scope.$index].query_type" filterable class="edit-input" clearable size="mini" placeholder="请选择">
                     <el-option
                       label="="
                       value="="
@@ -118,7 +130,7 @@
               </el-table-column>
               <el-table-column label="日期注解">
                 <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].dateAnnotation" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                  <el-select v-model="data[scope.$index].date_annotation" filterable class="edit-input" clearable size="mini" placeholder="请选择">
                     <el-option
                       label="自动创建时间"
                       value="CreationTimestamp"
@@ -132,7 +144,7 @@
               </el-table-column>
               <el-table-column label="关联字典">
                 <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].dictName" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                  <el-select v-model="data[scope.$index].dict_name" filterable class="edit-input" clearable size="mini" placeholder="请选择">
                     <el-option v-for="item in dicts" :key="item.id" :label="item.remark === '' ? item.name : item.remark" :value="item.name" />
                   </el-select>
                 </template>
@@ -159,21 +171,21 @@
               <el-input v-model="form.author" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">类上面的作者名称</span>
             </el-form-item>
-            <el-form-item label="模块名称" prop="moduleName">
-              <el-input v-model="form.moduleName" style="width: 40%" />
+            <el-form-item label="模块名称" prop="module_name">
+              <el-input v-model="form.module_name" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">模块的名称，请选择项目中已存在的模块</span>
             </el-form-item>
             <el-form-item label="至于包下" prop="pack">
               <el-input v-model="form.pack" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">项目包的名称，生成的代码放到哪个包里面</span>
             </el-form-item>
-            <el-form-item label="接口名称" prop="apiAlias">
-              <el-input v-model="form.apiAlias" style="width: 40%" />
+            <el-form-item label="接口名称" prop="api_alias">
+              <el-input v-model="form.api_alias" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">接口的名称，用于控制器与接口文档中</span>
             </el-form-item>
             <el-form-item label="前端路径" prop="path">
               <el-input v-model="form.path" style="width: 40%" />
-              <span style="color: #C0C0C0;margin-left: 10px;">输入views文件夹下的目录，不存在即创建</span>
+              <span style="color: #C0C0C0;margin-left: 10px;">输入views文件夹下的绝对路径，不存在即创建</span>
             </el-form-item>
             <!--            <el-form-item label="接口目录">-->
             <!--              <el-input v-model="form.apiPath" style="width: 40%" />-->
@@ -185,8 +197,8 @@
             </el-form-item>
             <el-form-item label="是否覆盖" prop="cover">
               <el-radio-group v-model="form.cover" size="mini" style="width: 40%">
-                <el-radio-button label="true">是</el-radio-button>
-                <el-radio-button label="false">否</el-radio-button>
+                <el-radio-button label="1">是</el-radio-button>
+                <el-radio-button label="0">否</el-radio-button>
               </el-radio-group>
               <span style="color: #C0C0C0;margin-left: 10px;">谨防误操作，请慎重选择</span>
             </el-form-item>
@@ -209,7 +221,7 @@ export default {
   data() {
     return {
       activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], syncLoading: false, genLoading: false,
-      form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '', apiAlias: null },
+      form: { config_id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: '0', apiPath: '', prefix: '', apiAlias: null },
       rules: {
         author: [
           { required: true, message: '作者不能为空', trigger: 'blur' }
@@ -217,13 +229,13 @@ export default {
         pack: [
           { required: true, message: '包路径不能为空', trigger: 'blur' }
         ],
-        moduleName: [
+        module_name: [
           { required: true, message: '包路径不能为空', trigger: 'blur' }
         ],
         path: [
           { required: true, message: '前端路径不能为空', trigger: 'blur' }
         ],
-        apiAlias: [
+        api_alias: [
           { required: true, message: '接口名称不能为空', trigger: 'blur' }
         ],
         cover: [
@@ -238,6 +250,7 @@ export default {
     this.$nextTick(() => {
       this.init()
       get(this.tableName).then(data => {
+        console.log(data)
         this.form = data
         this.form.cover = this.form.cover.toString()
       })
@@ -319,7 +332,7 @@ export default {
 </style>
 
 <style scoped>
- ::v-deep .input-with-select .el-input-group__prepend {
+  ::v-deep .input-with-select .el-input-group__prepend {
     background-color: #fff;
   }
 </style>

lms/nladmin-ui/src/views/generator/index.vue

@@ -23,29 +23,29 @@
     <!--表格渲染-->
     <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
       <el-table-column type="selection" width="55" />
-      <el-table-column show-overflow-tooltip prop="tableName" label="表名" />
+      <el-table-column show-overflow-tooltip prop="table_name" label="表名" />
       <el-table-column show-overflow-tooltip prop="engine" label="数据库引擎" />
       <el-table-column show-overflow-tooltip prop="coding" label="字符编码集" />
       <el-table-column show-overflow-tooltip prop="remark" label="备注" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="create_time" label="创建日期">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.create_time) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="160px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" style="margin-right: 2px" type="text">
-            <router-link :to="'/sys-tools/generator/preview/' + scope.row.tableName">
+            <router-link :to="'/sys-tools/generator/preview/' + scope.row.table_name">
               预览
             </router-link>
           </el-button>
-          <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="toDownload(scope.row.tableName)">下载</el-button>
+          <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="toDownload(scope.row.table_name)">下载</el-button>
           <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
-            <router-link :to="'/sys-tools/generator/config/' + scope.row.tableName">
+            <router-link :to="'/sys-tools/generator/config/' + scope.row.table_name">
               配置
             </router-link>
           </el-button>
-          <el-button type="text" style="margin-left: -1px" size="mini" @click="toGen(scope.row.tableName)">生成</el-button>
+          <el-button type="text" style="margin-left: -1px" size="mini" @click="toGen(scope.row.table_name)">生成</el-button>
         </template>
       </el-table-column>
     </el-table>

lms/nladmin-ui/src/views/system/timing/index.vue

@@ -4,7 +4,7 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input v-model="query.jobName" clearable size="mini" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-input v-model="query.job_name" clearable size="mini" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
         <rrOperation />
       </div>
       <crudOperation :permission="permission">
@@ -23,21 +23,21 @@
     <!--Form表单-->
     <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" append-to-body width="730px">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="任务名称" prop="jobName">
-          <el-input v-model="form.jobName" style="width: 220px;" />
+        <el-form-item label="任务名称" prop="job_name">
+          <el-input v-model="form.job_name" style="width: 220px;" />
         </el-form-item>
         <el-form-item label="任务描述" prop="description">
           <el-input v-model="form.description" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="Bean名称" prop="beanName">
-          <el-input v-model="form.beanName" style="width: 220px;" />
+        <el-form-item label="Bean名称" prop="bean_name">
+          <el-input v-model="form.bean_name" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="执行方法" prop="methodName">
-          <el-input v-model="form.methodName" style="width: 220px;" />
+        <el-form-item label="执行方法" prop="method_name">
+          <el-input v-model="form.method_name" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="Cron表达式" prop="cronExpression">
+        <el-form-item label="Cron表达式" prop="cron_expression">
           <!--          <el-input v-model="form.cronExpression" style="width: 220px;" />-->
-          <el-input v-model="form.cronExpression" placeholder="请输入CRON 表达式" style="width: 220px;">
+          <el-input v-model="form.cron_expression" placeholder="请输入CRON 表达式" style="width: 220px;">
             <template slot="append">
               <el-button type="primary" @click="handleShowCron">
                 生成表达式
@@ -47,24 +47,24 @@
           </el-input>
         </el-form-item>
         <el-form-item label="子任务ID">
-          <el-input v-model="form.subTask" placeholder="多个用逗号隔开，按顺序执行" style="width: 220px;" />
+          <el-input v-model="form.sub_task" placeholder="多个用逗号隔开，按顺序执行" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="任务负责人" prop="personInCharge">
-          <el-input v-model="form.personInCharge" style="width: 220px;" />
+        <el-form-item label="任务负责人" prop="person_in_charge">
+          <el-input v-model="form.person_in_charge" style="width: 220px;" />
         </el-form-item>
         <el-form-item label="告警邮箱" prop="email">
           <el-input v-model="form.email" placeholder="多个邮箱用逗号隔开" style="width: 220px;" />
         </el-form-item>
         <el-form-item label="失败后暂停">
-          <el-radio-group v-model="form.pauseAfterFailure" style="width: 220px">
-            <el-radio :label="true">是</el-radio>
-            <el-radio :label="false">否</el-radio>
+          <el-radio-group v-model="form.pause_after_failure" style="width: 220px">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="任务状态">
-          <el-radio-group v-model="form.isPause" style="width: 220px">
-            <el-radio :label="false">启用</el-radio>
-            <el-radio :label="true">暂停</el-radio>
+          <el-radio-group v-model="form.is_pause" style="width: 220px">
+            <el-radio label="0">启用</el-radio>
+            <el-radio label="1">暂停</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="参数内容">
@@ -79,40 +79,40 @@
     <!--表格渲染-->
     <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
       <el-table-column :selectable="checkboxT" type="selection" width="55" />
-      <el-table-column show-overflow-tooltip prop="id" label="任务ID" />
-      <el-table-column show-overflow-tooltip prop="jobName" label="任务名称" min-width="120" />
-      <el-table-column show-overflow-tooltip prop="beanName" label="Bean名称" />
-      <el-table-column show-overflow-tooltip prop="methodName" label="执行方法" />
+      <!--      <el-table-column show-overflow-tooltip prop="job_id" label="任务ID" />-->
+      <el-table-column show-overflow-tooltip prop="job_name" label="任务名称" min-width="120" />
+      <el-table-column show-overflow-tooltip prop="bean_name" label="Bean名称" />
+      <el-table-column show-overflow-tooltip prop="method_name" label="执行方法" />
       <el-table-column show-overflow-tooltip prop="params" label="参数" />
-      <el-table-column show-overflow-tooltip prop="cronExpression" label="cron表达式" min-width="100" show-tooltip-when-overflow />
-      <el-table-column show-overflow-tooltip prop="isPause" width="90px" label="状态">
+      <el-table-column show-overflow-tooltip prop="cron_expression" label="cron表达式" min-width="100" show-tooltip-when-overflow />
+      <el-table-column show-overflow-tooltip prop="is_pause" width="90px" label="状态">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.isPause ? 'warning' : 'success'">{{ scope.row.isPause ? '已暂停' : '运行中' }}</el-tag>
+          <el-tag :type="scope.row.is_pause ? 'warning' : 'success'">{{ scope.row.is_pause=='1' ? '已暂停' : '运行中' }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip prop="description" width="150px" label="描述" />
       <el-table-column show-overflow-tooltip prop="createTime" width="136px" label="创建日期">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.create_time) }}</span>
         </template>
       </el-table-column>
       <el-table-column v-permission="['admin','timing:edit','timing:del']" label="操作" width="170px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="crud.toEdit(scope.row)">编辑</el-button>
-          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
-          <el-button v-permission="['admin','timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
-            {{ scope.row.isPause ? '恢复' : '暂停' }}
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.job_id)">执行</el-button>
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.job_id,scope.row.is_pause=='1' ? '恢复' : '暂停')">
+            {{ scope.row.is_pause=='1' ? '恢复' : '暂停' }}
           </el-button>
           <el-popover
-            :ref="scope.row.id"
+            :ref="scope.row.job_id"
             v-permission="['admin','timing:del']"
             placement="top"
             width="200"
           >
             <p>确定停止并删除该任务吗？</p>
             <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
+              <el-button size="mini" type="text" @click="$refs[scope.row.job_id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.job_id)">确定</el-button>
             </div>
             <el-button slot="reference" type="text" size="mini">删除</el-button>
           </el-popover>
@@ -134,15 +134,14 @@ import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker'
 import Crontab from './components/crontab'
 
-const defaultForm = { id: null, jobName: null, subTask: null, beanName: null, methodName: null, params: null, cronExpression: null, pauseAfterFailure: true, isPause: false, personInCharge: null, email: null, description: null }
+const defaultForm = { job_id: null, bean_name: null, cron_expression: null, is_pause: '0', job_name: null, method_name: null, params: null, description: null, person_in_charge: null, email: null, sub_task: null, pause_after_failure: '1', create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
 export default {
   name: 'Timing',
-  components: { Log, pagination, crudOperation, rrOperation, DateRangePicker, Crontab },
+  components: { Log, pagination, crudOperation, rrOperation, Crontab },
   cruds() {
-    return CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }})
+    return CRUD({ title: '定时任务', idField: 'job_id', url: 'api/jobs', crudMethod: { ...crudJob }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
@@ -154,22 +153,22 @@ export default {
         del: ['admin', 'timing:del']
       },
       rules: {
-        jobName: [
+        job_name: [
           { required: true, message: '请输入任务名称', trigger: 'blur' }
         ],
         description: [
           { required: true, message: '请输入任务描述', trigger: 'blur' }
         ],
-        beanName: [
+        bean_name: [
           { required: true, message: '请输入Bean名称', trigger: 'blur' }
         ],
-        methodName: [
+        method_name: [
           { required: true, message: '请输入方法名称', trigger: 'blur' }
         ],
-        cronExpression: [
+        cron_expression: [
           { required: true, message: '请输入Cron表达式', trigger: 'blur' }
         ],
-        personInCharge: [
+        person_in_charge: [
           { required: true, message: '请输入负责人名称', trigger: 'blur' }
         ]
       },
@@ -222,16 +221,16 @@ export default {
       this.$refs.log.doInit()
     },
     checkboxT(row, rowIndex) {
-      return row.id !== 1
+      return row.job_id !== 1
     },
     /** cron表达式按钮操作 */
     handleShowCron() {
-      this.expression = this.form.cronExpression
+      this.expression = this.form.cron_expression
       this.openCron = true
     },
     /** 确定后回传值 */
     crontabFill(value) {
-      this.form.cronExpression = value
+      this.form.cron_expression = value
     }
   }
 }

lms/nladmin-ui/src/views/system/timing/log.vue

@@ -2,34 +2,34 @@
   <el-dialog :visible.sync="dialog" append-to-body title="执行日志" width="88%">
     <!-- 搜索 -->
     <div class="head-container">
-      <el-input v-model="query.jobName" clearable size="mini" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.job_name" clearable size="mini" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <date-range-picker v-model="query.createTime" class="date-item" />
-      <el-select v-model="query.isSuccess" placeholder="日志状态" clearable size="mini" class="filter-item" style="width: 110px" @change="toQuery">
+      <el-select v-model="query.is_success" placeholder="日志状态" clearable size="mini" class="filter-item" style="width: 110px" @change="toQuery">
         <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" style="width: 100%;margin-top: -10px;">
-      <el-table-column show-overflow-tooltip prop="jobName" label="任务名称" />
-      <el-table-column show-overflow-tooltip prop="beanName" label="Bean名称" />
-      <el-table-column show-overflow-tooltip prop="methodName" label="执行方法" />
+      <el-table-column show-overflow-tooltip prop="job_name" label="任务名称" />
+      <el-table-column show-overflow-tooltip prop="bean_name" label="Bean名称" />
+      <el-table-column show-overflow-tooltip prop="method_name" label="执行方法" />
       <el-table-column show-overflow-tooltip prop="params" width="120px" label="参数" />
-      <el-table-column show-overflow-tooltip prop="cronExpression" label="cron表达式" />
-      <el-table-column prop="createTime" label="异常详情" width="110px">
+      <el-table-column show-overflow-tooltip prop="cron_expression" label="cron表达式" />
+      <el-table-column prop="create_time" label="异常详情" width="110px">
         <template slot-scope="scope">
-          <el-button v-show="scope.row.exceptionDetail" size="mini" type="text" @click="info(scope.row.exceptionDetail)">查看详情</el-button>
+          <el-button v-show="scope.row.exception_detail" size="mini" type="text" @click="info(scope.row.exception_detail)">查看详情</el-button>
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip align="center" prop="time" width="100px" label="耗时(毫秒)" />
-      <el-table-column align="center" prop="isSuccess" width="80px" label="状态">
+      <el-table-column align="center" prop="is_success" width="80px" label="状态">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.isSuccess ? 'success' : 'danger'">{{ scope.row.isSuccess ? '成功' : '失败' }}</el-tag>
+          <el-tag :type="scope.row.is_success ? 'success' : 'danger'">{{ scope.row.is_success ? '成功' : '失败' }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column min-width="100" show-overflow-tooltip prop="createTime" label="创建日期">
+      <el-table-column min-width="100" show-overflow-tooltip prop="create_time" label="创建日期">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.create_time) }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -60,8 +60,8 @@ export default {
       title: '任务日志',
       errorInfo: '', errorDialog: false,
       enabledTypeOptions: [
-        { key: 'true', display_name: '成功' },
-        { key: 'false', display_name: '失败' }
+        { key: '1', display_name: '成功' },
+        { key: '0', display_name: '失败' }
       ]
     }
   },
@@ -91,7 +91,7 @@ export default {
     color: #444;
     background: #ffffff !important;
   }
- ::v-deep .el-dialog__body{
+  ::v-deep .el-dialog__body{
     padding: 0 20px 10px 20px !important;
   }
 </style>

lms/nladmin-ui/src/views/tools/storage/index.vue

@@ -57,7 +57,7 @@
       <el-table-column prop="name" label="文件名">
         <template slot-scope="scope">
           <el-popover
-            :content="'file/' + scope.row.type + '/' + scope.row.realName"
+            :content="'file/' + scope.row.type + '/' + scope.row.real_name"
             placement="top-start"
             title="路径"
             width="200"
@@ -65,7 +65,7 @@
           >
             <a
               slot="reference"
-              :href="baseApi + '/file/' + scope.row.type + '/' + scope.row.realName"
+              :href="baseApi + '/file/' + scope.row.type + '/' + scope.row.real_name"
               class="el-link--primary"
               style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
               target="_blank"
@@ -78,8 +78,8 @@
       <el-table-column prop="path" label="预览图">
         <template slot-scope="{row}">
           <el-image
-            :src=" baseApi + '/file/' + row.type + '/' + row.realName"
-            :preview-src-list="[baseApi + '/file/' + row.type + '/' + row.realName]"
+            :src=" baseApi + '/file/' + row.type + '/' + row.real_name"
+            :preview-src-list="[baseApi + '/file/' + row.type + '/' + row.real_name]"
             fit="contain"
             lazy
             class="el-avatar"
@@ -93,10 +93,10 @@
       <el-table-column prop="suffix" label="文件类型" />
       <el-table-column prop="type" label="类别" />
       <el-table-column prop="size" label="大小" />
-      <el-table-column prop="operate" label="操作人" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="create_name" label="操作人" />
+      <el-table-column prop="create_time" label="创建日期">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.create_time) }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -115,11 +115,11 @@ import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker'
 
-const defaultForm = { id: null, name: '' }
+const defaultForm = { storage_id: null, name: '' }
 export default {
   components: { pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '文件', url: 'api/localStorage', crudMethod: { ...crudFile }})
+    return CRUD({ title: '文件', idField: 'storage_id', url: 'api/localStorage', crudMethod: { ...crudFile }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
@@ -179,10 +179,10 @@ export default {
 </script>
 
 <style scoped>
-::v-deep .el-image__error, .el-image__placeholder{
-  background: none;
-}
-::v-deep .el-image-viewer__wrapper{
-  top: 55px;
-}
+  ::v-deep .el-image__error, .el-image__placeholder{
+    background: none;
+  }
+  ::v-deep .el-image-viewer__wrapper{
+    top: 55px;
+  }
 </style>