合并分支 'thy' 到 'ningbo'

src/components/assessment/homeDetailcopy.vue

@@ -2818,8 +2818,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.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}"
+                :class="{'pg-button no chang 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 chang':true}"
                 @click="goPg2(2)"
               >保存并详细评估</div>
             </div>
@@ -5631,6 +5631,9 @@ export default {
   cursor: default;
   background-color: #889cdd;
 }
+.pg-button.chang {
+ width: 150px;
+}
 .pg-button.no.active {
   cursor: pointer;
   background-color: #4877e6;

src/services/server.js

@@ -10,8 +10,8 @@ import axios from '@/services/axios';
  * dataType
  */
 import qs from 'qs';
-const assessma = 'http://120.55.57.35:8078'
-// const assessma = 'http://192.168.1.85:8078'
+// const assessma = 'http://120.55.57.35:8078'
+const assessma = 'http://192.168.1.85:8078'
 const server = {
     getloginOut(id) { // 用户退出
         return axios('/user/loginOut/' + id, {