diff --git a/pages/home/detail/eventHandle.vue b/pages/home/detail/eventHandle.vue
index bf40ea6..f108610 100644
--- a/pages/home/detail/eventHandle.vue
+++ b/pages/home/detail/eventHandle.vue
@@ -33,7 +33,7 @@
报警区域：
- {{eventDetail.area_.name}}
+ {{eventDetail.area_.name}}
@@ -41,7 +41,7 @@
触发人：
- {{eventDetail.employee_.name}}
+ {{eventDetail.employee_.name}}
@@ -49,7 +49,7 @@
触发人部门：
- {{eventDetail.employee_.belong_dept_.name}}
+ {{eventDetail.employee_.belong_dept_name}}
@@ -73,8 +73,8 @@
事件截图：
-
-
+
+
@@ -288,10 +288,12 @@
}
.form-img {
- width: 600upx;
+/* width: 600upx; */
height: 300upx;
}
-
+ .form-img-face{
+ width: 250upx;
+ }
/* radios */
uni-radio-group {
diff --git a/pages/home/detail/ticketHandle.vue b/pages/home/detail/ticketHandle.vue
index 464869d..7ef8ce6 100644
--- a/pages/home/detail/ticketHandle.vue
+++ b/pages/home/detail/ticketHandle.vue
@@ -525,15 +525,12 @@
that.type = params.type;
},
onShow() {
- debugger;
- console.log(this.type)
if (this.cateType === 'visit') {
this.getVisit();
} else if (this.cateType === 'rpj') {
this.getRpj();
} else {
this.getOpl();
- // this.getCloseDos();
}
this.getticketItem();
this.getBtns();
diff --git a/pages/home/list/event.vue b/pages/home/list/event.vue
index 54acac8..7af06a5 100644
--- a/pages/home/list/event.vue
+++ b/pages/home/list/event.vue
@@ -22,10 +22,10 @@
事件类型：
{{cate.name}}
- 报警区域：{{event.area_.name}}
+ 报警区域：{{event.area_.name}}
触发人：{{event.employee_.name}}
触发事件：{{event.operation_name}}
-
+ 触发人部门：{{event.employee_.belong_dept_name}}
触发时间：{{event.create_time}}
@@ -89,10 +89,12 @@
let that = this;
let params = {page: this.page};
that.$u.api.eventList(params).then(res => {
- that.eventList = res.results;
- console.log(that.eventList);
- debugger;
- if(res.results.length>0){}else{
+ if(res.results.length>0){
+ res.results.forEach(item=>{
+ that.eventList.push(item);
+ })
+
+ }else{
uni.showToast({
title: "已全部加载",
icon: 'none'
diff --git a/pages/home/list/ticket.vue b/pages/home/list/ticket.vue
index 6550551..2f18915 100644
--- a/pages/home/list/ticket.vue
+++ b/pages/home/list/ticket.vue
@@ -116,10 +116,12 @@
})
},
ticketHandle(val, type) {
+ debugger;
let projectId = val.ticket_data.visit ? val.ticket_data.visit : val.ticket_data.rpj ? val.ticket_data.rpj :
val.ticket_data.opl; //项目、许可证Id visit
let catetype = val.workflow_.key;
const params = `?ticketId=${val.id}&projectId=${projectId}&cateType=${catetype}&type=${type}`;
+ debugger;
uni.navigateTo({
url: '../detail/ticketHandle' + params,
})
diff --git a/store/index.js b/store/index.js
index 62a025c..d3f0d74 100644
--- a/store/index.js
+++ b/store/index.js
@@ -37,38 +37,8 @@ const store = new Vuex.Store({
vuex_appid: 'wxf7d6140f507466be',
vuex_login: 'http://qyjy.ctc-zc.com/h5/',
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_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_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: {
$uStore(state, payload) {