|
@@ -350,7 +350,6 @@ export default {
|
|
|
API_DeviceMenu.getList(params).then(response => {
|
|
|
this.loading = false
|
|
|
this.rowData = response.data
|
|
|
- console.log(response.data)
|
|
|
this.pageData = {
|
|
|
page_no: response.page_no,
|
|
|
page_size: response.page_size,
|
|
@@ -603,7 +602,11 @@ export default {
|
|
|
return DEVICE_TYPE.getDescFromValue(param.value)
|
|
|
},
|
|
|
formatterUnEscape(param){
|
|
|
+ if (param.value === null) {
|
|
|
+ return ""
|
|
|
+ }
|
|
|
return param.value.replace(/&/g, "&")
|
|
|
+ // return param.value
|
|
|
},
|
|
|
addInput(paramsTemp){
|
|
|
paramsTemp.push({
|
|
@@ -620,7 +623,7 @@ export default {
|
|
|
let _paramsTemp = '';
|
|
|
if (paramsTemp.length !== 0) {
|
|
|
for (let i = 0; i < paramsTemp.length; i++) {
|
|
|
- if (paramsTemp[i].parameter !== '') {
|
|
|
+ if (paramsTemp[i].parameter !== '' && paramsTemp[i].value !== '') {
|
|
|
if (i !== 0){
|
|
|
paramsTempStr += '&'
|
|
|
}
|
|
@@ -636,7 +639,7 @@ export default {
|
|
|
const paramsTemp = []
|
|
|
let _parameter = ''
|
|
|
let _value = ''
|
|
|
- if (str !== '') {
|
|
|
+ if (str !== null && str !== '') {
|
|
|
let _str = str.split('&')
|
|
|
for (let i = 0; i < _str.length; i++) {
|
|
|
_parameter = _str[i].split('=')[0]
|