|
@@ -201,9 +201,9 @@
|
|
|
<el-link type="success" v-if="item.eventCode!=null&&item.type ==1" @click="showEventDialog_message(item.eventCode)">
|
|
|
查看事件详情
|
|
|
</el-link>
|
|
|
- <div class="btm-r-pop-info-btm-btn" >
|
|
|
- <el-button type="primary" @click="selectMessageById(item.id)">标记已读
|
|
|
- </el-button>
|
|
|
+ <div class="btm-r-pop-info-btm-btn" v-else>
|
|
|
+ <el-button type="primary" @click="selectMessageById(item.id)">标记已读
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -436,7 +436,8 @@
|
|
|
v-for="(itemfile,indexfile) in item.fileVOs">
|
|
|
<el-image :src="itemfile.fileUrl" v-if="itemfile.fileType=='image'"
|
|
|
:preview-src-list="assetTypeAnImage(item.fileVOs)"
|
|
|
- style="width:3rem; height:3rem;margin: 2px;" :z-index="10000" :title="itemfile.fileName">
|
|
|
+ :z-index="10000"
|
|
|
+ style="width:3rem; height:3rem;margin: 2px;" :title="itemfile.fileName">
|
|
|
</el-image>
|
|
|
<img v-else-if="itemfile.fileType=='video'"
|
|
|
style="width:3rem; height:3rem;margin: 2px;"
|
|
@@ -472,14 +473,14 @@
|
|
|
<div class="this-con h-25 no-padding">
|
|
|
<div class="z-info-list" style="margin-top: 0;">
|
|
|
<div class="z-info-btm-grp">
|
|
|
-<!-- <div class="z-info-btm-grp-top">-->
|
|
|
-<!-- <div class="z-info-btm-grp-left">-->
|
|
|
-<!-- <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- </div>-->
|
|
|
-<!-- </div>-->
|
|
|
+ <!-- <div class="z-info-btm-grp-top">-->
|
|
|
+ <!-- <div class="z-info-btm-grp-left">-->
|
|
|
+ <!-- <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- </div>-->
|
|
|
+ <!-- </div>-->
|
|
|
<div class="z-info-btm-input">
|
|
|
<el-input type="textarea" v-model="eventLog" :autosize="{ minRows: 7, maxRows: 7}"
|
|
|
placeholder="请输入反馈信息">
|
|
@@ -537,17 +538,12 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="附件" prop="schedulePictures" v-if="eventStatusButton=='sh'">
|
|
|
<ImageUpload class="sj-upload" ref="ImageUpload" :limit="10" :fileType="['jpg', 'png','jpeg']" :value="uploadAttachList"
|
|
|
- <ImageUpload ref="ImageUpload" :limit="10" :fileType="['jpg', 'png','jpeg']" :value="uploadAttachList"
|
|
|
@input="getUrl"></ImageUpload>
|
|
|
</el-form-item>
|
|
|
- <el-button size="mini" type="primary" v-if="eventStatusButton=='sh'"
|
|
|
- class="sj-icon-btn"
|
|
|
- icon="el-icon-circle-check"
|
|
|
+ <el-button class="sj-icon-btn" icon="el-icon-check" size="mini" type="primary" v-if="eventStatusButton=='sh'"
|
|
|
@click="updateCentereventTEventcatalogueStatus('shtg',true)">通过
|
|
|
</el-button>
|
|
|
- <el-button size="mini" type="primary" v-if="eventStatusButton=='sh'"
|
|
|
- class="sj-icon-btn"
|
|
|
- icon="el-icon-circle-close"
|
|
|
+ <el-button class="sj-icon-btn" icon="el-icon-circle-close" size="mini" type="primary" v-if="eventStatusButton=='sh'"
|
|
|
@click="updateCentereventTEventcatalogueStatus('shbtg',true)">不通过
|
|
|
</el-button>
|
|
|
</el-form>
|
|
@@ -923,8 +919,8 @@ export default {
|
|
|
this.messageList = response.data
|
|
|
this.messageCount = response.data.length
|
|
|
})
|
|
|
- this.initWebSocket('MESSAGE_SOCKET', '/messagePush/', this.websockSid.userId)
|
|
|
- this.initWebSocket('MESSAGE_SOCKET', '/messageDeptPush/', this.websockSid.deptId)
|
|
|
+ this.initWebSocket('MESSAGE_SOCKET', '/messagePush/', this.websockSid.userId)
|
|
|
+ this.initWebSocket('MESSAGE_SOCKET', '/messageDeptPush/', this.websockSid.deptId)
|
|
|
|
|
|
},
|
|
|
filterbanNode(value, data) {
|