Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-elevue

src/views/content/layoutItem/layout/article/columns.ts

@@ -2,6 +2,12 @@ import { h } from 'vue';
 import { ElTag } from 'element-plus';
 
 export const columns = [
+  {
+    label: 'ID',
+    prop: 'id',
+    fixed: 'left',
+    width: 50,
+  },
   {
     label: '文章标题',
     prop: 'title',

src/views/content/layoutItem/layout/notice/columns.ts

@@ -2,6 +2,12 @@ import { h } from 'vue';
 import { ElTag } from 'element-plus';
 
 export const columns2 = [
+  {
+    label: 'ID',
+    prop: 'id',
+    fixed: 'left',
+    width: 50,
+  },
   {
     label: '通知标题',
     prop: 'title',

src/views/data/dict/columns.ts

@@ -5,13 +5,17 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
+    fixed: 'left',
+    width: 50,
   },
   {
     label: '字典名称',
     prop: 'name',
+    width: 100,
   },
   {
     label: '字典编码',
     prop: 'code',
+    width: 100,
   },
 ];

src/views/data/notice/columns.ts

@@ -8,7 +8,8 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
-    width: 100,
+    fixed: 'left',
+    width: 50,
   },
   {
     label: '通知标题',

src/views/data/param/columns.ts

@@ -8,7 +8,8 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
-    width: 100,
+    fixed: 'left',
+    width: 50,
   },
   {
     label: '参数名称',

src/views/system/level/columns.ts

@@ -8,7 +8,8 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
-    width: 80,
+    fixed: 'left',
+    width: 50,
   },
   {
     label: '职级名称',

src/views/system/logger/loginLog/columns.ts

@@ -8,6 +8,7 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
+    fixed: 'left',
     width: 100,
   },
   {

src/views/system/logger/operLog/columns.ts

@@ -8,6 +8,7 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
+    fixed: 'left',
     width: 100,
   },
   {

src/views/system/position/columns.ts

@@ -8,7 +8,8 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
-    width: 100,
+    fixed: 'left',
+    width: 50,
   },
   {
     label: '岗位名称',

src/views/system/role/columns.ts

@@ -8,7 +8,8 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
-    width: 100,
+    fixed: 'left',
+    width: 50,
   },
   {
     label: '角色名称',

src/views/system/tenant/columns.ts

@@ -8,7 +8,8 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
-    width: 100,
+    fixed: 'left',
+    width: 50,
   },
   {
     label: '租户名称',

src/views/system/user/columns.ts

@@ -8,7 +8,8 @@ export const columns = [
   {
     label: 'ID',
     prop: 'id',
-    width: 100,
+    fixed: 'left',
+    width: 50,
   },
   {
     label: '登录账号',