固有风险修改

src/views/riskProject/add/addInherent.vue

@@ -256,8 +256,8 @@
         应采取的管控措施
       </div>
       <van-field
-        v-model="form.takenMeasuresAdministration"
-        name="takenMeasuresAdministration"
+        v-model="form.measuresAdministration"
+        name="measuresAdministration"
         label=""
         type="textarea"
         rows="3"

src/views/riskProject/add/addPresent.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-form @submit="onSubmit" :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
+      @submit="onSubmit"
+      :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 name="userName" :value="form.userName" label="评估人" placeholder="请输入" />
-      <van-field readonly required name="projectName" :value="form.projectName" label="所属项目" placeholder="请输入" />
-      <van-field readonly required name="buildingName" :value="form.buildingName" label="所属建筑物" placeholder="请输入" />
+      <van-field
+        readonly
+        required
+        name="userName"
+        :value="form.userName"
+        label="评估人"
+        placeholder="请输入"
+      />
+      <van-field
+        readonly
+        required
+        name="projectName"
+        :value="form.projectName"
+        label="所属项目"
+        placeholder="请输入"
+      />
+      <van-field
+        readonly
+        required
+        name="buildingName"
+        :value="form.buildingName"
+        label="所属建筑物"
+        placeholder="请输入"
+      />
 
-      <van-field required readonly name="floorName" :value="form.floorName" label="所属楼层" placeholder="请选择"
-        :rules="[{ required: true, message: '所属楼层不能为空' }]" />
+      <van-field
+        required
+        readonly
+        name="floorName"
+        :value="form.floorName"
+        label="所属楼层"
+        placeholder="请选择"
+        :rules="[{ required: true, message: '所属楼层不能为空' }]"
+      />
 
-      <van-field readonly required name="roomName" :value="form.roomName" label="所属房间" placeholder="请输入"
-        :rules="[{ required: true, message: '所属房间不能为空' }]" />
+      <van-field
+        readonly
+        required
+        name="roomName"
+        :value="form.roomName"
+        label="所属房间"
+        placeholder="请输入"
+        :rules="[{ required: true, message: '所属房间不能为空' }]"
+      />
 
-      <van-field required name="name" v-model="form.name" label="危险源名称" placeholder="请输入"
-        :rules="[{ required: true, message: '危险源名称不能为空' }]" />
-      <van-field readonly v-model="form.factor" required name="factor" label="风险因素" placeholder="请选择"
-        @click="seletFactor('factor')" :rules="[{ required: true, message: '风险因素不能为空' }]" />
+      <van-field
+        required
+        name="name"
+        v-model="form.name"
+        label="危险源名称"
+        placeholder="请输入"
+        :rules="[{ required: true, message: '危险源名称不能为空' }]"
+      />
+      <van-field
+        readonly
+        v-model="form.factor"
+        required
+        name="factor"
+        label="风险因素"
+        placeholder="请选择"
+        @click="seletFactor('factor')"
+        :rules="[{ required: true, message: '风险因素不能为空' }]"
+      />
 
-      <van-field readonly v-model="form.type" required name="type" label="准事故类型" placeholder="请选择"
-        @click="seletType('type')" :rules="[{ required: true, message: '准事故类型不能为空' }]" />
+      <van-field
+        readonly
+        v-model="form.type"
+        required
+        name="type"
+        label="准事故类型"
+        placeholder="请选择"
+        @click="seletType('type')"
+        :rules="[{ required: true, message: '准事故类型不能为空' }]"
+      />
 
       <van-field
-                readonly
-                v-model="form.level"
-                required
-                name="level"
-                label="风险等级"
-                placeholder="请选择"
-                @click="seletGrade('level')"
-                :rules="[{ required: true, message: '风险等级不能为空' }]"
-            />
+        readonly
+        v-model="form.level"
+        required
+        name="level"
+        label="风险等级"
+        placeholder="请选择"
+        @click="seletGrade('level')"
+        :rules="[{ required: true, message: '风险等级不能为空' }]"
+      />
       <!-- <van-field
         readonly
         v-model="form.level"
@@ -46,20 +113,37 @@
         :rules="[{ required: true, message: '风险等级不能为空' }]"
       /> -->
 
-      <van-field required name="presenceLocation" v-model="form.presenceLocation" label="存在部位" placeholder="请输入"
-        :rules="[{ required: true, message: '存在部位不能为空' }]" />
+      <van-field
+        required
+        name="presenceLocation"
+        v-model="form.presenceLocation"
+        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 @delete="deleteFile(...arguments, 'uploaderImg')" multiple :max-count="5" upload-text="最多上传五个"
-            v-model="uploaderImg">
+          <van-uploader
+            @delete="deleteFile(...arguments, 'uploaderImg')"
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="uploaderImg"
+          >
             <template slot="default">
-              <div style="
+              <div
+                style="
                   width: 2.13333rem;
                   height: 2.13333rem;
                   background: #f7f8fa;
@@ -67,27 +151,52 @@
                   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 v-model="form.measuresProject" name="measuresProject" label="技术措施" type="textarea" rows="1" autosize
-        placeholder="请输入" />
+      <van-field
+        v-model="form.measuresProject"
+        name="measuresProject"
+        label="技术措施"
+        type="textarea"
+        rows="1"
+        autosize
+        placeholder="请输入"
+      />
       <van-field name="measuresProjectFile[]" label=" ">
         <template #input>
-          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresProjectFile" accept="file"
-            result-type="file" @delete="deleteFile(...arguments, 'measuresProjectFile')">
+          <van-uploader
+            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;
@@ -95,8 +204,13 @@
                                     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>
@@ -110,23 +224,60 @@
       </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
+        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
+        v-model="form.measuresAdministration"
+        name="measuresAdministration"
+        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
+        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')">
+          <van-uploader
+            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;
@@ -134,27 +285,52 @@
                     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 v-model="form.measuresEmergency" name="measuresEmergency" label="应急措施" type="textarea" rows="1" autosize
-        placeholder="请输入" />
+      <van-field
+        v-model="form.measuresEmergency"
+        name="measuresEmergency"
+        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')">
+          <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="
+              <div
+                style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -162,8 +338,13 @@
                                     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>
@@ -171,68 +352,165 @@
         </template>
       </van-field>
       <!-- v-if="this.$route.params.isView" -->
-      <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 name="trouble" :value="form.trouble" label="参考依据" placeholder="请选择"
-        @click="showTrouble = true" :rules="[{ required: true, message: '事故类型不能为空' }]" />
+      <van-field
+        readonly
+        required
+        name="trouble"
+        :value="form.trouble"
+        label="参考依据"
+        placeholder="请选择"
+        @click="showTrouble = true"
+        :rules="[{ required: true, message: '事故类型不能为空' }]"
+      />
       <van-popup v-model="showTrouble" position="bottom">
-        <van-picker show-toolbar value-key="name" :columns="columnsTrouble" @confirm="onConTrouble"
-          @cancel="showTrouble = false" />
+        <van-picker
+          show-toolbar
+          value-key="name"
+          :columns="columnsTrouble"
+          @confirm="onConTrouble"
+          @cancel="showTrouble = false"
+        />
       </van-popup>
       <van-popup v-model="showSource" position="bottom">
-        <van-picker show-toolbar value-key="name" :columns="columnsSource" @confirm="onConSource"
-          @cancel="showSource = false" />
+        <van-picker
+          show-toolbar
+          value-key="name"
+          :columns="columnsSource"
+          @confirm="onConSource"
+          @cancel="showSource = false"
+        />
       </van-popup>
       <!-- 楼层弹出层 -->
-      <van-popup v-model="ShowfloorList" position="bottom" :style="{ height: '100%' }">
-        <selectFloor :listdata="floorSource" @closeSlect="closeSlectfloor" @saveSlect="saveSlectfloor"></selectFloor>
+      <van-popup
+        v-model="ShowfloorList"
+        position="bottom"
+        :style="{ height: '100%' }"
+      >
+        <selectFloor
+          :listdata="floorSource"
+          @closeSlect="closeSlectfloor"
+          @saveSlect="saveSlectfloor"
+        ></selectFloor>
       </van-popup>
       <!-- 风险源弹出层 -->
-      <van-popup v-model="ShowSelectList" position="bottom" :style="{ height: '100%' }">
-        <selectList :listdata="columnsTrouble" @closeSlect="closeSlect" @saveSlect="saveSlect"></selectList>
+      <van-popup
+        v-model="ShowSelectList"
+        position="bottom"
+        :style="{ height: '100%' }"
+      >
+        <selectList
+          :listdata="columnsTrouble"
+          @closeSlect="closeSlect"
+          @saveSlect="saveSlect"
+        ></selectList>
       </van-popup>
       <!-- 准事故类型 -->
-      <van-popup v-model="ShowAccidentList" position="bottom" :style="{ height: '100%' }">
-        <selectList :listdata="columnsAccident" @closeSlect="closeSlectAccident" @saveSlect="saveSlectAccident">
+      <van-popup
+        v-model="ShowAccidentList"
+        position="bottom"
+        :style="{ height: '100%' }"
+      >
+        <selectList
+          :listdata="columnsAccident"
+          @closeSlect="closeSlectAccident"
+          @saveSlect="saveSlectAccident"
+        >
         </selectList>
       </van-popup>
       <!-- v-if="this.$route.params.isView" -->
       <div style="margin: 16px 16px 0">
-        <van-button round block type="info" native-type="submit">提交</van-button>
+        <van-button round block type="info" native-type="submit"
+          >提交</van-button
+        >
       </div>
     </van-form>
-    <van-dialog v-model="showGradeDialog" title="风险评测配置" :show-cancel-button="false" :show-confirm-button="false">
+    <van-dialog
+      v-model="showGradeDialog"
+      title="风险评测配置"
+      :show-cancel-button="false"
+      :show-confirm-button="false"
+    >
       <div class="dialogContain">
         <van-collapse v-model="activeNames">
           <van-collapse-item title="风险模型" name="1">
-            <van-field readonly required name="level" label="当前风险模型" placeholder="LS风险矩阵评估模型" />
+            <van-field
+              readonly
+              required
+              name="level"
+              label="当前风险模型"
+              placeholder="LS风险矩阵评估模型"
+            />
           </van-collapse-item>
           <van-collapse-item title="风险模型配置" name="2">
-            <van-popover v-model="showPopover" trigger="click" :actions="columnsRiskRank" @select="onSelect">
+            <van-popover
+              v-model="showPopover"
+              trigger="click"
+              :actions="columnsRiskRank"
+              @select="onSelect"
+            >
               <template #reference>
-                <van-field v-model="possibleValue" readonly required name="level" label="发生的可能性" placeholder="请选择" />
+                <van-field
+                  v-model="possibleValue"
+                  readonly
+                  required
+                  name="level"
+                  label="发生的可能性"
+                  placeholder="请选择"
+                />
               </template>
             </van-popover>
-            <van-popover v-model="showPopoveSetRank" trigger="click" :actions="columnsSetRank" @select="onSelectSetRank">
+            <van-popover
+              v-model="showPopoveSetRank"
+              trigger="click"
+              :actions="columnsSetRank"
+              @select="onSelectSetRank"
+            >
               <template #reference>
-                <van-field v-model="severityValue" readonly required name="level" label="后果严重程度" placeholder="请选择" />
+                <van-field
+                  v-model="severityValue"
+                  readonly
+                  required
+                  name="level"
+                  label="后果严重程度"
+                  placeholder="请选择"
+                />
               </template>
             </van-popover>
           </van-collapse-item>
         </van-collapse>
         <van-row type="flex" justify="center" style="margin-top:10px">
-          <van-col span="6"><van-button size="small" plain type="info"
-              @click="showGradeDialog = false">取消</van-button></van-col>
-          <van-col span="6"><van-button size="small" type="info" @click="goResultPage">开始测评</van-button></van-col>
+          <van-col span="6"
+            ><van-button
+              size="small"
+              plain
+              type="info"
+              @click="showGradeDialog = false"
+              >取消</van-button
+            ></van-col
+          >
+          <van-col span="6"
+            ><van-button size="small" type="info" @click="goResultPage"
+              >开始测评</van-button
+            ></van-col
+          >
         </van-row>
       </div>
     </van-dialog>
     <!-- v-if="this.$route.params.isView"  -->
     <div style="margin: 10px 16px 0px; padding-bottom: 16px">
-      <van-button round block type="warning" @click.native="cancel">取消</van-button>
+      <van-button round block type="warning" @click.native="cancel"
+        >取消</van-button
+      >
     </div>
   </div>
 </template>
@@ -260,7 +538,7 @@ export default {
     selectFloor,
     SelectList
   },
-  activated() { },
+  activated() {},
   beforeRouteEnter(to, from, next) {
     if (from.name == "addCurrent") {
       sessionStorage.setItem("presentForm", "");
@@ -506,7 +784,7 @@ export default {
         }
       });
     },
-    performTasks() { },
+    performTasks() {},
     // 点击预览图
     clickPre(e) {
       console.log(e);