提交 6a3c5438 authored 作者: thy's avatar thy

合并分支 'thy' 到 'master'

开发语言体系显示 查看合并请求 !126
......@@ -143,14 +143,14 @@
<div class="form-radio one">
<div class="radio-text one">原应用是否通过等级保护:</div>
<el-radio
v-model="form.secret"
v-model="form.gradeProtection"
:label="1"
@click.native.prevent="clickitem1('form','secret',1)"
@click.native.prevent="clickitem1('form','gradeProtection',1)"
></el-radio>
<el-radio
v-model="form.secret"
v-model="form.gradeProtection"
:label="2"
@click.native.prevent="clickitem1('form','secret',2)"
@click.native.prevent="clickitem1('form','gradeProtection',2)"
></el-radio>
</div>
<div class="form-radio one">
......@@ -3036,6 +3036,7 @@ export default {
gitName: "",
gitUrl: "",
form: {
gradeProtection:'',
localContact:"",
localPhone:"",
unitPhone:"",
......@@ -3731,6 +3732,8 @@ export default {
message: "导入Excel成功",
type: "success"
});
this.rpo = res.data.rpo
this.rto = res.data.rto
Object.keys(this.form).forEach(key => {
if (res.data[key] != -1) {
this.form[key] = res.data[key];
......@@ -3764,7 +3767,7 @@ export default {
];
for (var i = 0; i < res.data.browser[key].length; i++) {
if (res.data.browser[key][i].code == 13) {
arr[0] = res.data.browser[key][i];
arr[0].des = res.data.browser[key][i].des;
} else {
// res.data.browser[key][i].des = "nmsl";
arr.push(res.data.browser[key][i].code);
......@@ -3829,7 +3832,7 @@ export default {
arr.push(res.data.middleware[key][i].code);
arr2.push(res.data.middleware[key][i]);
} else if (res.data.middleware[key][i].code == 24) {
arr[0] = res.data.middleware[key][i];
arr[0].des = res.data.middleware[key][i].des;
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(res.data.middleware[key][i].code);
......@@ -3890,7 +3893,7 @@ export default {
arr.push(Number(res.data.middleware[key][i].code));
arr2.push(res.data.middleware[key][i]);
} else if (res.data.middleware[key][i].code == 25) {
arr[0] = res.data.middleware[key][i];
arr[0].des = res.data.middleware[key][i].des;
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(Number(res.data.middleware[key][i].code));
......@@ -4079,7 +4082,8 @@ export default {
arr.push(res.data.developLanguageSystem[key][i].code);
arr2.push(res.data.developLanguageSystem[key][i]);
} else if (res.data.developLanguageSystem[key][i].code == 4) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
......@@ -4118,7 +4122,8 @@ export default {
} else if (
res.data.developLanguageSystem[key][i].code == 12
) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
......@@ -4157,14 +4162,15 @@ export default {
} else if (
res.data.developLanguageSystem[key][i].code == 10
) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
this.csDevTechnologiescodeList = arr;
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == " fontDevTechnologies") {
} else if (key == "fontDevTechnologies") {
console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
......@@ -4196,7 +4202,8 @@ export default {
} else if (
res.data.developLanguageSystem[key][i].code == 17
) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
......@@ -4235,7 +4242,8 @@ export default {
} else if (
res.data.developLanguageSystem[key][i].code == 15
) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
......@@ -4269,6 +4277,8 @@ export default {
// if (res.data.rto != -1) {
// this.rto = res.data.rto;
// }
this.rpo = res.data.rpo
this.rto = res.data.rto
Object.keys(this.form).forEach(key => {
if (res.data[key] != -1) {
this.form[key] = res.data[key];
......@@ -4302,7 +4312,7 @@ export default {
];
for (var i = 0; i < res.data.browser[key].length; i++) {
if (res.data.browser[key][i].code == 13) {
arr[0] = res.data.browser[key][i];
arr[0].des = res.data.browser[key][i].des;
} else {
// res.data.browser[key][i].des = "nmsl";
arr.push(res.data.browser[key][i].code);
......@@ -4368,7 +4378,7 @@ export default {
arr.push(res.data.middleware[key][i].code);
arr2.push(res.data.middleware[key][i]);
} else if (res.data.middleware[key][i].code == 24) {
arr[0] = res.data.middleware[key][i];
arr[0].des = res.data.middleware[key][i].des;
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(res.data.middleware[key][i].code);
......@@ -4429,7 +4439,7 @@ export default {
arr.push(Number(res.data.middleware[key][i].code));
arr2.push(res.data.middleware[key][i]);
} else if (res.data.middleware[key][i].code == 25) {
arr[0] = res.data.middleware[key][i];
arr[0].des = res.data.middleware[key][i].des;
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(Number(res.data.middleware[key][i].code));
......@@ -4618,7 +4628,8 @@ export default {
arr.push(res.data.developLanguageSystem[key][i].code);
arr2.push(res.data.developLanguageSystem[key][i]);
} else if (res.data.developLanguageSystem[key][i].code == 4) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
......@@ -4657,7 +4668,8 @@ export default {
} else if (
res.data.developLanguageSystem[key][i].code == 12
) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
......@@ -4696,15 +4708,16 @@ export default {
} else if (
res.data.developLanguageSystem[key][i].code == 10
) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
this.csDevTechnologiescodeList = arr;
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == " fontDevTechnologies") {
console.log("先打印", this.developLanguageSystem[key]);
} else if (key == "fontDevTechnologies") {
console.log("执行这个吗")
var arr = [
{
code: 17,
......@@ -4735,11 +4748,14 @@ export default {
} else if (
res.data.developLanguageSystem[key][i].code == 17
) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
this.fontDevTechnologiescodeList = arr;
console.log("fontDevTechnologies", this.fontDevTechnologiescodeList);
console.log("fontDevTechnologies", this.developLanguageSystem[key]);
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "devFrameworks") {
......@@ -4774,7 +4790,8 @@ export default {
} else if (
res.data.developLanguageSystem[key][i].code == 15
) {
arr[0] = res.data.developLanguageSystem[key][i];
arr[0].des = res.data.developLanguageSystem[key][i].des;
arr2[0].des = res.data.developLanguageSystem[key][i].des;
}
}
setTimeout(() => {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论