Browse Source

解决冲突

pull/1/head
ljlong_2630 1 year ago
parent
commit
7a93b81e65
  1. 4
      .env.production
  2. 8
      src/views/model/alert/deviceparamalert.vue

4
.env.production

@ -5,8 +5,8 @@ VITE_APP_TITLE = 联美管理驾驶舱
VITE_APP_ENV = 'production' VITE_APP_ENV = 'production'
# 若依管理系统/生产环境 # 若依管理系统/生产环境
VITE_APP_BASE_API = 'http://10.10.10.56:9010' VITE_APP_BASE_API = '/prod-api/'
VITE_APP_BASE_API_IMAGE = 'http://10.10.10.56:9010' VITE_APP_BASE_API_IMAGE = '/prod-api/'
# 是否在打包时开启压缩,支持 gzip 和 brotli # 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip VITE_BUILD_COMPRESS = gzip

8
src/views/model/alert/deviceparamalert.vue

@ -893,6 +893,8 @@ function getModelList(row){
element.id = item.alertModelId; element.id = item.alertModelId;
proxy.$refs.policyTable.toggleRowSelection(element,true); proxy.$refs.policyTable.toggleRowSelection(element,true);
return element; return element;
}else{
element.id = null;
} }
}) })
}) })
@ -985,6 +987,8 @@ function computeDelPolicy() {
function computeAddPolicy() { function computeAddPolicy() {
const newSeletedRows = proxy.$refs.policyTable.getSelectionRows(); const newSeletedRows = proxy.$refs.policyTable.getSelectionRows();
newSeletedRows.forEach(item=>{ newSeletedRows.forEach(item=>{
console.log('item');
console.log(item);
let flag = false; let flag = false;
oldPolicyRows.value.forEach(element=>{ oldPolicyRows.value.forEach(element=>{
if(item.policyId == element.id){ if(item.policyId == element.id){
@ -992,9 +996,13 @@ function computeAddPolicy() {
} }
}) })
if(!flag){ if(!flag){
console.log('policyParams-before');
console.log(policyParams.value);
policyParams.value = policyParams.value.filter(element=>{ policyParams.value = policyParams.value.filter(element=>{
return item.policyId !== element.id; return item.policyId !== element.id;
}) })
console.log('policyParams-after');
console.log(policyParams.value);
//id //id
let policyParam = {}; let policyParam = {};
policyParam.deviceId = policyDeviceUuid.value; policyParam.deviceId = policyDeviceUuid.value;

Loading…
Cancel
Save