详情页加部分字段

src/views/riskProject/add/addCurrent.vue

@@ -22,8 +22,8 @@
                     <van-field readonly required name="roomName" :value="form.roomName" label="所属房间" placeholder="请输入"
                         @click="seletRoom('room')" :rules="[{ required: true, message: '所属房间不能为空' }]" />
 
-                    <van-field readonly required name="name" v-model="form.name" label="风险源名称" placeholder="请输入"
-                        :rules="[{ required: true, message: '风险源名称不能为空' }]" @click="seletSource()" />
+                    <van-field readonly required name="name" v-model="form.name" label="危险源名称" placeholder="请输入"
+                        :rules="[{ required: true, message: '危险源名称不能为空' }]" @click="seletSource()" />
 
                     <van-field v-model="form.factor" required name="factor" label="风险因素" placeholder="请选择"
                         @click="seletFactor('factor')" :rules="[{ required: true, message: '风险因素不能为空' }]" />
@@ -48,7 +48,6 @@
                             <van-uploader @delete="deleteFile(...arguments, 'uploaderImg')" multiple :max-count="5"
                                 upload-text="最多上传五个" v-model="uploaderImg">
                                 <template slot="default">
-                                    <!-- 11111111111 -->
                                     <div style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
@@ -100,17 +99,28 @@
                         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%);" />
+                        已采取的管控措施
                     </div>
-                    <van-field v-model="form.measuresAdministration" name="measuresAdministration" 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 multiple :max-count="5" upload-text="最多上传五个" v-model="measuresAdministrationFile"
                                 accept="file" result-type="file"
                                 @delete="deleteFile(...arguments, 'measuresAdministrationFile')">
                                 <template slot="default">
-                                    <!-- 11111111111 -->
                                     <div style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
@@ -128,6 +138,44 @@
                             </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>
+                    <van-field required v-model="form.hazardSourceName" name="hazardSourceName" label="危险源名称 " type="textarea"
+                        rows="1" autosize placeholder="请输入" />
+                    <van-field required v-model="form.majorHazardSource" name="majorHazardSource" label="是否存在重大危险源 " type="textarea"
+                        rows="1" autosize placeholder="请输入" />
+                        <van-field required v-model="form.measuresUserId" name="measuresUserId" label="重大危险源描述" type="textarea"
+                        rows="3" autosize placeholder="请输入" />
+                    <van-field v-model="form.majorHazardSourceDescription" name="majorHazardSourceDescription" label="应急措施" type="textarea"
+                        rows="1" autosize placeholder="请输入" />
+                        <van-field name="measuresEmergencyFile[]" label=" ">
+                        <template #input>
+                            <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresEmergencyFile"
+                                accept="file" result-type="file"
+                                @delete="deleteFile(...arguments, 'measuresEmergencyFile')">
+                                <template slot="default">
+                                    <div style="
+                                    width: 2.13333rem;
+                                    height: 2.13333rem;
+                                    background: #f7f8fa;
+                                    display: flex;
+                                    align-items: center;
+                                    justify-content: center;
+                                    flex-direction: column;
+                                ">
+                                        <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=""
@@ -166,17 +214,8 @@
                             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: '事故类型不能为空' }]" />
 
                     <div style="margin: 16px 16px 0">
                         <van-button round block type="info" native-type="submit">提交</van-button>
@@ -485,9 +524,9 @@ export default {
                     buildingId: this.buildingId,
                     planId: this.inherentId,
                     floorId: this.form.floorId,
-                    floorName:this.form.floorName,
-                    projectName:this.form.projectName,
-                    projectId:this.form.projectId,
+                    floorName: this.form.floorName,
+                    projectName: this.form.projectName,
+                    projectId: this.form.projectId,
                     roomName: this.form.roomName,
                     roomId: this.form.roomId
                 }

src/views/riskProject/add/addInherent.vue

@@ -78,9 +78,9 @@
         clickable
         name="name"
         v-model="form.name"
-        label="风险源名称"
+        label="危险源名称"
         placeholder="请输入"
-        :rules="[{ required: true, message: '风险源名称不能为空' }]"
+        :rules="[{ required: true, message: '危险源名称不能为空' }]"
       />
       <van-field
         v-model="form.factor"
@@ -188,7 +188,7 @@
         autosize
         placeholder="请输入"
       />
-      <van-field name="measuresProjectFile[]" label=" ">
+      <van-field name="measuresProjectFile[]" label="上传附件">
         <template #input>
           <van-uploader
             multiple
@@ -200,7 +200,6 @@
             @delete="deleteFile(...arguments, 'measuresProjectFile')"
           >
             <template slot="default">
-              <!-- 11111111111 -->
               <div
                 style="
                                     width: 2.13333rem;
@@ -231,17 +230,59 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        管理措施
+        应采取的管控措施
       </div>
       <van-field
         v-model="form.measuresAdministration"
         name="measuresAdministration"
-        label="管理措施"
+        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 name="measuresAdministrationFile[]" label=" ">
         <template #input>
           <van-uploader
@@ -254,7 +295,6 @@
             @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
           >
             <template slot="default">
-              <!-- 11111111111 -->
               <div
                 style="
                                     width: 2.13333rem;
@@ -277,6 +317,54 @@
           </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>
+      <van-field
+        v-model="form.hazardSourceName"
+        name="hazardSourceName"
+        label="危险源名称 "
+        type="textarea"
+        rows="1"
+        autosize
+        placeholder="请输入"
+      />
+
+      <van-field
+        v-model="form.majorHazardSource"
+        name="majorHazardSource"
+        label="是否存在重大危险源 "
+        type="textarea"
+        rows="1"
+        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.majorHazardSourceDescription"
+        name="majorHazardSourceDescription"
+        label=" "
+        type="textarea"
+        rows="3"
+        autosize
+        placeholder="请输入"
+      />
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
@@ -331,6 +419,7 @@
           </van-uploader>
         </template>
       </van-field>
+
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >

src/views/riskProject/taskLedger/presentDetail.vue

@@ -45,7 +45,7 @@
         required
         clickable
         name="name"
-        label="风险源名称"
+        label="危险源名称"
         placeholder="请输入"
         :rules="[{ required: true, message: '风险源名称不能为空' }]"
       />
@@ -130,7 +130,7 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        现有技术措施
+        技术措施
       </div>
       <van-field
         disabled
@@ -176,6 +176,7 @@
           </van-uploader>
         </template>
       </van-field>
+
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
@@ -184,12 +185,51 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        现有管理措施
+        应采取的管控措施
       </div>
       <van-field
-        disabled
+        v-model="form.measuresAdministration"
         name="measuresAdministration"
-        label="管理措施"
+        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
@@ -238,12 +278,12 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        现有应急措施
+        应急措施
       </div>
       <van-field
         disabled
         name="measuresEmergency"
-        label="应急措施"
+        label=""
         type="textarea"
         rows="1"
         autosize
@@ -294,6 +334,17 @@
         />
         参考依据
       </div>
+       <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/taskDetail.vue

@@ -104,13 +104,13 @@ export default {
       return timestampToTime(new Date(time), "DT1", true);
     },
     goDetail(item){
-      // sessionStorage.setItem('inherntId',this.inherentId)
-      // this.$router.push({
-      //   name:'presentDetail',
-      //   params:{
-      //     isView:false,
-      //   }
-      // })
+      sessionStorage.setItem('inherntId',this.inherentId)
+      this.$router.push({
+        name:'presentDetail',
+        params:{
+          isView:false,
+        }
+      })
     },
     onClick(name){
       if(name==='a'){