diff --git a/components/footers/footers.vue b/components/footers/footers.vue index 45b21bf8..0e857649 100644 --- a/components/footers/footers.vue +++ b/components/footers/footers.vue @@ -166,6 +166,14 @@ appShow: 1, isShow: true, }) + // that.tabList.push({ + // appName: '高风险', + // moduleIcon2: 'highRisk-icon', + // moduleIcon: 'highRisk-icon_active', + // plugin: 'highRisk', + // appShow: 1, + // isShow: true, + // }) that.tabList.push({ appName: '高风险', moduleIcon2: 'highRisk-icon', diff --git a/components/tree-node/areaIndex.vue b/components/tree-node/areaIndex.vue index fb62244e..0628df5f 100644 --- a/components/tree-node/areaIndex.vue +++ b/components/tree-node/areaIndex.vue @@ -1,134 +1,172 @@ + + + + + + + + +import TreeMenu from "./areaIndex.vue"; +export default { + name: "TreeMenu", + components: { + TreeMenu, + }, + props: ["item", "pageType", "treeIndex", "iconShow", "expandedIndex"], + data() { + return { + expanded: false, + }; + }, + mounted() { + if (this.expandedIndex == 0) { + this.expanded = true; + } + }, + methods: { + clickTreeItem(item) { + console.log(item, 777888); + if (!item.projectSn) return; + this.$emit("clickItem", item); + // uni.navigateTo({ + // url: `/pages/videoManage/videoGroup?&sn=${item.projectSn}` + // }) + }, + expandFn(e) { + console.log(e, 666); + this.expanded = !this.expanded; + }, + toggleNodes(item) { + this.$emit("clickItem", item); + }, + }, +}; + \ No newline at end of file + .expandedStyle { + // padding-left: 60rpx; + } +} + diff --git a/pages/projectEnd/workTicketManage/workTicketDetail.vue b/pages/projectEnd/workTicketManage/workTicketDetail.vue index 750d31ea..2f892787 100644 --- a/pages/projectEnd/workTicketManage/workTicketDetail.vue +++ b/pages/projectEnd/workTicketManage/workTicketDetail.vue @@ -189,7 +189,7 @@ 暂停作业 继续作业 - 重新开始 + 重新开始 结束作业 删除 @@ -198,7 +198,7 @@ + :confirm-text="stateType == 2 ? '是,立即暂停' : stateType == 3 ? '是,重新开始' : '是,立即结束'" :show-cancel-button="true" :cancel-text="stateType == 3 ? '取消' : '不,继续作业'"> @@ -209,6 +209,15 @@ 点击暂停作业后,需要到执法记录仪上手动结束工单。结束后录像将会自动上传到平台,可在历史回放中查看。 + + + 作业已完成,点击重新开始作业 + + + + + 作业已全部施工完成,点击结束作业 diff --git a/pages/projectEnd/workTicketManage/workTicketList.vue b/pages/projectEnd/workTicketManage/workTicketList.vue index 33f6c607..097b0ee0 100644 --- a/pages/projectEnd/workTicketManage/workTicketList.vue +++ b/pages/projectEnd/workTicketManage/workTicketList.vue @@ -103,7 +103,7 @@ 结束作业 - 重新开始 + 重新开始 @@ -144,7 +144,7 @@ + :confirm-text="stateType == 2 ? '是,立即暂停' : stateType == 3 ? '是,重新开始' : '是,立即结束'" :show-cancel-button="true" :cancel-text="stateType == 3 ? '取消' : '不,继续作业'"> @@ -155,6 +155,15 @@ 点击暂停作业后,需要到执法记录仪上手动结束工单,结束后录像将会自动上传到平台,可在历史回放中查看 + + + 作业已完成,点击重新开始作业 + + + + + 作业已全部施工完成,点击结束作业