Merge branch 'develop' into dev-lv

src/views/login.vue

@@ -2,9 +2,9 @@
   <div class="login" :style="{ backgroundImage: `url(${bg})` }">
     <div class="title">
       <div class="login-logo">
-        融通物管安全管理平台
+        融通危险源辨识系统建设项目
       </div>
-      <div class="login-name">Enterprise Business Data Monitoring</div>
+      <!-- <div class="login-name">Enterprise Business Data Monitoring</div> -->
     </div>
 
     <div class="con" :style="{ backgroundImage: `url(${conBg})` }">

src/views/riskProject/add/addInherent.vue

@@ -45,8 +45,8 @@
       <van-field
         required
         clickable
-        name="floorId"
-        :value="form.floorId"
+        name="floorName"
+        :value="form.floorName"
         label="所属楼层"
         placeholder="请选择"
         @click="seletFloor('floor')"

src/views/riskProject/add/taskList.vue

@@ -22,14 +22,14 @@
           <div>开始时间:</div>
           <div>
             {{
-              timestampToTimes(messageList.startTime) || messageList.startTime
+              timestampToTimes(messageList.startTime,'DT2') || messageList.startTime
             }}
           </div>
         </van-grid-item>
         <van-grid-item>
           <div>结束时间:</div>
           <div>
-            {{ timestampToTimes(messageList.endTime) || messageList.endTime }}
+            {{ timestampToTimes(messageList.endTime,'DT2') || messageList.endTime }}
           </div>
         </van-grid-item>
       </van-grid>
@@ -130,7 +130,7 @@
               input-align="right"
               :formatter="
                 () => {
-                  return timestampToTimes(form.startTime);
+                  return timestampToTimes(form.startTime,'DT2');
                 }
               "
               :rules="[{ required: true, message: '任务开始时间不能为空' }]"
@@ -143,7 +143,7 @@
               label="任务结束时间"
               :formatter="
                 () => {
-                  return timestampToTimes(form.endTime);
+                  return timestampToTimes(form.endTime,'DT2')
                 }
               "
               input-align="right"
@@ -169,8 +169,9 @@
                 type="flex"
                 justify="space-between"
                 style="margin-top:10px;"
+                @click="toRiskDetail(item)"
               >
-                <van-col span="20" @click="toRiskDetail(item)">
+                <van-col span="20" >
                   <van-col span="5">
                     <van-image
                       width="46"
@@ -189,7 +190,7 @@
                 <van-col span="4">
                   <van-row type="flex">
                     详情
-                    <van-icon name="arrow" size="26px" @click="goColorDetail" />
+                    <van-icon name="arrow" size="26px"  />
                   </van-row>
                 </van-col>
               </van-row>
@@ -209,7 +210,7 @@
                     <van-row>
                       <van-col span="24">
                         <div class="info-title">
-                          {{ timestampToTimes(item.startTime) }}
+                          {{ timestampToTimes(item.startTime,"DT1") }}
                         </div>
                       </van-col>
                     </van-row>
@@ -425,7 +426,7 @@
                   <van-row gutter="">
                     <van-col span="8">发起时间：</van-col>
                     <van-col span="16"
-                      >{{ timestampToTimes(item.startTime) }}
+                      >{{ timestampToTimes(item.startTime,"DT2") }}
                     </van-col>
                   </van-row>
                 </van-col>
@@ -554,8 +555,8 @@ export default {
     this.getRiskTaskList(this.planId, buildingId);
   },
   methods: {
-    timestampToTimes(time) {
-      return timestampToTime(new Date(time), "DT2", true);
+    timestampToTimes(time,type) {
+      return timestampToTime(new Date(time), type, true);
     },
     //执行任务
     performTasks() {

src/views/riskProject/taskLedger/tabDetail.vue

@@ -15,7 +15,7 @@
             <div style="display: flex;">
                 <van-field readonly required name="roomName" :value="InherentRisk.roomName" label="所属房间" placeholder="请输入"
                     :rules="[{ required: true, message: '所属房间不能为空' }]" />
-                <van-button style="color: #cccc;background-color: #f0f1f5;" icon="plus" type="info" />
+                <!-- <van-button style="color: #cccc;background-color: #f0f1f5;" icon="plus" type="info" /> -->
             </div>
             <van-field required clickable name="name" v-model="InherentRisk.factor" label="风险源名称" placeholder="请输入"
                 :rules="[{ required: true, message: '风险源名称不能为空' }]" />

src/views/riskProject/taskLedger/taskDetail.vue

@@ -39,7 +39,7 @@
                   </van-row>
                   <van-row type="flex" style="flex-direction: column;align-items: center;">
                     <van-col>
-                      <van-image round width="34" height="34" src="http://rongtongpc.censoft.com.cn/dev-api/profile/upload/2023/07/08/guyou.png" />
+                      <van-image round width="34" height="34" src="http://rongtongpc.censoft.com.cn/dev-api/profile/upload/2023/07/08/xianyou.png" />
                     </van-col>
                     <van-col>
                       {{ item.userName }}
@@ -99,7 +99,7 @@ export default {
       })
     },
     timestampToTimes(time) {
-      return timestampToTime(new Date(time), "DT2", true);
+      return timestampToTime(new Date(time), "DT1", true);
     },
     goDetail(item){
       console.log(item,'???')