Skip to content

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

合并分支 'thy' 到 'master'

1901 查看合并请求 !133
上级 f6c45b22 fd55d472
隐藏空白字符变更
内嵌 并排
正在显示 包含 109 行增加 和 23 行删除
src/components/assessment/homeDetailcopy.vue
浏览文件 @ adb0c738
...@@ -2104,9 +2104,9 @@ systemStructure.cdn.memory != '' " ...@@ -2104,9 +2104,9 @@ systemStructure.cdn.memory != '' "
</div> </div>
<div class="copy-nav-main more six" style="height:auto;"> <div class="copy-nav-main more six" style="height:auto;">
<div class="copy-nav-main-main five more" style="margin-top:20px;"> <div class="copy-nav-main-main five more" style="margin-top:20px;">
<el-checkbox-group v-model="middleware.middlewareEnums" style="float:left;"> <el-checkbox-group v-model="middlewareEnumsList" style="float:left;">
<el-checkbox label="TOMCAT">Tomcat</el-checkbox> <el-checkbox :label="item.code" v-for="(item,index) in middlewareEnumsList1" :key="index" @change="checkInput2('middlewareEnumsList',index,'middleware','middlewareEnums')">{{item.name}}</el-checkbox>
<el-checkbox label="NGNIX">Ngnix</el-checkbox> <!-- <el-checkbox label="NGNIX">Ngnix</el-checkbox>
<el-checkbox label="WEBSPHERE">websphere</el-checkbox> <el-checkbox label="WEBSPHERE">websphere</el-checkbox>
<el-checkbox label="WEBLOGIC">weblogic</el-checkbox> <el-checkbox label="WEBLOGIC">weblogic</el-checkbox>
<el-checkbox label="JBOSS">JBoss</el-checkbox> <el-checkbox label="JBOSS">JBoss</el-checkbox>
...@@ -2117,7 +2117,7 @@ systemStructure.cdn.memory != '' " ...@@ -2117,7 +2117,7 @@ systemStructure.cdn.memory != '' "
<el-checkbox label="LVS">LVS</el-checkbox> <el-checkbox label="LVS">LVS</el-checkbox>
<el-checkbox label="IIS">IIS</el-checkbox> <el-checkbox label="IIS">IIS</el-checkbox>
<el-checkbox label="LHA">LHA</el-checkbox> <el-checkbox label="LHA">LHA</el-checkbox>
<el-checkbox label="GERONIMO">Geronimo</el-checkbox> <el-checkbox label="GERONIMO">Geronimo</el-checkbox> -->
</el-checkbox-group> </el-checkbox-group>
<!-- <div class="form-radio" style="margin-top:5px;"> <!-- <div class="form-radio" style="margin-top:5px;">
<el-radio v-model="middleware.middlewareEnum" label="TOMCAT" >Tomcat</el-radio> <el-radio v-model="middleware.middlewareEnum" label="TOMCAT" >Tomcat</el-radio>
...@@ -2848,6 +2848,7 @@ export default { ...@@ -2848,6 +2848,7 @@ export default {
data() { data() {
//这里存放数据 //这里存放数据
return { return {
middlewareEnumsList:[],
opGAscodeList: [], opGAscodeList: [],
devLanguagescodeList: [], devLanguagescodeList: [],
csDevTechnologiescodeList: [], csDevTechnologiescodeList: [],
...@@ -2857,6 +2858,34 @@ export default { ...@@ -2857,6 +2858,34 @@ export default {
otherApis2List: [], otherApis2List: [],
browserPlugs1List: [], browserPlugs1List: [],
ziptext: "", ziptext: "",
// <el-checkbox label="TOMCAT">Tomcat</el-checkbox>
// <el-checkbox label="NGNIX">Ngnix</el-checkbox>
// <el-checkbox label="WEBSPHERE">websphere</el-checkbox>
// <el-checkbox label="WEBLOGIC">weblogic</el-checkbox>
// <el-checkbox label="JBOSS">JBoss</el-checkbox>
// <el-checkbox label="JONAS">JOnAS</el-checkbox>
// <el-checkbox label="HADOOP">Hadoop</el-checkbox>
// <el-checkbox label="KAFKA">Kafka</el-checkbox>
// <el-checkbox label="SPARK">SPARK</el-checkbox>
// <el-checkbox label="LVS">LVS</el-checkbox>
// <el-checkbox label="IIS">IIS</el-checkbox>
// <el-checkbox label="LHA">LHA</el-checkbox>
// <el-checkbox label="GERONIMO">Geronimo</el-checkbox>
middlewareEnumsList1: [
{ code: 1, des: "", name: "TOMCAT", version: "" },
{ code: 2, des: "", name: "NGNIX", version: "" },
{ code: 3, des: "", name: "WEBSPHERE", version: "" },
{ code: 4, des: "", name: "WEBLOGIC", version: "" },
{ code: 5, des: "", name: "JBOSS", version: "" },
{ code: 6, des: "", name: "JONAS", version: "" },
{ code: 7, des: "", name: "HADOOP", version: "" },
{ code: 8, des: "", name: "KAFKA", version: "" },
{ code: 9, des: "", name: "SPARK", version: "" },
{ code: 10, des: "", name: "LVS", version: "" },
// { code: 11, des: "", name: "IIS", version: "" },
{ code: 11, des: "", name: "LHA", version: "" },
{ code: 12, des: "", name: "GERONIMO", version: "" },
],
MicroServiceEnumList: [ MicroServiceEnumList: [
{ code: 0, des: "wu", name: "FLUME", version: "" }, { code: 0, des: "wu", name: "FLUME", version: "" },
{ code: 1, des: "wu", name: "ZOOKEEPER", version: "" }, { code: 1, des: "wu", name: "ZOOKEEPER", version: "" },
...@@ -3828,14 +3857,38 @@ export default { ...@@ -3828,14 +3857,38 @@ export default {
if (res.data.middleware[key] == undefined) { if (res.data.middleware[key] == undefined) {
} else { } else {
if(key == 'middlewareEnums'){ if(key == 'middlewareEnums'){
var arr = [
{
code: 15,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 15,
des: "",
name: "",
version: ""
}
];
for(var i = 0 ; i < res.data.middleware[key].length ; i ++){ for(var i = 0 ; i < res.data.middleware[key].length ; i ++){
if(res.data.middleware[key][i] == 15){
this.middleware.middlewareEnums[0].des = res.data.middleware[key][i].des if(res.data.middleware[key][i].code == 15){
arr[0].des = res.data.middleware[key][i].des
arr2[0].des = res.data.middleware[key][i].des
}else{ }else{
this.middleware.middlewareEnums.push(res.data.middleware[key][i].name) arr.push(res.data.middleware[key][i].code);
console.log(" this.middleware.middlewareEnums", arr)
arr2.push(res.data.middleware[key][i]);
} }
} }
console.log(" this.middleware.middlewareEnums", this.middleware.middlewareEnums) setTimeout(() => {
this.middlewareEnumsList = arr;
this.middleware[key] = arr2;
}, 500);
} }
else if (key == "microServices") { else if (key == "microServices") {
...@@ -4394,13 +4447,38 @@ export default { ...@@ -4394,13 +4447,38 @@ export default {
if (res.data.middleware[key] == undefined) { if (res.data.middleware[key] == undefined) {
} else { } else {
if(key == 'middlewareEnums'){ if(key == 'middlewareEnums'){
var arr = [
{
code: 15,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 15,
des: "",
name: "",
version: ""
}
];
for(var i = 0 ; i < res.data.middleware[key].length ; i ++){ for(var i = 0 ; i < res.data.middleware[key].length ; i ++){
if(res.data.middleware[key][i] == 15){
this.middleware.middlewareEnums[0].des = res.data.middleware[key][i].des if(res.data.middleware[key][i].code == 15){
arr[0].des = res.data.middleware[key][i].des
arr2[0].des = res.data.middleware[key][i].des
}else{ }else{
this.middleware.middlewareEnums.push(res.data.middleware[key][i].name) arr.push(res.data.middleware[key][i].code);
console.log(" this.middleware.middlewareEnums", arr)
arr2.push(res.data.middleware[key][i]);
} }
} }
setTimeout(() => {
this.middlewareEnumsList = arr;
this.middleware[key] = arr2;
}, 500);
} }
else if (key == "microServices") { else if (key == "microServices") {
console.log("先打印", this.middleware[key]); console.log("先打印", this.middleware[key]);
......
src/components/reportAssess/reportAssess.vue
浏览文件 @ adb0c738
...@@ -41,15 +41,22 @@ ...@@ -41,15 +41,22 @@
语言： 语言：
<span class="nmmsl"> <span class="nmmsl">
{{ this.language === 1? {{ this.language === 1?
'java' : this.language === 2 ? 'C' : this.language === 2 ?
'js' : this.language === 3 ? 'VB' : this.language === 3 ?
'python': this.language ===4 ? 'DELPHI': this.language ===4 ?
'asp' :this.language ===6? 'PHP' :this.language ===5?
'go' : this.language ===7? 'JAVA' : this.language ===6?
'html': this.language ===8? 'PYTHON': this.language ===7?
'c#' : this.language ===10? 'GO' : this.language ===8?
'unknow': '-' 'RUST': this.language ===9?
'RUBY' : this.language ===10?
'PERL': this.language == 11?
'MATLAB' : this.language ===12?
'QITA' : this.language ===13?
'JAVASCRIPT' : this.language ===14?
'HTML': '-'
}} }}
</span> </span>
</div> </div>
</el-col> </el-col>
...@@ -979,7 +986,7 @@ export default { ...@@ -979,7 +986,7 @@ export default {
getTechnology(name) { getTechnology(name) {
console.log(name) console.log(name)
this.$server.getTechnology(name).then(res=>{ this.$server.getTechnology(name).then(res=>{
console.log('数据请求结果',res.data) console.log('数据请求结果',res)
if (res.data === 500) { if (res.data === 500) {
this.picture = true this.picture = true
...@@ -999,13 +1006,14 @@ export default { ...@@ -999,13 +1006,14 @@ export default {
// this.type === 1 ? this.type = '改造' : this.type = '适配' // this.type === 1 ? this.type = '改造' : this.type = '适配'
this.framework = res.data.framework this.framework = res.data.framework
this.language = res.data.language this.language = res.data.language
this.budget = res.data.budget this.budget = res.data.budget
// firstTable // firstTable
this.tableData = res.data.sysScale this.tableData = res.data.sysScale
console.log( 'pic', res.data.code) console.log( 'pic', res.data)
console.log( '3333',this.tableData) // console.log( '3333',this.tableData)
console.log( 'type',this.type) // console.log( 'type',this.type)
// technologyReports 技术和替换策略建议 // technologyReports 技术和替换策略建议
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论