Skip to content

9
912project
提交 8c91bdbd authored 作者: thy's avatar thy
浏览文件
操作

合并分支 'thy' 到 'master'

Thy 查看合并请求 !124
上级 98663ff2 670859b6
显示空白字符变更
内嵌 并排
正在显示 包含 508 行增加 和 25 行删除
src/components/assessment/homeDetailcopy.vue
浏览文件 @ 8c91bdbd
......@@ -3299,7 +3299,7 @@ export default {
console.log("点击吼", this[arrName][val].des);
if (this[arrName][val].des == "nmsl") {
this[arrName][val].des = "";
} else if (this[arrName][val].des == "") {
} else if (this[arrName][val].des != "nmsl") {
this[arrName][val].des = "nmsl";
}
},
......@@ -3766,12 +3766,12 @@ export default {
if (res.data.browser[key][i].code == 13) {
arr[0] = res.data.browser[key][i];
} else {
res.data.browser[key][i].des = "nmsl";
// res.data.browser[key][i].des = "nmsl";
arr.push(res.data.browser[key][i].code);
arr2.push(res.data.browser[key][i]);
this.cities.map(item => {
if (item.code == res.data.browser[key][i].code) {
item.des = "";
item.des = res.data.browser[key][i].des
}
return item;
});
......@@ -3831,12 +3831,13 @@ export default {
} else if (res.data.middleware[key][i].code == 24) {
arr[0] = res.data.middleware[key][i];
} else {
res.data.middleware[key][i].des = "nmsl";
// res.data.middleware[key][i].des = "nmsl";
arr.push(res.data.middleware[key][i].code);
arr2.push(res.data.middleware[key][i]);
this.MicroServiceEnumList.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3891,13 +3892,14 @@ export default {
} else if (res.data.middleware[key][i].code == 25) {
arr[0] = res.data.middleware[key][i];
} else {
res.data.middleware[key][i].des = "nmsl";
// res.data.middleware[key][i].des = "nmsl";
arr.push(Number(res.data.middleware[key][i].code));
arr2.push(res.data.middleware[key][i]);
if (res.data.middleware[key][i].code == 1) {
this.otherApis1.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3905,7 +3907,8 @@ export default {
if (res.data.middleware[key][i].code == 4) {
this.otherApis2.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3913,7 +3916,8 @@ export default {
if (res.data.middleware[key][i].code == 8) {
this.otherApis3.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3921,7 +3925,8 @@ export default {
if (res.data.middleware[key][i].code == 10) {
this.otherApis4.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3929,7 +3934,8 @@ export default {
if (res.data.middleware[key][i].code == 12) {
this.otherApis5.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3937,7 +3943,8 @@ export default {
if (res.data.middleware[key][i].code == 14) {
this.otherApis6.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3945,7 +3952,8 @@ export default {
if (res.data.middleware[key][i].code == 16) {
this.otherApis7.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3953,7 +3961,8 @@ export default {
if (res.data.middleware[key][i].code == 18) {
this.otherApis8.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3961,7 +3970,8 @@ export default {
if (res.data.middleware[key][i].code == 19) {
this.otherApis9.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3969,7 +3979,8 @@ export default {
if (res.data.middleware[key][i].code == 20) {
this.otherApis10.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3977,7 +3988,8 @@ export default {
if (res.data.middleware[key][i].code == 21) {
this.otherApis11.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3985,7 +3997,8 @@ export default {
if (res.data.middleware[key][i].code == 22) {
this.otherApis12.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -3993,7 +4006,8 @@ export default {
if (res.data.middleware[key][i].code == 23) {
this.otherApis13.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -4001,7 +4015,8 @@ export default {
if (res.data.middleware[key][i].code == 24) {
this.otherApis14.map(item => {
if (item.code == res.data.middleware[key][i].code) {
item.des = "";
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
......@@ -4267,8 +4282,48 @@ export default {
Object.keys(this.browser).forEach(key => {
if (res.data.browser[key] != -1) {
if (res.data.browser[key] == undefined) {
} else {
if (key == "browserPlugs") {
var arr = [
{
code: 13,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 13,
des: "",
name: "",
version: ""
}
];
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];
} else {
// res.data.browser[key][i].des = "nmsl";
arr.push(res.data.browser[key][i].code);
arr2.push(res.data.browser[key][i]);
this.cities.map(item => {
if (item.code == res.data.browser[key][i].code) {
// item.des = "";
item.des = res.data.browser[key][i].des
}
return item;
});
}
}
setTimeout(() => {
this.browserPlugs1List = arr;
this.browser[key] = arr2;
console.log("浏览器", this.browserPlugs1List);
}, 500);
} else {
this.browser[key] = res.data.browser[key];
}
console.log(res.data.browser[key]);
}
}
......@@ -4285,15 +4340,239 @@ export default {
if (res.data.middleware[key] != -1) {
if (res.data.middleware[key] == undefined) {
} else {
this.middleware[key] = res.data.middleware[key];
if (key == "microServices") {
console.log("先打印", this.middleware[key]);
var arr = [
{
code: 24,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 24,
des: "",
name: "",
version: ""
}
];
for (var i = 0; i < res.data.middleware[key].length; i++) {
if (res.data.middleware[key][i].code < 15) {
res.data.middleware[key][i].des = "wu";
// res.data.middleware[key][i].ischeck = true
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// this.middleware[key].push(res.data.middleware[key][i])
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];
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(res.data.middleware[key][i].code);
arr2.push(res.data.middleware[key][i]);
this.MicroServiceEnumList.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
Object.keys(this.developLanguageSystem).forEach(key => {
if (res.data.developLanguageSystem[key] != -1) {
if (res.data.developLanguageSystem[key] == undefined) {
console.log("这个数组", this.MicroServiceEnumList);
// this.middleware[key].push(res.data.middleware[key][i])
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// res.data.middleware[key][i].ischeck = true
}
}
setTimeout(() => {
this.microServices2List = arr;
this.middleware[key] = arr2;
}, 500);
} else if (key == "otherApis") {
var arr = [
{
code: 25,
des: "",
apiName: "",
version: ""
}
];
var arr2 = [
{
code: 25,
des: "",
apiName: "",
version: ""
}
];
for (var i = 0; i < res.data.middleware[key].length; i++) {
if (
res.data.middleware[key][i].code == 0 ||
res.data.middleware[key][i].code == 2 ||
res.data.middleware[key][i].code == 3 ||
res.data.middleware[key][i].code == 5 ||
res.data.middleware[key][i].code == 6 ||
res.data.middleware[key][i].code == 7 ||
res.data.middleware[key][i].code == 9 ||
res.data.middleware[key][i].code == 11 ||
res.data.middleware[key][i].code == 13 ||
res.data.middleware[key][i].code == 15 ||
res.data.middleware[key][i].code == 17
) {
res.data.middleware[key][i].des = "wu";
// res.data.middleware[key][i].ischeck = true
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// this.middleware[key].push(res.data.middleware[key][i])
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];
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(Number(res.data.middleware[key][i].code));
arr2.push(res.data.middleware[key][i]);
if (res.data.middleware[key][i].code == 1) {
this.otherApis1.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 4) {
this.otherApis2.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 8) {
this.otherApis3.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 10) {
this.otherApis4.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 12) {
this.otherApis5.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 14) {
this.otherApis6.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 16) {
this.otherApis7.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 18) {
this.otherApis8.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 19) {
this.otherApis9.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 20) {
this.otherApis10.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 21) {
this.otherApis11.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 22) {
this.otherApis12.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 23) {
this.otherApis13.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
if (res.data.middleware[key][i].code == 24) {
this.otherApis14.map(item => {
if (item.code == res.data.middleware[key][i].code) {
// item.des = "";
item.des = res.data.middleware[key][i].des
}
return item;
});
}
// console.log("这个数组", this.MicroServiceEnumList)
// this.middleware[key].push(res.data.middleware[key][i])
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// res.data.middleware[key][i].ischeck = true
}
}
setTimeout(() => {
this.otherApis2List = arr;
this.middleware[key] = arr2;
}, 500);
} else {
this.developLanguageSystem[key] = res.data.developLanguageSystem[key];
this.middleware[key] = res.data.middleware[key];
}
}
}
});
......@@ -4304,6 +4583,210 @@ export default {
this.systemStructure[key] = res.data.systemStructure[key];
}
}
});
Object.keys(this.developLanguageSystem).forEach(key => {
if (res.data.developLanguageSystem[key] != -1) {
if (res.data.developLanguageSystem[key] == undefined) {
} else {
if (key == "opGAs") {
console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 4,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 4,
des: "",
name: "",
version: ""
}
];
for (
var i = 0;
i < res.data.developLanguageSystem[key].length;
i++
) {
if (res.data.developLanguageSystem[key][i].code < 4) {
// res.data.middleware[key][i].ischeck = true
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// this.middleware[key].push(res.data.middleware[key][i])
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];
}
}
setTimeout(() => {
this.opGAscodeList = arr;
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "devLanguages") {
console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 12,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 12,
des: "",
name: "",
version: ""
}
];
for (
var i = 0;
i < res.data.developLanguageSystem[key].length;
i++
) {
if (res.data.developLanguageSystem[key][i].code < 12) {
// res.data.middleware[key][i].ischeck = true
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// this.middleware[key].push(res.data.middleware[key][i])
arr.push(res.data.developLanguageSystem[key][i].code);
arr2.push(res.data.developLanguageSystem[key][i]);
} else if (
res.data.developLanguageSystem[key][i].code == 12
) {
arr[0] = res.data.developLanguageSystem[key][i];
}
}
setTimeout(() => {
this.devLanguagescodeList = arr;
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "csDevTechnologies") {
console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 10,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 10,
des: "",
name: "",
version: ""
}
];
for (
var i = 0;
i < res.data.developLanguageSystem[key].length;
i++
) {
if (res.data.developLanguageSystem[key][i].code < 10) {
// res.data.middleware[key][i].ischeck = true
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// this.middleware[key].push(res.data.middleware[key][i])
arr.push(res.data.developLanguageSystem[key][i].code);
arr2.push(res.data.developLanguageSystem[key][i]);
} else if (
res.data.developLanguageSystem[key][i].code == 10
) {
arr[0] = res.data.developLanguageSystem[key][i];
}
}
setTimeout(() => {
this.csDevTechnologiescodeList = arr;
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == " fontDevTechnologies") {
console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 17,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 17,
des: "",
name: "",
version: ""
}
];
for (
var i = 0;
i < res.data.developLanguageSystem[key].length;
i++
) {
if (res.data.developLanguageSystem[key][i].code < 17) {
// res.data.middleware[key][i].ischeck = true
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// this.middleware[key].push(res.data.middleware[key][i])
arr.push(res.data.developLanguageSystem[key][i].code);
arr2.push(res.data.developLanguageSystem[key][i]);
} else if (
res.data.developLanguageSystem[key][i].code == 17
) {
arr[0] = res.data.developLanguageSystem[key][i];
}
}
setTimeout(() => {
this.fontDevTechnologiescodeList = arr;
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "devFrameworks") {
console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 15,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 15,
des: "",
name: "",
version: ""
}
];
for (
var i = 0;
i < res.data.developLanguageSystem[key].length;
i++
) {
if (res.data.developLanguageSystem[key][i].code < 15) {
// res.data.middleware[key][i].ischeck = true
// this.MicroServiceEnumList.filter(item => item.code == res.data.middleware[key][i].code ).ischeck = true
// this.middleware[key].push(res.data.middleware[key][i])
arr.push(res.data.developLanguageSystem[key][i].code);
arr2.push(res.data.developLanguageSystem[key][i]);
} else if (
res.data.developLanguageSystem[key][i].code == 15
) {
arr[0] = res.data.developLanguageSystem[key][i];
}
}
setTimeout(() => {
this.devFrameworkscodeList = arr;
this.developLanguageSystem[key] = arr2;
}, 500);
} else {
this.developLanguageSystem[key] =
res.data.developLanguageSystem[key];
}
}
}
});
console.log("上次报告", this.form);
this.isLog = true;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论