diff --git a/common/config.js b/common/config.js index 0b3b001..a37ceb8 100644 --- a/common/config.js +++ b/common/config.js @@ -30,5 +30,5 @@ const config = { // config.baseUrl = 'http://183.230.235.66:11010/api'; -config.baseUrl = 'http://818aa9b.r28.cpolar.top'; +config.baseUrl = 'http://9143b75.r28.cpolar.top'; export default config; diff --git a/common/http.api.js b/common/http.api.js index 7207a7a..7a95542 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -35,12 +35,14 @@ const install = (Vue, vm) => { addOrder2:(params = {})=>vm.$u.post(config.adminPath+'/property/mobile/workOrders',params), //修改订单 updateOrder:(params = {})=>vm.$u.put(config.adminPath+'/property/workOrders',params), + updateOrder2:(params = {})=>vm.$u.put(config.adminPath+'/property/mobile/workOrders',params), //获取处理人 getHandler:(params = {})=>vm.$u.get(config.adminPath+'/property/enum-fetcher/enum-values/getServiceWorkOrdersHandler',params), getHandler2:(params = {})=>vm.$u.get(config.adminPath+'/property/enum-fetcher/enum-values/getAccount',params), + getHandler3:(params = {}, type) => vm.$u.get(config.adminPath+`/property/enum-fetcher/enum-getShiftScheduler/${type}`,params), //会议列表 getMeetings:(params = {})=>vm.$u.get(config.adminPath+'/property/roomBooking/list',params), @@ -57,6 +59,7 @@ const install = (Vue, vm) => { warnsProcess:(params = {})=>vm.$u.post(config.adminPath+'/sis/alarmEvents/complete',params), getWarnDetail:(params = {}, id) => vm.$u.get(config.adminPath+`/sis/alarmEvents/${id}`,params), + getWarnEventInfo:(params = {}, alarmId) => vm.$u.get(config.adminPath+`/sis/alarmEventAttachments/query/${alarmId}`,params), //巡检任务列表 getInspection:(params = {})=>vm.$u.get(config.adminPath+'/property/item/list',params), diff --git a/components/SelectUser.vue b/components/SelectUser.vue index a7f6b51..02a0def 100644 --- a/components/SelectUser.vue +++ b/components/SelectUser.vue @@ -19,7 +19,7 @@ - + {{ item.name }}（{{ item.department }}） @@ -64,7 +64,7 @@ computed: { filteredList() { if (!this.keyword) return this.list; - return this.list.filter(item => item.name.includes(this.keyword) || item.id.includes(this.keyword)); + return this.list.filter(item => item.name.includes(this.keyword) || item.value.includes(this.keyword)); } }, methods: { @@ -74,7 +74,7 @@ selectUser(item) { if (this.multiple) { if (this.isSelected(item)) { - this.selected = this.selected.filter(i => i.id !== item.id); + this.selected = this.selected.filter(i => i.value !== item.value); } else { this.selected.push(item); } @@ -83,7 +83,7 @@ } }, isSelected(item) { - return this.selected.some(i => i.id === item.id); + return this.selected.some(i => i.value === item.value); }, confirm() { this.$emit('confirm', this.selected); diff --git a/pages/sys/login/login.vue b/pages/sys/login/login.vue index 07c49df..9cf7ccd 100644 --- a/pages/sys/login/login.vue +++ b/pages/sys/login/login.vue @@ -14,7 +14,7 @@ - + diff --git a/pages/sys/workbench/earlyWarning/warnDetail.vue b/pages/sys/workbench/earlyWarning/warnDetail.vue index 7beeb1a..47b44d5 100644 --- a/pages/sys/workbench/earlyWarning/warnDetail.vue +++ b/pages/sys/workbench/earlyWarning/warnDetail.vue @@ -136,11 +136,11 @@ export default { } }, created() { - this.loadDetail(); + this.loadEevetInfo(); }, methods: { - async loadDetail() { - let res = await this.$u.api.getWarnDetail({}, this.warnInfo.id); + async loadEevetInfo() { + let res = await this.$u.api.getWarnEventInfo({}, this.warnInfo.id); if (res.code == "200") { } diff --git a/pages/sys/workbench/order/order.vue b/pages/sys/workbench/order/order.vue index 40dc294..3cc3403 100644 --- a/pages/sys/workbench/order/order.vue +++ b/pages/sys/workbench/order/order.vue @@ -4,7 +4,7 @@ - {{ !selectedFilters.type || selectedFilters.type.orderTypeName === '全部' ? '工单类型' : selectedFilters.type.orderTypeName }} + {{ (!selectedFilters.type || selectedFilters.type.orderTypeName === '全部') ? '工单类型' : (selectedFilters.type.orderTypeName.length > 5 ? selectedFilters.type.orderTypeName.substring(0, 5) + '...' : selectedFilters.type.orderTypeName) }} @@ -19,7 +19,7 @@ - {{ !selectedFilters.status || selectedFilters.status.name === '全部' ? '工单状态' : selectedFilters.status.name }} + {{ (!selectedFilters.status || selectedFilters.status.name === '全部') ? '工单状态' : (selectedFilters.status.name.length > 5 ? selectedFilters.status.name.substring(0, 5) + '...' : selectedFilters.status.name) }} @@ -33,8 +33,8 @@ - - {{ !selectedFilters.handler || selectedFilters.handler.name === '全部' ? '处理人' : selectedFilters.handler.name }} + + {{ (!selectedFilters.handler || selectedFilters.handler.name === '全部') ? '处理人' : (selectedFilters.handler.name.length > 5 ? selectedFilters.handler.name.substring(0, 5) + '...' : selectedFilters.handler.name) }} @@ -102,6 +102,7 @@ export default { data() { return { + tabs: ["待办", "全部"], activeTab: 0, // 每个 tab 分页数据 @@ -123,6 +124,7 @@ export default { typeList: [{ orderTypeName: '全部' }], statusList: [], handlerList: [{ name: "全部" }], + isManager: false, }; }, computed: { @@ -136,10 +138,17 @@ export default { created() { this.loadFilterData() this.onRefresh(); + this.isManager = this.vuex_user.roles[0].roleId == 1 + }, + onShow() { + uni.$once('refreshData', () => { + this.onRefresh() + }); }, methods: { async changeTab(idx) { this.activeTab = idx; + console.log('t1',"11111111") if (!this.tabLoaded[idx]) { this.isRefreshing = true; await this.onRefresh(); @@ -256,206 +265,206 @@ export default { }, }, }; - - - \ No newline at end of file diff --git a/pages/sys/workbench/order/orderDetail.vue b/pages/sys/workbench/order/orderDetail.vue index 8726447..a8d0e63 100644 --- a/pages/sys/workbench/order/orderDetail.vue +++ b/pages/sys/workbench/order/orderDetail.vue @@ -38,22 +38,23 @@ - + - + @click="transfer(1)">{{this.isManager ? '指派':this.detailStep == 2 ? '完成':'开始'}} + -