Merge branch 'dev' of http://git.izouma.com/licailing/zhirongip into dev

src/main/java/com/izouma/zhirongip/domain/resource/SuccessCase.java

@@ -19,6 +19,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
@@ -29,6 +30,7 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @Builder
 @Entity
+@Where(clause = "del = 0")
 @ApiModel(value = "成功案例")
 public class SuccessCase extends BaseEntity {
     @Searchable

src/main/vue/src/views/Dashboard.vue

@@ -5,43 +5,41 @@
             <div class="border"></div>
             <div class="content">
                 <el-button class="btn" type="info">总计</el-button>
-                <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 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.company }}</div>
+                </div>
+                <div class="text">
+                    <div class="text1">专家</div>
+                    <div class="text2">{{ list.expert }}</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>
@@ -172,29 +170,22 @@ export default {
                 font-weight: bold;
                 color: #214bbe;
             }
-            .conTent {
-                width: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                margin-right: 100px;
-                .text {
+            .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;
                     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;
-                    }
                 }
             }
         }