odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 注释序列号' (#370) from de into dev

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/370
This commit is contained in:
odjbin
2024-08-20 16:21:53 +00:00
parent f38a55f8a3 4813161c08
commit 4fd4cf4f4c
3 changed files with 98 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@@ -66,7 +66,7 @@ steps:
# 将deployment中定义的变量替换为drone中的内置变量 # 将deployment中定义的变量替换为drone中的内置变量
- cat deployment.yml - cat deployment.yml
# 通过kubectl指令运行deployment.yml,并指定授权文件kubectl_conf.yml # 通过kubectl指令运行deployment.yml,并指定授权文件kubectl_conf.yml
- kubectl apply -f deployment.yml -n test --kubeconfig=/app/config/tunnel-cloud-config.yml - kubectl apply -f deployment.yml -n pro --kubeconfig=/app/config/tunnel-cloud-config.yml
volumes: volumes:
- name: build - name: build

143
src/views/device-manage/index.vue
View File

@@ -76,19 +76,19 @@
@change="changeFanData(scope.row)"></el-input> @change="changeFanData(scope.row)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="serialNumber" label="序列号" align="center" width="500"> <!-- <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select" <!-- <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
@change="changeFanData(scope.row)" class="serialNumber"> <!-- @change="changeFanData(scope.row)" class="serialNumber">-->
<el-option <!-- <el-option-->
v-for="item in getSerialNumberOptions(scope.row)" <!-- v-for="item in scope.row.serialNumberOption"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value" <!-- :value="item.value"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="state" label="状态" align="center" min-width="86"> <el-table-column prop="state" label="状态" align="center" min-width="86">
<template #default="scope"> <template #default="scope">
<div class="switch"> <div class="switch">
@@ -160,19 +160,19 @@
@change="changeWindData(scope.row)"></el-input> @change="changeWindData(scope.row)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="serialNumber" label="序列号" align="center" width="500"> <!-- <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select" <!-- <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
@change="changeWindData(scope.row)" class="serialNumber"> <!-- @change="changeWindData(scope.row)" class="serialNumber">-->
<el-option <!-- <el-option-->
v-for="item in getSerialNumberOptions(scope.row)" <!-- v-for="item in scope.row.serialNumberOption"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value" <!-- :value="item.value"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="state" label="状态" align="center"> <el-table-column prop="state" label="状态" align="center">
<template #default="scope"> <template #default="scope">
<div class="switch wind-switch"> <div class="switch wind-switch">
@@ -244,19 +244,19 @@
@change="changeOtherData(scope.row)"></el-input> @change="changeOtherData(scope.row)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="serialNumber" label="序列号" align="center" width="500"> <!-- <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select" <!-- <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
@change="changeOtherData(scope.row)" clearable class="serialNumber"> <!-- @change="changeOtherData(scope.row)" clearable class="serialNumber">-->
<el-option <!-- <el-option-->
v-for="item in getSerialNumberOptions(scope.row)" <!-- v-for="item in scope.row.serialNumberOption"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value" <!-- :value="item.value"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="state" label="状态" align="center"> <el-table-column prop="state" label="状态" align="center">
<template #default="scope"> <template #default="scope">
<div class="switch wind-switch"> <div class="switch wind-switch">
@@ -371,16 +371,23 @@ const frequencyData = ref([])
const serialNumberOptions = ref([]) const serialNumberOptions = ref([])
const siteId = ref(0) const siteId = ref(0)
const tunnelName = ref('') const tunnelName = ref('')
const getSerialNumberOptions = (row) => { const getSerialNumberOptions =async (equipmentId) => {
console.info("🚀 ~ file:index method:getSerialNumberOptions line:375 -----", row) console.log('tunnelId',tunnelId)
getEquipmentSerialNumberOptions(tunnelId,row.equipmentId).then(res => { let {data,code,msg}=await getEquipmentSerialNumberOptions(tunnelId,equipmentId)
if (res.code === 1000) { if(code===1000){
serialNumberOptions.value = res.data return data
} else { }else{
ElMessage.error(res.msg) ElMessage.error(msg)
} }
}) // getEquipmentSerialNumberOptions(tunnelId,equipmentId).then(res => {
// if (res.code === 1000) {
// serialNumberOptions.value = res.data
// } else {
// ElMessage.error(res.msg)
// }
// })
} }
// getSerialNumberOptions()
const changeFan = (e) => { const changeFan = (e) => {
// const fanObj = { // const fanObj = {
// acquisitionPeriod: e * 1000, // acquisitionPeriod: e * 1000,
@@ -468,6 +475,7 @@ const editEquip = debounce(() => {
sensorList: newSensor, sensorList: newSensor,
// shuntList: editFenLiuData.value, // shuntList: editFenLiuData.value,
} }
console.info("🚀 ~ file:index method: line:478 -----",basicData)
editEquipment(basicData).then(res => { editEquipment(basicData).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
ElMessage.success('修改成功') ElMessage.success('修改成功')
@@ -482,25 +490,34 @@ const handleChangeMenu = (e) => {
changeIndex.value = e changeIndex.value = e
} }
const getList = () => { const getList =async () => {
const loading = ElLoading.service({ const loading = ElLoading.service({
lock: true, lock: true,
text: '正在加载系统资源...', text: '正在加载系统资源...',
background: 'rgba(0, 0, 0, 0.7)', background: 'rgba(0, 0, 0, 0.7)',
customClass: 'allLoading' customClass: 'allLoading'
}) })
getEquipmentList(tunnelId).then(res => { await getEquipmentList(tunnelId).then( res => {
if (res.code === 1000) { if (res.code === 1000) {
fanData.value = res.data.frequencyChangerList fanData.value = res.data.frequencyChangerList
fanData.value?.forEach( async item => {
item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
})
res.data.windPressureSensorList?.forEach(item => { res.data.windPressureSensorList?.forEach(item => {
item.offset = item.offset + 4000 item.offset = item.offset + 4000
}) })
winData.value = res.data.windPressureSensorList winData.value = res.data.windPressureSensorList
winData.value?.forEach( async item => {
item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
})
res.data.sensorList?.forEach(item => { res.data.sensorList?.forEach(item => {
item.offset = item.offset + 4000 item.offset = item.offset + 4000
}) })
otherData.value = res.data.sensorList otherData.value = res.data.sensorList
res.data.acquisitionList?.map(item => { otherData.value?.forEach( async item => {
item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
})
res.data.acquisitionList.map(item => {
item.acquisitionPeriod = item.acquisitionPeriod / 1000 item.acquisitionPeriod = item.acquisitionPeriod / 1000
if (item.typeKey === 'frequency') { if (item.typeKey === 'frequency') {
fanFrequency.value = item.acquisitionPeriod fanFrequency.value = item.acquisitionPeriod
@@ -528,7 +545,18 @@ getList()
<style lang="scss"> <style lang="scss">
.serialNumber{ .serialNumber{
.el-input{ .el-input{
width: 450px!important; width: 466px!important;
}
.el-input__suffix-inner{
.el-icon{
width: 3em!important;
height: 3em!important;
color: #fff!important;
svg{
width: 3em!important;
height: 3em!important;
}
}
} }
} }
.el-select.serialNumber { .el-select.serialNumber {
@@ -629,20 +657,13 @@ getList()
.device-box { .device-box {
display: flex; display: flex;
width: 2800px; width: 3200px;
height: 1600px; height: 1600px;
background: #064B66; background: #064B66;
border-radius: 20px; border-radius: 20px;
border: 2px solid #05FEFF; border: 2px solid #05FEFF;
box-sizing: border-box; box-sizing: border-box;
//:deep(.el-input__suffix-inner){
// .el-icon{
// svg{
// width:10em;
// height: 10em;
// }
// }
//}
.box-left { .box-left {
padding-left: 24px; padding-left: 24px;
width: 300px; width: 300px;

30
src/views/edit/edit.vue
View File

@@ -19,21 +19,21 @@
<el-form-item label="隧道简称"> <el-form-item label="隧道简称">
<el-input v-model="form.tunnelAlias" placeholder="请输入隧道简称"/> <el-input v-model="form.tunnelAlias" placeholder="请输入隧道简称"/>
</el-form-item> </el-form-item>
<el-form-item label="序列号前缀" prop="serialNumberPrefix"> <!-- <el-form-item label="序列号前缀" prop="serialNumberPrefix">-->
<el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/> <!-- <el-input v-model="form.serialNumberPrefix" placeholder="请输入序列号前缀"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="PLC序列号" prop="serialNumber"> <!-- <el-form-item label="PLC序列号" prop="serialNumber">-->
<el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/> <!-- <el-input v-model="form.serialNumber" placeholder="请输入PLC序列号"/>-->
</el-form-item> <!-- </el-form-item>-->
<div style="display: flex;flex-direction: column"> <!-- <div style="display: flex;flex-direction: column">-->
<div v-for="(item,index) in form.serialNumberList" :key="index" > <!-- <div v-for="(item,index) in form.serialNumberList" :key="index" >-->
<el-form-item :label="'序列号'+(index+2)"> <!-- <el-form-item :label="'序列号'+(index+2)">-->
<div style="flex: 1;display: flex;"> <!-- <div style="flex: 1;display: flex;">-->
<el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" /> <!-- <el-input v-model="item.serialNumberOne" :placeholder="'请输入序列号'+(index+2)" />-->
</div> <!-- </div>-->
</el-form-item> <!-- </el-form-item>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<el-form-item label="隧道长度"> <el-form-item label="隧道长度">
<el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/> <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
</el-form-item> </el-form-item>