flx:优化

This commit is contained in:
Rain_ 2025-11-13 13:49:42 +08:00
parent 46c69c5a24
commit 94f9c837df
8 changed files with 210 additions and 152 deletions

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: 'tabIcon-my', moduleIcon2: 'tabIcon-my',
@ -185,7 +193,12 @@
switch (plugin) { switch (plugin) {
case 'menu': case 'menu':
uni.redirectTo({ uni.redirectTo({
url: '../../pages/areaTree/areaTree2?type=backend' url: '/pages/areaTree/areaTree?type=backend'
})
break;
case 'highRisk':
uni.redirectTo({
url: '/pages/projectEnd/workTicketManage/highRiskWorkTicket?type=backend'
}) })
break; break;
case 'projectManage': case 'projectManage':
@ -196,11 +209,11 @@
case 'videoManage': case 'videoManage':
if (this.userInfo.accountType == 5) { if (this.userInfo.accountType == 5) {
uni.redirectTo({ uni.redirectTo({
url: '../../pages/videoManage/videoList?sn=' + that.userInfo.sn url: '/pages/videoManage/videoList?sn=' + that.userInfo.sn
}) })
} else { } else {
uni.redirectTo({ uni.redirectTo({
url: '../../pages/areaTree/areaTree' url: '/pages/areaTree/areaTree'
}) })
} }
break; break;

View File

@ -0,0 +1,134 @@
<template>
<view class="tree-content-compontent">
<view class="content-box" :class="{'content-box_project': item.projectSn}" :style="`padding-left: ${treeIndex * 30}rpx;`" @click="toggleNodes(item)">
<text class="box-text">
<image v-if="item.projectSn" class="img" src="/static/file-icon.png" mode=""></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>
<u-icon name="arrow-down" color="#B3B3B3" size="40"
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"
size="40"></u-icon>
<u-icon v-if="expanded && item.list && item.list.length" 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> -->
</view>
<view class="sub-component">
<view :class="{'expandedStyle': expanded == true}"
v-if="item.list && item.list.length && expanded">
<TreeMenu :pageType="pageType" :iconShow="iconShow" 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>
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);
}
},
}
</script>
<style lang="scss" scoped>
.tree-content-compontent {
background: white;
border-bottom: 2rpx solid #F7F7F7;
.content-box {
display: flex;
align-items: center;
justify-content: start;
padding: 16rpx 26rpx;
position: relative;
// border-bottom: 2px solid #D6D6D6;
>.box-text {
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-size: 30rpx;
color: #1A1A1A;
margin-right: auto;
display: inline-block;
flex: 1;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.img {
width: 28rpx;
height: 24rpx;
margin-right: 10rpx;
}
}
.box-text1 {
font-weight: 500;
font-size: 28rpx;
color: #B3B3B3;
padding: 0 28rpx;
}
}
.content-box_project {
background-color: #F2F3F7;
border-bottom: 1px solid #fff;
}
.sub-component {
background: #FFFFFF;
.tree-content-compontent {
background: #FFFFFF;
border: none;
}
}
.expandedStyle {
// padding-left: 60rpx;
}
}
</style>

View File

@ -110,7 +110,7 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:1667/' // 测试环境h5 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:1667/' // 测试环境h5
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' // 潮州项目h5 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' // 潮州项目h5
// Vue.prototype.url_config = 'http://gszhdz.crpower.com.cn:9809/' // 敦煌环境h5 // Vue.prototype.url_config = 'http://gszhdz.crpower.com.cn:9809/' // 敦煌环境h5
Vue.prototype.url_config = 'https://gszhdz.crpower.com.cn:9807/' // 敦煌环境h5 // Vue.prototype.url_config = 'https://gszhdz.crpower.com.cn:9807/' // 敦煌环境h5
// Vue.prototype.url_config = window.location.protocol + "//" + window.location.host + "/" // Vue.prototype.url_config = window.location.protocol + "//" + window.location.host + "/"
} else { } else {

View File

@ -12,106 +12,25 @@
placeholder="请输入项目名称" /> placeholder="请输入项目名称" />
<button class="mini-btn" type="primary" size="mini" @click="loadData">搜索</button> <button class="mini-btn" type="primary" size="mini" @click="loadData">搜索</button>
</view> </view>
<view class="areaItem" v-for="(item,index) in mapData" :key="index"> <template v-if="mapData.length > 0">
<view class="areaTitle" @click="expandSon(index)"> <tree-menu :pageType="pageType" :iconShow="true" v-for="(item,index) in mapData" :key="item.companyId" :item="item"
{{item.name}} <text v-if="!item.projectName">({{item.projectNum}})</text> :expandedIndex="index" :treeIndex="treeIndex" @clickItem="clickTreeItem"></tree-menu>
<text v-if="pageType=='video'&&item.projectName">({{item.videoNum}})</text> </template>
<view class="statusBox" v-if="pageType=='markRoom'&&item.projectName">
<image v-show="item.standardDevStopUsingNum!=0" class="icon-status"
src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;"></image>
<image v-show="item.standardDevNotOnline!=0" class="icon-status"
src="/static/offline_alarm.png" style="width: 20rpx;height: 20rpx;"></image>
<image v-show="item.standardTemperatureAlarmNum!=0" class="icon-status"
src="/static/temp_alarm.png" style="width: 16rpx;height: 13px;"></image>
<image v-show="item.standardHumidityAlarmNum!=0" class="icon-status"
src="/static/humi_alarm.png" style="width: 16rpx;height: 11px;"></image>
</view>
<uni-icons2 v-show="item.showSon&&item.list" class="arrow" type="arrowup" size="20"></uni-icons2>
<uni-icons2 v-show="!item.showSon&&item.list" class="arrow" type="arrowdown" size="20">
</uni-icons2>
</view>
<view class="areaInner" v-if="item.list&&item.showSon">
<view class="areaInnerItem" v-for="(item2,index2) in item.list" :key="index2">
<view class="areaTitle2" @click="expandSon2(index,index2)">
{{item2.name}}
<text v-if="!item2.projectName">({{item2.projectNum}})</text>
<text v-if="pageType=='video'&&item2.projectName">({{item2.videoNum}})</text>
<view class="statusBox" v-if="pageType=='markRoom'&&item2.projectName">
<image v-show="item2.standardDevStopUsingNum!=0" class="icon-status"
src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;"></image>
<image v-show="item2.standardDevNotOnline!=0" class="icon-status"
src="/static/offline_alarm.png" style="width: 20rpx;height: 20rpx;"></image>
<image v-show="item2.standardTemperatureAlarmNum!=0" class="icon-status"
src="/static/temp_alarm.png" style="width: 16rpx;height: 13px;"></image>
<image v-show="item2.standardHumidityAlarmNum!=0" class="icon-status"
src="/static/humi_alarm.png" style="width: 16rpx;height: 11px;"></image>
</view>
<uni-icons2 v-show="item2.showSon&&item2.list" class="arrow" type="arrowup" size="20">
</uni-icons2>
<uni-icons2 v-show="!item2.showSon&&item2.list" class="arrow" type="arrowdown" size="20">
</uni-icons2>
</view>
<view class="projectBox" v-if="item2.list&&item2.showSon">
<view class="projectItem" v-for="(item3,index3) in item2.list" :key="index3">
<view class="projectTitle" @click="viewVideoListFn(item3)">
{{item3.name}} <text
v-if="pageType=='video'&&item3.projectName">({{item3.videoNum}})</text>
<view class="statusBox" v-if="pageType=='markRoom'&&item3.projectName">
<image v-show="item3.standardDevStopUsingNum!=0" class="icon-status"
src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;"></image>
<image v-show="item3.standardDevNotOnline!=0" class="icon-status"
src="/static/offline_alarm.png" style="width: 20rpx;height: 20rpx;">
</image>
<image v-show="item3.standardTemperatureAlarmNum!=0" class="icon-status"
src="/static/temp_alarm.png" style="width: 16rpx;height: 13px;"></image>
<image v-show="item3.standardHumidityAlarmNum!=0" class="icon-status"
src="/static/humi_alarm.png" style="width: 16rpx;height: 11px;"></image>
</view>
<!-- <uni-icons2 v-show="item3.showSon&&item3.list" class="arrow" type="arrowup" size="20"></uni-icons2>
<uni-icons2 v-show="!item3.showSon&&item3.list" class="arrow" type="arrowdown" size="20"></uni-icons2> -->
</view>
<view class="" v-if="item3.list">
<view class="" v-for="(item4,index4) in item3.list" :key="index4">
<view class="projectTitle projectTitle2" @click="viewVideoListFn(item4)">
{{item4.name}} <text
v-if="pageType=='video'&&item4.projectName">({{item4.videoNum}})</text>
<view class="statusBox" v-if="pageType=='markRoom'">
<image v-show="item4.standardDevStopUsingNum!=0" class="icon-status"
src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;">
</image>
<image v-show="item4.standardDevNotOnline!=0" class="icon-status"
src="/static/offline_alarm.png"
style="width: 20rpx;height: 20rpx;"></image>
<image v-show="item4.standardTemperatureAlarmNum!=0"
class="icon-status" src="/static/temp_alarm.png"
style="width: 16rpx;height: 13px;"></image>
<image v-show="item4.standardHumidityAlarmNum!=0"
class="icon-status" src="/static/humi_alarm.png"
style="width: 16rpx;height: 11px;"></image>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view> </view>
</scroll-view> </scroll-view>
<footers v-if="pageType=='video'" :activeTab="'videoManage'"></footers> <footers v-if="pageType=='video' || pageType=='backend'" :activeTab="pageType=='video' ? 'videoManage': 'menu'"></footers>
</view> </view>
</template> </template>
<script> <script>
import footers from "../../components/footers/footers.vue" import footers from "../../components/footers/footers.vue"
import uniIcons from "@/components/uni-icons/uni-icons.vue" import uniIcons from "@/components/uni-icons/uni-icons.vue"
import TreeMenu from '@/components/tree-node/areaIndex.vue'
import headers from "../../components/headers/headers.vue" import headers from "../../components/headers/headers.vue"
export default { export default {
components: { components: {
footers footers,
TreeMenu
}, },
data() { data() {
return { return {
@ -120,7 +39,8 @@
userInfo: null, userInfo: null,
mapData: [], mapData: [],
headerName: '集团', headerName: '集团',
pageType: 'video' pageType: 'video',
treeIndex: 1, // index
}; };
}, },
onLoad(options) { onLoad(options) {
@ -135,44 +55,12 @@
this.initData(true); this.initData(true);
}, },
methods: { methods: {
clickTreeItem(item) {
this.viewVideoListFn(item)
},
searchFile(e) { searchFile(e) {
this.projectName = e.detail.value this.projectName = e.detail.value
}, },
//
expandSon(index) {
if (!this.mapData[index].list) {
uni.setStorageSync('projectDetail', JSON.stringify(this.mapData[index]))
this.viewVideoListFn(this.mapData[index])
} else {
if (this.mapData[index].showSon) {
// this.mapData[index].showSon=false
this.$set(this.mapData[index], `showSon`, false)
} else {
// this.mapData[index].showSon=true
this.$set(this.mapData[index], `showSon`, true)
}
}
// console.log(this.mapData)
},
//
expandSon2(index, index2) {
if (!this.mapData[index].list[index2].list) {
uni.setStorageSync('projectDetail', JSON.stringify(this.mapData[index].list[index2]))
this.viewVideoListFn(this.mapData[index].list[index2])
} else {
if (this.mapData[index].list[index2].showSon) {
// this.mapData[index].showSon=false
this.$set(this.mapData[index].list[index2], `showSon`, false)
} else {
// this.mapData[index].showSon=true
this.$set(this.mapData[index].list[index2], `showSon`, true)
}
}
// console.log(this.mapData)
},
viewVideoListFn(item) { viewVideoListFn(item) {
if (this.pageType == 'video') { if (this.pageType == 'video') {
uni.navigateTo({ uni.navigateTo({
@ -223,12 +111,7 @@
this.searchsn = that.userInfo.sn this.searchsn = that.userInfo.sn
break; break;
} }
this.loadData(type);
if (that.userInfo.accountType == 5) {
} else {
this.loadData(type);
}
}, },
// //
@ -239,14 +122,18 @@
url: "xmgl/company/getComapnyStatisticsList", url: "xmgl/company/getComapnyStatisticsList",
data: { data: {
sn: that.searchsn, sn: that.searchsn,
projectName:that.projectName, projectName: that.projectName,
showVideoNum: 1,
standardType: that.pageType == 'markRoom' ? 1 : 0 standardType: that.pageType == 'markRoom' ? 1 : 0
}, },
method: "POST", method: "POST",
success(res) { success(res) {
that.mapData = res.result.companyList ? res.result.companyList : res.result.projectList if (res.code == 200) {
if (res.result.companyInfo) { that.mapData = res.result.companyList ? res.result.companyList : res.result.projectList
that.headerName = res.result.companyInfo.companyName console.log(88488, that.mapData)
if (res.result.companyInfo) {
that.headerName = res.result.companyInfo.companyName
}
} }
} }
}) })
@ -317,9 +204,11 @@
font-size: 28rpx; font-size: 28rpx;
width: 65%; width: 65%;
} }
.uni-form-item { .uni-form-item {
position: relative; position: relative;
} }
.mini-btn { .mini-btn {
position: absolute; position: absolute;
right: 30rpx; right: 30rpx;
@ -329,4 +218,4 @@
height: 60rpx; height: 60rpx;
line-height: 60rpx; line-height: 60rpx;
} }
</style> </style>

View File

@ -26,8 +26,8 @@
<view class="box1"> <view class="box1">
<view>施工区域:</view> <view>施工区域:</view>
<view @click="onClickType(1)"> <view @click="onClickType(1)">
<u-input disabled style="pointer-events:none" :value="workTicketInfo.constructionAreasName" type="text" <u-input disabled style="pointer-events:none" :value="workTicketInfo.constructionAreasName"
:border="true" placeholder="请选择" /> type="text" :border="true" placeholder="请选择" />
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
@ -38,8 +38,8 @@
<view class="box1"> <view class="box1">
<view>申请单位:</view> <view>申请单位:</view>
<view @click="onClickType(2)"> <view @click="onClickType(2)">
<u-input disabled style="pointer-events:none" :value="workTicketInfo.applicantsName" type="text" <u-input disabled style="pointer-events:none" :value="workTicketInfo.applicantsName"
:border="true" placeholder="请选择" /> type="text" :border="true" placeholder="请选择" />
</view> </view>
</view> </view>
<!-- 敦煌升级 --> <!-- 敦煌升级 -->
@ -288,8 +288,8 @@
</view> </view>
<scroll-view v-if="teamOptionList.length > 0" scroll-y="true" style="max-height: 600rpx;"> <scroll-view v-if="teamOptionList.length > 0" scroll-y="true" style="max-height: 600rpx;">
<TreeView @node-click="onTeamClick" :multiple="true" checked-bg-color="rgba(81,129,246,0.1)" <TreeView @node-click="onTeamClick" :multiple="true" checked-bg-color="rgba(81,129,246,0.1)"
:data="teamOptionList" :children-key="'children'" :label-key="'teamName'" :data="teamOptionList" :children-key="'children'" :label-key="'teamName'" :id-key="'id'"
:id-key="'id'" :value="teamIdList" /> :value="teamIdList" />
</scroll-view> </scroll-view>
<view class="new-nodata_height" v-else> <view class="new-nodata_height" v-else>
<view class="new-nodata"> <view class="new-nodata">
@ -595,9 +595,13 @@
console.log('扫一扫得到的数据:' + res.result) console.log('扫一扫得到的数据:' + res.result)
if (res.result) { if (res.result) {
const resultInfo = JSON.parse(res.result); const resultInfo = JSON.parse(res.result);
that.policeCameraItemInfo = that.policeCameraItemList.find(item => item const find = that.policeCameraItemList.find(item => item
.devSn == resultInfo.devSn); .devSn == resultInfo.devSn);
that.submitShow = true; if (find) {
that.policeCameraItemInfo = find;
that.submitShow = true;
}
that.showToast('该设备识别失败,请手动绑定!', 'warning');
} }
} }
}) })

View File

@ -183,7 +183,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>
@ -192,7 +192,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>
@ -203,6 +203,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>
作业已全部施工完成点击结束作业 作业已全部施工完成点击结束作业

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>
作业已全部施工完成点击结束作业 作业已全部施工完成点击结束作业

BIN
static/file-icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 397 B