修改禅道已知问题

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

@@ -532,6 +532,8 @@ module.exports = {
   BatchCancelCollection: 'Confirm batch cancel collection?',
   unsubscribeConfirm: 'unsubscribe confirm?',
   confirmCancelCollection: 'confirm to cancel collection?',
-
+  theRelease: 'The release date should not exceed the standard implementation date',
-  theRelease:'The release date should not exceed the standard implementation date'
+  zoneOfApplication: 'zone of application',
+  releaseTime: 'release Time',
+  standardImplementationTime: 'Standard implementation time'
 }

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

@@ -536,5 +536,8 @@ module.exports = {
   BatchCancelCollection:'确认批量取消收藏?',
   unsubscribeConfirm:'确认取消订阅?',
   confirmCancelCollection:'确认取消收藏?',
-  theRelease:'发布日期不能大于标准实施日期'
+  theRelease:'发布日期不能大于标准实施日期',
+  zoneOfApplication:'适用地区',
+  releaseTime:'发布时间',
+  standardImplementationTime:'标准实施时间',
 }

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

@@ -11,7 +11,7 @@
             <a-col :span="12" v-if="item.field_show_type === '1' || item.field_show_type === '11'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -26,7 +26,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === '2'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -41,7 +41,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === '3'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -58,7 +58,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === '4'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -73,7 +73,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === '5'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -91,7 +91,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === '6'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -106,7 +106,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === '7'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -126,7 +126,7 @@
             <a-col :span="24" v-else-if="item.field_show_type === '8'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -141,7 +141,7 @@
             <a-col :span="24" v-else-if="item.field_show_type === '9'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -155,7 +155,7 @@
             <a-col :span="24" v-else-if="item.field_show_type === '10'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -171,7 +171,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === 'RADIO'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -187,7 +187,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === '0'">
               <div class="box-title-text" :title="item.db_field_txt">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -206,7 +206,7 @@
             <a-col :span="12" v-else-if="item.field_show_type === 'CHECKBOX'">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 0">*</span>
+                  <span class="Required" v-if="item.field_must_input == 1">*</span>
                   <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
                 </div>
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
@@ -373,7 +373,7 @@
         let rules = {}
         this.ruleList.forEach((res, index) => {
           const rule = []
-          if (res.field_must_input == 0) {
+          if (res.field_must_input == 1) {
             if (res.field_show_type === '1') {
               rule.push({
                 required: true,

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

@@ -158,6 +158,7 @@
         this.reconnect()
       },
       websocketOnmessage: function(e) {
+        console.log(e)
         console.log('-----接收消息-------', e.data)
         var data = eval('(' + e.data + ')') //解析对象
         if (data.cmd == 'topic') {

jero-web/src/components/uploadFile/file.vue

@@ -15,7 +15,7 @@
         :remove='remove'
         @change="handleChange">
         <p>
-          <a-icon style="font-size: 67px;color: #c0c4cc;" type="cloud-upload"/>
+          <a-icon class="action-upload" type="cloud-upload"/>
         </p>
         <p class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{this.$t('clickUpload')}}</p>
       </a-upload-dragger>
@@ -65,6 +65,7 @@
         }
       },
       beforeUpload(file) {
+
         console.log(file)
         // let thisFileType = this.thisFileType.replace(/\s+/g, "");
         this.fileTypeSatus = true
@@ -92,29 +93,6 @@
       remove() {
         this.fileTypeSatus = true
       },
-      mydownload(item) {
-        var fileName = item.fileName
-        downFile(this.downLoadFileUrl + '/' + item.ext1, {}).then((data) => {
-          if (!data) {
-            this.$message.destroy()
-            this.$message.warning('文件下载失败')
-            return
-          }
-          if (typeof window.navigator.msSaveBlob !== 'undefined') {
-            window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName)
-          } else {
-            let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
-            let link = document.createElement('a')
-            link.style.display = 'none'
-            link.href = url
-            link.setAttribute('download', fileName)
-            document.body.appendChild(link)
-            link.click()
-            document.body.removeChild(link) //下载完成移除元素
-            window.URL.revokeObjectURL(url) //释放掉blob对象
-          }
-        })
-      },
       mypreview(item) {
         let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
         window.open(url, '_blank')
@@ -221,4 +199,9 @@
   .ant-upload-list-item-name {
     color: rgba(0, 0, 0, 0.65) !important;
   }
+
+  .action-upload {
+    font-size: 67px;
+    color: #c0c4cc;
+  }
 </style>

jero-web/src/utils/request.js

@@ -72,14 +72,36 @@ const err = (error) => {
         notification.error({ message: '系统提示', description: '网络超时' })
         break
       case 401:
-        notification.error({ message: '系统提示', description: '未授权，请重新登录', duration: 4 })
+        if (token && data.message.includes('Token失效')) {
-        if (token) {
+          Modal.error({
+            title: '登录已过期',
+            content: '很抱歉，登录已过期，请重新登录',
+            okText: '重新登录',
+            mask: false,
+            onOk: () => {
               store.dispatch('Logout').then(() => {
-            setTimeout(() => {
+                Vue.ls.remove(ACCESS_TOKEN)
+                try {
+                  let path = window.document.location.pathname
+                  console.log('location pathname -> ' + path)
+                  if (path != '/' && path.indexOf('/user/login') == -1) {
                     window.location.reload()
-            }, 1500)
+                  }
+                } catch (e) {
+                  window.location.reload()
+                }
               })
             }
+          })
+        }
+        // notification.error({ message: '系统提示', description: '未授权，请重新登录', duration: 4 })
+        // if (token) {
+        //   store.dispatch('Logout').then(() => {
+        //     setTimeout(() => {
+        //       window.location.reload()
+        //     }, 1500)
+        //   })
+        // }
         break
       default:
         notification.error({

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

@@ -40,11 +40,21 @@
             ref="table"
             size="middle"
             bordered
+            :scroll="{x: true}"
             rowKey="id"
             :data-source="tableData"
             :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             :columns="columns"
           >
+             <span slot="operation" slot-scope="record">
+                 <a @click="Collection(record)" class="text-operation">
+                   {{!record.collectFlag || record.collectFlag == 0 ? $t('Collection') :$t('CancelCollection')}}
+                 </a>
+                 <a @click="subscribe(record)" class="text-operation">
+                    {{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
+                 </a>
+                 <a> {{$t('Push')}}</a>
+             </span>
             <!-- 字符串超长截取省略号显示-->
             <!--            <span slot="templateContent" slot-scope="text">-->
             <!--              <j-ellipsis :value="text" :length="25"/>-->
@@ -85,12 +95,22 @@
         </div>
       </div>
     </div>
+    <libraryPush
+      :url="url"
+      ref="libraryPushRef"
+    />
   </div>
 </template>
 
 <script>
+  import eventBUs from '../../../../common/event'
+  import { getAction, postAction } from '@/api/manage'
+  import libraryPush from '@/components/libraryPush/index'
   export default {
     name: 'DocumentLibrary',
+    components:{
+      libraryPush
+    },
     data() {
       return {
         searchOption: [
@@ -201,43 +221,61 @@
           }
         ],
         tableData: [],
+        url:{
+          pullMessage: 'document/bussDocumentLibraryEO/pullMessage',//推送
+        },
         columns: [
           {
-            title: '编号',
+            title: this.$t('standard'),
             align: 'center',
             dataIndex: 'templateCode'
           },
           {
-            title: '标题',
+            title: this.$t('title'),
             align: 'center',
             dataIndex: 'templateName'
           },
           {
-            title: '文件名称',
+            title: this.$t('fileName'),
             align: 'center',
             dataIndex: 'template'
           },
           {
-            title: '状态',
+            title: this.$t('status'),
             align: 'center',
-            dataIndex: 'templateCon',
+            dataIndex: 'templateCon'
-            sorter: (a, b) => a.age - b.age
           },
           {
-            title: '适用地区',
+            title: this.$t('zoneOfApplication'),
             align: 'center',
-            dataIndex: 'templateCont',
+            dataIndex: 'templateCont'
-            sorter: (a, b) => a.age - b.age
           },
           {
-            title: '功能领域',
+            title: this.$t('functionalAreas'),
             align: 'center',
             dataIndex: 'templateContent1'
           },
           {
-            title: '技术领域',
+            title: this.$t('technicalField'),
             align: 'center',
             dataIndex: 'templateContent2'
+          },
+          {
+            title: this.$t('releaseTime'),
+            align: 'center',
+            dataIndex: 'releaseTime'
+          },
+          {
+            title: this.$t('standardImplementationTime'),
+            align: 'center',
+            dataIndex: 'standardImplementationTime'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 200,
+            scopedSlots: { customRender: 'operation' }
           }
         ],
         selectedRowKeys: [],
@@ -330,11 +368,72 @@
       SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
+      },
+      //收藏按钮
+      Collection(val) {
+        let _this = this
+        this.$confirm({
+          content: val.collectFlag == 0 || !val.collectFlag ? _this.$t('ConfirmCollection') : _this.$t('cancelConfirmCollection'),
+          onOk() {
+            let url = ''
+            if (val.collectFlag == 0 || !val.collectFlag) {
+              url = 'document/bussDocumentLibraryEO/addCollect'
+            } else {
+              url = 'document/bussDocumentLibraryEO/cancelCollect'
+            }
+            getAction(url, { id: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      //订阅按钮
+      subscribe(val) {
+        let _this = this
+        this.$confirm({
+          content: val.subscribeFlag == 0 || !val.subscribeFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'),
+          onOk() {
+            let url = ''
+            if (val.subscribeFlag == 0 || !val.subscribeFlag) {
+              url = 'document/bussDocumentLibraryEO/addSubscribe'
+            } else {
+              url = 'document/bussDocumentLibraryEO/cancelSubscribe'
+            }
+            getAction(url, { id: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      //推送
+      handleCompare(val) {
+       let item = JSON.parse(JSON.stringify(val))
+        this.$nextTick(() => {
+          this.$refs.libraryPushRef.visible = true
+          this.$refs.libraryPushRef.tableKey = item.id.split(',')
+        })
       }
     }
   }
 </script>
+
 <style>
+  .table .ant-table-column-title {
+    font-weight: bold;
+  }
+
+  .ant-table td {
+    white-space: nowrap;
+  }
+
   .checkbox-left .ant-checkbox-inner {
     width: 18px !important;
     height: 18px !important;
@@ -495,8 +594,13 @@
     padding: 0 0 0 8px;
     box-sizing: border-box;
   }
+
   .page {
     text-align: right;
     margin-top: 20px;
   }
+
+  .text-operation {
+    margin-right: 8px;
+  }
 </style>