cloud-web-corejs 1.0.39 → 1.0.40

package/src/views/user/access_log/edit.vue

@@ -19,7 +19,7 @@
             <tbody>
             <tr>
               <th>{{ $t1('操作类型') }}</th>
-              <td>{{ logTypeMap[userLog.logType] }}</td>
+              <td>{{ userLog.logTypeName }}</td>
             </tr>
             <tr>
               <th>{{ $t1('操作内容') }}</th>
@@ -81,14 +81,7 @@ export default {
       tabIndex: 0,
       isEdit: false,
       dataId: '',
-      userLog: {},
-      logTypeMap: {
-        'login': this.$t1('登录成功'),
-        'loginFailed': this.$t1('登录失败'),
-        'logout': this.$t1('退出登录'),
-        'accessMenu': this.$t1('访问菜单'),
-        'changePassword': this.$t1('修改密码')
-      }
+      userLog: {}
     };
   },
   created() {

package/src/views/user/access_log/list.vue

@@ -145,13 +145,7 @@ export default {
       showAdvancedSearch: false,
       advancedFormData: {},
       showStatisticsList: false,
-      logTypeMap: {
-        'login': this.$t1('登录成功'),
-        'loginFailed': this.$t1('登录失败'),
-        'logout': this.$t1('退出登录'),
-        'accessMenu': this.$t1('访问菜单'),
-        'changePassword': this.$t1('修改密码')
-      }
+      logTypeMap: {}
     };
   },
   watch: {
@@ -166,6 +160,8 @@ export default {
       return this.checkNode && this.checkNode.data ? this.checkNode.data : {};
     },
     logType() {
+      debugger
+      let a = 2
       let checkNodeData = this.checkNode && this.checkNode.data ? this.checkNode.data : {};
       return checkNodeData.value ?? null
     }
@@ -209,14 +205,9 @@ export default {
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
             title: this.$t1('操作类型'),
-            field: 'logType',
+            field: 'logTypeName',
             fixed: 'left',
-            width: 150,
-            slots: {
-              default: ({row, rowIndex}) => {
-                return logTypeMap[row.logType] || '';
-              }
-            }
+            width: 150
           },
           {
             title: this.$t1('操作内容'),
@@ -303,6 +294,9 @@ export default {
       this.searchEvent();
     },
     handleNodeClick(data, node, v) {
+      debugger
+      let a = 1
+      let b = 3
       this.checkNode = node;
       this.formData.startTime = data.all ? null : data.logDate;
       this.formData.endTime = data.all ? null : data.logDate;
@@ -311,30 +305,44 @@ export default {
     },
     // 异步树叶子节点懒加载逻辑
     loadNode(node, resolve) {
-      let logTypeMap = this.logTypeMap;
-      let data = [
-        {
-          label: this.$t1('全部类型'),
-          all: true,
-          id: -1,
-          leaf: true,
+      this.$http({
+        url: USER_PREFIX + `/user_log_classify/listPage`,
+        method: `post`,
+        data: {
+          enabled: true
         },
-        ...Object.keys(logTypeMap).map(key => {
-          return {
-            label: logTypeMap[key],
-            value: key,
-            id: key,
-            leaf: true,
-          }
-        })
-      ]
-      resolve(data);
-      this.$nextTick(() => {
-        if (node.childNodes.length) {
-          this.checkFirstNode();
-          this.$forceUpdate();
+        success: res => {
+          let logTypeMap = {};
+          let rows = res.objx?.records || [];
+          let items = rows.map(item => {
+            logTypeMap[item.classifyCode] = item.classifyName;
+            return {
+              label: item.classifyName,
+              value: item.classifyCode,
+              id: item.classifyCode,
+              leaf: true,
+            }
+          })
+          this.logTypeMap = logTypeMap;
+          let data = [
+            {
+              label: this.$t1('全部类型'),
+              all: true,
+              id: -1,
+              leaf: true,
+            },
+            ...items
+          ]
+          resolve(data);
+          this.$nextTick(() => {
+            if (node.childNodes.length) {
+              this.checkFirstNode();
+              this.$forceUpdate();
+            }
+          });
         }
       });
+
     },
     checkFirstNode() {
       let node = this.$refs.tree.getNode(-1);

package/src/views/user/user/form_edit.vue

@@ -107,12 +107,8 @@
                 </td>
               </tr>
               <tr>
-                <th>{{ $t1('创建人') }}</th>
-                <td>{{ user.createBy }}</td>
                 <th>{{ $t1('创建时间') }}</th>
                 <td>{{ user.createDate }}</td>
-                <th>{{ $t1('更新人') }}</th>
-                <td>{{ user.modifyBy }}</td>
                 <th>{{ $t1('更新时间') }}</th>
                 <td>{{ user.modifyDate }}</td>
               </tr>

package/src/views/user/user/form_list.vue

@@ -151,16 +151,6 @@ export default {
               }
             }
           },
-          {
-            field: 'createBy',
-            title: this.$t1('创建人'),
-            width: 150
-          },
-          {
-            field: 'modifyBy',
-            title: this.$t1('更新人'),
-            width: 150
-          },
           {
             field: 'modifyDate',
             title: this.$t1('更新时间'),

package/src/views/user/user_log_classify/edit.vue

@@ -0,0 +1,144 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="userLogClassify">
+      <div class="d-header clearfix">
+        <div class="fl">
+          <i class="el-icon-info"/>
+          {{ dataId ? $t1('查看用户日志类型') : $t1('新增用户日志类型') }}
+        </div>
+        <div class="fr">
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
+            {{ $t1('重置') }}
+          </el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+          </el-button>
+        </div>
+      </div>
+      <div class="d-cont">
+        <div class="d-item">
+          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+          <table class="table-detail">
+            <tbody>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('类型名称') }}
+              </th>
+              <td>
+                <el-form-item prop="classifyName" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="userLogClassify.classifyName" clearable/>
+                </el-form-item>
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('类型编码') }}
+              </th>
+              <td>
+                <el-form-item prop="classifyCode" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="userLogClassify.classifyCode" clearable/>
+                </el-form-item>
+              </td>
+              <th>{{ $t1('设置') }}</th>
+              <td>
+                <el-checkbox :label="$t1('是否启用')" v-model="userLogClassify.enabled"></el-checkbox>
+              </td>
+            </tr>
+            <tr>
+              <th>{{ $t1('创建人') }}</th>
+              <td>{{ userLogClassify._createBy }}</td>
+              <th>{{ $t1('创建时间') }}</th>
+              <td>{{ userLogClassify.createDate }}</td>
+              <th>{{ $t1('更新人') }}</th>
+              <td>{{ userLogClassify._modifyBy }}</td>
+              <th>{{ $t1('更新时间') }}</th>
+              <td>{{ userLogClassify.modifyDate }}</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'userLogClassifyEdit',
+  props: {
+    _dataId: [String, Number]
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      userLogClassify: {
+        enabled: true
+      }
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/user_log_classify/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.userLogClassify = res.objx || {};
+          }
+        });
+      } else {
+        this.userLogClassify = {
+          enabled: true
+        };
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + (this.isEdit ? `/user_log_classify/update` : `/user_log_classify/save`);
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.userLogClassify,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    if (this.isEdit) {
+                      this.$baseReload();
+                    } else {
+                      this.$baseReload({
+                        updateParam: {
+                          _dataId: res.objx
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    }
+  }
+};
+</script>

package/src/views/user/user_log_classify/list.vue

@@ -0,0 +1,197 @@
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
+                  @reload="$reloadHandle"></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height">
+          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                    @custom="$vxeTableUtil.customHandle">
+            <template #form>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                    {{ $t1('新增') }}
+                  </vxe-button>
+                  <base-table-export :option="{ title: $t1('用户日志类型导出'), targetRef: 'table-m1'}"
+                                     :parent-target="_self"/>
+                </div>
+                <div class="fr">
+                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
+                              plain>{{ $t1('重置') }}
+                  </vxe-button>
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                    {{ $t1('搜索') }}
+                  </vxe-button>
+                </div>
+              </div>
+              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
+                        @submit="searchEvent" @reset="searchEvent">
+                <vxe-form-item :title="$t1('类型名称')+':'" field="classifyName">
+                  <template v-slot>
+                    <el-input v-model="formData.classifyName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('类型编码')+':'" field="classifyCode">
+                  <template v-slot>
+                    <el-input v-model="formData.classifyCode" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('是否启用')+':'" field="enabled">
+                  <template v-slot>
+                    <el-select v-model="formData.enabled" clearable>
+                      <el-option :value="true" :label="$t1('启用')"></el-option>
+                      <el-option :value="false" :label="$t1('禁用')"></el-option>
+                    </el-select>
+
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+
+export default {
+  name: 'user_log_classify:list',
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_userLogClassify_list-m1',
+        path: USER_PREFIX + '/user_log_classify/listPage',
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('类型名称'),
+            field: 'classifyName',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            field: 'classifyCode',
+            title: this.$t1('类型编码'),
+            width: 250
+          },
+          {
+            field: 'enabled',
+            title: this.$t1('是否启用'),
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>{this.$t1('启用')}</span>
+                    </div>
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>{this.$t1('禁用')}</span>
+                    </div>
+                  ];
+                }
+              }
+            }
+          },
+          {
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
+          },
+          {
+            field: '_createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
+          {
+            field: '_modifyBy',
+            title: this.$t1('更新人'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditDialog(row.id);
+                      }}
+                    >
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
+                      </el-tooltip>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    },
+    importExcel() {
+      let that = this;
+      that.$excelImport({
+        prefix: USER_PREFIX,
+        excel: USER_PREFIX + '/excelTemplate/user_log_classify/userLogClassify.xlsx',
+        multi: false,
+        saveUrl: USER_PREFIX + '/user_log_classify/save',
+        callback: () => {
+          that.searchEvent();
+        }
+      });
+    }
+  }
+};
+</script>