test问题

.env.production

@@ -4,4 +4,6 @@ ENV = 'production'
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # 如果接口是 http 形式， wss 需要改为 ws
 
-VUE_APP_LOCAL_API = 'http://gqfhq.gemho.cn:9103'
+# VUE_APP_LOCAL_API = 'http://gqfhq.gemho.cn:9103'
+VUE_APP_LOCAL_API = 'http://192.168.3.226:9103'
+

config/settings.js

 
 // var ServiceURL = 'http://192.168.3.216:9002';
 // var ServiceURL = 'http://192.168.3.250:9103';
-var ServiceURL = 'http://gqfhq.gemho.cn:9103';
+// var ServiceURL = 'http://gqfhq.gemho.cn:9103';
+var ServiceURL = 'http://192.168.3.226:9103'
 
 
 

src/assets/js/httpApi.js

@@ -1329,11 +1329,12 @@ var reqApis = function(){
 						"utilityModelsNumber": {name:"实用新型数（件)", must:true, key:'name', 'width': '180px',},
 
 						"softwareCopyrightNumber": {name:"软件著作权数（件)", must:true, key:'name', 'width': '180px',},
-						"companyLevel": {name:"企业级别", must:true, 'type':'select', key:'name', 'width': '180px',},
+						// "companyLevel": {name:"企业级别", must:true, 'type':'select', key:'name', 'width': '180px',},
+						"companyLevelName": {name:"企业级别", must:true,  key:'name', 'width': '180px',},
 						"totalEmployees": {name:"今年从业人数（人）", must:true, key:'name', 'width': '180px',},
 						"phdEmployees": {name:"博士人数（人）", must:true, key:'name', 'width': '180px',},
 						"overseasEmployees": {name:"留学人数（人）", must:true, key:'name', 'width': '180px',},
-						"revenueLastYear": {name:"上年营业收入（万元）", must:true, key:'name', 'width': '180px',},
+						// "revenueLastYear": {name:"上年营业收入（万元）", must:true, key:'name', 'width': '180px',},
 						"netProfit": {name:"净利润（万元）", must:true, key:'name', 'width': '180px',},
 						"taxesPaid": {name:"上缴税费（万元）", must:true, key:'name', 'width': '180px',},
 						"investmentProportion": {name:"研发投入占比", must:true, key:'name', 'width': '180px',},
@@ -1341,11 +1342,11 @@ var reqApis = function(){
 						"researchInput": {name:"研发投入（万元）", must:true, key:'name', 'width': '180px',},
 
 						// "mentorId": {name:"创业导师", 'type':'select', key:'name','width': '180px',},
-						"companyLevelName": {name:"企业级别", must:true,  key:'name', 'width': '180px',},
+					
 						"totalEmployees": {name:"今年从业人数（人）", must:true, key:'name', 'width': '180px',},
 						"phdEmployees": {name:"博士人数（人）", must:true, key:'name', 'width': '180px',},
 						"overseasEmployees": {name:"留学人数（人）", must:true, key:'name', 'width': '180px',},
-						"revenueLastYear": {name:"上年营业收入（万元）", must:true, key:'name', 'width': '180px',},
+						//"revenueLastYear": {name:"上年营业收入（万元）", must:true, key:'name', 'width': '180px',},
 						"netProfit": {name:"净利润（万元）", must:true, key:'name', 'width': '180px',},
 						"taxesPaid": {name:"上缴税费（万元）", must:true, key:'name', 'width': '180px',},
 						"investmentProportion": {name:"研发投入占比", must:true, key:'name', 'width': '180px',},

src/layout/components/MainNavbar.vue

@@ -67,7 +67,7 @@ export default {
 	},
 	methods: {
 		open() {
-		  this.$confirm('确定注销并退出系统吗？', '提示', {
+		  this.$confirm('确定退出系统吗？', '提示', {
 			confirmButtonText: '确定',
 			cancelButtonText: '取消',
 			type: 'warning'

src/layout/components/Navbar.vue

@@ -126,7 +126,7 @@ export default {
       this.$store.dispatch('app/toggleSideBar')
     },
     open() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
+      this.$confirm('确定退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/system/home/overview.vue

@@ -551,7 +551,9 @@
         tableData4panel0: [],
   
           // panel123 企业信息
-          data4panel1: {},
+          data4panel1: {
+            companyProductList: []
+          },
         totalCount4panel1: 0, // 总条目数
         currentPage4panel1: 0, // 当前页码
         pageSize4panel1: 10, // 每页显示的条目数量
@@ -670,7 +672,7 @@
             companyId: companyId+''
           })
           .then((res) => {
-            this.data4panel1 = res.body || {};
+            this.data4panel1 = res.body || { companyProductList: [] };
           });
       },
       changeCompany(companyId){
@@ -1204,7 +1206,12 @@
             font-size: 13px;
             color: #969aa3;
             padding-left: 15px;
-            line-height: 20px;
+            // line-height: 20px;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            -webkit-line-clamp: 4;
+            line-height: 1.6;
           }
         }
       }

src/views/system/home/tech.vue

@@ -6,8 +6,8 @@
           <div class="title" style="padding-bottom: 8px;">孵化器</div>
           <div class="content" style="font-size: 16px;margin-bottom: 4px;">{{data.incubatorAllCount}}家</div>
           <div style="color: gray; font-size: 14px;">
-            <span>国家级: {{data.provinceCount}}家</span>
-            <span>省级: {{data.countryCount}}家</span>
+            <span>国家级: {{data.countryCount}}家</span>
+            <span>省级: {{data.provinceCount}}家</span>
           </div>
         </li>
         <li>
@@ -575,6 +575,7 @@ export default {
     width: 360px;
     height: 442px;
     background: #ffffff;
+    // border: 1px solid #000;
     border-radius: 10px;
     margin-left: 23px;
     margin-right: 23px;
@@ -612,6 +613,8 @@ export default {
     img {
       width: 100%;
       // height: 442px;
+      height: 342px;
+      // height: 225px;
       border-radius: 10px;
     }
     h2 {