diff --git a/.drone.yml b/.drone.yml index 47b6292..a75a175 100644 --- a/.drone.yml +++ b/.drone.yml @@ -66,7 +66,7 @@ steps: # 将deployment中定义的变量替换为drone中的内置变量 - cat deployment.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: - name: build diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js index 981862e..a6d2c59 100644 --- a/src/api/tunnelManage.js +++ b/src/api/tunnelManage.js @@ -56,12 +56,13 @@ export const editEquipment = (data) => { data }) } -export const getEquipmentSerialNumberOptions = (tunnelId) => { +export const getEquipmentSerialNumberOptions = (tunnelId,equipmentId) => { return request({ url: '/tunnel/tunnel/serialnumber/options', method: 'get', params:{ - tunnelId:tunnelId + tunnelId:tunnelId, + equipmentId:equipmentId } }) } diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue index c8bdbfe..63ad8fa 100644 --- a/src/views/device-manage/index.vue +++ b/src/views/device-manage/index.vue @@ -76,19 +76,19 @@ @change="changeFanData(scope.row)"> - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + + +