suzhou-jichuang-lanhai
/
TcAssetVerificationPc
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: suzhou-jichuang-lanhai:999bbe00e081580eac3412a3e3dc66ddfaa68900
Branches Tags
suzhou-jichuang-lanhai:lijinlongNew
suzhou-jichuang-lanhai:xuhongjie
suzhou-jichuang-lanhai:main
suzhou-jichuang-lanhai:ltf
suzhou-jichuang-lanhai:lijinlong
..
compare: suzhou-jichuang-lanhai:6c4051cdfd0e63bd28b9d01157dc2d54f923f269
Branches Tags
suzhou-jichuang-lanhai:lijinlongNew
suzhou-jichuang-lanhai:xuhongjie
suzhou-jichuang-lanhai:main
suzhou-jichuang-lanhai:ltf
suzhou-jichuang-lanhai:lijinlong

No commits in common. '999bbe00e081580eac3412a3e3dc66ddfaa68900' and '6c4051cdfd0e63bd28b9d01157dc2d54f923f269' have entirely different histories.
999bbe00e0 ... 6c4051cdfd

4 changed files with 52 additions and 98 deletions
Show Stats

84
src/views/components/assetsType/index.vue
Unescape View File

@ -650,19 +650,11 @@
</el-col> </el-col>
<el-col :span="12" v-if="ruleForm.xtbsfs == 4"> <el-col :span="12" v-if="ruleForm.xtbsfs == 4">
<el-form-item label="云服务商" required> <el-form-item label="云服务商" required>
<!-- <el-input <el-input
v-model="ruleForm.yfws" v-model="ruleForm.yfws"
style="width: 100%" style="width: 100%"
placeholder="请输入云服务商" placeholder="请输入云服务商"
></el-input> --> ></el-input>
<el-select v-model="ruleForm.yfws" placeholder="请选择云服务商">
<el-option
v-for="dict in dict.type.yfws"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -3002,20 +2994,21 @@
<span class="top-title-box">新监管业务形态</span> <span class="top-title-box">新监管业务形态</span>
</el-row> </el-row>
<el-row style="margin: 20px 0"> <el-row style="margin: 20px 0">
<el-checkbox-group <el-radio-group
v-model="ruleForm.xjgywxt.remark" v-model="ruleForm.xjgywxt.remark"
@change="handleCheckboxChange" size="medium"
@input="changeRadio"
style="margin-left: 170px" style="margin-left: 170px"
> >
<el-checkbox label="1" border>云平台</el-checkbox> <el-radio label="1" border>云平台</el-radio>
<el-checkbox label="2" border>大数据</el-checkbox> <el-radio label="2" border>大数据</el-radio>
<el-checkbox label="3" border>物联网</el-checkbox> <el-radio label="3" border>物联网</el-radio>
<el-checkbox label="4" border>移动APP</el-checkbox> <el-radio label="4" border>移动APP</el-radio>
<el-checkbox label="5" border>工业控制</el-checkbox> <el-radio label="5" border>工业控制</el-radio>
<el-checkbox label="6" border>CDN</el-checkbox> <el-radio label="6" border>CDN</el-radio>
</el-checkbox-group> </el-radio-group>
</el-row> </el-row>
<div v-if="Array.isArray(ruleForm.xjgywxt.remark) && ruleForm.xjgywxt.remark[0] === '1'"> <div v-if="ruleForm.xjgywxt.remark == 1">
<!-- 云平台 --> <!-- 云平台 -->
<el-row style="margin: 10px 0"> <el-row style="margin: 10px 0">
<span class="top-title-two-box">云平台</span> <span class="top-title-two-box">云平台</span>
@ -3126,7 +3119,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div v-if="Array.isArray(ruleForm.xjgywxt.remark) && ruleForm.xjgywxt.remark[0] === '2'"> <div v-if="ruleForm.xjgywxt.remark == 2">
<!-- 大数据 --> <!-- 大数据 -->
<el-row style="margin: 10px 0"> <el-row style="margin: 10px 0">
<span class="top-title-two-box">大数据</span> <span class="top-title-two-box">大数据</span>
@ -3221,7 +3214,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div v-if="Array.isArray(ruleForm.xjgywxt.remark) && ruleForm.xjgywxt.remark[0] === '3'"> <div v-if="ruleForm.xjgywxt.remark == 3">
<!-- 一般物联网设备 --> <!-- 一般物联网设备 -->
<el-row style="margin: 10px 0"> <el-row style="margin: 10px 0">
<span class="top-title-two-box">一般物联网设备</span> <span class="top-title-two-box">一般物联网设备</span>
@ -3424,7 +3417,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div v-if="Array.isArray(ruleForm.xjgywxt.remark) && ruleForm.xjgywxt.remark[0] === '4'"> <div v-if="ruleForm.xjgywxt.remark == 4">
<!-- 移动APP --> <!-- 移动APP -->
<el-row style="margin: 10px 0"> <el-row style="margin: 10px 0">
<span class="top-title-two-box">移动APP</span> <span class="top-title-two-box">移动APP</span>
@ -3515,7 +3508,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div v-if="Array.isArray(ruleForm.xjgywxt.remark) && ruleForm.xjgywxt.remark[0] === '5'"> <div v-if="ruleForm.xjgywxt.remark == 5">
<!-- 工业控制 --> <!-- 工业控制 -->
<el-row style="margin: 10px 0"> <el-row style="margin: 10px 0">
<span class="top-title-two-box">工业控制</span> <span class="top-title-two-box">工业控制</span>
@ -3708,7 +3701,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div v-if="Array.isArray(ruleForm.xjgywxt.remark) && ruleForm.xjgywxt.remark[0] === '6'"> <div v-if="ruleForm.xjgywxt.remark == 6">
<!-- CDN信息 --> <!-- CDN信息 -->
<el-row style="margin: 10px 0"> <el-row style="margin: 10px 0">
<span class="top-title-two-box">CDN信息</span> <span class="top-title-two-box">CDN信息</span>
@ -4576,14 +4569,14 @@
</myUpload> </myUpload>
</el-form-item> </el-form-item>
</el-row> </el-row>
<!-- <el-row style="margin: 10px 0" v-if="ruleForm.bfyy"> <el-row style="margin: 10px 0" v-if="ruleForm.bfyy">
<span class="top-title-box">关停原因</span> <span class="top-title-box">关停原因</span>
</el-row> </el-row>
<el-row style="margin: 20px 0"> <el-row style="margin: 20px 0">
<el-form-item> <el-form-item>
<div>{{ ruleForm.bfyy }}</div> <div>{{ ruleForm.bfyy }}</div>
</el-form-item> </el-form-item>
</el-row> --> </el-row>
</div> </div>
<el-row <el-row
style="margin: 10px 0; padding-bottom: 50px; text-align: center" style="margin: 10px 0; padding-bottom: 50px; text-align: center"
@ -4653,7 +4646,6 @@ export default {
"xtfhqk_fls", "xtfhqk_fls",
"database_type", "database_type",
"sjzc_sjldw", "sjzc_sjldw",
"yfws",
], ],
components: { components: {
myUpload, myUpload,
@ -4698,7 +4690,7 @@ export default {
], ],
// 新监管业务形态 // 新监管业务形态
xjgywxt: { xjgywxt: {
remark: [], remark: "",
}, },
// 关联域名--多个 // 关联域名--多个
glymList: [ glymList: [
@ -4893,12 +4885,6 @@ export default {
} }
}, },
methods: { methods: {
handleCheckboxChange(val) {
// 只保留最后一个选中的，实现单选
if (val.length > 1) {
this.ruleForm.xjgywxt.remark = [val[val.length - 1]];
}
},
// 新增超链接的方法 // 新增超链接的方法
generateFullUrl(url) { generateFullUrl(url) {
if (!url) return ""; if (!url) return "";
@ -4929,21 +4915,10 @@ export default {
getInfo(id) { getInfo(id) {
assetInfo(id).then((res) => { assetInfo(id).then((res) => {
this.ruleForm = res.data; this.ruleForm = res.data;
// 新监管业务形态 remark 兼容回显 if (!this.ruleForm.xjgywxt) {
if (!this.ruleForm.xjgywxt) { this.ruleForm.xjgywxt = {};
this.ruleForm.xjgywxt = {}; this.$set(this.ruleForm.xjgywxt, "remark", "");
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) { if (this.ruleForm.fwwz) {
let arr = this.ruleForm.fwwz.split("-"); let arr = this.ruleForm.fwwz.split("-");
this.select = arr[0]; this.select = arr[0];
@ -5251,15 +5226,6 @@ export default {
newAssets() { newAssets() {
this.$refs["ruleForm"].validate((valid) => { this.$refs["ruleForm"].validate((valid) => {
if (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.xttz = this.xttz.join(",");
this.ruleForm.xtfhqkFcg = this.xtfhqkFcg.join(","); this.ruleForm.xtfhqkFcg = this.xtfhqkFcg.join(",");
this.ruleForm.xtfhqkFxl = this.xtfhqkFxl.join(","); this.ruleForm.xtfhqkFxl = this.xtfhqkFxl.join(",");

22
src/views/components/myAssetsType/index.vue
Unescape View File

@ -921,18 +921,15 @@
prop="yfws" prop="yfws"
:rules="{ :rules="{
required: true, required: true,
message: '请选择', message: '请输入',
trigger: 'change', trigger: 'blur',
}" }"
> >
<el-select v-model="ruleForm.yfws" placeholder="请选择云服务商"> <el-input
<el-option v-model="ruleForm.yfws"
v-for="dict in dict.type.yfws" style="width: 100%"
:key="dict.value" placeholder="请输入云服务商"
:label="dict.label" ></el-input>
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
@ -5224,14 +5221,14 @@
</myUpload> </myUpload>
</el-form-item> </el-form-item>
</el-row> </el-row>
<!-- <el-row style="margin: 10px 0" v-if="ruleForm.bfyy"> <el-row style="margin: 10px 0" v-if="ruleForm.bfyy">
<span class="top-title-box">关停原因</span> <span class="top-title-box">关停原因</span>
</el-row> </el-row>
<el-row style="margin: 20px 0"> <el-row style="margin: 20px 0">
<el-form-item> <el-form-item>
<div>{{ ruleForm.bfyy }}</div> <div>{{ ruleForm.bfyy }}</div>
</el-form-item> </el-form-item>
</el-row> --> </el-row>
</div> </div>
<el-row <el-row
style="margin: 10px 0; padding-bottom: 50px; text-align: center" style="margin: 10px 0; padding-bottom: 50px; text-align: center"
@ -5350,7 +5347,6 @@ export default {
"xtfhqk_fls", "xtfhqk_fls",
"database_type", "database_type",
"sjzc_sjldw", "sjzc_sjldw",
"yfws"
], ],
components: { components: {
myUpload, myUpload,

22
src/views/components/renwuType/webType1.vue
Unescape View File

@ -872,18 +872,15 @@
prop="yfws" prop="yfws"
:rules="{ :rules="{
required: true, required: true,
message: '请选择', message: '请输入',
trigger: 'change', trigger: 'blur',
}" }"
> >
<el-select v-model="ruleForm.yfws" placeholder="请选择云服务商"> <el-input
<el-option v-model="ruleForm.yfws"
v-for="dict in dict.type.yfws" style="width: 100%"
:key="dict.value" placeholder="请输入云服务商"
:label="dict.label" ></el-input>
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
@ -5066,14 +5063,14 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
</span> </span>
<!-- <el-row style="margin: 10px 0" v-if="ruleForm.bfyy"> <el-row style="margin: 10px 0" v-if="ruleForm.bfyy">
<span class="top-title-box">关停原因</span> <span class="top-title-box">关停原因</span>
</el-row> </el-row>
<el-row style="margin: 20px 0"> <el-row style="margin: 20px 0">
<el-form-item> <el-form-item>
<div>{{ ruleForm.bfyy }}</div> <div>{{ ruleForm.bfyy }}</div>
</el-form-item> </el-form-item>
</el-row> --> </el-row>
</div> </div>
</el-form> </el-form>
<el-row <el-row
@ -5180,7 +5177,6 @@ export default {
"xtfhqk_fls", "xtfhqk_fls",
"database_type", "database_type",
"sjzc_sjldw", "sjzc_sjldw",
"yfws"
], ],
components: { components: {
myUpload, myUpload,

22
src/views/components/renwuType/webType2DW.vue
Unescape View File

@ -896,18 +896,15 @@
prop="yfws" prop="yfws"
:rules="{ :rules="{
required: true, required: true,
message: '请选择', message: '请输入',
trigger: 'change', trigger: 'blur',
}" }"
> >
<el-select v-model="ruleForm.yfws" placeholder="请选择云服务商"> <el-input
<el-option v-model="ruleForm.yfws"
v-for="dict in dict.type.yfws" style="width: 100%"
:key="dict.value" placeholder="请输入云服务商"
:label="dict.label" ></el-input>
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
@ -5182,14 +5179,14 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
</span> </span>
<!-- <el-row style="margin: 10px 0" v-if="ruleForm.bfyy"> <el-row style="margin: 10px 0" v-if="ruleForm.bfyy">
<span class="top-title-box">关停原因</span> <span class="top-title-box">关停原因</span>
</el-row> </el-row>
<el-row style="margin: 20px 0"> <el-row style="margin: 20px 0">
<el-form-item> <el-form-item>
<div>{{ ruleForm.bfyy }}</div> <div>{{ ruleForm.bfyy }}</div>
</el-form-item> </el-form-item>
</el-row> --> </el-row>
</div> </div>
</el-form> </el-form>
<el-row <el-row
@ -5301,7 +5298,6 @@ export default {
"xtfhqk_fls", "xtfhqk_fls",
"database_type", "database_type",
"sjzc_sjldw", "sjzc_sjldw",
"yfws"
], ],
components: { components: {
myUpload, myUpload,

Write Preview
Loading…
Cancel
Save