解决冲突
This commit is contained in:
Hcat
@@ -8,7 +8,7 @@
|
||||
<div class="tunnel-name">
|
||||
{{ tunnelName }}
|
||||
</div>
|
||||
<div class="tunnel-title"></div>
|
||||
<tunnel-title/>
|
||||
</div>
|
||||
<div class="device-content">
|
||||
<div class="device-box">
|
||||
@@ -49,25 +49,34 @@
|
||||
:header-cell-style="{backgroundColor: '#064B66',color: '#fff',fontSize: '40px',borderBottom: 'none' }"
|
||||
:cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="fanData">
|
||||
<el-table-column prop="equipmentName" label="设备名称" align="center"/>
|
||||
<el-table-column prop="ratedPower" label="额定功率" align="center">
|
||||
<template #default="scope">
|
||||
<el-input placeholder="额定功率" v-model="scope.row.ratedPower"
|
||||
@change="changeRatedPower(scope.row)"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="phaseCurrentAOffset" label="A电流偏移量" align="center"/>
|
||||
<el-table-column prop="acurrentValue" label="A电流阈值" align="center">
|
||||
<template #default="scope">
|
||||
<el-input placeholder="A电流" v-model="scope.row.acurrentValue" @change="changeFanData(scope.row)"></el-input>
|
||||
<el-input placeholder="A电流" v-model="scope.row.acurrentValue"
|
||||
@change="changeFanData(scope.row)"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="phaseCurrentBOffset" label="B电流偏移量" align="center"/>
|
||||
<el-table-column prop="bcurrentValue" label="B电流阈值" align="center">
|
||||
<template #default="scope">
|
||||
<el-input placeholder="B电流" v-model="scope.row.bcurrentValue" @change="changeFanData(scope.row)"></el-input>
|
||||
<el-input placeholder="B电流" v-model="scope.row.bcurrentValue"
|
||||
@change="changeFanData(scope.row)"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="phaseCurrentCOffset" label="C电流偏移量" align="center"/>
|
||||
<el-table-column prop="ccurrentValue" label="C电流阈值" align="center">
|
||||
<template #default="scope">
|
||||
<el-input placeholder="C电流" v-model="scope.row.ccurrentValue" @change="changeFanData(scope.row)"></el-input>
|
||||
<el-input placeholder="C电流" v-model="scope.row.ccurrentValue"
|
||||
@change="changeFanData(scope.row)"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="state" label="状态" align="center">
|
||||
<el-table-column prop="state" label="状态" align="center" min-width="86">
|
||||
<template #default="scope">
|
||||
<div class="switch">
|
||||
<div
|
||||
@@ -117,12 +126,13 @@
|
||||
<el-table-column prop="offset" label="偏移量" align="center"/>
|
||||
<el-table-column prop="unit" label="单位" align="center">
|
||||
<template #default="scope">
|
||||
<el-input placeholder="单位" v-model="scope.row.unit" @change="changeWindData(scope.row)"></el-input>
|
||||
<el-input placeholder="单位" v-model="scope.row.unit" @change="changeWindData(scope.row)"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="alarmValue" label="阈值" align="center">
|
||||
<template #default="scope">
|
||||
<el-input placeholder="阈值" v-model="scope.row.alarmValue" @change="changeWindData(scope.row)"></el-input>
|
||||
<el-input placeholder="阈值" v-model="scope.row.alarmValue"
|
||||
@change="changeWindData(scope.row)"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="state" label="状态" align="center">
|
||||
@@ -159,7 +169,7 @@
|
||||
<span>其他传感器设备管理</span>
|
||||
<div class="collection-frequency">
|
||||
<span>采集频率</span>
|
||||
<el-input type="number" v-model="otherFrequency" @change="changeOther">
|
||||
<el-input type="number" v-model="otherFrequency" @change="changeOther">
|
||||
<template #suffix>
|
||||
<span>秒/次</span>
|
||||
</template>
|
||||
@@ -180,7 +190,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="alarmValue" label="阈值" align="center">
|
||||
<template #default="scope">
|
||||
<el-input placeholder="阈值" v-model="scope.row.alarmValue" @change="changeOtherData(scope.row)"></el-input>
|
||||
<el-input placeholder="阈值" v-model="scope.row.alarmValue"
|
||||
@change="changeOtherData(scope.row)"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="state" label="状态" align="center">
|
||||
@@ -233,7 +244,8 @@
|
||||
<el-table-column prop="offset" label="偏移量" align="center"/>
|
||||
<el-table-column prop="thresholdValue" label="阈值" align="center">
|
||||
<template #default="scope">
|
||||
<el-input placeholder="阈值" v-model="scope.row.thresholdValue" @change="changeFenData(scope.row)"></el-input>
|
||||
<el-input placeholder="阈值" v-model="scope.row.thresholdValue"
|
||||
@change="changeFenData(scope.row)"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="state" label="状态" align="center">
|
||||
@@ -273,7 +285,7 @@
|
||||
<script setup>
|
||||
import {ElMessage} from "element-plus";
|
||||
import {getEquipmentList, editEquipment, getTunnelDetail} from "@/api/tunnelManage";
|
||||
|
||||
import TunnelTitle from "@/components/tunnelTitle/index.vue";
|
||||
const router = useRouter()
|
||||
const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
|
||||
const userId = reactive(router.currentRoute.value.params.userId)
|
||||
@@ -293,43 +305,43 @@ const editFenLiuData = ref([])
|
||||
const frequencyData = ref([])
|
||||
const siteId = ref(0)
|
||||
const tunnelName = ref('')
|
||||
const changeFan=(e)=>{
|
||||
const fanObj={
|
||||
acquisitionPeriod: e*1000,
|
||||
const changeFan = (e) => {
|
||||
const fanObj = {
|
||||
acquisitionPeriod: e * 1000,
|
||||
tunnelId: tunnelId,
|
||||
typeKey: 'frequency'
|
||||
}
|
||||
frequencyData.value.push(fanObj)
|
||||
}
|
||||
const changeFanData=(row)=>{
|
||||
const changeFanData = (row) => {
|
||||
editFanData.value.push(row)
|
||||
}
|
||||
const changeWind=(e)=>{
|
||||
const windObj={
|
||||
acquisitionPeriod: e*1000,
|
||||
const changeWind = (e) => {
|
||||
const windObj = {
|
||||
acquisitionPeriod: e * 1000,
|
||||
tunnelId: tunnelId,
|
||||
typeKey: 'windPressure'
|
||||
}
|
||||
frequencyData.value.push(windObj)
|
||||
}
|
||||
const changeWindData=(row)=>{
|
||||
const changeWindData = (row) => {
|
||||
editWinData.value.push(row)
|
||||
}
|
||||
const changeOther=(e)=>{
|
||||
const otherObj={
|
||||
acquisitionPeriod: e*1000,
|
||||
const changeOther = (e) => {
|
||||
const otherObj = {
|
||||
acquisitionPeriod: e * 1000,
|
||||
tunnelId: tunnelId,
|
||||
typeKey: 'sensor'
|
||||
}
|
||||
frequencyData.value.push(otherObj)
|
||||
}
|
||||
const changeOtherData=(row)=>{
|
||||
const changeOtherData = (row) => {
|
||||
editOtherData.value.push(row)
|
||||
}
|
||||
const editEquip = () => {
|
||||
const basicData={
|
||||
tunnelId:tunnelId,
|
||||
acquisitionList:frequencyData.value,
|
||||
const basicData = {
|
||||
tunnelId: tunnelId,
|
||||
acquisitionList: frequencyData.value,
|
||||
frequencyChangerList: editFanData.value,
|
||||
windPressureSensorList: editWinData.value,
|
||||
sensorList: editOtherData.value,
|
||||
@@ -436,7 +448,7 @@ getList()
|
||||
|
||||
.device-box {
|
||||
display: flex;
|
||||
width: 2194px;
|
||||
width: 2260px;
|
||||
height: 1600px;
|
||||
background: #064B66;
|
||||
border-radius: 20px;
|
||||
@@ -549,7 +561,8 @@ getList()
|
||||
|
||||
.device-table {
|
||||
margin-top: 50px;
|
||||
margin-left: 60px;
|
||||
margin-left: 50px;
|
||||
margin-right: 50px;
|
||||
|
||||
.active {
|
||||
color: #FFFFFF;
|
||||
@@ -581,7 +594,8 @@ getList()
|
||||
}
|
||||
|
||||
:deep(.el-table--fit) {
|
||||
width: 1780px !important;
|
||||
//width: 1780px !important;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
:deep(.cell) {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<div class="back-icon"></div>
|
||||
<span>返回</span>
|
||||
</div>
|
||||
<div class="tunnel-title"></div>
|
||||
<tunnel-title/>
|
||||
<div class="btn-right">
|
||||
<div class="del-btn" @click="handleGotoDevice">设备管理</div>
|
||||
<div class="del-btn" @click="handleSave">保存</div>
|
||||
@@ -25,6 +25,9 @@
|
||||
<el-form-item label="隧道长度">
|
||||
<el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="施工长度">-->
|
||||
<!-- <el-input type="number" v-model="form.constructionLength" placeholder="请输入施工长度"/>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="是否默认">
|
||||
<el-radio-group v-model="form.isDefault">
|
||||
<el-radio :label="true">是</el-radio>
|
||||
@@ -45,16 +48,14 @@
|
||||
<script setup>
|
||||
import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
|
||||
import {editTunnel, getTunnelDetail} from "@/api/tunnelManage";
|
||||
import {computed, provide, toRaw} from "vue";
|
||||
import {useModelSceneStore} from "@/store/modelSceneStore";
|
||||
import {ElMessage} from "element-plus";
|
||||
import {initSceneData} from "../../api/tunnelScene";
|
||||
import {initSceneData} from "@/api/tunnelScene";
|
||||
import TunnelTitle from "@/components/tunnelTitle/index.vue";
|
||||
|
||||
const router = useRouter();
|
||||
const tunnelId = reactive(router.currentRoute.value.params.tunnelId);
|
||||
const userId = reactive(router.currentRoute.value.params.userId);
|
||||
const type = reactive(router.currentRoute.value.params.type);
|
||||
const modelStore = useModelSceneStore();
|
||||
const constructionLength = ref(0)
|
||||
const modelEquipmentList = ref(null)
|
||||
const form = ref({
|
||||
@@ -103,6 +104,7 @@ const getTunnelInfo = () => {
|
||||
serialNumber: form.value.serialNumber,
|
||||
remarks: form.value.remarks,
|
||||
constructionLength: constructionLength.value,
|
||||
// constructionLength: form.value.constructionLength,
|
||||
tunnelLength: form.value.totalLength,
|
||||
isDefault: form.value.isDefault,
|
||||
modelEquipmentList: modelEquipmentList.value,
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<div class="site-bgc">
|
||||
<div class="box-top">
|
||||
<div class="back-tunnel" @click="router.push('/')">
|
||||
<div class="back-tunnel" @click="handleGoHome">
|
||||
<div class="back-icon"></div>
|
||||
<span>返回</span>
|
||||
</div>
|
||||
<div class="tunnel-title"></div>
|
||||
<tunnel-title/>
|
||||
<div class="all-del-btn">
|
||||
<div class="all-btn" style=" margin-right: 40px;" v-if="!showAddIcon" @click="handleAdd">
|
||||
添加
|
||||
@@ -105,9 +105,11 @@
|
||||
<script setup>
|
||||
import {editSite, getSiteDetail, getSiteList, addSite, deleteSite} from "@/api/site";
|
||||
import {ElMessage, ElMessageBox} from "element-plus";
|
||||
import TunnelTitle from "@/components/tunnelTitle/index.vue";
|
||||
|
||||
const router = useRouter()
|
||||
const userId = reactive(router.currentRoute.value.params.userId)
|
||||
const siteId = reactive(router.currentRoute.value.params.siteId)
|
||||
const siteList = ref([])
|
||||
const siteIds = ref([])
|
||||
const siteNameList = ref([])
|
||||
@@ -135,6 +137,9 @@ const formRules = ref({
|
||||
siteName: [{required: true, message: '请输入站点名称', trigger:['blur','change']}]
|
||||
})
|
||||
const formInstance = ref()
|
||||
const handleGoHome = () => {
|
||||
router.push('/' + 'siteToHome/' + siteId)
|
||||
}
|
||||
const getList = () => {
|
||||
getSiteList({
|
||||
userId:userId,
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<div class="site-name">
|
||||
{{ siteName }}
|
||||
</div>
|
||||
<div class="tunnel-title"></div>
|
||||
<tunnel-title/>
|
||||
<div class="all-del-btn" v-if="showOperation">
|
||||
<div class="all-btn" style=" margin-right: 40px;" v-if="!showAddIcon" @click="handleAdd">
|
||||
添加
|
||||
@@ -45,8 +45,8 @@
|
||||
</div>
|
||||
<div class="tunnel-right">
|
||||
<div>
|
||||
<!-- <div class="fan-icon"></div>-->
|
||||
<!-- <span>风机异常</span>-->
|
||||
<!-- <div class="fan-icon"></div>-->
|
||||
<!-- <span>风机异常</span>-->
|
||||
</div>
|
||||
<div class="icons-block">
|
||||
<div v-for="equItem in iconsList" :key="item.icon" class="icon-text">
|
||||
@@ -79,6 +79,9 @@
|
||||
<el-form-item label="隧道长度" prop="totalLength">
|
||||
<el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="施工长度" prop="constructionLength">-->
|
||||
<!-- <el-input type="number" v-model="form.constructionLength" placeholder="请输入施工长度"/>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="是否默认">
|
||||
<el-radio-group v-model="form.isDefault">
|
||||
<el-radio :label="true">是</el-radio>
|
||||
@@ -112,17 +115,19 @@
|
||||
import {ElMessage, ElMessageBox} from "element-plus";
|
||||
import {getTunnelList, addTunnel, deleteTunnel} from "@/api/tunnelManage";
|
||||
import {getSiteDetail} from "@/api/site";
|
||||
import TunnelTitle from "@/components/tunnelTitle/index.vue";
|
||||
import {getTunnelBySiteId} from "@/api/largeScreen";
|
||||
|
||||
const validateNumber = (rule, value) => {
|
||||
const reg = /^[A-Za-z0-9]+$/;
|
||||
return reg.test(value);
|
||||
}
|
||||
const router = useRouter()
|
||||
const showAddIcon = ref(true)
|
||||
const params = router.currentRoute.value.params;
|
||||
const siteId = reactive(params.siteId)
|
||||
const userId = reactive(params.userId)
|
||||
const type = reactive(params.type)
|
||||
const validateNumber = (rule, value) => {
|
||||
const reg = /^[A-Za-z0-9]+$/;
|
||||
return reg.test(value);
|
||||
}
|
||||
const formRules = ref({
|
||||
tunnelName: [{required: true, message: '请输入隧道名称', trigger: ['blur', 'change']}],
|
||||
tunnelAlias: [{required: true, message: '请输入隧道简称', trigger: ['blur', 'change']}],
|
||||
@@ -130,7 +135,8 @@ const formRules = ref({
|
||||
{required: true, message: '请输入序列号', trigger: ['blur', 'change']},
|
||||
{validator: validateNumber, message: '请输入英文、数字、英文数字组合的用户名', trigger: ['blur', 'change']}
|
||||
],
|
||||
totalLength: [{required: true, message: '请输入隧道长度', trigger: ['blur', 'change']}]
|
||||
totalLength: [{required: true, message: '请输入隧道长度', trigger: ['blur', 'change']}],
|
||||
constructionLength: [{required: true, message: '请输入施工长度', trigger: ['blur', 'change']}]
|
||||
})
|
||||
const showFirst = ref(true)
|
||||
const showOperation = ref(true)
|
||||
@@ -208,11 +214,12 @@ const total = ref(10);
|
||||
onMounted(() => {
|
||||
showOperation.value = localStorage.getItem('roleKey') !== 'tunnel_admin';
|
||||
})
|
||||
|
||||
const handleGoSiteOrIndex = () => {
|
||||
if (type === 'bySite') {
|
||||
router.push('/site/' + userId)
|
||||
router.push('/site/' + userId + '/' + localStorage.getItem('currentSiteId'))
|
||||
} else if (type === 'byHome') {
|
||||
router.push('/')
|
||||
router.push('/' + 'siteToHome/' + siteId)
|
||||
}
|
||||
}
|
||||
//根据站点id获取隧道信息
|
||||
@@ -233,7 +240,6 @@ const getList = () => {
|
||||
total.value = res.data.total
|
||||
tunnelList.value = res.data.rows
|
||||
showFirst.value = total.value / pageInfo.pageSize >= 1;
|
||||
|
||||
// siteName.value = res.data.siteName
|
||||
} else {
|
||||
ElMessage.warning(res.msg)
|
||||
@@ -277,7 +283,15 @@ const handleSubmit = (instance) => {
|
||||
const handlePreview = (id) => {
|
||||
console.log('预览')
|
||||
if (id) {
|
||||
router.push('/' + id)
|
||||
getTunnelBySiteId(siteId).then((res) => {
|
||||
if (res?.code === 1000) {
|
||||
if (res.data.filter((item) => item.value == id).length === 0) {
|
||||
ElMessage.warning('当前预览的隧道未准备好, 不予展示, 请添加设备后再试!')
|
||||
} else {
|
||||
router.push('/' + id + '/' + siteId)
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
const handleGoToEditTunnel = (tunnelId) => {
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
<div id="main">
|
||||
<div class="box-top">
|
||||
<manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" v-if="showMenu" />
|
||||
<div class="tunnel-title"></div>
|
||||
<!-- <manage-length class="tunnel-length"></manage-length>-->
|
||||
<tunnel-title v-if="showTunnelTitle" />
|
||||
<div class="top-length">
|
||||
<!-- <span>隧道总长度: {{ tunnelLength }}米</span>-->
|
||||
<span>当前施工长度: {{ constructionLength }}米</span>
|
||||
@@ -32,7 +31,6 @@
|
||||
</div>
|
||||
<!-- <tunnel-scene id="tunnel-box" :isedit="false" /> -->
|
||||
<!-- 一进去的话应该是预览模式，所以引入这个组件1 -->
|
||||
|
||||
<preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId" :key="tunnelId" :tunnelLen="tunnelLen"
|
||||
:tunnelName="tunnelName" :largeScreen="largeScreen"></preview-scene>
|
||||
<div class="left">
|
||||
@@ -80,6 +78,7 @@ import WindPressureList from "@/components/content/windPressure/WindPressureList
|
||||
import AirInfo from "@/components/content/airInfo/AirInfo.vue";
|
||||
import BadGasInfo from "@/components/content/badGasInfo/BadGasInfo.vue";
|
||||
import ManageBtn from "@/components/manageBtn/index.vue";
|
||||
import TunnelTitle from "@/components/tunnelTitle/index.vue";
|
||||
import { dateFormat } from "@/utils/date.js";
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { useAuthStore } from "@/store/userstore.js";
|
||||
@@ -87,13 +86,18 @@ import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/lar
|
||||
import { ElMessage, ElMessageBox } from "element-plus";
|
||||
import { getUserInfo } from "@/api/login";
|
||||
import { initSceneData } from "@/api/tunnelScene";
|
||||
import { getTunnelList } from "@/api/tunnelManage";
|
||||
import { computed } from "vue";
|
||||
|
||||
const authStore = useAuthStore();
|
||||
const router = useRouter();
|
||||
const previewId = reactive(router.currentRoute.value.params.tunnelId)
|
||||
const siteId = reactive(router.currentRoute.value.params.siteId)
|
||||
const tunnelIdFlag = reactive(router.currentRoute.value.params.tunnelId)
|
||||
const selectIndex = ref(-1);
|
||||
const showFan = ref(false);
|
||||
const drawerLeft = ref(true);
|
||||
const showTunnelTitle = ref(true);
|
||||
const initialIndex = ref(0)
|
||||
const showFanLoading = ref(0)
|
||||
const showWindLoading = ref(0)
|
||||
@@ -103,6 +107,7 @@ const showMenu = ref(false);
|
||||
const currentSiteId = ref(0);
|
||||
const currentSite = ref("");
|
||||
const siteList = ref([])
|
||||
const totalTunnelList = ref([])
|
||||
const currentUser = ref("");
|
||||
const currentUserId = ref(0);
|
||||
const currentDate = ref(dateFormat());
|
||||
@@ -113,7 +118,9 @@ const tunnelLength = ref(0);
|
||||
const constructionLength = ref(0);
|
||||
const routeList = ref([]);
|
||||
let socket = reactive("");
|
||||
let pattern = reactive(new RegExp("[A-Za-z]+"));
|
||||
let tunnelName = reactive("")
|
||||
let isTunnel = reactive(false)
|
||||
|
||||
const btnList = ref([
|
||||
{
|
||||
@@ -155,9 +162,7 @@ const socketData = reactive({
|
||||
let tunnelLen = computed(() => tunnelLength);
|
||||
|
||||
onMounted(() => {
|
||||
if (previewId) {
|
||||
getScreenInfo(previewId)
|
||||
}
|
||||
getList()
|
||||
getUser()
|
||||
getOtherInfo()
|
||||
nextTick(() => {
|
||||
@@ -178,7 +183,7 @@ const getOtherInfo = () => {
|
||||
getLargeScreenInfo().then((res) => {
|
||||
if (res?.code === 1000) {
|
||||
let routeArr = [];
|
||||
res.data.routeList.forEach((item, index) => {
|
||||
res.data.routeList.forEach((item) => {
|
||||
for (let btn of btnList.value) {
|
||||
if (item === btn.route) {
|
||||
routeArr.push(btn)
|
||||
@@ -188,22 +193,25 @@ const getOtherInfo = () => {
|
||||
routeList.value = routeArr
|
||||
showMenu.value = true
|
||||
siteList.value = res.data.siteOption
|
||||
currentSiteId.value = res.data.siteOption[0].value
|
||||
currentSite.value = res.data.siteOption[0].label
|
||||
localStorage.setItem('site', currentSite.value)
|
||||
if (res.data.tunnelOption.length === 0) {
|
||||
getTunnel(res.data.siteOption[0].value)
|
||||
} else {
|
||||
if (!siteId) {
|
||||
tunnelList.value = res.data.tunnelOption
|
||||
}
|
||||
if (previewId) {
|
||||
tunnelList.value.forEach((item, index) => {
|
||||
if (item.value == previewId) {
|
||||
initialIndex.value = index
|
||||
}
|
||||
})
|
||||
|
||||
if (siteId) {
|
||||
currentSiteId.value = siteId
|
||||
currentSite.value = localStorage.getItem('site')
|
||||
showTunnelTitle.value = false
|
||||
nextTick(() => {
|
||||
showTunnelTitle.value = true
|
||||
});
|
||||
console.log('siteId', siteId)
|
||||
getTunnel(siteId)
|
||||
} else {
|
||||
getTunnel(res.data.siteOption[0].value)
|
||||
currentSiteId.value = res.data.siteOption[0].value
|
||||
currentSite.value = res.data.siteOption[0].label
|
||||
localStorage.setItem('site', currentSite.value)
|
||||
localStorage.setItem('currentSiteId', currentSiteId.value)
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -224,7 +232,7 @@ const getScreenInfo = (id) => {
|
||||
showWindLoading.value = 1
|
||||
}
|
||||
if (res.data.sensorList.length !== 0) {
|
||||
res.data.sensorList.forEach((item, index) => {
|
||||
res.data.sensorList.forEach((item) => {
|
||||
if (
|
||||
item.equipmentType === "carbonDioxide" ||
|
||||
item.equipmentType === "carbonMonoxide" ||
|
||||
@@ -255,18 +263,45 @@ const getScreenInfo = (id) => {
|
||||
})
|
||||
}
|
||||
};
|
||||
//根据站点id获取隧道信息
|
||||
const getList = () => {
|
||||
getTunnelList({
|
||||
siteId: siteId
|
||||
}).then(res => {
|
||||
if (res.code === 1000) {
|
||||
if (res.data.rows.length !== 0) {
|
||||
isTunnel = true;
|
||||
totalTunnelList.value = res.data.rows
|
||||
} else {
|
||||
isTunnel = false
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
//根据站点id获取隧道信息option
|
||||
let largeScreen = computed(() => largeScreenData)
|
||||
const getTunnel = (id) => {
|
||||
getTunnelBySiteId(id).then((res) => {
|
||||
if (res?.code === 1000) {
|
||||
if (res.data.length === 0) {
|
||||
ElMessage.warning('该站点下无隧道, 请新增隧道后再尝试!')
|
||||
if (isTunnel) {
|
||||
ElMessage.warning('该站点下没有隧道可展示, 请添加设备后再试!')
|
||||
} else {
|
||||
ElMessage.warning('该站点下没有隧道, 请新增隧道后再试!')
|
||||
}
|
||||
tunnelList.value = []
|
||||
} else {
|
||||
getScreenInfo(res.data[0]?.value)
|
||||
tunnelName = res.data[0].label
|
||||
if (!pattern.test(previewId)) {
|
||||
getScreenInfo(previewId)
|
||||
} else {
|
||||
getScreenInfo(res.data[0]?.value)
|
||||
tunnelName = res.data[0].label
|
||||
}
|
||||
tunnelList.value = res.data
|
||||
tunnelList.value.forEach((item, index) => {
|
||||
if (item.value == previewId) {
|
||||
initialIndex.value = index
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -288,17 +323,17 @@ const changeTunnel = (e) => {
|
||||
}
|
||||
const manageSelect = (index) => {
|
||||
console.log("首页点击-", index);
|
||||
if (index == '站点管理') {
|
||||
if (index === '站点管理') {
|
||||
if (currentUserId.value) {
|
||||
router.push("/site/" + currentUserId.value);
|
||||
router.push("/site/" + currentUserId.value + '/' + currentSiteId.value);
|
||||
}
|
||||
} else if (index == '隧道管理') {
|
||||
} else if (index === '隧道管理') {
|
||||
if (currentSiteId.value && currentUserId.value) {
|
||||
router.push("/tunnel/" + currentSiteId.value + '/byHome/' + currentUserId.value);
|
||||
router.push("/tunnel/" + localStorage.getItem('currentSiteId') + '/byHome/' + currentUserId.value);
|
||||
}
|
||||
} else if (index == '用户管理') {
|
||||
} else if (index === '用户管理') {
|
||||
if (currentSiteId.value) {
|
||||
router.push("/user/" + currentSiteId.value);
|
||||
router.push("/user/" + localStorage.getItem('currentSiteId'));
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -310,6 +345,15 @@ const handleChangeSite = (item) => {
|
||||
nextTick(() => {
|
||||
showFan.value = true;
|
||||
});
|
||||
localStorage.setItem('site', currentSite.value)
|
||||
localStorage.setItem('currentSiteId', currentSiteId.value)
|
||||
if (tunnelIdFlag) {
|
||||
router.push('/' + tunnelIdFlag + '/' + currentSiteId.value)
|
||||
}
|
||||
showTunnelTitle.value = false
|
||||
nextTick(() => {
|
||||
showTunnelTitle.value = true
|
||||
});
|
||||
}
|
||||
const closeLeft = () => {
|
||||
drawerLeft.value = !drawerLeft.value;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<div class="tunnel-bgc">
|
||||
<div class="box-top">
|
||||
<div class="back-tunnel" @click="router.push('/')">
|
||||
<div class="back-tunnel" @click="handleGoHome">
|
||||
<div class="back-icon"></div>
|
||||
<span>返回</span>
|
||||
</div>
|
||||
<div class="tunnel-title"></div>
|
||||
<tunnel-title/>
|
||||
<div class="all-del-btn">
|
||||
<!-- <div class="all-btn" @click="handleAll">-->
|
||||
<!-- 全选-->
|
||||
@@ -142,18 +142,18 @@
|
||||
|
||||
<script setup>
|
||||
import {Search} from '@element-plus/icons-vue'
|
||||
import {addUser, editUser, getUser, getRoleOption} from "@/api/user";
|
||||
import {addUser, editUser, getUser, getRoleOption, deleteUser, getUserDetail} from "@/api/user";
|
||||
import {ElMessage, ElMessageBox} from "element-plus";
|
||||
import {getTunnelOption} from "@/api/tunnel";
|
||||
import {deleteUser, getUserDetail} from "../../api/user";
|
||||
import TunnelTitle from "@/components/tunnelTitle/index.vue";
|
||||
|
||||
const router = useRouter()
|
||||
const title = ref('添加用户')
|
||||
const siteId = reactive(router.currentRoute.value.params.siteId)
|
||||
const currentSite = ref(localStorage.getItem('site'))
|
||||
const username = ref()
|
||||
const userIds = ref()
|
||||
const showFirst = ref(true)
|
||||
const currentSite = ref('')
|
||||
const formInstance = ref()
|
||||
const userData = ref([])
|
||||
const pageInfo = reactive({
|
||||
@@ -192,7 +192,9 @@ const multipleTable = ref()
|
||||
onMounted(() => {
|
||||
showAdmin.value = localStorage.getItem('userId') == 2;
|
||||
})
|
||||
|
||||
const handleGoHome = () => {
|
||||
router.push('/' + 'userToHome/' + siteId)
|
||||
}
|
||||
const getTunnel = () => {
|
||||
getTunnelOption(siteId).then(res => {
|
||||
if (res.code === 1000) {
|
||||
@@ -205,7 +207,6 @@ const handleAddUser = () => {
|
||||
reset()
|
||||
title.value = '添加用户'
|
||||
isVisited.value = true
|
||||
currentSite.value = localStorage.getItem('site')
|
||||
}
|
||||
const handleEditUser = (row) => {
|
||||
reset()
|
||||
@@ -220,9 +221,7 @@ const handleEditUser = (row) => {
|
||||
title.value = '修改用户'
|
||||
isVisited.value = true
|
||||
}
|
||||
const handleAll = () => {
|
||||
multipleTable.value.toggleAllSelection()
|
||||
}
|
||||
|
||||
const handleDelete = () => {
|
||||
if (userIds.value === undefined) {
|
||||
ElMessage.warning('请先选择用户进行删除')
|
||||
@@ -343,7 +342,7 @@ const handleSelect = async (selection, row) => {
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.user-select {
|
||||
.el-select__wrapper{
|
||||
.el-select__wrapper {
|
||||
min-height: 75px;
|
||||
height: auto !important;
|
||||
background-color: transparent;
|
||||
@@ -351,41 +350,50 @@ const handleSelect = async (selection, row) => {
|
||||
font-size: 35px;
|
||||
width: 476px;
|
||||
}
|
||||
|
||||
.el-select__placeholder.is-transparent {
|
||||
height: 54px;
|
||||
line-height: 54px;
|
||||
}
|
||||
|
||||
.el-select__selected-item {
|
||||
//height: 54px;
|
||||
//line-height: 54px;
|
||||
.el-tag {
|
||||
max-width: none!important;
|
||||
max-width: none !important;
|
||||
height: 55px;
|
||||
font-size: 43px;
|
||||
.el-icon {
|
||||
font-size: 51px;
|
||||
width: auto;
|
||||
height: auto;
|
||||
|
||||
.el-icon {
|
||||
font-size: 51px;
|
||||
width: auto;
|
||||
height: auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
.el-select__caret{
|
||||
|
||||
.el-select__caret {
|
||||
font-size: 35px !important;
|
||||
}
|
||||
|
||||
.el-select-dropdown__item.is-hovering {
|
||||
background-color: #064B66 !important;
|
||||
}
|
||||
|
||||
.el-select-dropdown.is-multiple .el-select-dropdown__item.is-selected:after {
|
||||
width: 42px;
|
||||
height: 42px;
|
||||
}
|
||||
|
||||
.el-input {
|
||||
min-height: 75px;
|
||||
height: auto !important;
|
||||
}
|
||||
|
||||
.el-form-item.is-error .el-input__wrapper {
|
||||
box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.el-select__popper {
|
||||
margin-top: -12px !important;
|
||||
background: #072247 !important;
|
||||
@@ -444,6 +452,7 @@ const handleSelect = async (selection, row) => {
|
||||
background-color: #05FEFF;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
font-size: 35px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user