Skip to content

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

合并分支 'thy' 到 'master'

输入参数修改 查看合并请求 !135
上级 adb0c738 443b451f
隐藏空白字符变更
内嵌 并排
正在显示 包含 71 行增加 和 27 行删除
src/components/assessment/homeDetailcopy.vue
浏览文件 @ 87721da4
......@@ -326,12 +326,12 @@ systemStructure.cdn.memory != '' "
<li :class="{'box-nav-title':true,'active':isOpen2}" @click="open2">
前端浏览器相关
<img
v-show="browser.plugInUnit == '' && browser.compatibleBrowsers == '' && browser.otherBrowser=='' && browser.geography == '' && browser.peripheral == '' && browser.media == '' && browser.animation== '' && browser.document == '' && browser.threeD == ''&& browser.flash == '' && browser.otherDemand == '' && browser.browserPlugs.length == 1 && browser.browserPlugs[0].des == ''"
v-show="browser.plugInUnit == '' && browser.compatibleBrowsers.length == 1 && browser.otherBrowser=='' && browser.geography == '' && browser.peripheral == '' && browser.media == '' && browser.animation== '' && browser.document == '' && browser.threeD == ''&& browser.flash == '' && browser.otherDemand == '' && browser.browserPlugs.length == 1 && browser.browserPlugs[0].des == '' && browser.compatibleBrowsers[0].des == ''"
src="./img/noform.png"
alt
/>
<img
v-show="browser.plugInUnit != '' || browser.compatibleBrowsers != '' || browser.otherBrowser!='' || browser.geography != '' || browser.peripheral != '' || browser.media != '' || browser.animation!= '' || browser.document != '' || browser.threeD != '' || browser.flash != '' || browser.otherDemand != '' || browser.browserPlugs.length > 1 ||browser.browserPlugs[0].des != ''"
v-show="browser.plugInUnit != '' || browser.compatibleBrowsers.length > 1 || browser.otherBrowser!='' || browser.geography != '' || browser.peripheral != '' || browser.media != '' || browser.animation!= '' || browser.document != '' || browser.threeD != '' || browser.flash != '' || browser.otherDemand != '' || browser.browserPlugs.length > 1 ||browser.browserPlugs[0].des != '' || browser.compatibleBrowsers[0].des != ''"
src="./img/doform.png"
alt
/>
......@@ -1914,15 +1914,16 @@ systemStructure.cdn.memory != '' "
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">兼容的浏览器：</div>
<div class="radios-box">
<el-checkbox-group v-model="browser.compatibleBrowsers">
<el-checkbox label="IETRIDENT">IE Trident 内核</el-checkbox>
<el-checkbox
<el-checkbox-group v-model="compatibleBrowsersList">
<el-checkbox :style="index==1?'width:320px;':''" :label="item.code" v-for="(item,index) in compatibleBrowsers1" :key="index" @change="checkInput2('compatibleBrowsers1',index,'browser','compatibleBrowsers')">{{item.name}}</el-checkbox>
<!-- <el-checkbox
label="CHROMEWEBKIT"
style="width:320px;"
>Chorme WebKit/Blink 内核</el-checkbox>
<el-checkbox label="FIREFOX">Firefox Gecko 内核</el-checkbox>
<el-checkbox label="OPERA">Opera Blink 内核</el-checkbox>
<el-checkbox label="SANLIUL">360安全浏览器 Trident/Blink双内核</el-checkbox>
<el-checkbox label="SANLIUL">360安全浏览器 Trident/Blink双内核</el-checkbox> -->
</el-checkbox-group>
</div>
<!-- <el-radio v-model="browser.compatibleBrowser" label="IETRIDENT">IE Trident 内核</el-radio>
......@@ -1939,7 +1940,7 @@ systemStructure.cdn.memory != '' "
>360安全浏览器 Trident/Blink双内核</el-radio>-->
<div class="copy-box-main-input" style="margin-top:60px;">
<span class="box-input-text">其他：</span>
<el-input v-model="browser.otherBrowser" placeholder="请输入"></el-input>
<el-input v-model="browser.compatibleBrowsers[0].des" placeholder="请输入"></el-input>
</div>
</div>
</div>
......@@ -2105,7 +2106,7 @@ systemStructure.cdn.memory != '' "
<div class="copy-nav-main more six" style="height:auto;">
<div class="copy-nav-main-main five more" style="margin-top:20px;">
<el-checkbox-group v-model="middlewareEnumsList" style="float:left;">
<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="item.code" v-for="(item,index) in middlewareEnumsList1" :key="index" @change="checkInput2('middlewareEnumsList1',index,'middleware','middlewareEnums')">{{item.name}}</el-checkbox>
<!-- <el-checkbox label="NGNIX">Ngnix</el-checkbox>
<el-checkbox label="WEBSPHERE">websphere</el-checkbox>
<el-checkbox label="WEBLOGIC">weblogic</el-checkbox>
......@@ -2817,7 +2818,7 @@ 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.length > 1 || middleware.middlewareEnums[0].des
: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.length>1 || browser.compatibleBrowsers[0].des != '' || 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>
......@@ -2848,6 +2849,7 @@ export default {
data() {
//这里存放数据
return {
compatibleBrowsersList:[],
middlewareEnumsList:[],
opGAscodeList: [],
devLanguagescodeList: [],
......@@ -2871,20 +2873,20 @@ export default {
// <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: "" },
// <el-checkbox label="IETRIDENT">IE Trident 内核</el-checkbox>
// <el-checkbox
// label="CHROMEWEBKIT"
// style="width:320px;"
// >Chorme WebKit/Blink 内核</el-checkbox>
// <el-checkbox label="FIREFOX">Firefox Gecko 内核</el-checkbox>
// <el-checkbox label="OPERA">Opera Blink 内核</el-checkbox>
// <el-checkbox label="SANLIUL">360安全浏览器 Trident/Blink双内核</el-checkbox>
compatibleBrowsers1: [
{ code: 4, des: "", name: "IE Trident 内核", version: "" },
{ code: 5, des: "", name: "Chorme WebKit/Blink 内核", version: "" },
{ code: 7, des: "", name: "Firefox Gecko 内核", version: "" },
{ code: 8, des: "", name: "Opera Blink 内核", version: "" },
{ code: 1, des: "", name: "360安全浏览器 Trident/Blink双内核", version: "" },
],
MicroServiceEnumList: [
{ code: 0, des: "wu", name: "FLUME", version: "" },
......@@ -3186,7 +3188,7 @@ export default {
},
browser: {
browserPlugs: [{ code: 13, des: "", name: "", version: "" }], // 浏览器插件
compatibleBrowsers: [], //兼容的浏览器
compatibleBrowsers: [{ code: 3, des: "", name: "", version: "" }], //兼容的浏览器
otherBrowser: "",
geography: "", //地理信息系统 int 1：是 2：否
peripheral: "", //调用外设
......@@ -3443,7 +3445,8 @@ export default {
this.systemStructure.disaster != "" ||
this.systemStructure.distributed != "" ||
this.browser.plugInUnit != "" ||
this.browser.compatibleBrowsers != "" ||
this.browser.compatibleBrowsers.length > 1 ||
this.browser.compatibleBrowsers[0].des != "" ||
this.browser.otherBrowser != "" ||
this.browser.geography != "" ||
this.browser.peripheral != "" ||
......@@ -3792,7 +3795,42 @@ export default {
if (res.data.browser[key] != -1) {
if (res.data.browser[key] == undefined) {
} else {
if (key == "browserPlugs") {
if(key == 'compatibleBrowsers'){
var arr = [
{
code: 3,
des: "",
name: "",
version: ""
}
];
var arr2 = [
{
code: 3,
des: "",
name: "",
version: ""
}
];
for(var i = 0 ; i < res.data.browser[key].length ; i ++){
if(res.data.browser[key][i].code == 3){
console.log("?????", res.data.browser[key][i].des)
arr[0].des = res.data.browser[key][i].des
arr2[0].des = res.data.browser[key][i].des
}else{
arr.push(res.data.browser[key][i].code);
// console.log(" this.middleware.middlewareEnums", arr)
arr2.push(res.data.browser[key][i]);
}
}
setTimeout(() => {
this.compatibleBrowsersList = arr;
this.browser[key] = arr2;
}, 500);
}
else if (key == "browserPlugs") {
var arr = [
{
code: 13,
......@@ -3812,6 +3850,7 @@ export default {
for (var i = 0; i < res.data.browser[key].length; i++) {
if (res.data.browser[key][i].code == 13) {
arr[0].des = res.data.browser[key][i].des;
arr2[0].des = res.data.browser[key][i].des;
}
else {
if(res.data.browser[key][i].code < 7){
......@@ -3920,6 +3959,7 @@ export default {
arr2.push(res.data.middleware[key][i]);
} else if (res.data.middleware[key][i].code == 24) {
arr[0].des = res.data.middleware[key][i].des;
arr2[0].des = res.data.middleware[key][i].des;
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(res.data.middleware[key][i].code);
......@@ -3931,7 +3971,7 @@ export default {
}
return item;
});
console.log("这个数组", this.MicroServiceEnumList);
console.log("这个数组qqqq", arr2);
// 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
......@@ -3981,6 +4021,7 @@ export default {
arr2.push(res.data.middleware[key][i]);
} else if (res.data.middleware[key][i].code == 25) {
arr[0].des = res.data.middleware[key][i].des;
arr2[0].des = res.data.middleware[key][i].des;
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(Number(res.data.middleware[key][i].code));
......@@ -4409,6 +4450,7 @@ export default {
for (var i = 0; i < res.data.browser[key].length; i++) {
if (res.data.browser[key][i].code == 13) {
arr[0].des = res.data.browser[key][i].des;
arr2[0].des = res.data.browser[key][i].des;
} else {
// res.data.browser[key][i].des = "nmsl";
arr.push(res.data.browser[key][i].code);
......@@ -4509,6 +4551,7 @@ export default {
arr2.push(res.data.middleware[key][i]);
} else if (res.data.middleware[key][i].code == 24) {
arr[0].des = res.data.middleware[key][i].des;
arr2[0].des = res.data.middleware[key][i].des;
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(res.data.middleware[key][i].code);
......@@ -4570,6 +4613,7 @@ export default {
arr2.push(res.data.middleware[key][i]);
} else if (res.data.middleware[key][i].code == 25) {
arr[0].des = res.data.middleware[key][i].des;
arr2[0].des = res.data.middleware[key][i].des;
} else {
// res.data.middleware[key][i].des = "nmsl";
arr.push(Number(res.data.middleware[key][i].code));
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论