页面调整优化

ant-design-vue-jeecg/src/views/km/search/AdvancedSearch.vue

@@ -285,33 +285,41 @@
           {
             title: '标题',
             align: "left",
+            dataIndex: 'title',
             scopedSlots: {customRender: 'docTitle'}
           },
           {
-            title: '文档来源',
+            title: '分类',
             align: "left",
-            dataIndex: 'source_dictText'
+            dataIndex: 'category_dictText',
+            width: 100,
+            filters: [],
+            customCell: () => {
+              return {
+                style: {
+                  'max-width': '6em',
+                  overflow: 'hidden',
+                  whiteSpace: 'nowrap',
+                  textOverflow: 'ellipsis'
+                },
+              };
+            },
           },
-
           {
-            title: '发文时间',
+            title: '标签',
             align: "left",
-            sorter: true,
+            dataIndex: 'businessType_dictText',
             customCell: () => {
               return {
                 style: {
-                  'min-width': '8em',
-                  'max-width': '15em',
+                  'max-width': '6em',
+                  overflow: 'hidden',
+                  whiteSpace: 'nowrap',
+                  textOverflow:'ellipsis'
                 },
               };
             },
-            dataIndex: 'pubTimeTxt'
           },
-          // {
-          //   title: '涉及业务',
-          //   align: "center",
-          //   dataIndex: 'businessType_dictText'
-          // },
           {
             title: '操作',
             dataIndex: 'action',

ant-design-vue-jeecg/src/views/km/search/DocSearch.vue

@@ -235,31 +235,37 @@
             scopedSlots: {customRender: 'docTitle'}
           },
           {
-            title: '文档来源',
+            title: '分类',
             align: "left",
-            dataIndex: 'source_dictText',
+            dataIndex: 'category_dictText',
+            width: 100,
             filters: [],
+            customCell: () => {
+              return {
+                style: {
+                  'max-width': '6em',
+                  overflow: 'hidden',
+                  whiteSpace: 'nowrap',
+                  textOverflow: 'ellipsis'
+                },
+              };
+            },
           },
-
           {
-            title: '发文时间',
+            title: '标签',
             align: "left",
-            dataIndex: 'pubTimeTxt',
+            dataIndex: 'businessType_dictText',
             customCell: () => {
               return {
                 style: {
-                  'min-width': '8em',
-                  'max-width': '15em',
+                  'max-width': '6em',
+                  overflow: 'hidden',
+                  whiteSpace: 'nowrap',
+                  textOverflow:'ellipsis'
                 },
               };
             },
-            sorter: true,
           },
-          // {
-          //   title: '涉及业务',
-          //   align: "center",
-          //   dataIndex: 'businessType_dictText'
-          // },
           {
             title: '操作',
             dataIndex: 'action',

ant-design-vue-jeecg/src/views/system/UserList.vue

@@ -128,9 +128,9 @@
                 </a-popconfirm>
               </a-menu-item>
 
-              <a-menu-item>
-                <a href="javascript:;" @click="handleAgentSettings(record.username)">代理人</a>
-              </a-menu-item>
+              <!--<a-menu-item>-->
+                <!--<a href="javascript:;" @click="handleAgentSettings(record.username)">代理人</a>-->
+              <!--</a-menu-item>-->
 
             </a-menu>
           </a-dropdown>
@@ -310,10 +310,10 @@
       handleChangePassword(username) {
         this.$refs.passwordmodal.show(username);
       },
-      handleAgentSettings(username){
-        this.$refs.sysUserAgentModal.agentSettings(username);
-        this.$refs.sysUserAgentModal.title = "用户代理人设置";
-      },
+      // handleAgentSettings(username){
+      //   this.$refs.sysUserAgentModal.agentSettings(username);
+      //   this.$refs.sysUserAgentModal.title = "用户代理人设置";
+      // },
       passwordModalOk() {
         //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
       },

ant-design-vue-jeecg/src/views/system/modules/UserModal.vue

@@ -163,7 +163,7 @@
         validatorRules:{
           username:[{required: true, message: '请输入用户账号!'},
                     {validator: this.validateUsername,}],
-          password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
+          password: [{required: false,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
                      {validator: this.validateToNextPassword,trigger: 'change'}],
           confirmpassword: [{required: true, message: '请重新输入登录密码!',},
                             { validator: this.compareToFirstPassword,}],