合并冲突

src/views/riskProject/add/addInherent.vue

@@ -608,6 +608,7 @@
           @cancel="showTrouble = false"
         />
       </van-popup>
+      
       <div style="margin: 16px 16px 0">
         <van-button round block type="info" native-type="submit"
           >提交</van-button
@@ -940,6 +941,13 @@ export default {
         }
       });
     },
+    //风险点
+    clickRiskDot(){
+
+    },
+    // //后果严重程度
+    // getConsequence(){
+    //     getFun(`/risk/plan/matrix/${type}/list`).then(res=>{
 
     closeSlectfloor() {
       this.ShowfloorList = false;

src/views/riskProject/add/taskList.vue

@@ -170,40 +170,50 @@
               :key="index"
             >
               <van-row
+                class="list-row"
                 type="flex"
                 justify="space-between"
                 style="margin-top:10px;"
                 @click="toRiskDetail(item)"
               >
                 <van-col span="20">
-                  <van-col span="5">
+                  <van-col span="5" style="line-height: 9;">
                     <van-image
                       width="58"
                       height="58"
-                      :src="require('@/assets/imgs/inherentOrange.png')"
+                      :src="(item.level == '较大风险' ? 
+                      require('@/assets/imgs/redInherent.png'):item.level == '较小风险'?
+                      require('@/assets/imgs/blueInherent.png'):require('@/assets/imgs/inherentOrange.png')
+                      )"
                     />
                     <!-- <van-image width="46" height="46" :src="item.avatar" /> -->
                   </van-col>
-                  <van-col span="15">
+                  <van-col span="17">
                     <van-row gutter="">
-                      <van-col span="9">风险名称：</van-col>
-                      <van-col span="15">{{ item.name }}</van-col>
+                      <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>
                     <van-row gutter="">
-                      <van-col span="9">风险等级：</van-col>
-                      <van-col span="15">{{ item.level }}</van-col>
+                      <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>
                     <van-row gutter="">
-                      <van-col span="9">上报时间：</van-col>
-                      <van-col span="15">{{ timestampToTimes(item.createTime, "DT2") }}</van-col>
+                      <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>
+                    <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>
                   </van-col>
                 </van-col>
-                <van-col span="4">
-                  <van-row type="flex">
+                <van-col span="4" class="list-right">
+                  <van-tag plain type="primary">详情<van-icon name="arrow" size="12px" /></van-tag>
+                  
+                  <!-- <van-row type="flex">
                     详情
-                    <van-icon name="arrow" size="26px" />
-                  </van-row>
+                    
+                  </van-row> -->
                 </van-col>
               </van-row>
             </van-cell-group>
@@ -810,6 +820,13 @@ p {
     line-height: 0.64rem;
   }
 }
+.list-row{
+  position: relative;
+}
+.list-right{
+  position: absolute;
+  right: 0;
+}
 
 .journal-wrap {
   position: relative;

src/views/riskProject/assess/index.vue

@@ -26,7 +26,7 @@
               <van-col span="17">
                 <van-row gutter="">
                   <van-col span="9">创建人：</van-col>
-                  <van-col span="15">{{ item.leaderUserName }}</van-col>
+                  <van-col span="15">{{ item.createUserName }}</van-col>
                 </van-row>
                 <van-row gutter="">
                   <van-col span="9">发起时间：</van-col>

vue.config.js

@@ -8,11 +8,11 @@ module.exports = {
     //以上的ip和端口是我们本机的;下面为需要跨域的
     proxy: { //配置跨域
       '/app-api': {
-        // target: 'http://192.168.4.232:8080/', //这里是后台的地址
+        target: 'http://192.168.4.232:8080/', //这里是后台的地址
         // target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
         // target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
         // target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
-        target: 'http://localhost:8081/', //这里是后台的地址
+        // target: 'http://localhost:8081/', //这里是后台的地址
         ws: true,
         changOrigin: true, //允许跨域 
         // logLevel: 'debug',  // 显示代理调试信息