合并冲突

src/views/riskProject/add/index.vue

@@ -94,6 +94,7 @@
 
       <van-field
         required
+        readonly
         name="leaderUserName"
         :value="form.leaderUserName"
         label="评估小组组长"
@@ -104,6 +105,7 @@
 
       <van-field
         required
+        readonly
         name="workUserNames"
         :value="form.workUserNames"
         label="评估小组成员"
@@ -357,8 +359,9 @@ export default {
     var userInfo = getUserInfo();
     this.form.userId = userInfo.userId;
     this.form.userName = userInfo.nickName;
-    this.form.deptName = userInfo.dept.deptName;
     this.form.deptId = userInfo.dept.deptId;
+    this.form.deptName = userInfo.dept.deptName;
+
     getFun(`/risk/plan/project/list`).then(res => {
       this.columnsSource = res.data;
     });
@@ -396,6 +399,7 @@ export default {
         loadingType: "spinner",
         duration: 0
       });
+      console.log(this.form.deptId,'00000')
       getFun(`/risk/plan/user/list/${this.form.deptId}`).then(res => {
         if (res.code == 200) {
           this.columnsTrouble = res.data;
@@ -423,7 +427,6 @@ export default {
       this.projectDept = true;
     },
     changeDept(id, name) {
-      console.log(id);
       this.form.deptId = id;
       this.form.deptName = name;
     },

src/views/riskProject/add/taskList.vue

@@ -181,29 +181,29 @@
                     <van-image
                       width="58"
                       height="58"
-                      :src="(item.level == '较大风险' ? 
-                      require('@/assets/imgs/redInherent.png'):item.level == '较小风险'?
-                      require('@/assets/imgs/blueInherent.png'):require('@/assets/imgs/inherentOrange.png')
+                      :src="(item.level == '重大风险' ? 
+                      require('@/assets/imgs/redInherent.png'):item.level == '较大风险'?
+                      require('@/assets/imgs/inherentOrange.png'): item.level === '一般风险'?require('@/assets/imgs/yellowInherent.png') :require('@/assets/imgs/blueInherent.png')
                       )"
                     />
                     <!-- <van-image width="46" height="46" :src="item.avatar" /> -->
                   </van-col>
                   <van-col span="17">
-                    <van-row gutter="">
-                      <van-col span="9" style="font-weight: bold;color:#000;">风险名称：</van-col>
-                      <van-col span="15" style="color: #606266;">{{ item.name }}</van-col>
+                    <van-row gutter="0">
+                      <van-col span="10" style="font-weight: bold;color:#000;font-size: 16px;">风险名称：</van-col>
+                      <van-col span="14" style="color: #000;font-size: 16px;">{{ item.name }}</van-col>
                     </van-row>
-                    <van-row gutter="">
-                      <van-col span="9" style="font-weight: bold;color:#000;">风险等级：</van-col>
-                      <van-col span="15" style="color: #606266;">{{ item.level }}</van-col>
+                    <van-row gutter="0">
+                      <van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">风险等级：</van-col>
+                      <van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ item.level }}</van-col>
                     </van-row>
-                    <van-row gutter="">
-                      <van-col span="9" style="font-weight: bold;color:#000;">上报时间：</van-col>
-                      <van-col span="15" style="color: #606266;">{{ timestampToTimes(item.createTime, "DT2") }}</van-col>
+                    <van-row gutter="0">
+                      <van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">上报时间：</van-col>
+                      <van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ timestampToTimes(item.createTime, "DT2") }}</van-col>
                     </van-row>
-                    <van-row gutter="">
-                      <van-col span="9" style="font-weight: bold;color:#000;">所属房间：</van-col>
-                      <van-col span="15" style="color: #606266;">{{ item.buildingName + item.floorName + item.roomName }}</van-col>
+                    <van-row gutter="0">
+                      <van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">所属房间：</van-col>
+                      <van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ item.buildingName + item.floorName + item.roomName }}</van-col>
                     </van-row>
                   </van-col>
                 </van-col>
@@ -799,6 +799,9 @@ export default {
 .cell-wrap {
   position: relative;
 }
+.van-cell-group--inset .van-row{
+  line-height: 1.5 !important;
+}
 
 p {
   font-size: 0.4rem;