diff --git a/src/project/xbot/AppConversation/AppConversation.vue b/src/apps/AppConversationXbot/AppConversationXbot.vue similarity index 100% rename from src/project/xbot/AppConversation/AppConversation.vue rename to src/apps/AppConversationXbot/AppConversationXbot.vue diff --git a/src/project/xbot/AppConversation/conversationDetail.vue b/src/apps/AppConversationXbot/conversationDetail.vue similarity index 100% rename from src/project/xbot/AppConversation/conversationDetail.vue rename to src/apps/AppConversationXbot/conversationDetail.vue diff --git a/src/project/xbot/AppConversation/groupDetail.vue b/src/apps/AppConversationXbot/groupDetail.vue similarity index 100% rename from src/project/xbot/AppConversation/groupDetail.vue rename to src/apps/AppConversationXbot/groupDetail.vue diff --git a/src/project/xbot/AppConversation/img/app-icon.png b/src/apps/AppConversationXbot/img/app-icon.png similarity index 100% rename from src/project/xbot/AppConversation/img/app-icon.png rename to src/apps/AppConversationXbot/img/app-icon.png diff --git a/src/project/xbot/AppConversation/img/app-mini-icon.png b/src/apps/AppConversationXbot/img/app-mini-icon.png similarity index 100% rename from src/project/xbot/AppConversation/img/app-mini-icon.png rename to src/apps/AppConversationXbot/img/app-mini-icon.png diff --git a/src/project/xbot/AppConversation/img/del-icon.png b/src/apps/AppConversationXbot/img/del-icon.png similarity index 100% rename from src/project/xbot/AppConversation/img/del-icon.png rename to src/apps/AppConversationXbot/img/del-icon.png diff --git a/src/project/xbot/AppConversation/img/dept-img.png b/src/apps/AppConversationXbot/img/dept-img.png similarity index 100% rename from src/project/xbot/AppConversation/img/dept-img.png rename to src/apps/AppConversationXbot/img/dept-img.png diff --git a/src/project/xbot/AppConversation/img/down-icon.png b/src/apps/AppConversationXbot/img/down-icon.png similarity index 100% rename from src/project/xbot/AppConversation/img/down-icon.png rename to src/apps/AppConversationXbot/img/down-icon.png diff --git a/src/project/xbot/AppConversation/img/fail-icon.png b/src/apps/AppConversationXbot/img/fail-icon.png similarity index 100% rename from src/project/xbot/AppConversation/img/fail-icon.png rename to src/apps/AppConversationXbot/img/fail-icon.png diff --git a/src/project/xbot/AppConversation/img/group-img.png b/src/apps/AppConversationXbot/img/group-img.png similarity index 100% rename from src/project/xbot/AppConversation/img/group-img.png rename to src/apps/AppConversationXbot/img/group-img.png diff --git a/src/project/xbot/AppConversation/img/ic-man@2x.png b/src/apps/AppConversationXbot/img/ic-man@2x.png similarity index 100% rename from src/project/xbot/AppConversation/img/ic-man@2x.png rename to src/apps/AppConversationXbot/img/ic-man@2x.png diff --git a/src/project/xbot/AppConversation/img/ic-woman@2x.png b/src/apps/AppConversationXbot/img/ic-woman@2x.png similarity index 100% rename from src/project/xbot/AppConversation/img/ic-woman@2x.png rename to src/apps/AppConversationXbot/img/ic-woman@2x.png diff --git a/src/project/xbot/AppConversation/img/retransmission-icon.png b/src/apps/AppConversationXbot/img/retransmission-icon.png similarity index 100% rename from src/project/xbot/AppConversation/img/retransmission-icon.png rename to src/apps/AppConversationXbot/img/retransmission-icon.png diff --git a/src/project/xbot/AppConversation/img/user-img.png b/src/apps/AppConversationXbot/img/user-img.png similarity index 100% rename from src/project/xbot/AppConversation/img/user-img.png rename to src/apps/AppConversationXbot/img/user-img.png diff --git a/src/project/xbot/AppConversation/img/wechat-icon.png b/src/apps/AppConversationXbot/img/wechat-icon.png similarity index 100% rename from src/project/xbot/AppConversation/img/wechat-icon.png rename to src/apps/AppConversationXbot/img/wechat-icon.png diff --git a/src/project/xbot/AppConversation/list.vue b/src/apps/AppConversationXbot/list.vue similarity index 100% rename from src/project/xbot/AppConversation/list.vue rename to src/apps/AppConversationXbot/list.vue diff --git a/src/project/xbot/AppConversation/triggerAlarm.vue b/src/apps/AppConversationXbot/triggerAlarm.vue similarity index 100% rename from src/project/xbot/AppConversation/triggerAlarm.vue rename to src/apps/AppConversationXbot/triggerAlarm.vue diff --git a/src/project/xbot/AppConversation/userInfo.vue b/src/apps/AppConversationXbot/userInfo.vue similarity index 100% rename from src/project/xbot/AppConversation/userInfo.vue rename to src/apps/AppConversationXbot/userInfo.vue diff --git a/src/project/xbot/AppDataStatistics/AppDataOverview.vue b/src/apps/AppDataStatisticsXbot/AppDataOverview.vue similarity index 100% rename from src/project/xbot/AppDataStatistics/AppDataOverview.vue rename to src/apps/AppDataStatisticsXbot/AppDataOverview.vue diff --git a/src/project/xbot/AppDataStatistics/AppDataStatistics.vue b/src/apps/AppDataStatisticsXbot/AppDataStatisticsXbot.vue similarity index 100% rename from src/project/xbot/AppDataStatistics/AppDataStatistics.vue rename to src/apps/AppDataStatisticsXbot/AppDataStatisticsXbot.vue diff --git a/src/project/xbot/AppDataStatistics/components/message.vue b/src/apps/AppDataStatisticsXbot/components/message.vue similarity index 100% rename from src/project/xbot/AppDataStatistics/components/message.vue rename to src/apps/AppDataStatisticsXbot/components/message.vue diff --git a/src/project/xbot/AppDataStatistics/components/sensitive.vue b/src/apps/AppDataStatisticsXbot/components/sensitive.vue similarity index 100% rename from src/project/xbot/AppDataStatistics/components/sensitive.vue rename to src/apps/AppDataStatisticsXbot/components/sensitive.vue diff --git a/src/project/xbot/AppDataStatistics/components/wechat.vue b/src/apps/AppDataStatisticsXbot/components/wechat.vue similarity index 100% rename from src/project/xbot/AppDataStatistics/components/wechat.vue rename to src/apps/AppDataStatisticsXbot/components/wechat.vue diff --git a/src/project/xbot/AppDataStatistics/img/down.png b/src/apps/AppDataStatisticsXbot/img/down.png similarity index 100% rename from src/project/xbot/AppDataStatistics/img/down.png rename to src/apps/AppDataStatisticsXbot/img/down.png diff --git a/src/project/xbot/AppDataStatistics/img/location.png b/src/apps/AppDataStatisticsXbot/img/location.png similarity index 100% rename from src/project/xbot/AppDataStatistics/img/location.png rename to src/apps/AppDataStatisticsXbot/img/location.png diff --git a/src/project/xbot/AppDataStatistics/img/up.png b/src/apps/AppDataStatisticsXbot/img/up.png similarity index 100% rename from src/project/xbot/AppDataStatistics/img/up.png rename to src/apps/AppDataStatisticsXbot/img/up.png diff --git a/src/project/xbot/AppSensitive/AppSensitive.vue b/src/apps/AppSensitiveXbot/AppSensitiveXbot.vue similarity index 100% rename from src/project/xbot/AppSensitive/AppSensitive.vue rename to src/apps/AppSensitiveXbot/AppSensitiveXbot.vue diff --git a/src/project/xbot/AppSensitive/conversationRecord.vue b/src/apps/AppSensitiveXbot/conversationRecord.vue similarity index 99% rename from src/project/xbot/AppSensitive/conversationRecord.vue rename to src/apps/AppSensitiveXbot/conversationRecord.vue index f18d9122..e80cc23e 100644 --- a/src/project/xbot/AppSensitive/conversationRecord.vue +++ b/src/apps/AppSensitiveXbot/conversationRecord.vue @@ -184,7 +184,7 @@ export default { this.getListInit() }, getKeywordList() { - this.$http.post(`/app/appsessionarchiveinfo/listForXbot`, null, { + this.$http.post(`/app/appsessionarchiveinfo/listByKeywordRecord`, null, { params: { userId: this.id, size: 10, @@ -194,7 +194,7 @@ export default { content: this.keyword, startTime: this.time ? this.time[0] : '', endTime: this.time ? this.time[1] : '', - seq: this.params.seq, + seq: '', msgId: this.params.msgId } }).then(res => { @@ -244,7 +244,7 @@ export default { this.preveHeight = res.height }).exec(); } - this.$http.post(`/app/appsessionarchiveinfo/list`, null, { + this.$http.post(`/app/appsessionarchiveinfo/listForXbot`, null, { params: { userId: this.id, current: this.current, diff --git a/src/project/xbot/AppSensitive/img/app-icon.png b/src/apps/AppSensitiveXbot/img/app-icon.png similarity index 100% rename from src/project/xbot/AppSensitive/img/app-icon.png rename to src/apps/AppSensitiveXbot/img/app-icon.png diff --git a/src/project/xbot/AppSensitive/img/app-mini-icon.png b/src/apps/AppSensitiveXbot/img/app-mini-icon.png similarity index 100% rename from src/project/xbot/AppSensitive/img/app-mini-icon.png rename to src/apps/AppSensitiveXbot/img/app-mini-icon.png diff --git a/src/project/xbot/AppSensitive/img/del-icon.png b/src/apps/AppSensitiveXbot/img/del-icon.png similarity index 100% rename from src/project/xbot/AppSensitive/img/del-icon.png rename to src/apps/AppSensitiveXbot/img/del-icon.png diff --git a/src/project/xbot/AppSensitive/img/down-icon.png b/src/apps/AppSensitiveXbot/img/down-icon.png similarity index 100% rename from src/project/xbot/AppSensitive/img/down-icon.png rename to src/apps/AppSensitiveXbot/img/down-icon.png diff --git a/src/project/xbot/AppSensitive/img/fail-icon.png b/src/apps/AppSensitiveXbot/img/fail-icon.png similarity index 100% rename from src/project/xbot/AppSensitive/img/fail-icon.png rename to src/apps/AppSensitiveXbot/img/fail-icon.png diff --git a/src/project/xbot/AppSensitive/img/group-img.png b/src/apps/AppSensitiveXbot/img/group-img.png similarity index 100% rename from src/project/xbot/AppSensitive/img/group-img.png rename to src/apps/AppSensitiveXbot/img/group-img.png diff --git a/src/project/xbot/AppSensitive/img/ic-man@2x.png b/src/apps/AppSensitiveXbot/img/ic-man@2x.png similarity index 100% rename from src/project/xbot/AppSensitive/img/ic-man@2x.png rename to src/apps/AppSensitiveXbot/img/ic-man@2x.png diff --git a/src/project/xbot/AppSensitive/img/ic-woman@2x.png b/src/apps/AppSensitiveXbot/img/ic-woman@2x.png similarity index 100% rename from src/project/xbot/AppSensitive/img/ic-woman@2x.png rename to src/apps/AppSensitiveXbot/img/ic-woman@2x.png diff --git a/src/project/xbot/AppSensitive/img/retransmission-icon.png b/src/apps/AppSensitiveXbot/img/retransmission-icon.png similarity index 100% rename from src/project/xbot/AppSensitive/img/retransmission-icon.png rename to src/apps/AppSensitiveXbot/img/retransmission-icon.png diff --git a/src/project/xbot/AppSensitive/img/user-img.png b/src/apps/AppSensitiveXbot/img/user-img.png similarity index 100% rename from src/project/xbot/AppSensitive/img/user-img.png rename to src/apps/AppSensitiveXbot/img/user-img.png diff --git a/src/project/xbot/AppSensitive/img/wechat-icon.png b/src/apps/AppSensitiveXbot/img/wechat-icon.png similarity index 100% rename from src/project/xbot/AppSensitive/img/wechat-icon.png rename to src/apps/AppSensitiveXbot/img/wechat-icon.png diff --git a/src/apps/AppWorkOrderXbot/AppWorkOrderXbot.vue b/src/apps/AppWorkOrderXbot/AppWorkOrderXbot.vue new file mode 100644 index 00000000..0fd85e95 --- /dev/null +++ b/src/apps/AppWorkOrderXbot/AppWorkOrderXbot.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/project/xbot/AppWorkOrder/Content.vue b/src/apps/AppWorkOrderXbot/Content.vue similarity index 95% rename from src/project/xbot/AppWorkOrder/Content.vue rename to src/apps/AppWorkOrderXbot/Content.vue index 2538a521..f319cf40 100644 --- a/src/project/xbot/AppWorkOrder/Content.vue +++ b/src/apps/AppWorkOrderXbot/Content.vue @@ -3,8 +3,7 @@
- - + {{ forms.user[0].name }} 请选择 @@ -107,6 +106,7 @@ export default { }, handleSelectUser(e) { + console.log(e) this.forms.user = e this.forms.handleUserId = e[0].id this.forms.handleUserName = e[0].name @@ -125,6 +125,7 @@ export default { this.submit() }, submit() { //status 1转交 2拒绝受理 3我已办结 + if(this.flag) return var url = '', successText = '', params = '' if (this.status == 1) { url = `/app/appsessionarchivereportinfo/transfer` @@ -153,6 +154,7 @@ export default { params.id = this.id this.$http.post(url, params).then((res) => { if (res.code == 0) { + this.flag = true this.$u.toast(successText) uni.$emit('updateDeatil') uni.$emit('getListInit') @@ -171,7 +173,7 @@ export default { this.forms.type = e[0].value }, toSelectUser() { - uni.navigateTo({url: './SelectUser'}) + uni.navigateTo({url: './SelectDeptUser'}) }, }, } diff --git a/src/project/xbot/AppWorkOrder/Detail.vue b/src/apps/AppWorkOrderXbot/Detail.vue similarity index 93% rename from src/project/xbot/AppWorkOrder/Detail.vue rename to src/apps/AppWorkOrderXbot/Detail.vue index 836472d8..e4487d13 100644 --- a/src/project/xbot/AppWorkOrder/Detail.vue +++ b/src/apps/AppWorkOrderXbot/Detail.vue @@ -8,7 +8,7 @@
{{ data.createTime }}
- 编辑 + 编辑
@@ -105,7 +105,20 @@
我来受理
-
前往办理
+
+
+ + 转交事件 +
+
+ + 拒绝受理 +
+ +
前往办理
+
+ + @@ -343,6 +356,7 @@ uni-page-body { .plan { padding: 0 32px; + background-color: #fff; .nav { padding: 26px 0; @@ -351,6 +365,7 @@ uni-page-body { .cards { position: relative; padding-bottom: 80px; + background-color: #fff; .cardss { display: flex; @@ -495,6 +510,10 @@ uni-page-body { font-weight: 500; color: #fff; } + + .width78 { + width: 78%; + } } .endDoIt { diff --git a/src/project/xbot/AppWorkOrder/Edit.vue b/src/apps/AppWorkOrderXbot/Edit.vue similarity index 88% rename from src/project/xbot/AppWorkOrder/Edit.vue rename to src/apps/AppWorkOrderXbot/Edit.vue index 17a861f5..176caa04 100644 --- a/src/project/xbot/AppWorkOrder/Edit.vue +++ b/src/apps/AppWorkOrderXbot/Edit.vue @@ -11,8 +11,11 @@
- + + + @@ -58,7 +61,8 @@ export default { flag: false, show: false, flList: [], - id: '' + id: '', + selectGird: {} } }, computed: { @@ -74,6 +78,7 @@ export default { document.title = '事件编辑' uni.$on('chooseLat', res => { this.forms.mapInfo = {...res} + this.$forceUpdate() }) }, methods: { @@ -86,20 +91,14 @@ export default { lng: res.data.lng, address: res.data.address, } - } - }) - }, - typeList() { - this.$http.post(`/app/appresidentreportgroup/list?current=1&size=100000`).then((res) => { - if (res.code == 0) { - this.flList = res.data.records.map(v => { - return { - label: v.id, - value: v.groupName + this.forms.typeName = res.data.type + var list = this.$dict.getDict('xbotReportEventType') + list.map((item) => { + if(item.dictValue == res.data.type) { + this.forms.typeName = item.dictName } }) - this.$forceUpdate() - this.getDetail() + this.selectGird = { girdId: res.data.girdId|| '', girdName: res.data.girdName || ''} } }) }, @@ -108,6 +107,7 @@ export default { this.forms.typeName = e[0].label }, confirmGird(v) { + console.log(v) this.forms.girdId = v.id this.forms.girdName = v.girdName }, @@ -137,6 +137,8 @@ export default { // return this.$u.toast('请输入手机号') // } this.flag = true + this.forms.girdId = this.selectGird.girdId + this.forms.girdName = this.selectGird.girdName this.$http.post(`/app/appsessionarchivereportinfo/update`, {...this.forms, ...this.forms.mapInfo}).then((res) => { if (res.code == 0) { this.$u.toast('事件编辑成功') diff --git a/src/project/xbot/AppWorkOrder/AppWorkOrder.vue b/src/apps/AppWorkOrderXbot/List.vue similarity index 97% rename from src/project/xbot/AppWorkOrder/AppWorkOrder.vue rename to src/apps/AppWorkOrderXbot/List.vue index e1d37ce8..cb9b4c4f 100644 --- a/src/project/xbot/AppWorkOrder/AppWorkOrder.vue +++ b/src/apps/AppWorkOrderXbot/List.vue @@ -56,8 +56,6 @@ import {mapState} from 'vuex' export default { props: {}, - name: "AppWorkOrder", - appName: "工单管理", data() { return { datas: [], @@ -104,6 +102,15 @@ export default { }) }, methods: { + getListInit() { + this.current = 1 + this.getList() + }, + nextPage() { + this.current++ + this.getList() + }, + getList() { let {current, eventStatus, searchGrid: {id: girdId}} = this this.$http.post(`/app/appsessionarchivereportinfo/list`, null, { diff --git a/src/project/xbot/AppWorkOrder/Map.vue b/src/apps/AppWorkOrderXbot/Map.vue similarity index 100% rename from src/project/xbot/AppWorkOrder/Map.vue rename to src/apps/AppWorkOrderXbot/Map.vue diff --git a/src/apps/AppWorkOrderXbot/Statistics.vue b/src/apps/AppWorkOrderXbot/Statistics.vue new file mode 100644 index 00000000..3927e6e7 --- /dev/null +++ b/src/apps/AppWorkOrderXbot/Statistics.vue @@ -0,0 +1,375 @@ + + + + + diff --git a/src/project/xbot/AppWorkOrder/components/1.png b/src/apps/AppWorkOrderXbot/components/1.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/1.png rename to src/apps/AppWorkOrderXbot/components/1.png diff --git a/src/project/xbot/AppWorkOrder/components/22.png b/src/apps/AppWorkOrderXbot/components/22.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/22.png rename to src/apps/AppWorkOrderXbot/components/22.png diff --git a/src/project/xbot/AppWorkOrder/components/img/add-icon.png b/src/apps/AppWorkOrderXbot/components/img/add-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/add-icon.png rename to src/apps/AppWorkOrderXbot/components/img/add-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/bg-1.png b/src/apps/AppWorkOrderXbot/components/img/bg-1.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/bg-1.png rename to src/apps/AppWorkOrderXbot/components/img/bg-1.png diff --git a/src/project/xbot/AppWorkOrder/components/img/bg-2.png b/src/apps/AppWorkOrderXbot/components/img/bg-2.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/bg-2.png rename to src/apps/AppWorkOrderXbot/components/img/bg-2.png diff --git a/src/project/xbot/AppWorkOrder/components/img/bg-3.png b/src/apps/AppWorkOrderXbot/components/img/bg-3.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/bg-3.png rename to src/apps/AppWorkOrderXbot/components/img/bg-3.png diff --git a/src/project/xbot/AppWorkOrder/components/img/down-icon.png b/src/apps/AppWorkOrderXbot/components/img/down-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/down-icon.png rename to src/apps/AppWorkOrderXbot/components/img/down-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/gird--select-icon.png b/src/apps/AppWorkOrderXbot/components/img/gird--select-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/gird--select-icon.png rename to src/apps/AppWorkOrderXbot/components/img/gird--select-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/gird-icon.png b/src/apps/AppWorkOrderXbot/components/img/gird-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/gird-icon.png rename to src/apps/AppWorkOrderXbot/components/img/gird-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/handle-icon-active.png b/src/apps/AppWorkOrderXbot/components/img/handle-icon-active.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/handle-icon-active.png rename to src/apps/AppWorkOrderXbot/components/img/handle-icon-active.png diff --git a/src/project/xbot/AppWorkOrder/components/img/handle-icon.png b/src/apps/AppWorkOrderXbot/components/img/handle-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/handle-icon.png rename to src/apps/AppWorkOrderXbot/components/img/handle-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/jujue.png b/src/apps/AppWorkOrderXbot/components/img/jujue.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/jujue.png rename to src/apps/AppWorkOrderXbot/components/img/jujue.png diff --git a/src/project/xbot/AppWorkOrder/components/img/line-img.png b/src/apps/AppWorkOrderXbot/components/img/line-img.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/line-img.png rename to src/apps/AppWorkOrderXbot/components/img/line-img.png diff --git a/src/project/xbot/AppWorkOrder/components/img/local-icon.png b/src/apps/AppWorkOrderXbot/components/img/local-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/local-icon.png rename to src/apps/AppWorkOrderXbot/components/img/local-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/no-admin.png b/src/apps/AppWorkOrderXbot/components/img/no-admin.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/no-admin.png rename to src/apps/AppWorkOrderXbot/components/img/no-admin.png diff --git a/src/project/xbot/AppWorkOrder/components/img/remove-icon.png b/src/apps/AppWorkOrderXbot/components/img/remove-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/remove-icon.png rename to src/apps/AppWorkOrderXbot/components/img/remove-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/right-icon.png b/src/apps/AppWorkOrderXbot/components/img/right-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/right-icon.png rename to src/apps/AppWorkOrderXbot/components/img/right-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/search-icon.png b/src/apps/AppWorkOrderXbot/components/img/search-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/search-icon.png rename to src/apps/AppWorkOrderXbot/components/img/search-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/search.png b/src/apps/AppWorkOrderXbot/components/img/search.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/search.png rename to src/apps/AppWorkOrderXbot/components/img/search.png diff --git a/src/project/xbot/AppWorkOrder/components/img/set-icon-active.png b/src/apps/AppWorkOrderXbot/components/img/set-icon-active.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/set-icon-active.png rename to src/apps/AppWorkOrderXbot/components/img/set-icon-active.png diff --git a/src/project/xbot/AppWorkOrder/components/img/set-icon.png b/src/apps/AppWorkOrderXbot/components/img/set-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/set-icon.png rename to src/apps/AppWorkOrderXbot/components/img/set-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/setting-icon.png b/src/apps/AppWorkOrderXbot/components/img/setting-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/setting-icon.png rename to src/apps/AppWorkOrderXbot/components/img/setting-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/statistics-icon-active.png b/src/apps/AppWorkOrderXbot/components/img/statistics-icon-active.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/statistics-icon-active.png rename to src/apps/AppWorkOrderXbot/components/img/statistics-icon-active.png diff --git a/src/project/xbot/AppWorkOrder/components/img/statistics-icon.png b/src/apps/AppWorkOrderXbot/components/img/statistics-icon.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/statistics-icon.png rename to src/apps/AppWorkOrderXbot/components/img/statistics-icon.png diff --git a/src/project/xbot/AppWorkOrder/components/img/tx@2x.png b/src/apps/AppWorkOrderXbot/components/img/tx@2x.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/tx@2x.png rename to src/apps/AppWorkOrderXbot/components/img/tx@2x.png diff --git a/src/project/xbot/AppWorkOrder/components/img/user-img.png b/src/apps/AppWorkOrderXbot/components/img/user-img.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/user-img.png rename to src/apps/AppWorkOrderXbot/components/img/user-img.png diff --git a/src/project/xbot/AppWorkOrder/components/img/xz.png b/src/apps/AppWorkOrderXbot/components/img/xz.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/xz.png rename to src/apps/AppWorkOrderXbot/components/img/xz.png diff --git a/src/project/xbot/AppWorkOrder/components/img/xzh.png b/src/apps/AppWorkOrderXbot/components/img/xzh.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/xzh.png rename to src/apps/AppWorkOrderXbot/components/img/xzh.png diff --git a/src/project/xbot/AppWorkOrder/components/img/zhuanjiao.png b/src/apps/AppWorkOrderXbot/components/img/zhuanjiao.png similarity index 100% rename from src/project/xbot/AppWorkOrder/components/img/zhuanjiao.png rename to src/apps/AppWorkOrderXbot/components/img/zhuanjiao.png diff --git a/src/project/xbot/AppWorkOrder/components/yan.jpg b/src/apps/AppWorkOrderXbot/components/yan.jpg similarity index 100% rename from src/project/xbot/AppWorkOrder/components/yan.jpg rename to src/apps/AppWorkOrderXbot/components/yan.jpg diff --git a/src/apps/AppWorkOrderXbot/images/files.png b/src/apps/AppWorkOrderXbot/images/files.png new file mode 100644 index 00000000..10d53502 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/files.png differ diff --git a/src/apps/AppWorkOrderXbot/images/gird--select-icon.png b/src/apps/AppWorkOrderXbot/images/gird--select-icon.png new file mode 100644 index 00000000..205144d2 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/gird--select-icon.png differ diff --git a/src/apps/AppWorkOrderXbot/images/local-icon.png b/src/apps/AppWorkOrderXbot/images/local-icon.png new file mode 100644 index 00000000..3e23aff6 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/local-icon.png differ diff --git a/src/apps/AppWorkOrderXbot/images/pass.png b/src/apps/AppWorkOrderXbot/images/pass.png new file mode 100644 index 00000000..36f698b2 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/pass.png differ diff --git a/src/apps/AppWorkOrderXbot/images/refuse.png b/src/apps/AppWorkOrderXbot/images/refuse.png new file mode 100644 index 00000000..af15b9e5 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/refuse.png differ diff --git a/src/apps/AppWorkOrderXbot/images/right-icon.png b/src/apps/AppWorkOrderXbot/images/right-icon.png new file mode 100644 index 00000000..e1c626b7 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/right-icon.png differ diff --git a/src/apps/AppWorkOrderXbot/images/shaixuan.png b/src/apps/AppWorkOrderXbot/images/shaixuan.png new file mode 100644 index 00000000..88015ea5 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/shaixuan.png differ diff --git a/src/apps/AppWorkOrderXbot/images/tx@2x.png b/src/apps/AppWorkOrderXbot/images/tx@2x.png new file mode 100644 index 00000000..d9620e08 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/tx@2x.png differ diff --git a/src/apps/AppWorkOrderXbot/images/xz.png b/src/apps/AppWorkOrderXbot/images/xz.png new file mode 100644 index 00000000..98f78cda Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/xz.png differ diff --git a/src/apps/AppWorkOrderXbot/images/xzh.png b/src/apps/AppWorkOrderXbot/images/xzh.png new file mode 100644 index 00000000..967fa399 Binary files /dev/null and b/src/apps/AppWorkOrderXbot/images/xzh.png differ diff --git a/src/components/AiPagePicker.vue b/src/components/AiPagePicker.vue index 21b6e67f..dc391639 100644 --- a/src/components/AiPagePicker.vue +++ b/src/components/AiPagePicker.vue @@ -37,6 +37,7 @@ export default { gridUser: {url: "/components/pages/selectGirdUser", label: "name"}, party: {url: "/components/pages/selectParty", label: "name"}, dept: {url: "/components/pages/selectDept", label: "name"}, + deptUser: {url: "/components/pages/selectDeptUser", label: "name"}, custom: {...this.ops} }, pickList: [] diff --git a/src/components/pages/img/right-icon.png b/src/components/pages/img/right-icon.png new file mode 100644 index 00000000..e1c626b7 Binary files /dev/null and b/src/components/pages/img/right-icon.png differ diff --git a/src/components/pages/img/tx@2x.png b/src/components/pages/img/tx@2x.png new file mode 100644 index 00000000..d9620e08 Binary files /dev/null and b/src/components/pages/img/tx@2x.png differ diff --git a/src/components/pages/selectDeptUser.vue b/src/components/pages/selectDeptUser.vue new file mode 100644 index 00000000..75dcb921 --- /dev/null +++ b/src/components/pages/selectDeptUser.vue @@ -0,0 +1,303 @@ + + + + + diff --git a/src/project/lulong/AppHandSnapshot/Add.vue b/src/project/lulong/AppHandSnapshot/Add.vue index 0c80136f..5bd7f9f3 100644 --- a/src/project/lulong/AppHandSnapshot/Add.vue +++ b/src/project/lulong/AppHandSnapshot/Add.vue @@ -73,7 +73,7 @@ export default { this.typeList() }, onShow() { - document.title = '事件添加' + document.title = '巡查添加' this.forms.name = this.user.name this.forms.phone = this.user.phone this.forms.girdId = this.user.girdId @@ -84,7 +84,7 @@ export default { }, methods: { typeList() { - this.$http.post(`/app/appresidentreportgroup/list`, null, { + this.$http.post(`/app/apppatrolreportgroup/list`, null, { params: { size: 9999, }, diff --git a/src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue b/src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue index 2eef94c8..5d7c642b 100644 --- a/src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue +++ b/src/project/lulong/AppHandSnapshot/AppHandSnapshot.vue @@ -79,11 +79,9 @@ export default { uni.$on('showTab', () => { this.isTab = true }) - uni.$on('getListInit', () => { + if (!this.tabIndex) { this.$nextTick(() => this.$refs['List'].getListInit()) - }) - - this.$nextTick(() => this.$refs['List'].getListInit()) + } }, onReachBottom() { if (!this.tabIndex) { diff --git a/src/project/lulong/AppHandSnapshot/Content.vue b/src/project/lulong/AppHandSnapshot/Content.vue index fdba5ef6..8f6f177e 100644 --- a/src/project/lulong/AppHandSnapshot/Content.vue +++ b/src/project/lulong/AppHandSnapshot/Content.vue @@ -83,7 +83,7 @@ export default { }, methods: { typeList() { - this.$http.post(`/app/appresidentreportgroup/list`, null, { + this.$http.post(`/app/apppatrolreportgroup/list`, null, { params: { size: 9999, }, @@ -113,7 +113,7 @@ export default { submit() { //status 1转交 2拒绝受理 3我已办结 var url = '', successText = '', params = '' if (this.status == 1) { - url = `/app/appresidentreportinfo/transfer` + url = `/app/apppatrolreportinfo/transfer` successText = '转交成功' params = { ...this.forms, @@ -127,12 +127,12 @@ export default { // } } if (this.status == 2) { - url = `/app/appresidentreportinfo/finishByGirdMember` + url = `/app/apppatrolreportinfo/finishByGirdMember` successText = '拒绝成功' params = {...this.forms, eventStatus: 0} } if (this.status == 3) { - url = `/app/appresidentreportinfo/finishByGirdMember` + url = `/app/apppatrolreportinfo/finishByGirdMember` successText = '办结成功' params = {...this.forms, eventStatus: 1} } diff --git a/src/project/lulong/AppHandSnapshot/Detail.vue b/src/project/lulong/AppHandSnapshot/Detail.vue index 923c00ce..545a5c3a 100644 --- a/src/project/lulong/AppHandSnapshot/Detail.vue +++ b/src/project/lulong/AppHandSnapshot/Detail.vue @@ -94,7 +94,7 @@
-
+
转交事件 @@ -107,6 +107,18 @@
我来受理
+
+
+ + 转交事件 +
+
+ + 拒绝受理 +
+ +
前往办理
+
@@ -169,11 +181,11 @@ export default { }) }, onShow() { - document.title = '事件上报' + document.title = '巡查上报' }, methods: { getDetail() { - this.$http.post(`/app/appresidentreportinfo/queryDetailById?id=${this.id}`).then((res) => { + this.$http.post(`/app/apppatrolreportinfo/queryDetailById?id=${this.id}`).then((res) => { if (res?.data) { this.data = res.data } @@ -197,6 +209,9 @@ export default { }, toContent(status) { + if(status == 3 && !this.data.doRight) { + return this.$u.toast('没有办理权限') + } uni.navigateTo({url: `./Content?status=${status}&groupId=${this.data.groupId}&groupName=${this.data.groupName}&id=${this.id}`}) }, previewImage(images, img) { @@ -352,6 +367,7 @@ uni-page-body { .cards { position: relative; padding-bottom: 80px; + background-color: #fff; .cardss { display: flex; @@ -496,6 +512,7 @@ uni-page-body { font-weight: 500; color: #fff; } + } .endDoIt { diff --git a/src/project/lulong/AppHandSnapshot/List.vue b/src/project/lulong/AppHandSnapshot/List.vue index 35640deb..5e5e0ea1 100644 --- a/src/project/lulong/AppHandSnapshot/List.vue +++ b/src/project/lulong/AppHandSnapshot/List.vue @@ -51,7 +51,7 @@
- +
@@ -78,6 +78,7 @@ export default { showType: false, eventStatus: '', eventStatusText: '', + isAdd: true } }, computed: { @@ -89,7 +90,7 @@ export default { onLoad() { }, onShow() { - document.title = '事件上报' + document.title = '巡查上报' this.searchGrid.girdId = this.user.girdId this.searchGrid.girdName = this.user.girdName this.current = 1 @@ -98,6 +99,7 @@ export default { created() { this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory', 'residentEventSource').then(() => { this.getList() + this.getIsAdd() }) }, methods: { @@ -111,7 +113,7 @@ export default { }, getList() { let {current, eventStatus, searchGrid: {id: girdId}} = this - this.$http.post(`/app/apppatrolreportinfo/list`, null, { + this.$http.post(`/app/apppatrolreportinfo/listByGirdMember`, null, { params: { size: 10, current, @@ -165,7 +167,15 @@ export default { }, add() { uni.navigateTo({url: './Add'}) - } + }, + + getIsAdd() { + this.$http.post(`/app/apppatrolreportinfo/checkGirdMemberUser`).then((res) => { + if (res.code == 0) { + this.isAdd = res.data + } + }) + }, }, } diff --git a/src/project/lulong/AppHandSnapshot/Map.vue b/src/project/lulong/AppHandSnapshot/Map.vue index d73d4269..e22678ac 100644 --- a/src/project/lulong/AppHandSnapshot/Map.vue +++ b/src/project/lulong/AppHandSnapshot/Map.vue @@ -152,7 +152,10 @@ export default { position: evt.latLng }); this.latLng = evt.latLng - this.address = evt.poi.name + var geocoder = new TMap.service.Geocoder(); + geocoder.getAddress({ location: this.latLng }).then((result) => { + this.address = result.result.address; + }); }, confirm() { if (!this.latLng.lat) { diff --git a/src/project/lulong/AppHandSnapshot/SelectUser.vue b/src/project/lulong/AppHandSnapshot/SelectUser.vue index ebf3075a..cc09a1fd 100644 --- a/src/project/lulong/AppHandSnapshot/SelectUser.vue +++ b/src/project/lulong/AppHandSnapshot/SelectUser.vue @@ -74,7 +74,7 @@ export default { methods: { getTree() { this.slectList = [] - this.$http.post(`/app/appresidentreportinfo/listGirdInfoByTransfer?id=${this.detailId}`).then((res) => { + this.$http.post(`/app/apppatrolreportinfo/listGirdInfoByTransfer?id=${this.detailId}`).then((res) => { if (res?.data) { this.allData = res.data this.treeInit() diff --git a/src/project/lulong/AppHandSnapshot/Statistics.vue b/src/project/lulong/AppHandSnapshot/Statistics.vue index 66f9c01f..2299b247 100644 --- a/src/project/lulong/AppHandSnapshot/Statistics.vue +++ b/src/project/lulong/AppHandSnapshot/Statistics.vue @@ -1,157 +1,294 @@