xuqiang пре 4 година
родитељ
комит
95d1b83b87
2 измењених фајлова са 61 додато и 52 уклоњено
  1. 2 2
      src/main/vue/src/plugins/http.js
  2. 59 50
      src/main/vue/src/views/Dashboard.vue

+ 2 - 2
src/main/vue/src/plugins/http.js

@@ -5,8 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'http://localhost:8080';
-        // baseUrl = 'http://zhirongip.izouma.com';
+        // baseUrl = 'http://localhost:8080';
+        baseUrl = 'http://zhirongip.izouma.com';
         // baseUrl = 'http://192.168.50.127:8080';
         break;
     case 'test':

+ 59 - 50
src/main/vue/src/views/Dashboard.vue

@@ -5,41 +5,43 @@
             <div class="border"></div>
             <div class="content">
                 <el-button class="btn" type="info">总计</el-button>
-                <div class="text">
-                    <div class="text1">政策</div>
-                    <div class="text2">{{ list.policy }}</div>
-                </div>
-                <div class="text">
-                    <div class="text1">法律</div>
-                    <div class="text2">{{ list.law }}</div>
-                </div>
-                <div class="text">
-                    <div class="text1">知产</div>
-                    <div class="text2">{{ list.intellectualProperty }}</div>
-                </div>
-                <div class="text">
-                    <div class="text1">技术</div>
-                    <div class="text2">{{ list.technology }}</div>
-                </div>
-                <div class="text">
-                    <div class="text1">产品</div>
-                    <div class="text2">{{ list.product }}</div>
-                </div>
-                <div class="text">
-                    <div class="text1">企业</div>
-                    <div class="text2">{{ list.policy }}</div>
-                </div>
-                <div class="text">
-                    <div class="text1">专家</div>
-                    <div class="text2">{{ list.company }}</div>
-                </div>
-                <div class="text">
-                    <div class="text1">军采信息</div>
-                    <div class="text2">{{ list.purchase }}</div>
-                </div>
-                <div class="text">
-                    <div class="text1">成交案例</div>
-                    <div class="text2">{{ list.successCase }}</div>
+                <div class="conTent">
+                    <div class="text">
+                        <div class="text1">政策</div>
+                        <div class="text2">{{ list.policy }}</div>
+                    </div>
+                    <div class="text">
+                        <div class="text1">法律</div>
+                        <div class="text2">{{ list.law }}</div>
+                    </div>
+                    <div class="text">
+                        <div class="text1">知产</div>
+                        <div class="text2">{{ list.intellectualProperty }}</div>
+                    </div>
+                    <div class="text">
+                        <div class="text1">技术</div>
+                        <div class="text2">{{ list.technology }}</div>
+                    </div>
+                    <div class="text">
+                        <div class="text1">产品</div>
+                        <div class="text2">{{ list.product }}</div>
+                    </div>
+                    <div class="text">
+                        <div class="text1">企业</div>
+                        <div class="text2">{{ list.policy }}</div>
+                    </div>
+                    <div class="text">
+                        <div class="text1">专家</div>
+                        <div class="text2">{{ list.company }}</div>
+                    </div>
+                    <div class="text">
+                        <div class="text1">军采信息</div>
+                        <div class="text2">{{ list.purchase }}</div>
+                    </div>
+                    <div class="text">
+                        <div class="text1">成交案例</div>
+                        <div class="text2">{{ list.successCase }}</div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -170,22 +172,29 @@ export default {
                 font-weight: bold;
                 color: #214bbe;
             }
-            .text {
-                margin-right: 96px;
-                .text1 {
-                    font-size: 16px;
-                    font-weight: 400;
-                    color: #000000;
-                    line-height: 22px;
-                    margin-bottom: 16px;
-                }
-                .text2 {
-                    font-size: 18px;
-                    font-family: Arial-BoldMT, Arial;
-                    font-weight: normal;
-                    color: #214bbe;
-                    line-height: 22px;
+            .conTent {
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                margin-right: 100px;
+                .text {
                     text-align: center;
+                    .text1 {
+                        font-size: 16px;
+                        font-weight: 400;
+                        color: #000000;
+                        line-height: 22px;
+                        margin-bottom: 16px;
+                    }
+                    .text2 {
+                        font-size: 18px;
+                        font-family: Arial-BoldMT, Arial;
+                        font-weight: normal;
+                        color: #214bbe;
+                        line-height: 22px;
+                        text-align: center;
+                    }
                 }
             }
         }