update css

cirs-admin/src/main/resources/application.yml

@@ -76,7 +76,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: 123456
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:

cirs-biz/src/main/java/com/cirs/biz/domain/TVerificationTaskDetail.java

@@ -1,7 +1,5 @@
 package com.cirs.biz.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.cirs.common.annotation.Excel;
 import com.cirs.common.core.domain.BaseEntity;
 
@@ -32,203 +30,281 @@ public class TVerificationTaskDetail extends BaseEntity
     @Excel(name = "标准结果1")
     private String result1;
 
+    private Long result1Id;
+
     /** 标准结果2 */
     @Excel(name = "标准结果2")
     private String result2;
 
+    private Long result2Id;
+
     /** 标准结果3 */
     @Excel(name = "标准结果3")
     private String result3;
 
+    private Long result3Id;
+
     /** 标准结果4 */
     @Excel(name = "标准结果4")
     private String result4;
 
+    private Long result4Id;
+
     /** 标准结果5 */
     @Excel(name = "标准结果5")
     private String result5;
 
+    private Long result5Id;
+
     /** 计算结果1 */
     @Excel(name = "计算结果1")
     private String calculate1;
 
+    private Long calculate1Id;
+
     /** 计算结果2 */
     @Excel(name = "计算结果2")
     private String calculate2;
 
+    private Long calculate2Id;
+
     /** 计算结果3 */
     @Excel(name = "计算结果3")
     private String calculate3;
 
+    private Long calculate3Id;
+
     @Excel(name = "计算结果4")
     private String calculate4;
 
+    private Long calculate4Id;
+
     @Excel(name = "计算结果5")
     private String calculate5;
+
+    private Long calculate5Id;
+
     /** 召回率 */
-//    @Excel(name = "召回率")
-//    private String accuracy;
 
-    public void setId(Long id)
-    {
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
-        return id;
+    public Long getTaskId() {
+        return taskId;
     }
-    public void setUseScene(String useScene)
-    {
-        this.useScene = useScene;
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
     }
 
-    public String getUseScene()
-    {
+    public String getUseScene() {
         return useScene;
     }
-    public void setTaskId(Long taskId)
-    {
-        this.taskId = taskId;
+
+    public void setUseScene(String useScene) {
+        this.useScene = useScene;
     }
 
-    public Long getTaskId()
-    {
-        return taskId;
+    public String getSearchCondition() {
+        return searchCondition;
     }
-    public void setSearchCondition(String searchCondition) 
-    {
+
+    public void setSearchCondition(String searchCondition) {
         this.searchCondition = searchCondition;
     }
 
-    public String getSearchCondition() 
-    {
-        return searchCondition;
+    public String getResult1() {
+        return result1;
     }
-    public void setResult1(String result1) 
-    {
+
+    public void setResult1(String result1) {
         this.result1 = result1;
     }
 
-    public String getResult1() 
-    {
-        return result1;
+    public Long getResult1Id() {
+        return result1Id;
     }
-    public void setResult2(String result2) 
-    {
-        this.result2 = result2;
+
+    public void setResult1Id(Long result1Id) {
+        this.result1Id = result1Id;
     }
 
-    public String getResult2() 
-    {
+    public String getResult2() {
         return result2;
     }
-    public void setResult3(String result3) 
-    {
-        this.result3 = result3;
+
+    public void setResult2(String result2) {
+        this.result2 = result2;
+    }
+
+    public Long getResult2Id() {
+        return result2Id;
     }
 
-    public String getResult3() 
-    {
+    public void setResult2Id(Long result2Id) {
+        this.result2Id = result2Id;
+    }
+
+    public String getResult3() {
         return result3;
     }
-    public void setResult4(String result4) 
-    {
-        this.result4 = result4;
+
+    public void setResult3(String result3) {
+        this.result3 = result3;
     }
 
-    public String getResult4() 
-    {
+    public Long getResult3Id() {
+        return result3Id;
+    }
+
+    public void setResult3Id(Long result3Id) {
+        this.result3Id = result3Id;
+    }
+
+    public String getResult4() {
         return result4;
     }
-    public void setResult5(String result5) 
-    {
-        this.result5 = result5;
+
+    public void setResult4(String result4) {
+        this.result4 = result4;
+    }
+
+    public Long getResult4Id() {
+        return result4Id;
     }
 
-    public String getResult5() 
-    {
+    public void setResult4Id(Long result4Id) {
+        this.result4Id = result4Id;
+    }
+
+    public String getResult5() {
         return result5;
     }
-    public void setCalculate1(String calculate1) 
-    {
-        this.calculate1 = calculate1;
+
+    public void setResult5(String result5) {
+        this.result5 = result5;
+    }
+
+    public Long getResult5Id() {
+        return result5Id;
+    }
+
+    public void setResult5Id(Long result5Id) {
+        this.result5Id = result5Id;
     }
 
-    public String getCalculate1() 
-    {
+    public String getCalculate1() {
         return calculate1;
     }
-    public void setCalculate2(String calculate2) 
-    {
-        this.calculate2 = calculate2;
+
+    public void setCalculate1(String calculate1) {
+        this.calculate1 = calculate1;
+    }
+
+    public Long getCalculate1Id() {
+        return calculate1Id;
+    }
+
+    public void setCalculate1Id(Long calculate1Id) {
+        this.calculate1Id = calculate1Id;
     }
 
-    public String getCalculate2() 
-    {
+    public String getCalculate2() {
         return calculate2;
     }
-    public void setCalculate3(String calculate3)
-    {
-        this.calculate3 = calculate3;
+
+    public void setCalculate2(String calculate2) {
+        this.calculate2 = calculate2;
+    }
+
+    public Long getCalculate2Id() {
+        return calculate2Id;
     }
 
-    public String getCalculate3() 
-    {
+    public void setCalculate2Id(Long calculate2Id) {
+        this.calculate2Id = calculate2Id;
+    }
+
+    public String getCalculate3() {
         return calculate3;
     }
-    public void setCalculate4(String calculate4)
-    {
-        this.calculate4 = calculate4;
+
+    public void setCalculate3(String calculate3) {
+        this.calculate3 = calculate3;
+    }
+
+    public Long getCalculate3Id() {
+        return calculate3Id;
+    }
+
+    public void setCalculate3Id(Long calculate3Id) {
+        this.calculate3Id = calculate3Id;
     }
 
-    public String getCalculate4()
-    {
+    public String getCalculate4() {
         return calculate4;
     }
-    public void setCalculate5(String calculate5)
-    {
-        this.calculate5 = calculate5;
+
+    public void setCalculate4(String calculate4) {
+        this.calculate4 = calculate4;
     }
 
-    public String getCalculate5()
-    {
+    public Long getCalculate4Id() {
+        return calculate4Id;
+    }
+
+    public void setCalculate4Id(Long calculate4Id) {
+        this.calculate4Id = calculate4Id;
+    }
+
+    public String getCalculate5() {
         return calculate5;
     }
-//    public void setAccuracy(String accuracy)
-//    {
-//        this.accuracy = accuracy;
-//    }
-//
-//    public String getAccuracy()
-//    {
-//        return accuracy;
-//    }
+
+    public void setCalculate5(String calculate5) {
+        this.calculate5 = calculate5;
+    }
+
+    public Long getCalculate5Id() {
+        return calculate5Id;
+    }
+
+    public void setCalculate5Id(Long calculate5Id) {
+        this.calculate5Id = calculate5Id;
+    }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("taskId", getTaskId())
-            .append("useScene",getUseScene())
-            .append("searchCondition", getSearchCondition())
-            .append("result1", getResult1())
-            .append("result2", getResult2())
-            .append("result3", getResult3())
-            .append("result4", getResult4())
-            .append("result5", getResult5())
-            .append("calculate1", getCalculate1())
-            .append("calculate2", getCalculate2())
-            .append("calculate3", getCalculate3())
-            .append("calculate2", getCalculate4())
-            .append("calculate3", getCalculate5())
-//            .append("accuracy", getAccuracy())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-
-            .toString();
+        return "TVerificationTaskDetail{" +
+                "id=" + id +
+                ", taskId=" + taskId +
+                ", useScene='" + useScene + '\'' +
+                ", searchCondition='" + searchCondition + '\'' +
+                ", result1='" + result1 + '\'' +
+                ", result1Id=" + result1Id +
+                ", result2='" + result2 + '\'' +
+                ", result2Id=" + result2Id +
+                ", result3='" + result3 + '\'' +
+                ", result3Id=" + result3Id +
+                ", result4='" + result4 + '\'' +
+                ", result4Id=" + result4Id +
+                ", result5='" + result5 + '\'' +
+                ", result5Id=" + result5Id +
+                ", calculate1='" + calculate1 + '\'' +
+                ", calculate1Id=" + calculate1Id +
+                ", calculate2='" + calculate2 + '\'' +
+                ", calculate2Id=" + calculate2Id +
+                ", calculate3='" + calculate3 + '\'' +
+                ", calculate3Id=" + calculate3Id +
+                ", calculate4='" + calculate4 + '\'' +
+                ", calculate4Id=" + calculate4Id +
+                ", calculate5='" + calculate5 + '\'' +
+                ", calculate5Id=" + calculate5Id +
+                '}';
     }
 }

cirs-ui/src/views/index.vue

@@ -1,17 +1,14 @@
 <template>
 
   <div class="app-container home">
-
-
-
     <el-carousel :interval="5000" type="card" height="380px">
       <el-carousel-item >
-          <img src='@/assets/images/img4.jpg' @click="recommend" alt="图片无法加载" style="width:100%;height:100%" class="image"/>
-        <span style="position: absolute; bottom: 10px;right: 300px;font-size: 24px;font-family: 新宋体;color: #3A71A8;font-weight: bold">推荐元器件</span>
+          <img src='@/assets/images/img4.png' @click="recommend" alt="图片无法加载" style="width:100%;height:100%" class="image"/>
+        <span style="position: absolute; bottom: 10px;right: 300px;font-size: 30px;font-family: 新宋体;color: #3A71A8;font-weight: bold">元器件推荐</span>
       </el-carousel-item>
       <el-carousel-item >
-        <img src='@/assets/images/img6.jpg' @click="task" alt="图片无法加载" style="width:100%;height:100%" class="image"/>
-        <span style="position: absolute; bottom: 10px;right: 270px;font-size: 24px;font-family: 新宋体;color: #3A71A8;font-weight: bold">验证任务详情</span>
+        <img src='@/assets/images/img6.png' @click="task" alt="图片无法加载" style="width:100%;height:100%" class="image"/>
+        <span style="position: absolute; bottom: 10px;right: 300px;font-size: 30px;font-family: 新宋体;color: #3A71A8;font-weight: bold">验证任务</span>
       </el-carousel-item>
 
       <el-carousel-item >
@@ -22,35 +19,32 @@
 
     <div align="center"  style="font-size: 18px;"> 评分最高的10个元器件
 
-    <el-row class="bgimg" >
-      <el-col :span="12" v-for="idx in topten.length" :key="idx" >
-        <el-card :body-style="{ padding: '0px' }" style="font-size: 20px;background-color: #d3dce6">
+    <el-row>
+      <el-col :span="6" v-for="(idx,index) in topten.length" :key="idx" :offset="index%3 > 0 ? 2 : 1">
+        <el-card class="bgimg" :body-style="{ padding: '0px' }" style="font-size: 20px;background-color: revert;margin-bottom: 20px;">
 
           <div style="padding: 34px;">
-            <td>
-
-            <span>
-              <el-button
-
-                type="text"
-                @click="handleDetail(topten[idx-1].componentId)"
-
-              >{{ topten[idx-1].componentName}} </el-button>
-
-            </span>
-            <span style="font-size: 14px"> 评分：</span>
-            </td>
-            <td>
-            <el-rate
-              v-model="topten[idx-1].score"
-              disabled
-              show-score
-              text-color="#ff9900"
-
-            >
-            </el-rate>
-            </td>
-
+            <p>
+              <span>
+                <el-button
+                  type="text"
+                  style="font-size:20px;color: wheat;"
+                  @click="handleDetail(topten[idx-1].componentId)"
+                >{{ topten[idx-1].componentName}} </el-button>
+              </span>
+            </p>
+            <p>
+              <div class="block">
+                <span style="font-size: 14px;color: wheat;"> 评分：</span>
+                <el-rate
+                  v-model="topten[idx-1].score"
+                  disabled
+                  show-score
+                  text-color="#ff9900"
+                >
+                </el-rate>
+              </div>
+            </p>
           </div>
         </el-card>
       </el-col>
@@ -353,10 +347,12 @@ export default {
 
 <style scoped lang="scss">
 .bgimg{
-  background-image: url('../assets/images/cardbackground.png');
+  background-image: url('../assets/images/panel.png');
   background-size: cover;
   padding: 20px;
   border-radius: 20px;
+  width: 100%;
+  display: block;
 }
 .home {
   background: radial-gradient(circle at 10% 20%, #3A71A8 0%,  rgb(239, 249, 249)90%);
@@ -427,7 +423,7 @@ export default {
   }
 
   .el-carousel__item:nth-child(2n+1) {
-    background-color: #d3dce6;
+    background-color: #1a2c41;
   }
 
 }