Sfoglia il codice sorgente

首页,移动端得通告管理分别增加文件预览功能,服务联调;

SunZehao 1 anno fa
parent
commit
0093c4af4a

+ 24 - 53
src/components/gateWay/gateWayNotificationDetail.vue

@@ -10,35 +10,6 @@
                         <el-input v-model="ruleForm.noticeContent" disabled
                             type="textarea" :rows="10" placeholder="请输入公告内容"></el-input>
                     </el-form-item>
-                    <el-form-item label="发布对象" prop="sendTo">
-                        <el-select v-model="ruleForm.sendTo" placeholder="请选择发布对象">
-                            <el-option
-                            v-for="item in sendToData"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-row>
-                        <el-col :span="12" v-if="ruleForm.sendTo === '个别部门'">
-                            <el-form-item label="个别部门" prop="sendToContent">
-                                <el-select v-model="ruleForm.sendToContent" multiple collapse-tags disabled placeholder="请选择部门">
-                                    <el-option
-                                    v-for="item in departData"
-                                    :key="item.id"
-                                    :label="item.keyName"
-                                    :value="item.id">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="排序">
-                                <el-input-number v-model="ruleForm.serialNumber" disabled :min="1" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
                     <el-form-item label="附件">
                         <div class="fliesHeader">
                             <span>附件名</span>
@@ -49,12 +20,11 @@
                             <div class="fliesMain">
                                 <div>
                                     <img :src="file" style="margin-right: 10px" >
-                                    <span class="fliesMainSpan spanOne">{{it.name}}</span>
+                                    <span class="fliesMainSpan spanOne">{{it.fileName}}</span>
                                 </div>
-                                <span class="fliesMainSpan spanTwo" style="font-size:14px">{{it.deptName}}</span>
-                                <!-- <span>{{userMes.unitName}}</span> -->
+                                <span class="fliesMainSpan spanTwo" style="font-size:14px">{{it.releaseDept}}</span>
                                 <div class="fileOperate">
-                                    <div @click="previewFile(it.name)" style="cursor:pointer">
+                                    <div @click="previewFile(it)" style="cursor:pointer">
                                         <img :src="yulan" style="margin-right: 10px;" >
                                         <span style="font-size:14px">预览</span>
                                     </div>
@@ -111,33 +81,34 @@ export default {
                 releaseDept: row.releaseDept,
                 releasePeople: row.releasePeople
             }
-            if (row.noticeAnnex !== '') {
-                let filesArr = row.noticeAnnex.split(',')
-                let filesArrNew = []
-                filesArr.forEach(it => {
+            if (row.memo4 !== '') {
+                let filesNameArr = row.memo4.split(',')
+                let filesUrlArr = row.noticeAnnex.split(',')
+                let filesArr = []
+                filesNameArr.forEach((iv, index) =>{
                     let obj = {
-                        name: it,
-                        deptName: row.releaseDeptName
+                        releaseDept: row.releaseDeptName,
+                        fileName: iv,
+                        fileUrl: filesUrlArr[index]
                     }
-                    filesArrNew.push(obj)
+                    filesArr.push(obj)
                 })
-                this.filesListEdit = filesArrNew
+                this.filesListEdit = filesArr
             }
         },
         previewFile(it) {
-            // this.filesVisible = true
-            let params = {
-                url: it
+            let downipcc = ''
+            let previewipcc = ''
+            if (window.location.hostname === '10.65.78.81') {
+                downipcc = 'http://10.65.79.83:86'
+                previewipcc = 'http://10.65.79.83:8012'
+            } else {
+                downipcc = 'http://10.65.78.23:18600'
+                previewipcc = 'http://10.65.78.23:8012'
             }
-            apiGetevaluationdeptnoticeFilePreview(params).then(datas =>{
-                if (datas) {
-                    // const blob = new Blob([datas], {type: 'application/pdf'})
-                    // const url = URL.createObjectURL(blob)
-                    // window.open(url)
-                    // console.log('files', datas)
-                    window.open(datas.data, 'target')
-                }
-            })
+            let downUrl = `${downipcc}/f-center/hadoop/hdfs/download?path=${it.fileUrl}`
+            let previewUrl = `${previewipcc}/onlinePreview?hdfs=true&url=${encodeURIComponent(downUrl)}`
+            window.open(previewUrl)
         },
     }
 }

+ 7 - 19
src/components/notification/notificationMangePage.vue

@@ -566,12 +566,12 @@ export default {
                 let filesNameArr = this.evalradio.memo4.split(',')
                 let filesUrlArr = this.evalradio.noticeAnnex.split(',')
                 let filesArr = []
-                let obj = {
-                    releaseDept: this.evalradio.releaseDept
-                }
                 filesNameArr.forEach((iv, index) =>{
-                    obj.fileName = iv
-                    obj.fileUrl = filesUrlArr[index]
+                    let obj = {
+                        releaseDept: this.evalradio.releaseDeptName,
+                        fileName: iv,
+                        fileUrl: filesUrlArr[index]
+                    }
                     filesArr.push(obj)
                 })
                 this.filesListEdit = filesArr
@@ -636,26 +636,14 @@ export default {
             let previewipcc = ''
             if (window.location.hostname === '10.65.78.81') {
                 downipcc = 'http://10.65.79.83:86'
-                previewipcc = 'http://10.65.79.83:86'
+                previewipcc = 'http://10.65.79.83:8012'
             } else {
                 downipcc = 'http://10.65.78.23:18600'
                 previewipcc = 'http://10.65.78.23:8012'
             }
             let downUrl = `${downipcc}/f-center/hadoop/hdfs/download?path=${it.fileUrl}`
-            let previewUrl = `${previewipcc}/onlinePreview?hdfs=true&url='+${encodeURIComponent(downUrl)}`
+            let previewUrl = `${previewipcc}/onlinePreview?hdfs=true&url=${encodeURIComponent(downUrl)}`
             window.open(previewUrl)
-            // let params = {
-            //     url: it
-            // }
-            // apiGetevaluationdeptnoticeFilePreview(params).then(datas =>{
-            //     if (datas) {
-            //         // const blob = new Blob([datas], {type: 'application/pdf'})
-            //         // const url = URL.createObjectURL(blob)
-            //         // window.open(url)
-            //         // console.log('files', datas)
-            //         window.open(datas.data, 'target')
-            //     }
-            // })
         },
         //移除文件
         removeFile(item) {

+ 23 - 22
src/mobeilComponent/notificationPageDetail.vue

@@ -34,8 +34,8 @@
                 <div class="cssCommon">
                     <p>附件:</p>
                     <el-table :data="filesListEdit" style="width: 100%">
-                        <el-table-column label="附件名" prop="name" width="130" />
-                        <el-table-column label="发送单位" prop="deptName" width="150" />
+                        <el-table-column label="附件名" prop="fileName" width="130" />
+                        <el-table-column label="发送单位" prop="releaseDept" width="150" />
                         <el-table-column label="操作" width="100">
                             <template #default="scope">
                             <div @click="previewFile(scope.row)" style="cursor:pointer">
@@ -111,17 +111,19 @@ export default {
                 releaseDept: row.releaseDept,
                 releasePeople: row.releasePeople
             }
-            if (row.noticeAnnex !== '') {
-                let filesArr = row.noticeAnnex.split(',')
-                let filesArrNew = []
-                filesArr.forEach(it => {
+            if (row.memo4 !== '') {
+                let filesNameArr = row.memo4.split(',')
+                let filesUrlArr = row.noticeAnnex.split(',')
+                let filesArr = []
+                filesNameArr.forEach((iv, index) =>{
                     let obj = {
-                        name: it,
-                        deptName: row.releaseDeptName
+                        releaseDept: row.releaseDeptName,
+                        fileName: iv,
+                        fileUrl: filesUrlArr[index]
                     }
-                    filesArrNew.push(obj)
+                    filesArr.push(obj)
                 })
-                this.filesListEdit = filesArrNew
+                this.filesListEdit = filesArr
             }
         },
         chooseMenu() {
@@ -131,19 +133,18 @@ export default {
             this.$router.push({ path: "/notificationMobeil"})
         },
         previewFile(it) {
-            // this.filesVisible = true
-            let params = {
-                url: it
+            let downipcc = ''
+            let previewipcc = ''
+            if (window.location.hostname === '10.65.78.81') {
+                downipcc = 'http://10.65.79.83:86'
+                previewipcc = 'http://10.65.79.83:8012'
+            } else {
+                downipcc = 'http://10.65.78.23:18600'
+                previewipcc = 'http://10.65.78.23:8012'
             }
-            apiGetevaluationdeptnoticeFilePreview(params).then(datas =>{
-                if (datas) {
-                    // const blob = new Blob([datas], {type: 'application/pdf'})
-                    // const url = URL.createObjectURL(blob)
-                    // window.open(url)
-                    // console.log('files', datas)
-                    window.open(datas.data, 'target')
-                }
-            })
+            let downUrl = `${downipcc}/f-center/hadoop/hdfs/download?path=${it.fileUrl}`
+            let previewUrl = `${previewipcc}/onlinePreview?hdfs=true&url=${encodeURIComponent(downUrl)}`
+            window.open(previewUrl)
         },
     }
 }