This commit is contained in:
shijing 2022-09-16 11:30:29 +08:00
parent 4e85fb5541
commit c33363b712
5 changed files with 19 additions and 46 deletions

View File

@ -33,7 +33,7 @@
<text class="form-left-text">报警区域</text> <text class="form-left-text">报警区域</text>
</view> </view>
<view class="form-right"> <view class="form-right">
<view v-if="eventDetail.area_">{{eventDetail.area_.name}}</view> <view v-if="eventDetail.area_!=null">{{eventDetail.area_.name}}</view>
</view> </view>
</view> </view>
<view class="form-item" v-if="eventDetail.obj_cate==='people'"> <view class="form-item" v-if="eventDetail.obj_cate==='people'">
@ -41,7 +41,7 @@
<text class="form-left-text">触发人</text> <text class="form-left-text">触发人</text>
</view> </view>
<view class="form-right"> <view class="form-right">
<view v-if="eventDetail.employee_">{{eventDetail.employee_.name}}</view> <view v-if="eventDetail.employee_!=null">{{eventDetail.employee_.name}}</view>
</view> </view>
</view> </view>
<view class="form-item" v-if="eventDetail.obj_cate==='people'"> <view class="form-item" v-if="eventDetail.obj_cate==='people'">
@ -49,7 +49,7 @@
<text class="form-left-text">触发人部门</text> <text class="form-left-text">触发人部门</text>
</view> </view>
<view class="form-right"> <view class="form-right">
<view v-if="eventDetail.employee_">{{eventDetail.employee_.belong_dept_.name}}</view> <view v-if="eventDetail.employee_!=null">{{eventDetail.employee_.belong_dept_name}}</view>
</view> </view>
</view> </view>
<view class="form-item" v-if="eventDetail.obj_cate==='opl'"> <view class="form-item" v-if="eventDetail.obj_cate==='opl'">
@ -73,8 +73,8 @@
<text class="form-left-text">事件截图</text> <text class="form-left-text">事件截图</text>
</view> </view>
<view class="form-right" style=""> <view class="form-right" style="">
<image class="form-img" :src="eventDetail.global_img_f"></image> <image fit="cover" class="form-img" :src="eventDetail.global_img_f"></image>
<image class="form-img" v-if="eventDetail.face_img_f!==null&&eventDetail.face_img_f!==undefined" :src="eventDetail.face_img_f"></image> <image fit="cover" class="form-img form-img-face" v-if="eventDetail.face_img_f!==null&&eventDetail.face_img_f!==undefined" :src="eventDetail.face_img_f"></image>
</view> </view>
</view> </view>
</view> </view>
@ -288,10 +288,12 @@
} }
.form-img { .form-img {
width: 600upx; /* width: 600upx; */
height: 300upx; height: 300upx;
} }
.form-img-face{
width: 250upx;
}
/* radios */ /* radios */
uni-radio-group { uni-radio-group {

View File

@ -525,15 +525,12 @@
that.type = params.type; that.type = params.type;
}, },
onShow() { onShow() {
debugger;
console.log(this.type)
if (this.cateType === 'visit') { if (this.cateType === 'visit') {
this.getVisit(); this.getVisit();
} else if (this.cateType === 'rpj') { } else if (this.cateType === 'rpj') {
this.getRpj(); this.getRpj();
} else { } else {
this.getOpl(); this.getOpl();
// this.getCloseDos();
} }
this.getticketItem(); this.getticketItem();
this.getBtns(); this.getBtns();

View File

@ -22,10 +22,10 @@
<view class="info-details">事件类型 <view class="info-details">事件类型
<text v-for="cate in event.cates_">{{cate.name}}</text> <text v-for="cate in event.cates_">{{cate.name}}</text>
</view> </view>
<view class="info-details">报警区域{{event.area_.name}}</view> <view class="info-details" v-if="event.area_!==null">报警区域{{event.area_.name}}</view>
<view class="info-details" v-if="event.obj_cate==='people'&&event.employee_!=null">触发人{{event.employee_.name}}</view> <view class="info-details" v-if="event.obj_cate==='people'&&event.employee_!=null">触发人{{event.employee_.name}}</view>
<view class="info-details" v-else-if="event.obj_cate==='opl'">触发事件{{event.operation_name}}</view> <view class="info-details" v-else-if="event.obj_cate==='opl'">触发事件{{event.operation_name}}</view>
<!-- <view class="info-details" v-if="event.obj_cate==='people'&&event.employee_!=null">触发人部门{{event.employee_.belong_dept_.name}} </view> --> <view class="info-details" v-if="event.employee_!=null">触发人部门{{event.employee_.belong_dept_name}} </view>
<view class="info-details">触发时间{{event.create_time}} </view> <view class="info-details">触发时间{{event.create_time}} </view>
</view> </view>
<view class="bottom-btns"> <view class="bottom-btns">
@ -89,10 +89,12 @@
let that = this; let that = this;
let params = {page: this.page}; let params = {page: this.page};
that.$u.api.eventList(params).then(res => { that.$u.api.eventList(params).then(res => {
that.eventList = res.results; if(res.results.length>0){
console.log(that.eventList); res.results.forEach(item=>{
debugger; that.eventList.push(item);
if(res.results.length>0){}else{ })
}else{
uni.showToast({ uni.showToast({
title: "已全部加载", title: "已全部加载",
icon: 'none' icon: 'none'

View File

@ -116,10 +116,12 @@
}) })
}, },
ticketHandle(val, type) { ticketHandle(val, type) {
debugger;
let projectId = val.ticket_data.visit ? val.ticket_data.visit : val.ticket_data.rpj ? val.ticket_data.rpj : let projectId = val.ticket_data.visit ? val.ticket_data.visit : val.ticket_data.rpj ? val.ticket_data.rpj :
val.ticket_data.opl; //Id visit val.ticket_data.opl; //Id visit
let catetype = val.workflow_.key; let catetype = val.workflow_.key;
const params = `?ticketId=${val.id}&projectId=${projectId}&cateType=${catetype}&type=${type}`; const params = `?ticketId=${val.id}&projectId=${projectId}&cateType=${catetype}&type=${type}`;
debugger;
uni.navigateTo({ uni.navigateTo({
url: '../detail/ticketHandle' + params, url: '../detail/ticketHandle' + params,
}) })

View File

@ -37,38 +37,8 @@ const store = new Vuex.Store({
vuex_appid: 'wxf7d6140f507466be', vuex_appid: 'wxf7d6140f507466be',
vuex_login: 'http://qyjy.ctc-zc.com/h5/', vuex_login: 'http://qyjy.ctc-zc.com/h5/',
vuex_host: 'http://127.0.0.1:8000', vuex_host: 'http://127.0.0.1:8000',
//vuex_api: 'http://47.95.0.242:9101/api',
vuex_api: 'http://10.99.5.79:20309/api', vuex_api: 'http://10.99.5.79:20309/api',
// vuex_apifile: 'http://127.0.0.1:8000/api/file/',
// vuex_host: 'https://testsearch.ctc.ac.cn',
// vuex_api: 'https://testsearch.ctc.ac.cn/api',
vuex_apifile: 'https://testsearch.ctc.ac.cn/api/file/', vuex_apifile: 'https://testsearch.ctc.ac.cn/api/file/',
// 如果vuex_version无需保存到本地永久存储无需lifeData.vuex_version方式
// vuex_version: '1.0.1',
// vuex_demo: '绛紫',
// 自定义tabbar数据
// vuex_tabbar: [{
// iconPath: "/static/uview/example/component.png",
// selectedIconPath: "/static/uview/example/component_select.png",
// text: '组件',
// pagePath: '/pages/example/components'
// },
// {
// iconPath: "/static/uview/example/js.png",
// selectedIconPath: "/static/uview/example/js_select.png",
// text: '工具',
// midButton: true,
// pagePath: '/pages/example/js'
// },
// {
// iconPath: "/static/uview/example/template.png",
// selectedIconPath: "/static/uview/example/template_select.png",
// text: '模板',
// pagePath: '/pages/example/template'
// }
// ]
}, },
mutations: { mutations: {
$uStore(state, payload) { $uStore(state, payload) {