admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flx:合并冲突

Browse Source
This commit is contained in:
Rain_ 2025-11-13 13:56:26 +08:00
commit 4ece02d9ca
4 changed files with 187 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/footers/footers.vue
View File

@ -166,6 +166,14 @@
appShow: 1, appShow: 1,
isShow: true, isShow: true,
}) })
// that.tabList.push({
// appName: '高风险',
// moduleIcon2: 'highRisk-icon',
// moduleIcon: 'highRisk-icon_active',
// plugin: 'highRisk',
// appShow: 1,
// isShow: true,
// })
that.tabList.push({ that.tabList.push({
appName: '高风险', appName: '高风险',
moduleIcon2: 'highRisk-icon', moduleIcon2: 'highRisk-icon',

276
components/tree-node/areaIndex.vue
View File

@ -1,134 +1,172 @@
<template> <template>
<view class="tree-content-compontent"> <view class="tree-content-compontent">
<view class="content-box" :class="{'content-box_project': item.projectSn}" :style="`padding-left: ${treeIndex * 30}rpx;`" @click="toggleNodes(item)"> <view
<text class="box-text"> class="content-box"
<image v-if="item.projectSn" class="img" src="/static/file-icon.png" mode=""></image> :class="{ 'content-box_project': item.projectSn }"
{{ item.name }} :style="`padding-left: ${treeIndex * 30}rpx;`"
</text> @click="toggleNodes(item)"
<view @click.stop="expandFn"> >
<template v-if="pageType == 'video'"> <text class="box-text">
<text v-if="item.projectNum || item.projectNum == 0" class="box-text1">{{ item.projectNum || '' }}</text> <image
<text v-else class="box-text1">({{ item.onlineVideoNum || 0 }}/{{ item.videoNum || 0 }})</text> v-if="item.projectSn"
</template> class="img"
<text v-else class="box-text1">{{ item.projectNum || '' }}</text> src="/static/file-icon.png"
mode=""
<!-- <u-icon name="arrow-right" color="#B3B3B3" size="40" ></image>
{{ item.name }}
</text>
<view @click.stop="expandFn">
<template v-if="pageType == 'video'">
<text
v-if="item.projectNum || item.projectNum == 0"
class="box-text1"
>{{ item.projectNum || "" }}</text
>
<text v-else class="box-text1"
>({{ item.onlineVideoNum || 0 }}/{{ item.videoNum || 0 }})</text
>
</template>
<text v-else class="box-text1">{{ item.projectNum || "" }}</text>
<!-- <u-icon name="arrow-right" color="#B3B3B3" size="40"
v-if="!expanded && item.list && item.list.length" style="margin-right: 10rpx;"></u-icon> v-if="!expanded && item.list && item.list.length" style="margin-right: 10rpx;"></u-icon>
<u-icon name="arrow-down" color="#B3B3B3" size="40" <u-icon name="arrow-down" color="#B3B3B3" size="40"
v-if="expanded && item.list && item.list.length" style="margin-right: 10rpx;"></u-icon> --> v-if="expanded && item.list && item.list.length" style="margin-right: 10rpx;"></u-icon> -->
<u-icon v-if="!expanded && item.list && item.list.length" name="arrow-right" color="#B3B3B3" <u-icon
size="40"></u-icon> v-if="!expanded && item.list && item.list.length"
<u-icon v-if="expanded && item.list && item.list.length" name="arrow-down" color="#B3B3B3" name="arrow-right"
size="40"></u-icon> color="#B3B3B3"
</view> size="40"
<image v-if="(!item.list || !item.list.length) && !iconShow" style="width:55rpx;height:40rpx;" ></u-icon>
src="../../static/videoControlIcon/videoIcon1.png" mode=""> <u-icon
</image> v-if="expanded && item.list && item.list.length"
<!-- <image style="width:80rpx;height:80rpx;float:left" src="../../static/icon-down-black.png" mode=""> name="arrow-down"
color="#B3B3B3"
size="40"
></u-icon>
</view>
<image
v-if="(!item.list || !item.list.length) && !iconShow"
style="width: 55rpx; height: 40rpx"
src="../../static/videoControlIcon/videoIcon1.png"
mode=""
>
</image>
<!-- <image style="width:80rpx;height:80rpx;float:left" src="../../static/icon-down-black.png" mode="">
</image> --> </image> -->
</view> </view>
<view class="sub-component"> <view class="sub-component">
<view :class="{'expandedStyle': expanded == true}" <view
v-if="item.list && item.list.length && expanded"> :class="{ expandedStyle: expanded == true }"
<TreeMenu :pageType="pageType" :iconShow="iconShow" v-for="(child, index) in item.list" :key="child.companyId || child.projectId" :item="child" v-if="item.list && item.list.length && expanded"
:treeIndex="treeIndex + 1" :expandedIndex="index" @clickItem="clickTreeItem"></TreeMenu> >
</view> <TreeMenu
</view> :pageType="pageType"
</view> :iconShow="iconShow"
</template> v-for="(child, index) in item.list"
:key="child.companyId || child.projectId"
:item="child"
:treeIndex="treeIndex + 1"
:expandedIndex="index"
@clickItem="clickTreeItem"
></TreeMenu>
</view>
</view>
</view>
</template>
<script> <script>
import TreeMenu from './areaIndex.vue'; import TreeMenu from "./areaIndex.vue";
export default { export default {
name: 'TreeMenu', name: "TreeMenu",
components: { components: {
TreeMenu TreeMenu,
}, },
props: ['item', 'pageType', 'treeIndex', 'iconShow', 'expandedIndex'], props: ["item", "pageType", "treeIndex", "iconShow", "expandedIndex"],
data() { data() {
return { return {
expanded: false, expanded: false,
}; };
}, },
mounted() { mounted() {
if (this.expandedIndex == 0) { if (this.expandedIndex == 0) {
this.expanded = true; this.expanded = true;
} }
}, },
methods: { methods: {
clickTreeItem(item) { clickTreeItem(item) {
console.log(item, 777888) console.log(item, 777888);
if(!item.projectSn) return; if (!item.projectSn) return;
this.$emit('clickItem', item); this.$emit("clickItem", item);
// uni.navigateTo({ // uni.navigateTo({
// url: `/pages/videoManage/videoGroup?&sn=${item.projectSn}` // url: `/pages/videoManage/videoGroup?&sn=${item.projectSn}`
// }) // })
}, },
expandFn(e) { expandFn(e) {
console.log(e, 666) console.log(e, 666);
this.expanded = !this.expanded; this.expanded = !this.expanded;
}, },
toggleNodes(item) { toggleNodes(item) {
this.$emit('clickItem', item); this.$emit("clickItem", item);
} },
}, },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.tree-content-compontent { .tree-content-compontent {
background: white; background: white;
border-bottom: 2rpx solid #F7F7F7; border-bottom: 2rpx solid #f7f7f7;
.content-box { .content-box {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: start; justify-content: start;
padding: 16rpx 26rpx; padding: 16rpx 26rpx;
position: relative; position: relative;
// border-bottom: 2px solid #D6D6D6; // border-bottom: 2px solid #D6D6D6;
>.box-text { > .box-text {
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 30rpx; font-size: 30rpx;
color: #1A1A1A; color: #1a1a1a;
margin-right: auto; margin-right: auto;
display: inline-block; display: inline-block;
flex: 1; flex: 1;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
.img { .img {
width: 28rpx; width: 28rpx;
height: 24rpx; height: 24rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
} }
.box-text1 { .box-text1 {
font-weight: 500; font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
color: #B3B3B3; color: #b3b3b3;
padding: 0 28rpx; padding: 0 28rpx;
} }
} }
.content-box_project { .content-box_project {
background-color: #F2F3F7; background-color: #f2f3f7;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
.sub-component { .sub-component {
background: #FFFFFF; background: #ffffff;
.tree-content-compontent { .tree-content-compontent {
background: #FFFFFF; background: #ffffff;
border: none; border: none;
} }
} }
.expandedStyle { .expandedStyle {
// padding-left: 60rpx; // padding-left: 60rpx;
} }
} }
</style> </style>

13
pages/projectEnd/workTicketManage/workTicketDetail.vue
View File

@ -189,7 +189,7 @@
</view> </view>
<view v-if="workTicketInfo.status == 2" @click="onStateShow(2)">暂停作业</view> <view v-if="workTicketInfo.status == 2" @click="onStateShow(2)">暂停作业</view>
<view v-if="workTicketInfo.status == 3" @click="onChangeState(3)">继续作业</view> <view v-if="workTicketInfo.status == 3" @click="onChangeState(3)">继续作业</view>
<view v-if="workTicketInfo.status == 4" @click="onChangeState(3)">重新开始</view> <view v-if="workTicketInfo.status == 4" @click="onStateShow(3)">重新开始</view>
<view v-if="workTicketInfo.status == 2 || workTicketInfo.status == 3" @click="onStateShow(4)" <view v-if="workTicketInfo.status == 2 || workTicketInfo.status == 3" @click="onStateShow(4)"
class="btn-error">结束作业</view> class="btn-error">结束作业</view>
<view @click="onDelete" class="btn-error">删除</view> <view @click="onDelete" class="btn-error">删除</view>
@ -198,7 +198,7 @@
</view> </view>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
<u-modal @cancel="onStateCancel" @confirm="onStateConfirm" v-model="stateShow" <u-modal @cancel="onStateCancel" @confirm="onStateConfirm" v-model="stateShow"
:confirm-text="stateType == 2 ? '是,立即暂停' : '是，立即结束'" :show-cancel-button="true" cancel-text="不,继续作业"> :confirm-text="stateType == 2 ? '是,立即暂停' : stateType == 3 ? '是,重新开始' : '是，立即结束'" :show-cancel-button="true" :cancel-text="stateType == 3 ? '取消' : '不,继续作业'">
<view class="slot-content"> <view class="slot-content">
<view class="content_main-box1" v-if="stateType == 2"> <view class="content_main-box1" v-if="stateType == 2">
<view> <view>
@ -209,6 +209,15 @@
<view>点击暂停作业后，需要到执法记录仪上手动结束工单。结束后录像将会自动上传到平台，可在历史回放中查看。</view> <view>点击暂停作业后，需要到执法记录仪上手动结束工单。结束后录像将会自动上传到平台，可在历史回放中查看。</view>
</view> </view>
</view> </view>
<view class="content_main-box1" v-if="stateType == 3">
<view>
作业已完成，点击重新开始作业
</view>
<view>
<!-- <u-icon name="info-circle"></u-icon>
<view>点击结束作业后，需要到执法记录仪上手动结束工单，结束后录像将会自动上传到平台，可在历史回放中查看</view> -->
</view>
</view>
<view class="content_main-box1" v-else-if="stateType == 4"> <view class="content_main-box1" v-else-if="stateType == 4">
<view> <view>
作业已全部施工完成，点击结束作业 作业已全部施工完成，点击结束作业

13
pages/projectEnd/workTicketManage/workTicketList.vue
View File

@ -103,7 +103,7 @@
<view @click.stop="onStateShow(4, item)" class="btn-error">结束作业</view> <view @click.stop="onStateShow(4, item)" class="btn-error">结束作业</view>
</view> </view>
<view class="box-bottom" v-else> <view class="box-bottom" v-else>
<view @click.stop="onChangeState(3, item)">重新开始</view> <view @click.stop="onStateShow(3, item)">重新开始</view>
</view> </view>
</view> </view>
</view> </view>
@ -144,7 +144,7 @@
</view> </view>
</u-popup> </u-popup>
<u-modal @cancel="onStateCancel" @confirm="onStateConfirm" v-model="stateShow" <u-modal @cancel="onStateCancel" @confirm="onStateConfirm" v-model="stateShow"
:confirm-text="stateType == 2 ? '是,立即暂停' : '是，立即结束'" :show-cancel-button="true" cancel-text="不,继续作业"> :confirm-text="stateType == 2 ? '是,立即暂停' : stateType == 3 ? '是,重新开始' : '是，立即结束'" :show-cancel-button="true" :cancel-text="stateType == 3 ? '取消' : '不,继续作业'">
<view class="slot-content"> <view class="slot-content">
<view class="content_main-box1" v-if="stateType == 2"> <view class="content_main-box1" v-if="stateType == 2">
<view> <view>
@ -155,6 +155,15 @@
<view>点击暂停作业后，需要到执法记录仪上手动结束工单，结束后录像将会自动上传到平台，可在历史回放中查看</view> <view>点击暂停作业后，需要到执法记录仪上手动结束工单，结束后录像将会自动上传到平台，可在历史回放中查看</view>
</view> </view>
</view> </view>
<view class="content_main-box1" v-if="stateType == 3">
<view>
作业已完成，点击重新开始作业
</view>
<view>
<!-- <u-icon name="info-circle"></u-icon>
<view>点击结束作业后，需要到执法记录仪上手动结束工单，结束后录像将会自动上传到平台，可在历史回放中查看</view> -->
</view>
</view>
<view class="content_main-box1" v-else-if="stateType == 4"> <view class="content_main-box1" v-else-if="stateType == 4">
<view> <view>
作业已全部施工完成，点击结束作业 作业已全部施工完成，点击结束作业