update

src/views/riskProject/add/addPresent.vue

@@ -25,7 +25,7 @@
       <van-field readonly v-model="form.type" required name="type" label="准事故类型" placeholder="请选择"
         @click="seletType('type')" :rules="[{ required: true, message: '准事故类型不能为空' }]" />
 
-      <!-- <van-field
+      <van-field
                 readonly
                 v-model="form.level"
                 required
@@ -34,8 +34,8 @@
                 placeholder="请选择"
                 @click="seletGrade('level')"
                 :rules="[{ required: true, message: '风险等级不能为空' }]"
-            /> -->
-      <van-field
+            />
+      <!-- <van-field
         readonly
         v-model="form.level"
         required
@@ -44,7 +44,7 @@
         placeholder="请选择"
         @click="seletGrade"
         :rules="[{ required: true, message: '风险等级不能为空' }]"
-      />
+      /> -->
 
       <van-field required name="presenceLocation" v-model="form.presenceLocation" label="存在部位" placeholder="请输入"
         :rules="[{ required: true, message: '存在部位不能为空' }]" />
@@ -103,13 +103,13 @@
           </van-uploader>
         </template>
       </van-field>
-      <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
+      <!-- <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
         <img src="@/assets/accidentIcon/bookmark.svg" alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);" />
           应采取的管控措施
       </div>
       <van-field v-model="form.measuresAdministration" name="measuresAdministration" label="" type="textarea" rows="3"
-        autosize placeholder="请输入" />
+        autosize placeholder="请输入" /> -->
       <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
         <img src="@/assets/accidentIcon/bookmark.svg" alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);" />

src/views/riskProject/add/taskList.vue

@@ -178,9 +178,9 @@
                 <van-col span="20">
                   <van-col span="5">
                     <van-image
-                      width="46"
-                      height="74"
-                      src="http://rongtongpc.censoft.com.cn/dev-api/profile/upload/2023/07/08/guyou.png"
+                      width="58"
+                      height="58"
+                      :src="require('@/assets/imgs/inherentOrange.png')"
                     />
                     <!-- <van-image width="46" height="46" :src="item.avatar" /> -->
                   </van-col>

src/views/riskProject/taskLedger/presentDetail.vue

@@ -3,105 +3,53 @@
     <van-sticky offset-top="0">
       <LHeader :text="text"></LHeader>
     </van-sticky>
-    <van-form
-      :scroll-to-error="true"
-      :show-error="false"
-      validate-trigger="onSubmit"
-    >
-      <div
-        style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
-      >
-        <img
-          src="@/assets/accidentIcon/bookmark.svg"
-          alt=""
-          style="position: relative;top: 32%;transform: translateY(-50%);"
-        />
+    <van-form :scroll-to-error="true" :show-error="false" validate-trigger="onSubmit">
+      <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
+        <img src="@/assets/accidentIcon/bookmark.svg" alt=""
+          style="position: relative;top: 32%;transform: translateY(-50%);" />
         风险信息
       </div>
       <van-field readonly required label="评估人" placeholder="请输入" />
       <van-field readonly required label="所属项目" placeholder="请输入" />
       <van-field readonly required label="所属建筑物" placeholder="请输入" />
 
-      <van-field
-        required
-        clickable
-        name="floorName"
-        label="所属楼层"
-        placeholder="请选择"
-        :rules="[{ required: true, message: '所属楼层不能为空' }]"
-      />
+      <van-field required clickable name="floorName" label="所属楼层" placeholder="请选择"
+        :rules="[{ required: true, message: '所属楼层不能为空' }]" />
       <div style="display: flex;">
-        <van-field
-          readonly
-          required
-          name="roomName"
-          label="所属房间"
-          placeholder="请输入"
-          :rules="[{ required: true, message: '所属房间不能为空' }]"
-        />
+        <van-field readonly required name="roomName" label="所属房间" placeholder="请输入"
+          :rules="[{ required: true, message: '所属房间不能为空' }]" />
         <!-- <van-button style="color: #cccc;background-color: #f0f1f5;" icon="plus" type="info" /> -->
       </div>
-      <van-field
-        required
-        clickable
-        name="name"
-        label="危险源名称"
-        placeholder="请输入"
-        :rules="[{ required: true, message: '风险源名称不能为空' }]"
-      />
-      <van-field
-        required
-        name="factor"
-        label="风险因素"
-        placeholder="请选择"
-        :rules="[{ required: true, message: '风险因素不能为空' }]"
-      />
-      <van-field
-        required
-        name="type"
-        label="准事故类型"
-        placeholder="请选择"
-        :rules="[{ required: true, message: '准事故类型不能为空' }]"
-      />
+      <van-field required clickable name="name" label="风险源名称" placeholder="请输入"
+        :rules="[{ required: true, message: '风险源名称不能为空' }]" />
+      <van-field required name="factor" label="风险因素" placeholder="请选择"
+        :rules="[{ required: true, message: '风险因素不能为空' }]" />
+      <van-field required name="type" label="准事故类型" placeholder="请选择"
+        :rules="[{ required: true, message: '准事故类型不能为空' }]" />
+      <van-field readonly required name="level" label="风险等级" placeholder="请选择"
+        :rules="[{ required: true, message: '风险等级不能为空' }]" />
 
-      <van-field
-        required
-        name="presenceLocation"
-        label="存在部位"
-        placeholder="请输入"
-        :rules="[{ required: true, message: '存在部位不能为空' }]"
-      />
-      <van-field
+      <van-field required name="presenceLocation" label="存在部位" placeholder="请输入"
+        :rules="[{ required: true, message: '存在部位不能为空' }]" />
+      <!-- <van-field
         readonly
         required
         name="level"
         label="风险管控措施评价"
         placeholder="请选择"
         :rules="[{ required: true, message: '风险等级不能为空' }]"
-      />
+      /> -->
 
-      <div
-        style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
-      >
-        <img
-          src="@/assets/accidentIcon/bookmark.svg"
-          alt=""
-          style="position: relative;top: 32%;transform: translateY(-50%);"
-        />
+      <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
+        <img src="@/assets/accidentIcon/bookmark.svg" alt=""
+          style="position: relative;top: 32%;transform: translateY(-50%);" />
         风险源图片
       </div>
       <van-field name="hdPicture1" label="风险源图片">
         <template #input>
-          <van-uploader
-            multiple
-            :max-count="5"
-            disabled
-            upload-text="最多上传五个"
-            v-model="uploaderImg"
-          >
+          <van-uploader multiple :max-count="5" disabled upload-text="最多上传五个" v-model="uploaderImg">
             <template slot="default">
-              <div
-                style="
+              <div style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -109,53 +57,26 @@
                                     align-items: center;
                                     justify-content: center;
                                     flex-direction: column;
-                                "
-              >
-                <img
-                  src="@/assets/upload/pic.png"
-                  alt=""
-                  style="width: 0.64rem; height: 0.64rem"
-                />
+                                ">
+                <img src="@/assets/upload/pic.png" alt="" style="width: 0.64rem; height: 0.64rem" />
                 <span class="van-uploader__upload-text">最多上传五个</span>
               </div>
             </template>
           </van-uploader>
         </template>
       </van-field>
-      <div
-        style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
-      >
-        <img
-          src="@/assets/accidentIcon/bookmark.svg"
-          alt=""
-          style="position: relative;top: 32%;transform: translateY(-50%);"
-        />
+      <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
+        <img src="@/assets/accidentIcon/bookmark.svg" alt=""
+          style="position: relative;top: 32%;transform: translateY(-50%);" />
         技术措施
       </div>
-      <van-field
-        disabled
-        name="measuresProject"
-        label="技术措施"
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请输入"
-      />
+      <van-field disabled name="measuresProject" label="技术措施" type="textarea" rows="1" autosize placeholder="请输入" />
       <van-field name="measuresProjectFile[]" label=" ">
         <template #input>
-          <van-uploader
-            disabled
-            multiple
-            :max-count="5"
-            upload-text="最多上传五个"
-            v-model="measuresProjectFile"
-            accept="file"
-            result-type="file"
-            @delete="deleteFile(...arguments, 'measuresProjectFile')"
-          >
+          <van-uploader disabled multiple :max-count="5" upload-text="最多上传五个" v-model="measuresProjectFile" accept="file"
+            result-type="file" @delete="deleteFile(...arguments, 'measuresProjectFile')">
             <template slot="default">
-              <div
-                style="
+              <div style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -163,13 +84,8 @@
                                     align-items: center;
                                     justify-content: center;
                                     flex-direction: column;
-                                "
-              >
-                <img
-                  src="@/assets/upload/file.png"
-                  alt=""
-                  style="width: 0.64rem; height: 0.64rem"
-                />
+                                ">
+                <img src="@/assets/upload/file.png" alt="" style="width: 0.64rem; height: 0.64rem" />
                 <span class="van-uploader__upload-text">最多上传五个</span>
               </div>
             </template>
@@ -177,79 +93,30 @@
         </template>
       </van-field>
 
-      <div
-        style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
-      >
-        <img
-          src="@/assets/accidentIcon/bookmark.svg"
-          alt=""
-          style="position: relative;top: 32%;transform: translateY(-50%);"
-        />
+      <!-- <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
+        <img src="@/assets/accidentIcon/bookmark.svg" alt=""
+          style="position: relative;top: 32%;transform: translateY(-50%);" />
         应采取的管控措施
       </div>
-      <van-field
-        v-model="form.measuresAdministration"
-        name="measuresAdministration"
-        label=""
-        type="textarea"
-        rows="3"
-        autosize
-        placeholder="请输入"
-      />
-      <div
-        style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
-      >
-        <img
-          src="@/assets/accidentIcon/bookmark.svg"
-          alt=""
-          style="position: relative;top: 32%;transform: translateY(-50%);"
-        />
+      <van-field v-model="form.measuresAdministration" name="measuresAdministration" label="" type="textarea" rows="3"
+        autosize placeholder="请输入" /> -->
+      <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
+        <img src="@/assets/accidentIcon/bookmark.svg" alt=""
+          style="position: relative;top: 32%;transform: translateY(-50%);" />
         已采取的管控措施
       </div>
-      <van-field
-        v-model="form.takenMeasuresAdministration"
-        name="takenMeasuresAdministration"
-        label=""
-        type="textarea"
-        rows="3"
-        autosize
-        placeholder="请输入"
-      />
-      <van-field
-        required
-        v-model="form.measuresDeptId"
-        name="measuresDeptId"
-        label="管控责任单位 "
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请输入"
-      />
-      <van-field
-        required
-        v-model="form.measuresUserId"
-        name="measuresUserId"
-        label="管控责任人 "
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请输入"
-      />
+      <van-field v-model="form.takenMeasuresAdministration" name="takenMeasuresAdministration" label="" type="textarea"
+        rows="3" autosize placeholder="请输入" />
+      <van-field required v-model="form.measuresDeptId" name="measuresDeptId" label="管控责任单位 " type="textarea" rows="1"
+        autosize placeholder="请输入" />
+      <van-field required v-model="form.measuresUserId" name="measuresUserId" label="管控责任人 " type="textarea" rows="1"
+        autosize placeholder="请输入" />
       <van-field name="measuresAdministrationFile[]" label=" ">
         <template #input>
-          <van-uploader
-            disabled
-            multiple
-            :max-count="5"
-            upload-text="最多上传五个"
-            v-model="measuresAdministrationFile"
-            accept="file"
-            result-type="file"
-            @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
-          >
+          <van-uploader disabled multiple :max-count="5" upload-text="最多上传五个" v-model="measuresAdministrationFile"
+            accept="file" result-type="file" @delete="deleteFile(...arguments, 'measuresAdministrationFile')">
             <template slot="default">
-              <div
-                style="
+              <div style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -257,53 +124,26 @@
                                     align-items: center;
                                     justify-content: center;
                                     flex-direction: column;
-                                "
-              >
-                <img
-                  src="@/assets/upload/file.png"
-                  alt=""
-                  style="width: 0.64rem; height: 0.64rem"
-                />
+                                ">
+                <img src="@/assets/upload/file.png" alt="" style="width: 0.64rem; height: 0.64rem" />
                 <span class="van-uploader__upload-text">最多上传五个</span>
               </div>
             </template>
           </van-uploader>
         </template>
       </van-field>
-      <div
-        style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
-      >
-        <img
-          src="@/assets/accidentIcon/bookmark.svg"
-          alt=""
-          style="position: relative;top: 32%;transform: translateY(-50%);"
-        />
+      <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
+        <img src="@/assets/accidentIcon/bookmark.svg" alt=""
+          style="position: relative;top: 32%;transform: translateY(-50%);" />
         应急措施
       </div>
-      <van-field
-        disabled
-        name="measuresEmergency"
-        label=""
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请输入"
-      />
+      <van-field disabled name="measuresEmergency" label="" type="textarea" rows="1" autosize placeholder="请输入" />
       <van-field name="measuresEmergencyFile[]" label=" ">
         <template #input>
-          <van-uploader
-            disabled
-            multiple
-            :max-count="5"
-            upload-text="最多上传五个"
-            v-model="measuresEmergencyFile"
-            accept="file"
-            result-type="file"
-            @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
-          >
+          <van-uploader disabled multiple :max-count="5" upload-text="最多上传五个" v-model="measuresEmergencyFile"
+            accept="file" result-type="file" @delete="deleteFile(...arguments, 'measuresEmergencyFile')">
             <template slot="default">
-              <div
-                style="
+              <div style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -311,40 +151,21 @@
                                     align-items: center;
                                     justify-content: center;
                                     flex-direction: column;
-                                "
-              >
-                <img
-                  src="@/assets/upload/file.png"
-                  alt=""
-                  style="width: 0.64rem; height: 0.64rem"
-                />
+                                ">
+                <img src="@/assets/upload/file.png" alt="" style="width: 0.64rem; height: 0.64rem" />
                 <span class="van-uploader__upload-text">最多上传五个</span>
               </div>
             </template>
           </van-uploader>
         </template>
       </van-field>
-      <div
-        style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
-      >
-        <img
-          src="@/assets/accidentIcon/bookmark.svg"
-          alt=""
-          style="position: relative;top: 32%;transform: translateY(-50%);"
-        />
+      <div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
+        <img src="@/assets/accidentIcon/bookmark.svg" alt=""
+          style="position: relative;top: 32%;transform: translateY(-50%);" />
         参考依据
       </div>
-       <van-field
-          readonly
-          required
-          clickable
-          name="trouble"
-          :value="form.trouble"
-          label="参考依据"
-          placeholder="请选择"
-          @click="showTrouble = true"
-          :rules="[{ required: true, message: '事故类型不能为空' }]"
-      />
+      <van-field readonly required clickable name="trouble" :value="form.trouble" label="参考依据" placeholder="请选择"
+        @click="showTrouble = true" :rules="[{ required: true, message: '事故类型不能为空' }]" />
     </van-form>
   </div>
 </template>

src/views/riskProject/taskLedger/tabDetail.vue

@@ -17,8 +17,12 @@
           :rules="[{ required: true, message: '所属房间不能为空' }]" />
         <!-- <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: '危险源名称不能为空' }]" />
+      <van-field required clickable name="name" v-model="InherentRisk.factor" label="风险源名称" placeholder="请输入"
+        :rules="[{ required: true, message: '风险源名称不能为空' }]" />
+      <van-field required clickable name="name" v-model="InherentRisk.factor" label="风险点类型" placeholder="请输入"
+        :rules="[{ required: true, message: '风险点类型不能为空' }]" />
+      <van-field required clickable name="name" v-model="InherentRisk.factor" label="安全警示标志" placeholder="请输入"
+        :rules="[{ required: true, message: '安全警示标志不能为空' }]" />
       <van-field v-model="InherentRisk.factor" required name="factor" label="风险因素" placeholder="请选择"
         :rules="[{ required: true, message: '风险因素不能为空' }]" />
       <van-field v-model="InherentRisk.type" required name="type" label="准事故类型" placeholder="请选择"
@@ -84,7 +88,7 @@
         </template>
       </van-field>
 
-      <div
+      <!-- <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
         <img
@@ -102,7 +106,7 @@
         rows="3"
         autosize
         placeholder="请输入"
-      />
+      /> -->
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
@@ -111,7 +115,7 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        已采取的管控措施
+        应采取的管控措施
       </div>
       <van-field
         v-model="form.takenMeasuresAdministration"