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

fix : 注释序列号

Browse Source
This commit is contained in:
odjbin
2024-08-20 22:48:08 +08:00
parent 191c7dbbb5
commit 493f816e3c
4 changed files with 64 additions and 64 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 pro --kubeconfig=/app/config/tunnel-cloud-config.yml - kubectl apply -f deployment.yml -n test --kubeconfig=/app/config/tunnel-cloud-config.yml
volumes: volumes:
- name: build - name: build

5
src/api/tunnelManage.js
View File

@@ -56,12 +56,13 @@ export const editEquipment = (data) => {
data data
}) })
} }
export const getEquipmentSerialNumberOptions = (tunnelId) => { export const getEquipmentSerialNumberOptions = (tunnelId,equipmentId) => {
return request({ return request({
url: '/tunnel/tunnel/serialnumber/options', url: '/tunnel/tunnel/serialnumber/options',
method: 'get', method: 'get',
params:{ params:{
tunnelId:tunnelId tunnelId:tunnelId,
equipmentId:equipmentId
} }
}) })
} }

91
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 serialNumberOptions"--> v-for="item in getSerialNumberOptions(scope.row)"
<!-- :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 serialNumberOptions"--> v-for="item in getSerialNumberOptions(scope.row)"
<!-- :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 serialNumberOptions"--> v-for="item in getSerialNumberOptions(scope.row)"
<!-- :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,9 +371,9 @@ 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 = () => { const getSerialNumberOptions = (row) => {
console.log('tunnelId',tunnelId) console.info("🚀 ~ file:index method:getSerialNumberOptions line:375 -----", row)
getEquipmentSerialNumberOptions(tunnelId).then(res => { getEquipmentSerialNumberOptions(tunnelId,row.equipmentId).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
serialNumberOptions.value = res.data serialNumberOptions.value = res.data
} else { } else {
@@ -381,7 +381,6 @@ const getSerialNumberOptions = () => {
} }
}) })
} }
getSerialNumberOptions()
const changeFan = (e) => { const changeFan = (e) => {
// const fanObj = { // const fanObj = {
// acquisitionPeriod: e * 1000, // acquisitionPeriod: e * 1000,
@@ -493,15 +492,15 @@ const getList = () => {
getEquipmentList(tunnelId).then(res => { getEquipmentList(tunnelId).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
fanData.value = res.data.frequencyChangerList fanData.value = res.data.frequencyChangerList
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
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 => { 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

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>