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

cirs-ui/src/store/modules/user.js

@@ -51,7 +51,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/stylist.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

cirs-ui/src/views/index.vue

@@ -20,8 +20,8 @@
       </el-carousel-item>
     </el-carousel>
 
-    <div align="center"  style="font-size: 18px;"> 评分最高的10个元器件
-
+    <div align="center"  style="font-size: 18px;">
+      <div style="margin: 10px;color:rgb(255 0 0)">评分最高的10个元器件</div>
     <el-row>
       <el-col :span="11" v-for="(idx,index) in topten.length" :key="idx" :offset="index%2 > 0 ? 1 : 0">
         <el-card class="bgimg" :body-style="{ padding: '0px' }" style="font-size: 20px;background-color: revert;margin-bottom: 20px;">
@@ -351,12 +351,11 @@ export default {
 
 <style scoped lang="scss">
 .bgimg{
-  background-image: url('../assets/images/panel.png');
-  background-size: cover;
-  padding: 20px;
-  border-radius: 20px;
-  width: 100%;
-  display: block;
+  border: 2px solid #032d60;
+  -webkit-box-shadow: #07417a 0 0 10px;
+  -moz-box-shadow: #07417a 0 0 10px;
+  box-shadow: inset 0 0 30px #07417a;
+  position: relative;
 }
 .home {
   background: radial-gradient(circle at 10% 20%, #3A71A8 0%,  rgb(239, 249, 249)90%);

sql/cirs_20230223.sql

@@ -817,7 +817,7 @@ IF
 	EXISTS t_verification_task_detail;
 CREATE TABLE t_verification_task_detail (
 	id BIGINT ( 20 ) NOT NULL auto_increment COMMENT '编号',
-	task_id VARCHAR ( 255 ) COMMENT '任务id',
+	task_id BIGINT ( 20 )COMMENT '任务id',
 	search_condition VARCHAR ( 511 ) COMMENT '查询条件',
 	result1 VARCHAR ( 255 ) COMMENT '标准结果1',
 	result2 VARCHAR ( 255 ) COMMENT '标准结果2',