Skip to content

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

0611

上级 11326173
隐藏空白字符变更
内嵌 并排
正在显示 包含 82 行增加 和 81 行删除
src/components/assessment/homeDetailcopy.vue
浏览文件 @ 550947b9
......@@ -3335,12 +3335,12 @@ export default {
this.openModel = false;
},
checkInput(arrName, val, jsonName, jsonArr) {
// console.log(arr)
console.log(
// // console.log(arr)
// console.log(
this[jsonName][jsonArr].filter(
item => item.code == this[arrName][val].code
)
);
// this.middleware.microServices.push(arr)
if (
this[jsonName][jsonArr].filter(
......@@ -3353,11 +3353,11 @@ export default {
item => item.code != this[arrName][val].code
);
}
console.log("push之后", this[jsonName][jsonArr]);
// console.log("push之后", this[jsonName][jsonArr]);
if (this[arrName][val].des == "wu") {
return;
}
console.log("点击吼", this[arrName][val].des);
// console.log("点击吼", this[arrName][val].des);
if (this[arrName][val].des == "nmsl") {
this[arrName][val].des = "";
} else if (this[arrName][val].des != "nmsl") {
......@@ -3365,11 +3365,11 @@ export default {
}
},
checkInput2(arrName, val, jsonName, jsonArr) {
// console.log(arr)
console.log(
// // console.log(arr)
// console.log(
this[jsonName][jsonArr].filter(
item => item.code == this[arrName][val].code
)
);
// this.middleware.microServices.push(arr)
if (
......@@ -3394,14 +3394,14 @@ export default {
}
});
// if(this.$route.query.authority == 0){
// console.log("执行")
// // console.log("执行")
// this.$router.push({name:'AssessmentUser', query: {
// username: this.$route.query.username,
// id: this.$route.query.id,
// authority: this.$route.query.authority,
// }})
// }else if (this.$route.query.authority == 1){
// console.log("执行")
// // console.log("执行")
// this.$router.push({name:'Assessment', query: {
// username: this.$route.query.username,
// id: this.$route.query.id,
......@@ -3410,14 +3410,14 @@ export default {
// }
},
backTop() {
console.log("zzz");
// console.log("zzz");
document.getElementById("tchar_nav").scrollIntoView({
behavior: "smooth", // 平滑过渡
block: "start" // 上边框与视窗顶部平齐。默认值
});
},
checkList(val) {
console.log("group", val);
// console.log("group", val);
},
goPg2(flag) {
if (flag == 1) {
......@@ -3646,20 +3646,20 @@ export default {
}
for (var key in obj) {
if (obj[key] === "" || JSON.stringify(obj[key]) == "{}") {
console.log(obj[key]);
console.log("11111", obj[key]);
// console.log(obj[key]);
// console.log("11111", obj[key]);
delete obj[key];
}
}
console.log("======>", obj);
console.log("ma======>", JSON.stringify(obj));
// console.log("=231321=====>", obj.applicationType.length);
// console.log("======>", obj);
// console.log("ma======>", JSON.stringify(obj));
// // console.log("=231321=====>", obj.applicationType.length);
// return
this.$server.goPg(obj).then(res => {
console.log(res);
// console.log(res);
this.$store.commit("changeRoutePg", 1);
this.$message({
......@@ -3761,7 +3761,7 @@ export default {
: (this.systemStructure[objKey][objName] = e);
},
clickitem1(objKey, objName, e) {
console.log(this[objKey][objName]);
// console.log(this[objKey][objName]);
e === this[objKey][objName]
? (this[objKey][objName] = "")
: (this[objKey][objName] = e);
......@@ -3777,7 +3777,7 @@ export default {
e.target.value=e.target.value.replace(/^0[^\.]+/g, '0')
e.target.value=e.target.value.replace(/^(\d+)\.(\d).*$/, '$1.$2')
// this.input=e.target.value
// console.log(this.input)
// // console.log(this.input)
},
addZip(name, file, git) {
this.loading = false;
......@@ -3788,20 +3788,20 @@ export default {
} else if (name == "git") {
this.form.codeUrl = file;
this.form.gitUrl = git;
console.log("执行了git？", this.form.gitUrl);
// // console.log("执行了git？", this.form.gitUrl);
}
},
uploadExcel() {},
after(file) {
// var test = document.getElementById('fileUpload').files[0].name
this.ziptext = this.$refs.file.files[0].name;
console.log("导入几个了",this.$refs.file.files)
// console.log("导入几个了",this.$refs.file.files)
var fd = new FormData();
fd.append("file", this.$refs.file.files[0]);
fd.append("username", "qwe");
this.myLoading();
this.$server.upExcel(fd).then(res => {
console.log("导入Excel成功", res);
// console.log("导入Excel成功", res);
// return
if(res.data.code == 500){
this.$message({
......@@ -3870,12 +3870,12 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
}
else if(res.data.data.browser[key][i].code == 3){
console.log("?????", res.data.data.browser[key][i].des)
// console.log("?????", res.data.data.browser[key][i].des)
arr[0].des = res.data.data.browser[key][i].des
arr2[0].des = res.data.data.browser[key][i].des
}else{
arr.push(res.data.data.browser[key][i].code);
// console.log(" this.middleware.middlewareEnums", arr)
// // console.log(" this.middleware.middlewareEnums", arr)
arr2.push(res.data.data.browser[key][i]);
}
}
......@@ -3932,12 +3932,12 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
setTimeout(() => {
this.browserPlugs1List = arr;
this.browser[key] = arr2;
console.log("浏览器", this.browserPlugs1List);
// console.log("浏览器", this.browserPlugs1List);
}, 500);
} else {
this.browser[key] = res.data.data.browser[key];
}
console.log(res.data.data.browser[key]);
// console.log(res.data.data.browser[key]);
}
}
});
......@@ -3977,7 +3977,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
arr2[0].des = res.data.data.middleware[key][i].des
}else{
arr.push(res.data.data.middleware[key][i].code);
console.log(" this.middleware.middlewareEnums", arr)
// console.log(" this.middleware.middlewareEnums", arr)
arr2.push(res.data.data.middleware[key][i]);
}
}
......@@ -3989,7 +3989,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
}
else if (key == "microServices") {
console.log("先打印", this.middleware[key]);
// console.log("先打印", this.middleware[key]);
var arr = [
{
code: 24,
......@@ -4029,7 +4029,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
}
return item;
});
console.log("这个数组qqqq", arr2);
// console.log("这个数组qqqq", arr2);
// this.middleware[key].push(res.data.data.middleware[key][i])
// this.MicroServiceEnumList.filter(item => item.code == res.data.data.middleware[key][i].code ).ischeck = true
// res.data.data.middleware[key][i].ischeck = true
......@@ -4210,7 +4210,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
return item;
});
}
// console.log("这个数组", this.MicroServiceEnumList)
// // console.log("这个数组", this.MicroServiceEnumList)
// this.middleware[key].push(res.data.data.middleware[key][i])
// this.MicroServiceEnumList.filter(item => item.code == res.data.data.middleware[key][i].code ).ischeck = true
// res.data.data.middleware[key][i].ischeck = true
......@@ -4233,7 +4233,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
if(res.data.data.systemStructure[key].deploy == -1){
}else{
// console.log(this.systemStructure[key].deploy,'deploy')
// // console.log(this.systemStructure[key].deploy,'deploy')
this.systemStructure[key] = res.data.data.systemStructure[key];
}
}
......@@ -4253,7 +4253,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
} else {
if (key == "opGAs") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 4,
......@@ -4291,7 +4291,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "devLanguages") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 12,
......@@ -4331,7 +4331,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "csDevTechnologies") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 10,
......@@ -4371,7 +4371,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "fontDevTechnologies") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 17,
......@@ -4411,7 +4411,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "devFrameworks") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 15,
......@@ -4453,7 +4453,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
} else {
if(key == 'name' && res.data.data.developLanguageSystem[key] == '无'){
this.developLanguageSystem.name = ''
console.log(this.developLanguageSystem.name)
// console.log(this.developLanguageSystem.name)
}else{
this.developLanguageSystem[key] =
......@@ -4463,7 +4463,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
}
}
});
console.log("最后打印", this.browser);
// console.log("最后打印", this.browser);
this.loading = false;
});
},
......@@ -4472,14 +4472,14 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
},
getPrev() {
this.$server.pgName(this.$route.query.id).then(res => {
console.log('马老板的返回',res.data);
// console.log('马老板的返回',res.data);
// return
// console.log('马老板的返回',res.rpo);
// console.log('马老板的返回',res.data.data);
// // console.log('马老板的返回',res.rpo);
// // console.log('马老板的返回',res.data.data);
if (res.data.data == undefined) {
this.isLog = false;
} else {
console.log("1234")
// console.log("1234")
// thy
// if (res.data.data.rpo != -1) {
// this.rpo = res.data.data.rpo;
......@@ -4534,12 +4534,12 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
for(var i = 0 ; i < res.data.data.browser[key].length ; i ++){
if(res.data.data.browser[key][i].code == 3){
console.log("?????", res.data.data.browser[key][i].des)
// console.log("?????", res.data.data.browser[key][i].des)
arr[0].des = res.data.data.browser[key][i].des
arr2[0].des = res.data.data.browser[key][i].des
}else{
arr.push(res.data.data.browser[key][i].code);
// console.log(" this.middleware.middlewareEnums", arr)
// // console.log(" this.middleware.middlewareEnums", arr)
arr2.push(res.data.data.browser[key][i]);
}
}
......@@ -4586,12 +4586,12 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
setTimeout(() => {
this.browserPlugs1List = arr;
this.browser[key] = arr2;
console.log("浏览器", this.browserPlugs1List);
// console.log("浏览器", this.browserPlugs1List);
}, 500);
} else {
this.browser[key] = res.data.data.browser[key];
}
console.log(res.data.data.browser[key]);
// console.log(res.data.data.browser[key]);
}
}
});
......@@ -4631,7 +4631,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
arr2[0].des = res.data.data.middleware[key][i].des
}else{
arr.push(res.data.data.middleware[key][i].code);
console.log(" this.middleware.middlewareEnums", arr)
// console.log(" this.middleware.middlewareEnums", arr)
arr2.push(res.data.data.middleware[key][i]);
}
}
......@@ -4642,7 +4642,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
}
else if (key == "microServices") {
console.log("先打印", this.middleware[key]);
// console.log("先打印", this.middleware[key]);
var arr = [
{
code: 24,
......@@ -4682,7 +4682,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
}
return item;
});
console.log("这个数组", this.MicroServiceEnumList);
// console.log("这个数组", this.MicroServiceEnumList);
// this.middleware[key].push(res.data.data.middleware[key][i])
// this.MicroServiceEnumList.filter(item => item.code == res.data.data.middleware[key][i].code ).ischeck = true
// res.data.data.middleware[key][i].ischeck = true
......@@ -4863,7 +4863,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
return item;
});
}
// console.log("这个数组", this.MicroServiceEnumList)
// // console.log("这个数组", this.MicroServiceEnumList)
// this.middleware[key].push(res.data.data.middleware[key][i])
// this.MicroServiceEnumList.filter(item => item.code == res.data.data.middleware[key][i].code ).ischeck = true
// res.data.data.middleware[key][i].ischeck = true
......@@ -4886,7 +4886,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
if(res.data.data.systemStructure[key].deploy == -1){
}else{
// console.log(this.systemStructure[key].deploy,'deploy')
// // console.log(this.systemStructure[key].deploy,'deploy')
this.systemStructure[key] = res.data.data.systemStructure[key];
}
}
......@@ -4898,7 +4898,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
} else {
if (key == "opGAs") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 4,
......@@ -4936,7 +4936,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "devLanguages") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 12,
......@@ -4976,7 +4976,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "csDevTechnologies") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 10,
......@@ -5016,7 +5016,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "fontDevTechnologies") {
console.log("执行这个吗")
// console.log("执行这个吗")
var arr = [
{
code: 17,
......@@ -5053,12 +5053,12 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
}
setTimeout(() => {
this.fontDevTechnologiescodeList = arr;
console.log("fontDevTechnologies", this.fontDevTechnologiescodeList);
console.log("fontDevTechnologies", this.developLanguageSystem[key]);
// console.log("fontDevTechnologies", this.fontDevTechnologiescodeList);
// console.log("fontDevTechnologies", this.developLanguageSystem[key]);
this.developLanguageSystem[key] = arr2;
}, 500);
} else if (key == "devFrameworks") {
console.log("先打印", this.developLanguageSystem[key]);
// console.log("先打印", this.developLanguageSystem[key]);
var arr = [
{
code: 15,
......@@ -5100,7 +5100,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
} else {
if(key == 'name' && res.data.data.developLanguageSystem[key] == '无'){
this.developLanguageSystem.name = ''
console.log(this.developLanguageSystem.name)
// console.log(this.developLanguageSystem.name)
}else{
this.developLanguageSystem[key] =
......@@ -5110,7 +5110,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
}
}
});
console.log("最后拿到的系统部署", this.systemStructure);
// console.log("最后拿到的系统部署", this.systemStructure);
this.isLog = true;
}
});
......@@ -5120,7 +5120,7 @@ this.developLanguageSystem = this.$options.data().developLanguageSystem
created() {
this.getPrev();
console.log("系统不熟");
// console.log("系统不熟");
},
//生命周期 - 挂载完成（可以访问DOM元素）
mounted() {
......@@ -5135,32 +5135,32 @@ ws.onopen = function() {
ws.onmessage = function (e) {
//1成功 2失败
console.log('链接成功');
console.log("websocket!!!",e)
// console.log('链接成功');
// console.log("websocket!!!",e)
if(JSON.parse(e.data).msg != ""){
// this.myloadingText = JSON.parse(e.data)
// var str = document.querySelector(".myloading2 .el-loading-text")
// console.log('dsadsadsadsadsadsadsa',str)
// console.log(this.$loading(options))
// // console.log('dsadsadsadsadsadsadsa',str)
// // console.log(this.$loading(options))
var str = document.querySelector(".myloading2 .el-loading-text")
// console.log('dsadsadsadsadsadsadsa',str)
// // console.log('dsadsadsadsadsadsadsa',str)
str.innerText = JSON.parse(e.data).msg
// console.log(JSON.parse(e.data));
// // console.log(JSON.parse(e.data));
}
// console.log(JSON.parse(e.data));
// // console.log(JSON.parse(e.data));
};
ws.onclose = function() {
console.log('链接关闭');
// console.log('链接关闭');
};
ws.onerror = function () {
console.log('发生异常了');
// console.log('发生异常了');
}
},
......
src/components/reportAssess/reportAssess.vue
浏览文件 @ 550947b9
......@@ -51,10 +51,16 @@
</div>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<div><span style="display: inline-block;width: 88.5px;text-align: right;">预算：</span><span class="nmmsl">{{sumAmount1}} <i style="color:#333;">万</i></span> </div>
</el-col> -->
<el-col :span="8">
<div> 修改建议：<span class="nmmsl">
{{ recastMethod === 1 ?
'代码重构' :recastMethod === 2 ? '代码修改': recastMethod === 3 ?'无需代码修改':'-' }}
</span>
</div>
</el-col>
</el-row>
<el-row :gutter="24" style="padding-bottom: 15px;">
<el-col :span="8">
......@@ -86,13 +92,8 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div> 修改建议：<span class="nmmsl">
{{ recastMethod === 1 ?
'代码重构' :recastMethod === 2 ? '代码修改': recastMethod === 3 ?'无需代码修改':'-' }}
</span>
</div>
</el-col>
<el-col :span="8"></el-col>
<el-col :span="8"></el-col>
<el-col :span="8"></el-col>
</el-row>
......@@ -204,7 +205,7 @@
<div class="seven-title">
<span :class="{'active':isTurnOn == true}" @click="turnOn">关键技术及替换策略建议</span>
<span :class="{'active':isTurnOn1 == true}" @click="turnOn1">工作量评估</span>
<span :class="{'active':isTurnOn2 == true}" @click="turnOn2">额外依赖服务申请</span>
<!-- <span :class="{'active':isTurnOn2 == true}" @click="turnOn2">额外依赖服务申请</span> -->
<span :class="{'active':isTurnOn3 == true}" @click="turnOn3">适配难度评估</span>
</div>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论