修改消息通知

jero-web/src/components/layouts/Tabcrumbs.vue

@@ -25,10 +25,9 @@
       }
     },
     watch: {
-      '$route': function(val) {
+      '$route': function(to,form) {
-        console.log(val)
+        if (to.meta.title == '首页') {
-        if (val.meta.title == '首页') {
+          this.Navigation = to.meta.title
-          this.Navigation = val.meta.title
           this.subNavigation = null
         } else {
           this.updateMenu()

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

@@ -189,8 +189,8 @@
                 <a-form-model-item class="itemModel" :prop="item.db_field_name">
                   <a-tree-select
                     v-model="formInline[item.db_field_name]"
-                    style="width: 100%"
                     :maxTagCount="1"
+                    style="width: 100%"
                     :tree-data="item.tree"
                     tree-checkable
                     :placeholder="$t('PleaseSelect')+item.db_field_txt"
@@ -282,7 +282,7 @@
             text: this.$t('relatedInformation'),
             content: []
           }
-        ],
+        ]
       }
     },
     mounted() {
@@ -349,7 +349,7 @@
         }
         /** 赋值给当前对应的表单文件 */
         this.formInline[this.uploadName] = attIdList.join(',')
-        this.formInline = {...this.formInline }
+        this.formInline = { ...this.formInline }
       },
       handleInput(value) {
         this.$nextTick(() => {
@@ -369,9 +369,9 @@
                 message: res.db_field_txt + this.$t('cannotEmpty'),
                 trigger: 'blur'
               })
-            } else if (res.field_show_type === '4' ||  res.field_show_type === '6' ||
+            } else if (res.field_show_type === '4' || res.field_show_type === '6' ||
               res.field_show_type === '5' || res.field_show_type === '7'
-              ) {
+            ) {
               rule.push({
                 required: true,
                 message: res.db_field_txt + this.$t('cannotEmpty'),
@@ -425,6 +425,7 @@
                 }
               })
             })
+            console.log(this.headerText)
           }
         })
       },

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

@@ -72,7 +72,8 @@
         expandedKeys: [],
         visible: false,
         confirmLoading: false,
-        selectedKey: []
+        selectedKey: [],
+        tableKey:[],
       }
     },
     mounted() {
@@ -85,6 +86,7 @@
       handleCancel() {
         this.visible = false
       },
+      //String departIds,String userIds,String documentIds
       handleSubmit() {
         getAction(this.url.pullMessage, {}).then((res) => {
           if (res.success) {

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

@@ -12,7 +12,7 @@
         <a-tabs>
           <a-tab-pane :tab="msg1Title" key="1">
             <a-list>
-              <a-list-item :key="index" v-for="(record, index) in announcement1">
+              <a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
                 <div style="margin-left: 5%;width: 80%;">
                   <p style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;color:#00B3BE">
                     <a :title="record.msgContent" @click="showAnnouncement(record)">{{ record.msgContent }}</a>

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

@@ -182,9 +182,14 @@
       },
       //推送
       handleCompare() {
-        this.$nextTick(() => {
+        if (this.idList.length > 0){
-          this.$refs.libraryPushRef.visible = true
+          this.$nextTick(() => {
-        })
+            this.$refs.libraryPushRef.visible = true
+            this.$refs.libraryPushRef.tableKey = this.idList
+          })
+        }else{
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       },
       //导入
       handleImport() {