lidie 1 год назад
Родитель
Сommit
2138644be8

+ 1 - 1
src/views/component/fileTraining/fileDialog.vue

@@ -151,7 +151,7 @@ export default {
         setInterfaceTime () {
             this.timer = setTimeout(() => {
                 this.$emit('pause')
-            }, 30000)
+            }, 180000)
         },
         formattedTimestamp (timestamp) {
             const date = new Date(timestamp)

+ 7 - 1
src/views/component/fileTraining/index.vue

@@ -244,6 +244,13 @@ export default {
         fileInfos: {
             handler (newVal) {
                 this.leftData = newVal
+                const temp = JSON.parse(JSON.stringify(newVal))
+                temp.sort((a, b) => {
+                    return new Date(b.fa_fang_shi_jian_).getTime() - new Date(a.fa_fang_shi_jian_).getTime()
+                })
+                if (newVal !== temp) {
+                    this.leftData = temp
+                }
                 newVal.forEach(val => {
                     this.fileShow(val)
                 })
@@ -382,7 +389,6 @@ export default {
             this.curFileName = activity.FILE_NAME_
             this.fileShow(activity)// 展示内容改变
             this.checkNum(activity)// 阅读量
-
             // this.$forceUpdate()// 触发监听器
         },
         // 阅读量函数

+ 9 - 24
src/views/infosManage/fileIE.vue

@@ -873,36 +873,21 @@ export default {
                         xiu_ding_ban_ben_: el.xiu_ding_ban_ben_, xiu_ding_wen_jian_: el.xiu_ding_wen_jian_,
                         wen_jian_bian_hao: el.wen_jian_bian_hao,
                         bian_zhi_ren_: el.bian_zhi_ren_,
-                        cao_zuo_lei_xing_: el.cao_zuo_lei_xing_
+                        cao_zuo_lei_xing_: el.cao_zuo_lei_xing_,
+                        xiu_ding_fu_jian_: el.xiu_ding_fu_jian_
                     }
                     this.handleFileInfo(obj)
                 })
                 this.dialogVisible = true
             })
-            /**
-             * ban_ben_(版本)
-             * xiu_ding_bian_hao(修订编号)
-             * xiu_ding_wen_jian_ (修订文件)
-             * xiu_ding_ban_ben_(修订版本)
-             * xiu_ding_nei_rong(修订内容)
-             * yuan_yin_(原因)
-             * fa_fang_shi_jian_(发放时间,共用)
-             * {id_:el.id_,wen_jian_ming_che:el.xiu_ding_wen_jian_ ban_ben_:el.ban_ben_,wen_jian_ming_che:el.xiu_ding_nei_rong:el.xiu_ding_nei_rong,yuan_yin_:el.yuan_yin_,xiu_ding_ban_ben_:el.xiu_ding_ban_ben_,xiu_ding_wen_jian_:el.xiu_ding_wen_jian_,fu_j}
-             */
-            // 1
-            // this.$common.request('sql', sql1).then(res => {
-            //     console.log('res测试', res)
-            //     const list = res.variables.data
-            //     list.forEach(el => {
-            //         const obj = { id: el.id_, wen_jian_ming_che: el.wen_jian_ming_che, fu_jian_: el.wen_jian_fu_jian_, xiu_ding_nei_rong: el.xiu_ding_nei_rong, yuan_yin_: el.yuan_yin_, xiu_ding_ban_ben_: el.xiu_ding_ban_ben_, ban_ben_: el.ban_ben_, wen_jian_bian_hao: el.wen_jian_bian_hao, fa_fang_shi_jian_: el.fa_fang_shi_jian_
-            //         }
-            //         this.handleFileInfo(obj)
-            //     })
-            //     this.dialogVisible = true
-            // })
         },
         handleFileInfo (val) {
-            const sql = `select * from ibps_file_attachment where id_= '${val.fu_jian_}'`
+            let sql = ''
+            if (val.cao_zuo_lei_xing_ === '修订') {
+                sql = `select * from ibps_file_attachment where id_= '${val.xiu_ding_fu_jian_}'`
+            } else {
+                sql = `select * from ibps_file_attachment where id_= '${val.fu_jian_}'`
+            }
             this.$common.request('sql', sql).then(res => {
                 this.fileInfos = {}// 本人添加
                 const { data = [] } = res.variables || {}
@@ -910,7 +895,7 @@ export default {
                     this.$message.warning('没有可查阅的文件,请查明原因!')
                     return
                 }
-                this.fileInfos = { id: val.id, FILE_NAME_: val.wen_jian_ming_che, fileInfos: data[0], func: this.handleUpdate, ban_ben_: val.ban_ben_, xiu_ding_nei_rong: val.xiu_ding_nei_rong ? val.xiu_ding_nei_rong : '', yuan_yin_: val.yuan_yin_ ? val.yuan_yin_ : '', xiu_ding_ban_ben_: val.xiu_ding_ban_ben_ ? val.xiu_ding_ban_ben_ : '', wen_jian_bian_hao: val.wen_jian_bian_hao, fa_fang_shi_jian_: val.fa_fang_shi_jian_, bian_zhi_ren_: val.bian_zhi_ren_, cao_zuo_lei_xing_: val.cao_zuo_lei_xing_, zId: val.zId }
+                this.fileInfos = { id: val.id, FILE_NAME_: val.wen_jian_ming_che, fileInfos: data[0], func: this.handleUpdate, ban_ben_: val.ban_ben_, xiu_ding_nei_rong: val.xiu_ding_nei_rong ? val.xiu_ding_nei_rong : '', yuan_yin_: val.yuan_yin_ ? val.yuan_yin_ : '', xiu_ding_ban_ben_: val.xiu_ding_ban_ben_ ? val.xiu_ding_ban_ben_ : '', wen_jian_bian_hao: val.wen_jian_bian_hao, fa_fang_shi_jian_: val.fa_fang_shi_jian_, bian_zhi_ren_: val.bian_zhi_ren_, cao_zuo_lei_xing_: val.cao_zuo_lei_xing_, zId: val.zId, xiu_ding_fu_jian_: val.xiu_ding_fu_jian_ }
                 this.fileArray.push(this.fileInfos)
             })
         },