Skip to content

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

合并分支 'thy' 到 'master'

原中间件情况 查看合并请求 !132
上级 fb367873 2d7edcbe
隐藏空白字符变更
内嵌 并排
正在显示 包含 51 行增加 和 16 行删除
src/components/assessment/homeDetailcopy.vue
浏览文件 @ f6c45b22
......@@ -88,8 +88,8 @@
<span class="input_text">月</span>
</el-form-item>
<el-form-item label="单位名称：" style="opacity:0;">
<el-input v-model="notime"></el-input>
<el-form-item label="开发语言：">
<el-input v-model="developLanguageSystem.name"></el-input>
</el-form-item>
<el-form-item label="单位名称：" style="opacity:0;">
<el-input v-model="notime"></el-input>
......@@ -339,12 +339,14 @@ systemStructure.cdn.memory != '' "
<li :class="{'box-nav-title':true,'active':isOpen3}" @click="open3">
中间件/API相关
<img
v-show="middleware.middlewareEnums == '' && middleware.otherMiddleware == '' && middleware.web==''&& middleware.jndi == '' && middleware.jms == '' && middleware.route == '' && middleware.microServices.length == 1 && middleware.otherApis.length == 1 && middleware.microServices[0].des == '' && middleware.otherApis[0].des == ''"
v-show="middleware.middlewareEnums.length == 1 && middleware.middlewareEnums[0].des
== '' && middleware.web==''&& middleware.jndi == '' && middleware.jms == '' && middleware.route == '' && middleware.microServices.length == 1 && middleware.otherApis.length == 1 && middleware.microServices[0].des == '' && middleware.otherApis[0].des == ''"
src="./img/noform.png"
alt
/>
<img
v-show="middleware.middlewareEnums != '' || middleware.otherMiddleware != '' || middleware.web!='' || middleware.jndi != '' || middleware.jms != '' || middleware.route != '' || middleware.microServices.length > 1 || middleware.otherApis.length > 1 || middleware.microServices[0].des != '' || middleware.otherApis[0].des != ''"
v-show="middleware.middlewareEnums.length > 1 || middleware.middlewareEnums[0].des
!= '' || middleware.web!='' || middleware.jndi != '' || middleware.jms != '' || middleware.route != '' || middleware.microServices.length > 1 || middleware.otherApis.length > 1 || middleware.microServices[0].des != '' || middleware.otherApis[0].des != ''"
src="./img/doform.png"
alt
/>
......@@ -2064,13 +2066,15 @@ systemStructure.cdn.memory != '' "
<span class="open-title" style=" cursor: pointer;"
@click="open3">中间件/API相关</span>
<img
v-show="middleware.middlewareEnums == '' && middleware.otherMiddleware == '' && middleware.web==''&& middleware.jndi == '' && middleware.jms == '' && middleware.route == ''"
v-show="middleware.middlewareEnums == '' && middleware.middlewareEnums[0].des
== '' && middleware.web==''&& middleware.jndi == '' && middleware.jms == '' && middleware.route == ''"
src="./img/noform.png"
alt
class="rule-img"
/>
<img
v-show="middleware.middlewareEnums != '' || middleware.otherMiddleware != '' || middleware.web!='' || middleware.jndi != '' || middleware.jms != '' || middleware.route != ''"
v-show="middleware.middlewareEnums != '' || middleware.middlewareEnums[0].des
!= '' || middleware.web!='' || middleware.jndi != '' || middleware.jms != '' || middleware.route != ''"
src="./img/doform.png"
alt
class="rule-img"
......@@ -2106,14 +2110,14 @@ systemStructure.cdn.memory != '' "
<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="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>
<el-checkbox label="GERONIMO">Geronimo</el-checkbox>
</el-checkbox-group>
<!-- <div class="form-radio" style="margin-top:5px;">
<el-radio v-model="middleware.middlewareEnum" label="TOMCAT" >Tomcat</el-radio>
......@@ -2132,7 +2136,8 @@ systemStructure.cdn.memory != '' "
</div>-->
<div class="copy-box-main-input more" style="float:left;padding-top:20px;">
<span class="box-input-text">其他：</span>
<el-input v-model="middleware.otherMiddleware" placeholder="请输入"></el-input>
<el-input v-model="middleware.middlewareEnums[0].des
" placeholder="请输入"></el-input>
</div>
</div>
<div class="clear"></div>
......@@ -2812,7 +2817,8 @@ systemStructure.cdn.memory != '' "
<div class="pg-button ball" @click="backTop">回到顶部</div>
<div
v-show="isOpen"
:class="{'pg-button no active':form.cost!=''&& form.projectName!='' && (systemStructure.application.deploy != '' || systemStructure.application.code != '' || systemStructure.application.other != '' || systemStructure.application.edition != '' || systemStructure.database.other != '' || systemStructure.database.deploy != '' || systemStructure.database.code != '' || systemStructure.database.edition != '' || systemStructure.storage.edition != '' || systemStructure.storage.other != '' || systemStructure.storage.deploy != '' || systemStructure.storage.code != '' || systemStructure.otherEquipment.code != '' || systemStructure.otherEquipment.edition != '' || systemStructure.otherEquipment.deploy != '' || systemStructure.otherEquipment.other != '' || systemStructure.slb.code != '' || systemStructure.slb.edition != '' || systemStructure.slb.deploy != '' || systemStructure.slb.other != '' || systemStructure.otherDemand != '' || systemStructure.loadBalance != '' || systemStructure.disaster != '' || systemStructure.distributed != '' || browser.plugInUnit != '' || browser.compatibleBrowsers != '' || browser.otherBrowser!='' || browser.geography != '' || browser.peripheral != '' || browser.media != '' || browser.animation!= '' || browser.document != '' || browser.threeD != '' || browser.flash != '' || browser.otherDemand != '' || middleware.middlewareEnums != '' || middleware.otherMiddleware != '' || middleware.web!='' || middleware.jndi != '' || middleware.jms != '' || middleware.route != '' || database.databaseType != '' || database.othertype != '' || database.view !='' || database.storage != '' || database.function != '' || database.dbLink != '' || database.sequence != '' || database.timeTask != '' || database.trigger != '' || database.disasterTolerance != ''|| database.separate != '' || database.safe != '' || database.performance != ''|| database.otherContent != '' || rpo != '' ||rto != '' || apply.reason != '' || apply.cost != '' || browser.browserPlugs.length > 1 ||browser.browserPlugs[0].des != '' || middleware.microServices.length > 1 || middleware.otherApis.length > 1 || middleware.microServices[0].des != '' || middleware.otherApis[0].des != '' || developLanguageSystem.csDevTechnologies.length > 1 || developLanguageSystem.devFrameworks.length> 1 ||developLanguageSystem.devLanguages.length > 1 || developLanguageSystem.fontDevTechnologies.length> 1 || developLanguageSystem.opGAs.length > 1 ||developLanguageSystem.opGAs[0].des != '' ||developLanguageSystem.csDevTechnologies[0].des != '' ||developLanguageSystem.devFrameworks[0].des != '' ||developLanguageSystem.devLanguages[0].des != '' ||developLanguageSystem.fontDevTechnologies[0].des != '' || systemStructure.nas.cpuNum != '' || systemStructure.nas.num != '' || systemStructure.nas.ghz != '' || systemStructure.cdn.cpuNum != '' || systemStructure.cdn.num != '' || systemStructure.cdn.ghz != '' || systemStructure.slb.ghz != '' || systemStructure.slb.cpuNum != '' || systemStructure.slb.num != '' || systemStructure.vps.cpuNum != '' || systemStructure.vps.ghz != '' || systemStructure.vps.num != '' || systemStructure.application.cpuNum != '' || systemStructure.application.num != '' || systemStructure.application.ghz != '' || systemStructure.database.cpuNum != '' || systemStructure.database.num != '' || systemStructure.database.ghz != '' || systemStructure.otherEquipment.num != '' || systemStructure.otherEquipment.ghz != '' || systemStructure.otherEquipment.cpuNum != '' || systemStructure.vps.code != '' || systemStructure.vps.edition != '' || systemStructure.vps.deploy != '' || systemStructure.vps.other != '' ||systemStructure.cdn.code != '' || systemStructure.cdn.edition != '' || systemStructure.cdn.deploy != '' || systemStructure.cdn.other != '' ||systemStructure.nas.code != '' || systemStructure.nas.edition != '' || systemStructure.nas.deploy != '' || systemStructure.nas.other != '' || systemStructure.cdn.memory != '' ||systemStructure.slb.memory != '' ||systemStructure.vps.memory != '' ||systemStructure.application.memory != '' ||systemStructure.otherEquipment.memory != '' ||systemStructure.cdn.memory != '' ) ,'pg-button no':true}"
:class="{'pg-button no active':form.cost!=''&& form.projectName!='' && (systemStructure.application.deploy != '' || systemStructure.application.code != '' || systemStructure.application.other != '' || systemStructure.application.edition != '' || systemStructure.database.other != '' || systemStructure.database.deploy != '' || systemStructure.database.code != '' || systemStructure.database.edition != '' || systemStructure.storage.edition != '' || systemStructure.storage.other != '' || systemStructure.storage.deploy != '' || systemStructure.storage.code != '' || systemStructure.otherEquipment.code != '' || systemStructure.otherEquipment.edition != '' || systemStructure.otherEquipment.deploy != '' || systemStructure.otherEquipment.other != '' || systemStructure.slb.code != '' || systemStructure.slb.edition != '' || systemStructure.slb.deploy != '' || systemStructure.slb.other != '' || systemStructure.otherDemand != '' || systemStructure.loadBalance != '' || systemStructure.disaster != '' || systemStructure.distributed != '' || browser.plugInUnit != '' || browser.compatibleBrowsers != '' || browser.otherBrowser!='' || browser.geography != '' || browser.peripheral != '' || browser.media != '' || browser.animation!= '' || browser.document != '' || browser.threeD != '' || browser.flash != '' || browser.otherDemand != '' || middleware.middlewareEnums.length > 1 || middleware.middlewareEnums[0].des
!= '' || middleware.web!='' || middleware.jndi != '' || middleware.jms != '' || middleware.route != '' || database.databaseType != '' || database.othertype != '' || database.view !='' || database.storage != '' || database.function != '' || database.dbLink != '' || database.sequence != '' || database.timeTask != '' || database.trigger != '' || database.disasterTolerance != ''|| database.separate != '' || database.safe != '' || database.performance != ''|| database.otherContent != '' || rpo != '' ||rto != '' || apply.reason != '' || apply.cost != '' || browser.browserPlugs.length > 1 ||browser.browserPlugs[0].des != '' || middleware.microServices.length > 1 || middleware.otherApis.length > 1 || middleware.microServices[0].des != '' || middleware.otherApis[0].des != '' || developLanguageSystem.csDevTechnologies.length > 1 || developLanguageSystem.devFrameworks.length> 1 ||developLanguageSystem.devLanguages.length > 1 || developLanguageSystem.fontDevTechnologies.length> 1 || developLanguageSystem.opGAs.length > 1 ||developLanguageSystem.opGAs[0].des != '' ||developLanguageSystem.csDevTechnologies[0].des != '' ||developLanguageSystem.devFrameworks[0].des != '' ||developLanguageSystem.devLanguages[0].des != '' ||developLanguageSystem.fontDevTechnologies[0].des != '' || systemStructure.nas.cpuNum != '' || systemStructure.nas.num != '' || systemStructure.nas.ghz != '' || systemStructure.cdn.cpuNum != '' || systemStructure.cdn.num != '' || systemStructure.cdn.ghz != '' || systemStructure.slb.ghz != '' || systemStructure.slb.cpuNum != '' || systemStructure.slb.num != '' || systemStructure.vps.cpuNum != '' || systemStructure.vps.ghz != '' || systemStructure.vps.num != '' || systemStructure.application.cpuNum != '' || systemStructure.application.num != '' || systemStructure.application.ghz != '' || systemStructure.database.cpuNum != '' || systemStructure.database.num != '' || systemStructure.database.ghz != '' || systemStructure.otherEquipment.num != '' || systemStructure.otherEquipment.ghz != '' || systemStructure.otherEquipment.cpuNum != '' || systemStructure.vps.code != '' || systemStructure.vps.edition != '' || systemStructure.vps.deploy != '' || systemStructure.vps.other != '' ||systemStructure.cdn.code != '' || systemStructure.cdn.edition != '' || systemStructure.cdn.deploy != '' || systemStructure.cdn.other != '' ||systemStructure.nas.code != '' || systemStructure.nas.edition != '' || systemStructure.nas.deploy != '' || systemStructure.nas.other != '' || systemStructure.cdn.memory != '' ||systemStructure.slb.memory != '' ||systemStructure.vps.memory != '' ||systemStructure.application.memory != '' ||systemStructure.otherEquipment.memory != '' ||systemStructure.cdn.memory != '' ) ,'pg-button no':true}"
@click="goPg2(2)"
>保存并详细评估</div>
</div>
......@@ -3180,7 +3186,14 @@ export default {
version: ""
}
],
middlewareEnums: [],
middlewareEnums: [
{
code:15,
des:'',
name:'',
version:''
}
],
otherMiddleware: "",
web: "",
jndi: "",
......@@ -3188,6 +3201,7 @@ export default {
route: ""
}, //中间件
developLanguageSystem: {
name:'',
csDevTechnologies: [
{
name: "",
......@@ -3410,8 +3424,9 @@ export default {
this.browser.threeD != "" ||
this.browser.flash != "" ||
this.browser.otherDemand != "" ||
this.middleware.middlewareEnums != "" ||
this.middleware.otherMiddleware != "" ||
this.middleware.middlewareEnums.length > 1 ||
this.middleware.middlewareEnums[0].des
!= "" ||
this.middleware.web != "" ||
this.middleware.jndi != "" ||
this.middleware.jms != "" ||
......@@ -3812,7 +3827,18 @@ export default {
if (res.data.middleware[key] != -1) {
if (res.data.middleware[key] == undefined) {
} else {
if (key == "microServices") {
if(key == 'middlewareEnums'){
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
}else{
this.middleware.middlewareEnums.push(res.data.middleware[key][i].name)
}
}
console.log(" this.middleware.middlewareEnums", this.middleware.middlewareEnums)
}
else if (key == "microServices") {
console.log("先打印", this.middleware[key]);
var arr = [
{
......@@ -4367,7 +4393,16 @@ export default {
if (res.data.middleware[key] != -1) {
if (res.data.middleware[key] == undefined) {
} else {
if (key == "microServices") {
if(key == 'middlewareEnums'){
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
}else{
this.middleware.middlewareEnums.push(res.data.middleware[key][i].name)
}
}
}
else if (key == "microServices") {
console.log("先打印", this.middleware[key]);
var arr = [
{
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论