dev01 1 年之前
父節點
當前提交
1e1d03b78a

+ 1 - 1
src/views/login.vue

@@ -56,7 +56,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2023 阿凡提 版权所有.</span>
+      <span>Copyright © 2018-2024 阿凡提 版权所有.</span>
     </div>
   </div>
 </template>

+ 20 - 19
src/views/monitor/cache/list.vue

@@ -15,16 +15,13 @@
           <el-table
             v-loading="loading"
             :data="cacheNames"
+            border
             :height="tableHeight"
             highlight-current-row
             @row-click="getCacheKeys"
             style="width: 100%"
           >
-            <el-table-column
-              label="序号"
-              width="60"
-              type="index"
-            ></el-table-column>
+            <el-table-column label="序号" width="60" type="index"></el-table-column>
 
             <el-table-column
               label="缓存名称"
@@ -73,16 +70,13 @@
           <el-table
             v-loading="subLoading"
             :data="cacheKeys"
+            border
             :height="tableHeight"
             highlight-current-row
             @row-click="handleCacheValue"
             style="width: 100%"
           >
-            <el-table-column
-              label="序号"
-              width="60"
-              type="index"
-            ></el-table-column>
+            <el-table-column label="序号" width="60" type="index"></el-table-column>
             <el-table-column
               label="缓存键名"
               align="center"
@@ -152,7 +146,14 @@
 </template>
 
 <script>
-import { listCacheName, listCacheKey, getCacheValue, clearCacheName, clearCacheKey, clearCacheAll } from "@/api/monitor/cache";
+import {
+  listCacheName,
+  listCacheKey,
+  getCacheValue,
+  clearCacheName,
+  clearCacheKey,
+  clearCacheAll,
+} from "@/api/monitor/cache";
 
 export default {
   name: "CacheList",
@@ -164,7 +165,7 @@ export default {
       loading: true,
       subLoading: false,
       nowCacheName: "",
-      tableHeight: window.innerHeight - 200
+      tableHeight: window.innerHeight - 200,
     };
   },
   created() {
@@ -174,7 +175,7 @@ export default {
     /** 查询缓存名称列表 */
     getCacheNames() {
       this.loading = true;
-      listCacheName().then(response => {
+      listCacheName().then((response) => {
         this.cacheNames = response.data;
         this.loading = false;
       });
@@ -186,7 +187,7 @@ export default {
     },
     /** 清理指定名称缓存 */
     handleClearCacheName(row) {
-      clearCacheName(row.cacheName).then(response => {
+      clearCacheName(row.cacheName).then((response) => {
         this.$modal.msgSuccess("清理缓存名称[" + row.cacheName + "]成功");
         this.getCacheKeys();
       });
@@ -198,7 +199,7 @@ export default {
         return;
       }
       this.subLoading = true;
-      listCacheKey(cacheName).then(response => {
+      listCacheKey(cacheName).then((response) => {
         this.cacheKeys = response.data;
         this.subLoading = false;
         this.nowCacheName = cacheName;
@@ -211,7 +212,7 @@ export default {
     },
     /** 清理指定键名缓存 */
     handleClearCacheKey(cacheKey) {
-      clearCacheKey(cacheKey).then(response => {
+      clearCacheKey(cacheKey).then((response) => {
         this.$modal.msgSuccess("清理缓存键名[" + cacheKey + "]成功");
         this.getCacheKeys();
       });
@@ -226,16 +227,16 @@ export default {
     },
     /** 查询缓存内容详细 */
     handleCacheValue(cacheKey) {
-      getCacheValue(this.nowCacheName, cacheKey).then(response => {
+      getCacheValue(this.nowCacheName, cacheKey).then((response) => {
         this.cacheForm = response.data;
       });
     },
     /** 清理全部缓存 */
     handleClearCacheAll() {
-      clearCacheAll().then(response => {
+      clearCacheAll().then((response) => {
         this.$modal.msgSuccess("清理全部缓存成功");
       });
-    }
+    },
   },
 };
 </script>

+ 1 - 1
src/views/monitor/job/index.vue

@@ -91,7 +91,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="jobList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />

+ 1 - 1
src/views/monitor/job/log.vue

@@ -101,7 +101,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="jobLogList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />

+ 1 - 1
src/views/monitor/logininfor/index.vue

@@ -98,7 +98,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" v-loading="loading" :data="list" border @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="访问编号" align="center" prop="infoId" />
       <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />

+ 1 - 0
src/views/monitor/online/index.vue

@@ -26,6 +26,7 @@
     <el-table
       v-loading="loading"
       :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
+      border
       style="width: 100%;"
     >
       <el-table-column label="序号" type="index" align="center">

+ 1 - 1
src/views/monitor/operlog/index.vue

@@ -102,7 +102,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" v-loading="loading" :data="list" border @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="日志编号" align="center" prop="operId" />
       <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />

+ 7 - 4
src/views/project/list/index.vue

@@ -163,12 +163,14 @@
         <el-table
           v-loading="loading"
           :data="userList"
+          border
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
             label="项目编号"
             align="center"
+            width="90"
             key="projectNumber"
             prop="projectNumber"
             v-if="columns[0].visible"
@@ -176,7 +178,7 @@
           <el-table-column
             label="项目年份"
             align="center"
-            width="80"
+            width="75"
             key="projectYear"
             prop="projectYear"
             v-if="columns[1].visible"
@@ -184,7 +186,7 @@
           <el-table-column
             label="是否跨年"
             align="center"
-            width="80"
+            width="75"
             key="crossYear"
             prop="crossYear"
             v-if="columns[2].visible"
@@ -213,6 +215,7 @@
             align="center"
             key="staffName"
             prop="staffName"
+            show-overflow-tooltip
             v-if="columns[5].visible"
           />
           <el-table-column
@@ -241,7 +244,7 @@
           <el-table-column
             label="创建年份"
             align="center"
-            width="80"
+            width="75"
             key="createYear"
             prop="createYear"
             v-if="columns[8].visible"
@@ -263,7 +266,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="80"
+            width="60"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">

+ 31 - 2
src/views/record/list/index.vue

@@ -59,7 +59,16 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="时间">
+          <el-form-item label="员工名称" prop="adminName">
+            <el-input
+              v-model="queryParams.adminName"
+              placeholder="请输入员工名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="打卡时间">
             <el-date-picker
               v-model="dateRange"
               style="width: 240px"
@@ -100,6 +109,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="研发时间">
+            <el-date-picker
+              v-model="datResearch"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button
               type="primary"
@@ -157,12 +177,14 @@
         <el-table
           v-loading="loading"
           :data="userList"
+          border
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
             label="员工工号"
             align="center"
+            width="90"
             key="jobNumber"
             prop="jobNumber"
             v-if="columns[0].visible"
@@ -209,6 +231,7 @@
           <el-table-column
             label="打卡月份"
             align="center"
+            width="50"
             key="createMonth"
             prop="createMonth"
             v-if="columns[6].visible"
@@ -268,7 +291,7 @@
           <el-table-column
             label="附件"
             align="center"
-            width="80"
+            width="70"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
@@ -382,6 +405,7 @@ export default {
       initPassword: undefined,
       // 日期范围
       dateRange: [],
+      datResearch:[],
       // 岗位选项
       postOptions: [],
       // 角色选项
@@ -491,6 +515,10 @@ export default {
         this.queryParams.startTime = this.dateRange[0];
         this.queryParams.endTime = this.dateRange[1];
       }
+      if(this.datResearch.length>0){
+        this.queryParams.researchStart = this.datResearch[0];
+        this.queryParams.researchEnd = this.datResearch[1];
+      }
       this.queryParams.roleType = 3;
       listRecord(this.queryParams).then((response) => {
         this.userList = response.rows;
@@ -522,6 +550,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
+      this.datResearch = [];
       this.resetForm("queryForm");
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;

+ 1 - 1
src/views/register.vue

@@ -61,7 +61,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2023 阿凡提 版权所有.</span>
+      <span>Copyright © 2018-2024 阿凡提 版权所有.</span>
     </div>
   </div>
 </template>

+ 1 - 1
src/views/system/config/index.vue

@@ -102,7 +102,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="configList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="参数主键" align="center" prop="configId" />
       <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />

+ 5 - 14
src/views/system/dept/index.vue

@@ -62,24 +62,15 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="deptList"
+      border
       row-key="deptId"
       :default-expand-all="isExpandAll"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <el-table-column
-        prop="maxDuration"
-        align="center"
-        label="最高工时"
-        width="140"
-      ></el-table-column>
-      <el-table-column
-        prop="orderNum"
-        align="center"
-        label="排序"
-        width="200"
-      ></el-table-column>
-      <el-table-column prop="status" label="状态" width="100">
+      <el-table-column prop="deptName" label="部门名称" width="280"></el-table-column>
+      <el-table-column prop="maxDuration" align="center" label="最高工时" width="90"></el-table-column>
+      <el-table-column prop="orderNum" align="center" label="排序" width="60"></el-table-column>
+      <el-table-column prop="status" align="center" label="状态" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
         </template>

+ 1 - 1
src/views/system/dict/data.vue

@@ -90,7 +90,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dataList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编码" align="center" prop="dictCode" />
       <el-table-column label="字典标签" align="center" prop="dictLabel">

+ 1 - 1
src/views/system/dict/index.vue

@@ -107,7 +107,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="typeList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />

+ 1 - 0
src/views/system/menu/index.vue

@@ -52,6 +52,7 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="menuList"
+      border
       row-key="menuId"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"

+ 1 - 1
src/views/system/notice/index.vue

@@ -69,7 +69,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="noticeList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
       <el-table-column

+ 1 - 1
src/views/system/post/index.vue

@@ -79,7 +79,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="postList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="岗位编号" align="center" prop="postId" />
       <el-table-column label="岗位编码" align="center" prop="postCode" />

+ 1 - 1
src/views/system/role/authUser.vue

@@ -59,7 +59,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="userList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />

+ 1 - 1
src/views/system/role/index.vue

@@ -97,7 +97,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="roleList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />

+ 1 - 1
src/views/system/role/selectUser.vue

@@ -24,7 +24,7 @@
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
+      <el-table @row-click="clickRow" ref="table" :data="userList" border @selection-change="handleSelectionChange" height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />

+ 1 - 1
src/views/system/user/authRole.vue

@@ -17,7 +17,7 @@
     </el-form>
 
     <h4 class="form-header h4">角色信息</h4>
-    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
+    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)" border>
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
           <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>

+ 2 - 1
src/views/system/user/index.vue

@@ -251,6 +251,7 @@
         <el-table
           v-loading="loading"
           :data="userList"
+          border
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
@@ -344,7 +345,7 @@
             align="center"
             key="status"
             v-if="columns[10].visible"
-            width="60"
+            width="70"
           >
             <template slot-scope="scope">
               <dict-tag

+ 1 - 1
src/views/tool/gen/editTable.vue

@@ -5,7 +5,7 @@
         <basic-info-form ref="basicInfo" :info="info" />
       </el-tab-pane>
       <el-tab-pane label="字段信息" name="columnInfo">
-        <el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
+        <el-table ref="dragTable" :data="columns" border row-key="columnId" :max-height="tableHeight">
           <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
           <el-table-column
             label="字段列名"

+ 1 - 1
src/views/tool/gen/importTable.vue

@@ -24,7 +24,7 @@
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
+      <el-table @row-click="clickRow" ref="table" :data="dbTableList" border @selection-change="handleSelectionChange" height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>

+ 1 - 1
src/views/tool/gen/index.vue

@@ -80,7 +80,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" align="center" width="55"></el-table-column>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template slot-scope="scope">