修改按钮样式

jero-web/src/assets/less/common.less

@@ -1,7 +1,18 @@
 
 /*列表上方操作按钮区域*/
 .ant-card-body .table-operator {
-  margin-bottom: 8px;
+  margin-bottom: 18px;
+  text-align: right;
+}
+.operator-text{
+   cursor: pointer;
+   margin-right: 50px;
+   font-size: 14px;
+   font-weight: 600;
+   display: inline-block;
+}
+.operator-text:last-child{
+  margin-right: 16px;
 }
 /** Button按钮间距 */
 .table-operator .ant-btn {

jero-web/src/common/lang/en-us.js

@@ -339,4 +339,7 @@ module.exports = {
   TextStatus:'TextStatus',
   PleaseEnter:'Please enter',
   PleaseSelect:'Please select',
+  ModificationTime:'Modification time',
+  ModificationContent:'Modification content',
+  personnel:'personnel',
 }

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

@@ -343,4 +343,7 @@ module.exports = {
   TextStatus:'文本状态',
   PleaseEnter:'请输入',
   PleaseSelect:'请选择',
+  ModificationTime:'修改时间',
+  ModificationContent:'修改内容',
+  personnel:'人员',
 }

jero-web/src/components/PersonnelSelection/index.vue

@@ -8,7 +8,7 @@
     </div>
     <a-drawer
       :title="'人员选择'"
-      :maskClosable="true"
+      :maskClosable="false"
       :width="600"
       placement="right"
       :closable="true"

jero-web/src/components/Standardselection/index.vue

@@ -13,7 +13,7 @@
     </div>
     <a-drawer
       :title="'标准选择'"
-      :maskClosable="true"
+      :maskClosable="false"
       :width="1000"
       placement="right"
       :closable="true"

jero-web/src/components/tableDate/index.vue

@@ -117,6 +117,7 @@
         getAction(this.url.tableHeader, params).then((res) => {
           if (res.success) {
             var jsonHead = res.result
+            this.columns = []
             jsonHead.forEach((res, index) => {
               this.columns.push({
                 title: res.db_field_txt,
@@ -134,7 +135,7 @@
             let width = 0
             if (this.OperationList.length > 0) {
               this.OperationList.forEach((res) => {
-                width += res.text.length * 8 + width
+                width += res.text.length * 9 + width
               })
             }
             if (this.showAction) {
@@ -207,7 +208,7 @@
   }
 
   .text {
-    margin-right: 16px;
+    margin-right: 10px;
   }
 
   .page {

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

@@ -8,7 +8,7 @@
             {{this.$route.query.serial_number}} 《{{this.$route.query.title}}》 标准详情
           </div>
           <div class="doc-detail-right">
-            <a-button class="doc-detail-btn" type="primary">更新log</a-button>
+            <a-button class="doc-detail-btn" @click="UpdateLog" type="primary">更新log</a-button>
             <a-button class="doc-detail-btn" type="primary">文档拆分</a-button>
             <a-button class="doc-detail-btn" type="primary">文档翻译</a-button>
             <a-button class="doc-detail-btn" type="primary">文档对比</a-button>
@@ -29,7 +29,7 @@
             <div class="TextInformation" v-if="val == '文本信息'">
               <div class="TextInformationContent" v-for="(ol,index1) in item[val]" style="width: 100%">
               <span class="TextInformationContentLeft">
-                 <span >{{ol.db_field_txt}}</span>
+                 <span>{{ol.db_field_txt}}</span>
               </span>
                 <span class="TextInformationContentcontent">
                          <span @click="pdfPreview(ol.value)">{{ol.value ? ol.value.fileName : '--'}}</span>
@@ -53,20 +53,66 @@
           </div>
         </div>
       </div>
+      <a-modal
+        title="更新log"
+        :width="900"
+        :visible="visible"
+        :confirm-loading="confirmLoading"
+        :maskClosable="false"
+        @ok="handleOk"
+        @cancel="handleCancel"
+      >
+        <a-table
+          class="table"
+          :columns="columns"
+          pagination
+          :scroll="{y: 400}"
+          :data-source="dataSource"
+          :loading="loading"
+        >
+        </a-table>
+      </a-modal>
     </div>
   </a-card>
 </template>
 <script>
   import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
-
+  import { JeroListMixin } from '@/mixins/JeroListMixin'
   export default {
     name: 'docIndex',
+    mixins:[JeroListMixin],
     data() {
       return {
         url: {
-          getInfo: 'document/bussDocumentLibraryEO/getInfoById'
+          getInfo: 'document/bussDocumentLibraryEO/getInfoById',
+          list:'log/bussLogE/page',
         },
-        detailList: []
+        detailList: [],
+        visible: false,
+        confirmLoading: false,
+        loading: false,
+        columns: [
+          {
+            title: this.$t('ModificationContent'),
+            dataIndex: 'db_field_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('ModificationTime'),
+            dataIndex: 'db_field_name',
+            align: 'center',
+            ellipsis: true,
+            width:140
+          },
+          {
+            title: this.$t('personnel'),
+            dataIndex: 'db_field_name',
+            align: 'center',
+            ellipsis: true,
+            width:100
+          }
+        ],
       }
     },
     mounted() {
@@ -82,12 +128,22 @@
           }
         })
       },
-      pdfPreview(item){
+      pdfPreview(item) {
         window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.id))
       },
       download(item) {
         downloadFile('/sys/common/download', item.fileName, { id: item.id })
-      }
+      },
+      UpdateLog() {
+        this.visible = true
+      },
+      handleOk() {
+        this.visible = false
+      },
+      handleCancel() {
+        this.visible = false
+      },
+
     }
   }
 </script>

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

@@ -4,13 +4,34 @@
       <search :flag="'1'" :url="url"/>
     </div>
     <div class="table-operator">
-      <a-button @click="handleExport()" type="primary">数据导出</a-button>
+      <div @click="handleDel" class="operator-text">
-      <a-button @click="handleFileExport()" type="primary">带文件导出</a-button>
+        <a-icon type="delete" />
-      <a-button @click="handleAdd()" type="primary">{{$t('add')}}</a-button>
+        批量删除
-      <a-button @click="handleModule()" type="primary">模板下载</a-button>
+      </div>
-      <a-button @click="handleModule()" type="primary">导入</a-button>
+      <div @click="handleExport" class="operator-text">
-      <a-button @click="handleDel()" type="primary">批量删除</a-button>
+        <a-icon type="export" :rotate="-90"/>
-      <a-button @click="handleCompare()" type="primary" icon="plus">推送</a-button>
+        数据导出
+      </div>
+      <div @click="handleFileExport" class="operator-text">
+        <a-icon type="mail" />
+        带文件导出
+      </div>
+      <div @click="handleCompare" class="operator-text">
+        <a-icon type="rocket" :rotate="45" />
+        推送
+      </div>
+      <div @click="handleModule" class="operator-text">
+        <a-icon type="download" />
+        模板下载
+      </div>
+      <div @click="handleModule" class="operator-text">
+        <a-icon type="import" :rotate="270" />
+        导入
+      </div>
+      <div @click="handleAdd" class="operator-text">
+        <a-icon type="plus" />
+        {{$t('add')}}
+      </div>
     </div>
     <div>
       <!--
@@ -229,5 +250,5 @@
 </script>
 
 <style scoped>
-
+  @import '~@assets/less/common.less'
 </style>

jero-web/src/views/documentManage/library/modules/addForm.vue

@@ -1,7 +1,7 @@
 <template>
   <a-drawer
     :title="title"
-    :maskClosable="true"
+    :maskClosable="false"
     :width="drawerWidth"
     placement="right"
     :closable="true"