diff --git a/src/views/components/assetsType/index.vue b/src/views/components/assetsType/index.vue
index 39f1c51..cc43270 100644
--- a/src/views/components/assetsType/index.vue
+++ b/src/views/components/assetsType/index.vue
@@ -3002,21 +3002,20 @@
新监管业务形态
-
- 云平台
- 大数据
- 物联网
- 移动APP
- 工业控制
- CDN
-
+ 云平台
+ 大数据
+ 物联网
+ 移动APP
+ 工业控制
+ CDN
+
-
+
云平台
@@ -3127,7 +3126,7 @@
-
+
大数据
@@ -3222,7 +3221,7 @@
-
+
一般物联网设备
@@ -3425,7 +3424,7 @@
-
+
移动APP
@@ -3516,7 +3515,7 @@
-
+
工业控制
@@ -3709,7 +3708,7 @@
-
+
CDN信息
@@ -4577,14 +4576,14 @@
-
+
1) {
+ this.ruleForm.xjgywxt.remark = [val[val.length - 1]];
+ }
+ },
// 新增超链接的方法
generateFullUrl(url) {
if (!url) return "";
@@ -4924,10 +4929,21 @@ export default {
getInfo(id) {
assetInfo(id).then((res) => {
this.ruleForm = res.data;
- if (!this.ruleForm.xjgywxt) {
- this.ruleForm.xjgywxt = {};
- this.$set(this.ruleForm.xjgywxt, "remark", "");
- }
+ // 新监管业务形态 remark 兼容回显
+ if (!this.ruleForm.xjgywxt) {
+ this.ruleForm.xjgywxt = {};
+ this.$set(this.ruleForm.xjgywxt, "remark", []);
+ } else {
+ // 兼容后端返回字符串
+ if (
+ typeof this.ruleForm.xjgywxt.remark === "string" &&
+ this.ruleForm.xjgywxt.remark !== ""
+ ) {
+ this.ruleForm.xjgywxt.remark = [this.ruleForm.xjgywxt.remark];
+ } else if (!Array.isArray(this.ruleForm.xjgywxt.remark)) {
+ this.ruleForm.xjgywxt.remark = [];
+ }
+ }
if (this.ruleForm.fwwz) {
let arr = this.ruleForm.fwwz.split("-");
this.select = arr[0];
@@ -5235,6 +5251,15 @@ export default {
newAssets() {
this.$refs["ruleForm"].validate((valid) => {
if (valid) {
+ // 修复remark类型问题
+ if (
+ this.ruleForm.xjgywxt &&
+ Array.isArray(this.ruleForm.xjgywxt.remark)
+ ) {
+ // 只取第一个选中的值,或用join(',')拼接
+ this.ruleForm.xjgywxt.remark =
+ this.ruleForm.xjgywxt.remark[0] || "";
+ }
this.ruleForm.xttz = this.xttz.join(",");
this.ruleForm.xtfhqkFcg = this.xtfhqkFcg.join(",");
this.ruleForm.xtfhqkFxl = this.xtfhqkFxl.join(",");
diff --git a/src/views/components/myAssetsType/index.vue b/src/views/components/myAssetsType/index.vue
index b1d4e8d..0361347 100644
--- a/src/views/components/myAssetsType/index.vue
+++ b/src/views/components/myAssetsType/index.vue
@@ -5224,14 +5224,14 @@
-
+
-
+
-
+