修改已知问题

jero-web/src/common/lang/zh-cn.js

@@ -296,7 +296,7 @@ module.exports = {
   ConfirmPassword:'确认密码',
   reenterLoginPassword:'请重新输入登录密码',
   enterUserName:'请输入用户姓名',
-  RoleAssignment:'角色分配',
+  RoleAssignment:'角色配置',
   selectUserRole:'请选择用户角色',
   DepartmentAllocation:'部门分配',
   ClickSelectDepartment:'点击选择部门',

jero-web/src/components/tools/HeaderNotice.vue

@@ -9,7 +9,7 @@
     :overlayStyle="{ width: '300px', top: '50px' }">
     <template slot="content">
       <a-spin :spinning="loadding">
-        <a-tabs>
+        <a-tabs class="tabs">
           <a-tab-pane :tab="msg1Title" key="1">
             <a-list>
               <a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
@@ -218,6 +218,9 @@
   .header-notice-wrapper {
     top: 50px !important;
   }
+  .tabs .ant-tabs-nav .ant-tabs-tab-active{
+        color: #000F16!important;
+  }
 </style>
 <style lang="less" scoped>
   .header-notice {

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -248,6 +248,7 @@
           window.open(url, '_blank')
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           console.log(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {

jero-web/src/views/documentManage/library/index.vue

@@ -141,7 +141,7 @@
           ...this.$refs.searchRef.queryParam,
           id: this.idList.join(',')
         }
-        downloadFile('document/bussDocumentLibraryEO/exportExcel', '文档库.xlsx', query, this.Deselect)
+        downloadFile('document/bussDocumentLibraryEO/exportExcel', '文档库.xls', query, this.Deselect)
       },
       Deselect() {
         this.$refs.tableDataRef.selectedRowKeys = []
@@ -162,7 +162,7 @@
       },
       //下载模板
       handleModule() {
-        downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库.xlsx', {})
+        downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库.xls', {})
       },
       //批量删除
       handleDel() {

jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue

@@ -120,9 +120,9 @@
                        @click="checkedClick(item)"
                        :class="{ 'null-input':item.checked }">
                     <div class="text-header">
-                      <span>{{item.type}}</span>
-                      <span>{{item.number}}</span>
-                      <span>{{item.title}}</span>
+                      <span :title="item.module_type">{{item.module_type}}</span>
+                      <span :title="item.serial_number">{{item.serial_number}}</span>
+                      <span :title="item.title">{{item.title}}</span>
                     </div>
                     <div class="text-content">
                       {{item.content}}
@@ -638,6 +638,11 @@
       font-size: 16px;
       font-weight: bold;
       color: #040B29;
+      display: inline-block;
+      max-width: 200px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
     }
   }
 

jero-web/src/views/documentTools/searchCenter/components/whole.vue

@@ -4,7 +4,7 @@
       <span>检索范围：</span>
       <span>{{ queryParam.selectValue }}</span>
     </div>
-    <a-checkbox-group v-model="checkboxText">
+    <a-checkbox-group v-model="checkboxText" v-if="conList.length > 0">
       <li v-for="(item,index) in conList" :key="index">
         <div style="margin-bottom: 10px;position: relative">
           <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
@@ -12,31 +12,32 @@
                @click="checkedClick(item)"
                :class="{ 'null-input':item.checked }">
             <div class="text-header">
-              <span>{{item.module_type}}</span>
-              <span>{{item.serial_number}}</span>
-              <span>{{item.title}}</span>
+              <span :title="item.module_type">{{item.module_type}}</span>
+              <span :title="item.serial_number">{{item.serial_number}}</span>
+              <span :title="item.title">{{item.title}}</span>
             </div>
-            <div class="text-content" v-html="item.content" v-if="!queryParam.selectValue">
+            <div class="text-content" :title="item.content" v-html="item.content" v-if="!queryParam.selectValue">
 
             </div>
-            <div class="text-content" v-html="item.content"
+            <div class="text-content" :title="item.content" v-html="item.content"
                  v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
 
             </div>
-            <div class="text-content" v-html="item.content" v-else-if="!item.file_text && queryParam.selectValue">
+            <div class="text-content" :title="item.content" v-html="item.content"
+                 v-else-if="!item.file_text && queryParam.selectValue">
 
             </div>
-            <div class="text-content" v-html="item.file_text" v-else>
+            <div class="text-content" :title="item.file_text" v-html="item.file_text" v-else>
 
             </div>
           </div>
         </div>
       </li>
     </a-checkbox-group>
-    <div>
-        暂无数据
+    <div class="noData" v-else>
+      暂无数据
     </div>
-    <div class="page">
+    <div class="page" v-if="conList.length > 0">
       <a-pagination
         :show-total="total => $t('total')+` ${total} `+$t('strip')"
         show-quick-jumper
@@ -181,6 +182,11 @@
       font-size: 16px;
       font-weight: bold;
       color: #040B29;
+      display: inline-block;
+      max-width: 200px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
     }
   }
 
@@ -195,4 +201,10 @@
     text-align: right;
     margin-top: 20px;
   }
+
+  .noData {
+    width: 100%;
+    text-align: center;
+    line-height: 10;
+  }
 </style>

jero-web/src/views/system/DictList.vue

@@ -125,7 +125,7 @@
           },
           {
             title: this.$t('DictionaryName'),
-            align: 'left',
+            align: 'center',
             dataIndex: 'dictName'
           },
           // {
@@ -136,12 +136,12 @@
           // },
           {
             title: this.$t('DictionaryNumber'),
-            align: 'left',
+            align: 'center',
             dataIndex: 'dictCode'
           },
           {
             title: this.$t('describe'),
-            align: 'left',
+            align: 'center',
             dataIndex: 'description'
           },
           {

jero-web/src/views/system/PermissionList.vue

@@ -107,39 +107,39 @@
           {
             title: this.$t('MenuName'),
             dataIndex: 'name',
+            align: 'center',
             key: 'name'
           },
           {
             title: this.$t('MenuEnName'),
             dataIndex: 'menuEn',
+            align: 'center',
             key: 'menuEn'
           },
-          {
-            title: this.$t('MenuType'),
-            dataIndex: 'menuType',
-            key: 'menuType',
-            customRender: this.text
-          },
           {
             title: 'icon',
             dataIndex: 'icon',
+            align: 'center',
             key: 'icon'
           },
           {
             title: this.$t('assembly'),
             dataIndex: 'component',
+            align: 'center',
             key: 'component',
             scopedSlots: { customRender: 'component' }
           },
           {
             title: this.$t('route'),
             dataIndex: 'url',
+            align: 'center',
             key: 'url',
             scopedSlots: { customRender: 'url' }
           },
           {
             title: this.$t('sort'),
             dataIndex: 'sortNo',
+            align: 'center',
             key: 'sortNo'
           },
           {

jero-web/src/views/system/RoleUserList.vue

@@ -30,7 +30,7 @@
       <!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
       <!--            <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
       <!--          </a-upload>-->
-      <div  @click="handleExportXls($t('RoleManagement'))" class="operator-text">
+      <div @click="handleExportXls($t('RoleManagement'))" class="operator-text">
         <a-icon type="export" :rotate="-90"/>
         {{$t('export')}}
       </div>
@@ -52,27 +52,13 @@
         :loading="loading"
         @change="handleTableChange">
          <span slot="action" slot-scope="text, record">
-            <a @click="handleOpen(record)">{{$t('user')}}</a>
-            <a-divider type="vertical"/>
-
-            <a-dropdown>
-              <a class="ant-dropdown-link">
-                {{$t('more')}} <a-icon type="down"/>
-              </a>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a @click="handlePerssion(record.id)">{{$t('toGrantAuthorization')}}</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a @click="handleEdit(record)">{{$t('edit')}}</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete1(record.id)">
-                    <a>{{$t('delete')}}</a>
+             <a @click="handlePerssion(record.id)" class="text">{{$t('toGrantAuthorization')}}</a>
+             <a @click="handleEdit(record)" class="text">{{$t('edit')}}</a>
+           <a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete1(record.id)">
+                    <a class="text">{{$t('delete')}}</a>
                   </a-popconfirm>
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
+           <!--            <a @click="handleOpen(record)">{{$t('user')}}</a>-->
+           <!--            <a-divider type="vertical"/>-->
         </span>
       </a-table>
     </div>
@@ -275,7 +261,15 @@
 
       },
       handleDelete1: function(id) {
-        this.handleDelete(id)
+        let that = this
+        getAction(this.url.delete, { id: id }).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message)
+            that.loadData()
+          } else {
+            that.$message.warning(res.message)
+          }
+        })
         this.dataSource2 = []
         this.currentRoleId = ''
       },
@@ -393,6 +387,7 @@
   .ant-btn {
     margin-left: 8px
   }
+
   .box-title-text {
     line-height: 1.4;
     display: flex;
@@ -426,4 +421,8 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
+
+  .text {
+    margin-right: 8px;
+  }
 </style>

jero-web/src/views/system/UserAnnouncementList.vue

@@ -61,12 +61,13 @@
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
       :columns="columns"
       :dataSource="dataSource"
+      :scroll="{x: 1600}"
       :pagination="ipagination"
       :loading="loading"
       @change="handleTableChange">
       <span slot="msgContent" slot-scope="text,scope">
            <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" :title="text" @click="msgContentClick(scope)">
-             {{text && text.length > 25?text.slice(0,24)+'...':text}}
+             {{text}}
            </a>
       </span>
       <span slot="msgCategory" slot-scope="text,scope">
@@ -82,7 +83,7 @@
 
 <script>
   import { filterObj } from '@/utils/util'
-  import { getAction, putAction , deleteAction } from '@/api/manage'
+  import { getAction, putAction, deleteAction } from '@/api/manage'
   import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import DynamicNotice from '../../components/tools/DynamicNotice'
@@ -109,17 +110,21 @@
             title: this.$t('MessageContent'),
             align: 'center',
             dataIndex: 'msgContent',
+            width: 600,
+            ellipsis: true,
             scopedSlots: { customRender: 'msgContent' }
           },
           {
             title: this.$t('MessageType'),
             align: 'center',
             dataIndex: 'msgCategory',
+            width: 200,
             scopedSlots: { customRender: 'msgCategory' }
           },
           {
             title: this.$t('NotificationTime'),
             align: 'center',
+            width: 200,
             dataIndex: 'sendTime'
           }
         ],
@@ -160,10 +165,10 @@
               getAction(that.url.readAllMsg, { ids: selectedRowKeys.join(',') }).then((res) => {
                 if (res.success) {
                   that.selectedRowKeys = []
-                  that.$message.success(this.$t('OperationSuccessful'))
+                  that.$message.success(that.$t('OperationSuccessful'))
                   that.loadData()
-                }else{
-                  that.$message.success(this.$t('operationFailed'))
+                } else {
+                  that.$message.success(that.$t('operationFailed'))
                 }
               })
             }
@@ -193,10 +198,10 @@
               deleteAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
                 if (res.success) {
                   that.selectedRowKeys = []
-                  that.$message.success(this.$t('OperationSuccessful'))
+                  that.$message.success(that.$t('OperationSuccessful'))
                   that.loadData()
-                }else{
-                  that.$message.success(this.$t('operationFailed'))
+                } else {
+                  that.$message.success(that.$t('operationFailed'))
                 }
               })
             }

jero-web/src/views/system/UserList.vue

@@ -107,6 +107,10 @@
             <a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>
           </div>
         </template>
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)" >{{$t('RoleAssignment')}}</a>
+        </span>
+
       </a-table>
     </div>
     <!-- table区域-end -->
@@ -206,14 +210,14 @@
             align: 'center',
             width: 80,
             dataIndex: 'status_dictText'
+          },
+          {
+            title: this.$t('operation'),
+            dataIndex: 'action',
+            scopedSlots: {customRender: 'action'},
+            align: "center",
+            width: 80
           }
-          // {
-          //   title: this.$t('operation'),
-          //   dataIndex: 'action',
-          //   scopedSlots: {customRender: 'action'},
-          //   align: "center",
-          //   width: 170
-          // }
         ],
         superQueryFieldList: [
           { type: 'input', value: 'username', text: this.$t('userAccount') },

jero-web/vue.config.js

@@ -4,6 +4,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
+
 const webpack = require('webpack')
 // vue.config.js
 module.exports = {
@@ -32,11 +33,11 @@ module.exports = {
 
     // 生产环境，开启js\css压缩
     if (process.env.NODE_ENV === 'production') {
-        config.plugin('compressionPlugin').use(new CompressionPlugin({
-          test: /\.(js|css|less)$/, // 匹配文件名
-          threshold: 10240, // 对超过10k的数据压缩
-          deleteOriginalAssets: false // 不删除源文件
-        }))
+      config.plugin('compressionPlugin').use(new CompressionPlugin({
+        test: /\.(js|css|less)$/, // 匹配文件名
+        threshold: 10240, // 对超过10k的数据压缩
+        deleteOriginalAssets: false // 不删除源文件
+      }))
     }
     config.plugin('provide').use(webpack.ProvidePlugin, [{
       $: 'jquery',
@@ -57,9 +58,9 @@ module.exports = {
       .rule('vxe')
       .test(/\.js$/)
       .include
-        .add(resolve('node_modules/vxe-table'))
-        .add(resolve('node_modules/vxe-table-plugin-antd'))
-        .end()
+      .add(resolve('node_modules/vxe-table'))
+      .add(resolve('node_modules/vxe-table-plugin-antd'))
+      .end()
       .use()
       .loader('babel-loader')
       .end()
@@ -82,14 +83,14 @@ module.exports = {
   devServer: {
     port: 3000,
     proxy: {
-     /* '/api': {
-        target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
-        ws: false,
-        changeOrigin: true,
-        pathRewrite: {
-          '/jero-boot': ''  //默认所有请求都加了jero-boot前缀，需要去掉
-        }
-      }, */
+      /* '/api': {
+         target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
+         ws: false,
+         changeOrigin: true,
+         pathRewrite: {
+           '/jero-boot': ''  //默认所有请求都加了jero-boot前缀，需要去掉
+         }
+       }, */
       '/jero-boot': {
         target: 'http://localhost:8080', //请求本地 jero-boot后台项目
         // target: 'http://10.0.1.25:8080',