Merge branch 'dev' of licailing/zhirongip into master

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/java/com/izouma/zhirongip/domain/supply/TechnicalManager.java

@@ -32,7 +32,9 @@ public class TechnicalManager extends BaseEntity {
     @ExcelIgnore
     private Long userId;
 
-//    private String avatar;
+    @ExcelProperty(value = "照片")
+    @ApiModelProperty(value = "照片")
+    private String avatar;
 
     private String sex;
 

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':

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.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>
         </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;
+                    }
                 }
             }
         }

src/main/vue/src/views/supply/TechnicalManagerEdit.vue

@@ -18,15 +18,20 @@
                     size="small"
                     style="max-width: 600px;"
                 >
-                    <!-- <el-form-item prop="avatar" label="头像">
-                        <crop-upload v-model="formData.avatar"></crop-upload>
-                    </el-form-item> -->
+                    <el-form-item prop="avatar" label="照片">
+                        <single-upload v-model="formData.avatar"></single-upload>
+                    </el-form-item>
                     <el-form-item prop="name" label="姓名">
                         <el-input v-model="formData.name"></el-input>
                     </el-form-item>
                     <el-form-item prop="sex" label="性别">
                         <el-radio-group v-model="formData.sex">
-                            <el-radio v-for="item in sexOptions" :key="item.value" :label="item.value">
+                            <el-radio
+                                v-for="item in sexOptions"
+                                :key="item.value"
+                                :label="item.value"
+                                @change="chageAvatar"
+                            >
                                 {{ item.label }}
                             </el-radio>
                         </el-radio-group>
@@ -122,7 +127,9 @@ export default {
     data() {
         return {
             saving: false,
-            formData: {},
+            formData: {
+                avatar: 'https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-08-13-09-59-23yoEbtbgH.png'
+            },
             rules: {
                 name: [{ required: true, message: '请输入姓名' }],
                 qualification: [{ required: true, message: '请添加资质图片' }],
@@ -153,6 +160,10 @@ export default {
             sexOptions: [
                 { label: '男', value: '男' },
                 { label: '女', value: '女' }
+            ],
+            avatars: [
+                'https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-08-13-09-59-23yoEbtbgH.png',
+                'https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-08-13-09-59-33aDGeVuix.png'
             ]
         };
     },
@@ -198,6 +209,14 @@ export default {
                         this.$message.error((e || {}).error || '删除失败');
                     }
                 });
+        },
+        chageAvatar(res) {
+            let avatar = this.formData.avatar;
+            if (res == '男' && (avatar == this.avatars[1] || avatar == '')) {
+                this.formData.avatar = this.avatars[0];
+            } else if (res == '女' && (avatar == this.avatars[0] || avatar == '')) {
+                this.formData.avatar = this.avatars[1];
+            }
         }
     }
 };

src/main/vue/src/widgets/RecentDemand.vue

@@ -67,7 +67,18 @@ export default {
                                 ],
                                 borderWidth: 1
                             }
-                        ]
+                        ],
+                        options: {
+                            scales: {
+                                yAxes: [
+                                    {
+                                        ticks: {
+                                            min: 0
+                                        }
+                                    }
+                                ]
+                            }
+                        }
                     };
                 })
                 .catch(e => {

src/main/vue/src/widgets/RecentSupply.vue

@@ -67,7 +67,18 @@ export default {
                                 ],
                                 borderWidth: 1
                             }
-                        ]
+                        ],
+                        options: {
+                            scales: {
+                                yAxes: [
+                                    {
+                                        ticks: {
+                                            min: 0
+                                        }
+                                    }
+                                ]
+                            }
+                        }
                     };
                 })
                 .catch(e => {

src/main/zhi-rong-web/src/components/list/ManageGride.vue

@@ -1,6 +1,6 @@
 <template>
     <router-link :to="path" class="manage" :class="{ 'manage-mini': size === 'mini' }">
-        <el-image :src="getImg(info.qualification)" fit="fill"></el-image>
+        <el-image :src="getImg(info.avatar)" fit="fill"></el-image>
         <div class="content">
             <div class="name">{{ info.name }}</div>
             <!-- <div class="tags">

src/main/zhi-rong-web/src/components/popup/Message.vue

@@ -44,7 +44,7 @@
                 <el-form-item prop="type" label="证件类型">
                     <el-select v-model="formData.type" clearable filterable placeholder="请选择" style="width: 100%">
                         <el-option
-                            v-for="item in typeOptions"
+                            v-for="item in typeOptionsList"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value"
@@ -97,7 +97,7 @@ export default {
                 title: [{ required: true, message: '请输入咨询标题' }],
                 content: [{ required: true, message: '请输入正文详情' }]
             },
-            typeOptions: [
+            typeOptionsList: [
                 { label: '身份证', value: 'ID_CARD' },
                 { label: '军官证', value: 'OFFICER_ID' }
             ]

src/main/zhi-rong-web/src/views/detail/TechnicalManager.vue

@@ -110,8 +110,8 @@ export default {
     },
     computed: {
         imgs() {
-            if (this.info.qualification && this.info.qualification.length > 0) {
-                return this.info.qualification;
+            if (this.info.avatar && this.info.avatar.length > 0) {
+                return this.info.avatar;
             } else {
                 return [this.getImg()];
             }