Skip to content

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

合并分支 'thy' 到 'ningbo'

Thy 查看合并请求 !134
上级 154b2000 fd55d472
隐藏空白字符变更
内嵌 并排
正在显示 包含 220 行增加 和 85 行删除
src/components/assessment/homeDetailcopy.vue
浏览文件 @ c75b5864
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
<span class="input_text">月</span> <span class="input_text">月</span>
</el-form-item> </el-form-item>
<el-form-item label="单位名称：" style="opacity:0;"> <el-form-item label="开发语言：">
<el-input v-model="notime"></el-input> <el-input v-model="developLanguageSystem.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="单位名称：" style="opacity:0;"> <el-form-item label="单位名称：" style="opacity:0;">
<el-input v-model="notime"></el-input> <el-input v-model="notime"></el-input>
...@@ -290,22 +290,22 @@ ...@@ -290,22 +290,22 @@
系统部署架构 系统部署架构
<img <img
v-show="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 == '' && v-show="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.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.otherDemand == '' && systemStructure.loadBalance == '' && systemStructure.disaster == '' && systemStructure.distributed == '' && 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.cdn.space == '' && 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.otherDemand == '' && systemStructure.loadBalance == '' && systemStructure.disaster == '' && systemStructure.distributed == '' && 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.cdn.memory == '' &&
systemStructure.slb.space == '' && systemStructure.slb.memory == '' &&
systemStructure.vps.space == '' && systemStructure.vps.memory == '' &&
systemStructure.application.space == '' && systemStructure.application.memory == '' &&
systemStructure.otherEquipment.space == '' && systemStructure.otherEquipment.memory == '' &&
systemStructure.cdn.space == '' " systemStructure.cdn.memory == '' "
src="./img/noform.png" src="./img/noform.png"
alt alt
/> />
<img <img
v-show="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 != '' || 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.space != '' || v-show="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 != '' || 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.space != '' || systemStructure.slb.memory != '' ||
systemStructure.vps.space != '' || systemStructure.vps.memory != '' ||
systemStructure.application.space != '' || systemStructure.application.memory != '' ||
systemStructure.otherEquipment.space != '' || systemStructure.otherEquipment.memory != '' ||
systemStructure.cdn.space != '' " systemStructure.cdn.memory != '' "
src="./img/doform.png" src="./img/doform.png"
alt alt
/> />
...@@ -339,12 +339,14 @@ systemStructure.cdn.space != '' " ...@@ -339,12 +339,14 @@ systemStructure.cdn.space != '' "
<li :class="{'box-nav-title':true,'active':isOpen3}" @click="open3"> <li :class="{'box-nav-title':true,'active':isOpen3}" @click="open3">
中间件/API相关 中间件/API相关
<img <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" src="./img/noform.png"
alt alt
/> />
<img <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" src="./img/doform.png"
alt alt
/> />
...@@ -364,8 +366,8 @@ systemStructure.cdn.space != '' " ...@@ -364,8 +366,8 @@ systemStructure.cdn.space != '' "
</li> </li>
<li :class="{'box-nav-title':true,'active':isOpen5}" @click="open5"> <li :class="{'box-nav-title':true,'active':isOpen5}" @click="open5">
迁移策略 迁移策略
<img v-show="rto == -1 && rpo == -1" src="./img/noform.png" alt /> <img v-show="rto == '' && rpo == ''" src="./img/noform.png" alt />
<img v-show="rto != -1 || rpo != -1" src="./img/doform.png" alt /> <img v-show="rto != '' || rpo != ''" src="./img/doform.png" alt />
</li> </li>
<li :class="{'box-nav-title':true,'active':isOpen6}" @click="open6"> <li :class="{'box-nav-title':true,'active':isOpen6}" @click="open6">
额外申请 额外申请
...@@ -577,7 +579,7 @@ systemStructure.cdn.space != '' " ...@@ -577,7 +579,7 @@ systemStructure.cdn.space != '' "
<el-input v-model="systemStructure.application.ghz"></el-input> <el-input v-model="systemStructure.application.ghz"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="内存："> <el-form-item label="内存：">
<el-input v-model="systemStructure.application.space"></el-input> <el-input v-model="systemStructure.application.memory"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -746,7 +748,7 @@ systemStructure.cdn.space != '' " ...@@ -746,7 +748,7 @@ systemStructure.cdn.space != '' "
<el-input v-model="systemStructure.database.ghz"></el-input> <el-input v-model="systemStructure.database.ghz"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="内存："> <el-form-item label="内存：">
<el-input v-model="systemStructure.database.space"></el-input> <el-input v-model="systemStructure.database.memory"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -915,7 +917,7 @@ systemStructure.cdn.space != '' " ...@@ -915,7 +917,7 @@ systemStructure.cdn.space != '' "
<el-input v-model="systemStructure.nas.ghz"></el-input> <el-input v-model="systemStructure.nas.ghz"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="内存："> <el-form-item label="内存：">
<el-input v-model="systemStructure.nas.space"></el-input> <el-input v-model="systemStructure.nas.memory"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1083,7 +1085,7 @@ systemStructure.cdn.space != '' " ...@@ -1083,7 +1085,7 @@ systemStructure.cdn.space != '' "
<el-input v-model="systemStructure.slb.ghz"></el-input> <el-input v-model="systemStructure.slb.ghz"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="内存："> <el-form-item label="内存：">
<el-input v-model="systemStructure.slb.space"></el-input> <el-input v-model="systemStructure.slb.memory"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1251,7 +1253,7 @@ systemStructure.cdn.space != '' " ...@@ -1251,7 +1253,7 @@ systemStructure.cdn.space != '' "
<el-input v-model="systemStructure.cdn.ghz"></el-input> <el-input v-model="systemStructure.cdn.ghz"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="内存："> <el-form-item label="内存：">
<el-input v-model="systemStructure.cdn.space"></el-input> <el-input v-model="systemStructure.cdn.memory"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1419,7 +1421,7 @@ systemStructure.cdn.space != '' " ...@@ -1419,7 +1421,7 @@ systemStructure.cdn.space != '' "
<el-input v-model="systemStructure.vps.ghz"></el-input> <el-input v-model="systemStructure.vps.ghz"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="内存："> <el-form-item label="内存：">
<el-input v-model="systemStructure.vps.space"></el-input> <el-input v-model="systemStructure.vps.memory"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1594,7 +1596,7 @@ systemStructure.cdn.space != '' " ...@@ -1594,7 +1596,7 @@ systemStructure.cdn.space != '' "
<el-input v-model="systemStructure.otherEquipment.ghz"></el-input> <el-input v-model="systemStructure.otherEquipment.ghz"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="内存："> <el-form-item label="内存：">
<el-input v-model="systemStructure.otherEquipment.space"></el-input> <el-input v-model="systemStructure.otherEquipment.memory"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1920,7 +1922,7 @@ systemStructure.cdn.space != '' " ...@@ -1920,7 +1922,7 @@ systemStructure.cdn.space != '' "
>Chorme WebKit/Blink 内核</el-checkbox> >Chorme WebKit/Blink 内核</el-checkbox>
<el-checkbox label="FIREFOX">Firefox Gecko 内核</el-checkbox> <el-checkbox label="FIREFOX">Firefox Gecko 内核</el-checkbox>
<el-checkbox label="OPERA">Opera Blink 内核</el-checkbox> <el-checkbox label="OPERA">Opera Blink 内核</el-checkbox>
<el-checkbox label="SECURE">360安全浏览器 Trident/Blink双内核</el-checkbox> <el-checkbox label="SANLIUL">360安全浏览器 Trident/Blink双内核</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<!-- <el-radio v-model="browser.compatibleBrowser" label="IETRIDENT">IE Trident 内核</el-radio> <!-- <el-radio v-model="browser.compatibleBrowser" label="IETRIDENT">IE Trident 内核</el-radio>
...@@ -2064,13 +2066,15 @@ systemStructure.cdn.space != '' " ...@@ -2064,13 +2066,15 @@ systemStructure.cdn.space != '' "
<span class="open-title" style=" cursor: pointer;" <span class="open-title" style=" cursor: pointer;"
@click="open3">中间件/API相关</span> @click="open3">中间件/API相关</span>
<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/noform.png" src="./img/noform.png"
alt alt
class="rule-img" class="rule-img"
/> />
<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" src="./img/doform.png"
alt alt
class="rule-img" class="rule-img"
...@@ -2100,20 +2104,20 @@ systemStructure.cdn.space != '' " ...@@ -2100,20 +2104,20 @@ systemStructure.cdn.space != '' "
</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>
<el-checkbox label="JOnAS">JOnAS</el-checkbox> <el-checkbox label="JONAS">JOnAS</el-checkbox>
<el-checkbox label="Hadoop">Hadoop</el-checkbox> <el-checkbox label="HADOOP">Hadoop</el-checkbox>
<el-checkbox label="KAFKA">Kafka</el-checkbox> <el-checkbox label="KAFKA">Kafka</el-checkbox>
<el-checkbox label="SPARK">SPARK</el-checkbox> <el-checkbox label="SPARK">SPARK</el-checkbox>
<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>
...@@ -2132,7 +2136,8 @@ systemStructure.cdn.space != '' " ...@@ -2132,7 +2136,8 @@ systemStructure.cdn.space != '' "
</div>--> </div>-->
<div class="copy-box-main-input more" style="float:left;padding-top:20px;"> <div class="copy-box-main-input more" style="float:left;padding-top:20px;">
<span class="box-input-text">其他：</span> <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> </div>
<div class="clear"></div> <div class="clear"></div>
...@@ -2812,7 +2817,8 @@ systemStructure.cdn.space != '' " ...@@ -2812,7 +2817,8 @@ systemStructure.cdn.space != '' "
<div class="pg-button ball" @click="backTop">回到顶部</div> <div class="pg-button ball" @click="backTop">回到顶部</div>
<div <div
v-show="isOpen" 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.space != '' ||systemStructure.slb.space != '' ||systemStructure.vps.space != '' ||systemStructure.application.space != '' ||systemStructure.otherEquipment.space != '' ||systemStructure.cdn.space != '' ) ,'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)" @click="goPg2(2)"
>保存并详细评估</div> >保存并详细评估</div>
</div> </div>
...@@ -2842,6 +2848,7 @@ export default { ...@@ -2842,6 +2848,7 @@ export default {
data() { data() {
//这里存放数据 //这里存放数据
return { return {
middlewareEnumsList:[],
opGAscodeList: [], opGAscodeList: [],
devLanguagescodeList: [], devLanguagescodeList: [],
csDevTechnologiescodeList: [], csDevTechnologiescodeList: [],
...@@ -2851,6 +2858,34 @@ export default { ...@@ -2851,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: "" },
...@@ -2955,7 +2990,6 @@ export default { ...@@ -2955,7 +2990,6 @@ export default {
{ code: 4, des: "", name: "ASP", version: "" }, { code: 4, des: "", name: "ASP", version: "" },
{ code: 5, des: "", name: "HTML", version: "" }, { code: 5, des: "", name: "HTML", version: "" },
{ code: 6, des: "", name: "JQuery框架", version: "" }, { code: 6, des: "", name: "JQuery框架", version: "" },
{ code: 7, des: "", name: "Spring框架", version: "" },
{ code: 8, des: "", name: "Angular框架", version: "" }, { code: 8, des: "", name: "Angular框架", version: "" },
{ code: 9, des: "", name: "VUE框架", version: "" }, { code: 9, des: "", name: "VUE框架", version: "" },
{ code: 10, des: "", name: "React框架", version: "" }, { code: 10, des: "", name: "React框架", version: "" },
...@@ -3073,7 +3107,7 @@ export default { ...@@ -3073,7 +3107,7 @@ export default {
cpuNum: "", cpuNum: "",
num: "", num: "",
ghz: "", ghz: "",
space: "" memory: ""
}, //应用服务器 }, //应用服务器
cdn: { cdn: {
deploy: "", deploy: "",
...@@ -3083,7 +3117,7 @@ export default { ...@@ -3083,7 +3117,7 @@ export default {
cpuNum: "", cpuNum: "",
num: "", num: "",
ghz: "", ghz: "",
space: "" memory: ""
}, //应用服务器 }, //应用服务器
nas: { nas: {
deploy: "", deploy: "",
...@@ -3093,7 +3127,7 @@ export default { ...@@ -3093,7 +3127,7 @@ export default {
cpuNum: "", cpuNum: "",
num: "", num: "",
ghz: "", ghz: "",
space: "" memory: ""
}, //应用服务器 }, //应用服务器
vps: { vps: {
deploy: "", deploy: "",
...@@ -3103,7 +3137,7 @@ export default { ...@@ -3103,7 +3137,7 @@ export default {
cpuNum: "", cpuNum: "",
num: "", num: "",
ghz: "", ghz: "",
space: "" memory: ""
}, //应用服务器 }, //应用服务器
database: { database: {
deploy: "", deploy: "",
...@@ -3113,7 +3147,7 @@ export default { ...@@ -3113,7 +3147,7 @@ export default {
cpuNum: "", cpuNum: "",
num: "", num: "",
ghz: "", ghz: "",
space: "" memory: ""
}, //数据库服务器 }, //数据库服务器
storage: { storage: {
deploy: "", deploy: "",
...@@ -3123,7 +3157,7 @@ export default { ...@@ -3123,7 +3157,7 @@ export default {
cpuNum: "", cpuNum: "",
num: "", num: "",
ghz: "", ghz: "",
space: "" memory: ""
}, //存储 }, //存储
otherEquipment: { otherEquipment: {
deploy: "", deploy: "",
...@@ -3133,7 +3167,7 @@ export default { ...@@ -3133,7 +3167,7 @@ export default {
cpuNum: "", cpuNum: "",
num: "", num: "",
ghz: "", ghz: "",
space: "" memory: ""
}, //其他服务设备 }, //其他服务设备
slb: { slb: {
deploy: "", deploy: "",
...@@ -3143,7 +3177,7 @@ export default { ...@@ -3143,7 +3177,7 @@ export default {
cpuNum: "", cpuNum: "",
num: "", num: "",
ghz: "", ghz: "",
space: "" memory: ""
}, //slb }, //slb
otherDemand: "", otherDemand: "",
loadBalance: "", loadBalance: "",
...@@ -3181,7 +3215,14 @@ export default { ...@@ -3181,7 +3215,14 @@ export default {
version: "" version: ""
} }
], ],
middlewareEnums: [], middlewareEnums: [
{
code:15,
des:'',
name:'',
version:''
}
],
otherMiddleware: "", otherMiddleware: "",
web: "", web: "",
jndi: "", jndi: "",
...@@ -3189,6 +3230,7 @@ export default { ...@@ -3189,6 +3230,7 @@ export default {
route: "" route: ""
}, //中间件 }, //中间件
developLanguageSystem: { developLanguageSystem: {
name:'',
csDevTechnologies: [ csDevTechnologies: [
{ {
name: "", name: "",
...@@ -3246,8 +3288,8 @@ export default { ...@@ -3246,8 +3288,8 @@ export default {
performance: "", performance: "",
otherContent: "" otherContent: ""
}, },
rpo: -1, //迁移策略 rpo: '', //迁移策略
rto: -1, //迁移策略 rto: '', //迁移策略
apply: { apply: {
reason: "", reason: "",
cost: "" cost: ""
...@@ -3411,8 +3453,9 @@ export default { ...@@ -3411,8 +3453,9 @@ export default {
this.browser.threeD != "" || this.browser.threeD != "" ||
this.browser.flash != "" || this.browser.flash != "" ||
this.browser.otherDemand != "" || this.browser.otherDemand != "" ||
this.middleware.middlewareEnums != "" || this.middleware.middlewareEnums.length > 1 ||
this.middleware.otherMiddleware != "" || this.middleware.middlewareEnums[0].des
!= "" ||
this.middleware.web != "" || this.middleware.web != "" ||
this.middleware.jndi != "" || this.middleware.jndi != "" ||
this.middleware.jms != "" || this.middleware.jms != "" ||
...@@ -3431,8 +3474,8 @@ export default { ...@@ -3431,8 +3474,8 @@ export default {
this.database.safe != "" || this.database.safe != "" ||
this.database.performance != "" || this.database.performance != "" ||
this.database.otherContent != "" || this.database.otherContent != "" ||
this.rto != -1 || this.rto != '' ||
this.rpo != -1 || this.rpo != '' ||
this.apply.reason != "" || this.apply.reason != "" ||
this.apply.cost != "" || this.apply.cost != "" ||
this.browser.browserPlugs.length > 1 || this.browser.browserPlugs.length > 1 ||
...@@ -3454,13 +3497,13 @@ export default { ...@@ -3454,13 +3497,13 @@ export default {
this.systemStructure.nas.cpuNum != "" || this.systemStructure.nas.cpuNum != "" ||
this.systemStructure.nas.num != "" || this.systemStructure.nas.num != "" ||
this.systemStructure.nas.ghz != "" || this.systemStructure.nas.ghz != "" ||
this.systemStructure.nas.space != "" || this.systemStructure.nas.memory != "" ||
this.systemStructure.cdn.space != "" || this.systemStructure.cdn.memory != "" ||
this.systemStructure.slb.space != "" || this.systemStructure.slb.memory != "" ||
this.systemStructure.vps.space != "" || this.systemStructure.vps.memory != "" ||
this.systemStructure.application.space != "" || this.systemStructure.application.memory != "" ||
this.systemStructure.otherEquipment.space != "" || this.systemStructure.otherEquipment.memory != "" ||
this.systemStructure.cdn.space != "" || this.systemStructure.cdn.memory != "" ||
this.systemStructure.cdn.cpuNum != "" || this.systemStructure.cdn.cpuNum != "" ||
this.systemStructure.cdn.num != "" || this.systemStructure.cdn.num != "" ||
this.systemStructure.cdn.ghz != "" || this.systemStructure.cdn.ghz != "" ||
...@@ -3769,16 +3812,24 @@ export default { ...@@ -3769,16 +3812,24 @@ export default {
for (var i = 0; i < res.data.browser[key].length; i++) { for (var i = 0; i < res.data.browser[key].length; i++) {
if (res.data.browser[key][i].code == 13) { if (res.data.browser[key][i].code == 13) {
arr[0].des = res.data.browser[key][i].des; arr[0].des = res.data.browser[key][i].des;
} else { }
// res.data.browser[key][i].des = "nmsl"; else {
arr.push(res.data.browser[key][i].code); if(res.data.browser[key][i].code < 7){
arr2.push(res.data.browser[key][i]); res.data.browser[key][i].des = 'wu'
this.cities.map(item => { arr.push(res.data.browser[key][i].code);
if (item.code == res.data.browser[key][i].code) { arr2.push(res.data.browser[key][i]);
item.des = res.data.browser[key][i].des }else{
}
return item; //thyking 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 = res.data.browser[key][i].des
}
return item;
});
}
} }
} }
setTimeout(() => { setTimeout(() => {
...@@ -3805,7 +3856,42 @@ export default { ...@@ -3805,7 +3856,42 @@ export default {
if (res.data.middleware[key] != -1) { if (res.data.middleware[key] != -1) {
if (res.data.middleware[key] == undefined) { if (res.data.middleware[key] == undefined) {
} else { } else {
if (key == "microServices") { 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 ++){
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{
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") {
console.log("先打印", this.middleware[key]); console.log("先打印", this.middleware[key]);
var arr = [ var arr = [
{ {
...@@ -4280,8 +4366,15 @@ export default { ...@@ -4280,8 +4366,15 @@ export default {
// if (res.data.rto != -1) { // if (res.data.rto != -1) {
// this.rto = res.data.rto; // this.rto = res.data.rto;
// } // }
this.rpo = res.data.rpo if(res.data.rpo == -1){
this.rto = res.data.rto this.rpo = ''
}
if(res.data.rto == -1){
this.rto = ''
}
// this.rpo = res.data.rpo
// this.rto = res.data.rto
Object.keys(this.form).forEach(key => { Object.keys(this.form).forEach(key => {
if (res.data[key] != -1) { if (res.data[key] != -1) {
this.form[key] = res.data[key]; this.form[key] = res.data[key];
...@@ -4353,7 +4446,41 @@ export default { ...@@ -4353,7 +4446,41 @@ export default {
if (res.data.middleware[key] != -1) { if (res.data.middleware[key] != -1) {
if (res.data.middleware[key] == undefined) { if (res.data.middleware[key] == undefined) {
} else { } else {
if (key == "microServices") { 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 ++){
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{
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") {
console.log("先打印", this.middleware[key]); console.log("先打印", this.middleware[key]);
var arr = [ var arr = [
{ {
......
src/components/reportAssess/reportAssess.vue
浏览文件 @ c75b5864
...@@ -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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论