Merge remote-tracking branch 'origin/cirs-biz-branch' into cirs-biz-branch

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

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

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

@@ -20,9 +20,12 @@ public class TElecCompRecord extends BaseEntity
     /** 编号 */
     private Long id;
 
-    /** 元器件名称 */
+    /** 元器件编号 */
     @Excel(name = "元器件编号")
     private String componentId;
+    /** 型号规格 */
+    @Excel(name = "国产型号")
+    private String componentModel;
 
     /** 使用场景 */
     @Excel(name = "应用设备")
@@ -42,12 +45,12 @@ public class TElecCompRecord extends BaseEntity
     {
         return id;
     }
-    public void setComponentId(String componentId) 
+    public void setComponentId(String componentId)
     {
         this.componentId = componentId;
     }
 
-    public String getComponentId() 
+    public String getComponentId()
     {
         return componentId;
     }
@@ -70,6 +73,14 @@ public class TElecCompRecord extends BaseEntity
         return usedDate;
     }
 
+    public String getComponentModel() {
+        return componentModel;
+    }
+
+    public void setComponentModel(String componentModel) {
+        this.componentModel = componentModel;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -82,6 +93,7 @@ public class TElecCompRecord extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("componentModel",getComponentModel())
             .toString();
     }
 }

cirs-biz/src/main/resources/mapper/biz/TElecCompRecordMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TElecCompRecord" id="TElecCompRecordResult">
         <result property="id"    column="id"    />
         <result property="componentId"    column="component_id"    />
+        <result property="componentModel" column="component_model"    />
         <result property="usedBy"    column="used_by"    />
         <result property="usedDate"    column="used_date"    />
         <result property="createBy"    column="create_by"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
     <sql id="selectTElecCompRecordVo">
-        select id, component_id, used_by, used_date, create_by, create_time, update_by, update_time, remark from t_elec_comp_record
+        select id, component_id, used_by, used_date, create_by, create_time, update_by, update_time, remark, component_model from t_elec_comp_record
     </sql>
 
     <select id="selectTElecCompRecordList" parameterType="TElecCompRecord" resultMap="TElecCompRecordResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_elec_comp_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="componentId != null">component_id,</if>
+            <if test="componentModel != null">component_model,</if>
             <if test="usedBy != null">used_by,</if>
             <if test="usedDate != null">used_date,</if>
             <if test="createBy != null">create_by,</if>
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="componentId != null">#{componentId},</if>
+            <if test="componentModel != null">#{componentModel},</if>
             <if test="usedBy != null">#{usedBy},</if>
             <if test="usedDate != null">#{usedDate},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -73,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_elec_comp_record
         <trim prefix="SET" suffixOverrides=",">
             <if test="componentId != null">component_id = #{componentId},</if>
+            <if test="componentModel != null">component_model = #{componentModel},</if>
             <if test="usedBy != null">used_by = #{usedBy},</if>
             <if test="usedDate != null">used_date = #{usedDate},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

cirs-ui/src/views/biz/evaluation/index.vue

@@ -97,6 +97,7 @@
     <el-table v-loading="loading" :data="evaluationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="编号" align="center" prop="id" />-->
+      <el-table-column label="使用场景" align="center" prop = "useScene" :show-overflow-tooltip="true"/>
       <el-table-column label="查询条件" align="center" prop="searchCondition" :show-overflow-tooltip="true"/>
       <el-table-column label="元器件编号" align="center" prop="componentId" :show-overflow-tooltip="true"/>
       <el-table-column label="元器件名称" align="center" :show-overflow-tooltip="true">
@@ -114,10 +115,11 @@
           <span>{{getComponentQuality(scope.row.componentId)}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="评分" align="center" prop="mark" />
       <el-table-column label="应用设备" align="center" prop="usedBy" :show-overflow-tooltip="true"/>
-      <el-table-column label="使用场景" align="center" prop = "useScene" :show-overflow-tooltip="true"/>
+
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
+      <el-table-column label="评分" align="center" prop="mark" />
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -402,3 +404,13 @@ export default {
   }
 };
 </script>
+<style>
+
+.el-checkbox__inner {
+  border-color: #8492a6 !important;
+}
+.app-container {
+  min-height: 100vh;
+  background: radial-gradient(circle at 10% 20%, #3A71A8 0%, rgb(239, 249, 249) 90%);
+}
+</style>

cirs-ui/src/views/biz/recommend/index.vue

@@ -392,7 +392,7 @@ export default {
     getList() {
       // console.log(this.queryParams)
       this.loading = true
-      this.evaluation.searchCondition = this.searchCondition
+
       RecommendlistComponent(this.queryParams).then(response => { // queryParams中分页的信息应该是在session中保存，在请求的时候通过session封装到了pagedomain中了
         this.componentList = response.rows
 
@@ -419,6 +419,7 @@ export default {
       this.evaluation.mark = this.escore
       this.evaluation.remark = this.eremark
       this.evaluation.useScene = this.use_scene
+      this.evaluation.searchCondition = this.searchCondition
 
       addEvaluation(this.evaluation).then(response => {
         // this.$modal.msgSuccess("评分成功");

cirs-ui/src/views/biz/record/index.vue

@@ -1,17 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="元器件编号" prop="componentId">
-<!--        <el-input-->
-<!--          v-model="queryParams.componentId"-->
-<!--          placeholder="请输入元器件编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-        <el-select v-model="queryParams.componentId" filterable placeholder="请输入元器件编号">
+      <el-form-item label="国产型号" prop="componentModel">
+
+        <el-select v-model="queryParams.id" filterable placeholder="请输入元器件编号">
           <el-option
             v-for="item in componentInfo"
-            :value="item.id">
+            :value="item.componentModel">
           </el-option>
         </el-select>
       </el-form-item>
@@ -96,7 +91,7 @@
     <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange" >
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="编号" align="center" prop="id" />-->
-      <el-table-column label="元器件编号" align="center" prop="componentId" />
+      <el-table-column label="国产型号" align="center" prop="componentModel" />
       <el-table-column label="应用设备" align="center" prop="usedBy" :show-overflow-tooltip='true' />
       <el-table-column label="使用日期" align="center" prop="usedDate" width="180">
         <template slot-scope="scope">
@@ -165,12 +160,12 @@
     <!-- 添加或修改元器件使用经历对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form  style="border:1px solid #C0C0C0;padding: 5px;margin: auto" ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="元器件编号" prop="componentId">
-<!--          <el-input v-model="form.componentId" placeholder="请输入元器件编号" />-->
-          <el-select v-model="form.componentId" filterable placeholder="请输入元器件编号">
+        <el-form-item label="国产型号" prop="componentModel">
+
+          <el-select v-model="queryParams.id" filterable placeholder="请输入元器件编号">
             <el-option
               v-for="item in componentInfo"
-              :value="item.id">
+              :value="item.componentModel">
             </el-option>
           </el-select>
         </el-form-item>
@@ -395,3 +390,13 @@ export default {
   }
 };
 </script>
+<style>
+
+.el-checkbox__inner {
+  border-color: #8492a6 !important;
+}
+.app-container {
+  min-height: 100vh;
+  background: radial-gradient(circle at 10% 20%, #3A71A8 0%, rgb(239, 249, 249) 90%);
+}
+</style>