Merge branch 'dev-yf'' into 'develop'

Dev yf'

See merge request !23

src/views/riskProject/add/addCurrent.vue

@@ -440,7 +440,6 @@
             label="参考依据"
             placeholder="请选择"
             @click="selectData('referenceBasis', false)"
-            :rules="[{ required: true, message: '事故类型不能为空' }]"
           />
           <van-dialog
             v-model="showGradeDialog"
@@ -1189,6 +1188,12 @@ export default {
     },
     performTasks() {
       console.log("1233213 :>> ", 1233213);
+      this.$router.push({
+        name: "addPresent",
+        params: {
+          id: this.inherentId
+        }
+      });
     },
     // 点击预览图
     clickPre(e) {

src/views/riskProject/add/addInherent.vue

@@ -15,7 +15,7 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        风险信息
+        固有风险信息
       </div>
       <van-field
         readonly
@@ -437,7 +437,6 @@
         label="参考依据"
         placeholder="请选择"
         @click="selectData('referenceBasis', false)"
-        :rules="[{ required: true, message: '事故类型不能为空' }]"
       />
       <van-dialog
         v-model="showGradeDialog"

src/views/riskProject/add/addPresent.vue

@@ -15,7 +15,7 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        风险信息
+        现有风险信息
       </div>
       <van-field
         readonly
@@ -28,8 +28,8 @@
       <van-field
         readonly
         required
-        name="projectName"
-        :value="form.projectName"
+        name="projectId"
+        :value="form.projectId"
         label="所属项目"
         placeholder="请输入"
       />
@@ -39,19 +39,21 @@
         name="buildingName"
         :value="form.buildingName"
         label="所属建筑物"
-        placeholder="请输入"
+        placeholder="请输入 "
       />
 
       <van-field
         required
-        readonly
+        clickable
         name="floorName"
         :value="form.floorName"
         label="所属楼层"
         placeholder="请选择"
+        @click="seletFloor('floor')"
         :rules="[{ required: true, message: '所属楼层不能为空' }]"
       />
 
+      <div style="display: flex;">
         <van-field
           readonly
           required
@@ -59,11 +61,21 @@
           :value="form.roomName"
           label="所属房间"
           placeholder="请输入"
+          @click="seletRoom('room')"
           :rules="[{ required: true, message: '所属房间不能为空' }]"
         />
+        <van-button
+          style="color: #cccc;background-color: #f0f1f5;"
+          icon="plus"
+          type="info"
+          native-type="button"
+          @click="tjfjClcik"
+        />
+      </div>
 
       <van-field
         required
+        clickable
         name="name"
         v-model="form.name"
         label="危险源名称"
@@ -71,13 +83,13 @@
         :rules="[{ required: true, message: '危险源名称不能为空' }]"
       />
       <van-field
-        readonly
         v-model="form.factor"
+        readonly
         required
         name="factor"
         label="风险因素"
         placeholder="请选择"
-        @click="seletFactor('factor')"
+        @click="selectData('factor', false)"
         :rules="[{ required: true, message: '风险因素不能为空' }]"
       />
 
@@ -88,31 +100,10 @@
         name="type"
         label="准事故类型"
         placeholder="请选择"
-        @click="seletType('type')"
+        @click="selectData('type', false)"
         :rules="[{ required: true, message: '准事故类型不能为空' }]"
       />
 
-      <van-field
-        readonly
-        v-model="form.level"
-        required
-        name="level"
-        label="风险等级"
-        placeholder="请选择"
-        @click="seletGrade('level')"
-        :rules="[{ required: true, message: '风险等级不能为空' }]"
-      />
-      <!-- <van-field
-        readonly
-        v-model="form.level"
-        required
-        name="level"
-        label="风险管控措施评价"
-        placeholder="请选择"
-        @click="seletGrade"
-        :rules="[{ required: true, message: '风险等级不能为空' }]"
-      /> -->
-
       <van-field
         required
         name="presenceLocation"
@@ -142,6 +133,7 @@
             v-model="uploaderImg"
           >
             <template slot="default">
+              <!-- 11111111111 -->
               <div
                 style="
                                     width: 2.13333rem;
@@ -177,13 +169,13 @@
       <van-field
         v-model="form.measuresProject"
         name="measuresProject"
-        label="技术措施"
+        label=""
         type="textarea"
-        rows="1"
+        rows="3"
         autosize
         placeholder="请输入"
       />
-      <van-field name="measuresProjectFile[]" label=" ">
+      <van-field name="measuresProjectFile[]" label="上传附件">
         <template #input>
           <van-uploader
             multiple
@@ -216,13 +208,7 @@
           </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.measuresAdministration" name="measuresAdministration" label="" type="textarea" rows="3"
-        autosize placeholder="请输入" /> -->
+
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
@@ -244,26 +230,31 @@
       />
 
       <van-field
-        required
-        v-model="form.measuresDeptId"
-        name="measuresDeptId"
-        label="管控责任单位"
+        v-model="form.measuresDeptName"
+        name="measuresDeptName"
+        label="管控责任单位 "
         type="textarea"
         rows="1"
         autosize
-        placeholder="请输入"
+        @click="
+          {
+            measuresDept = true;
+          }
+        "
+        placeholder="请选择"
       />
       <van-field
-        required
-        v-model="form.measuresUserId"
-        name="measuresUserId"
-        label="管控责任人"
+        v-model="form.measuresUserName"
+        name="measuresUserName"
+        label="管控责任人 "
         type="textarea"
         rows="1"
         autosize
-        placeholder="请输入"
+        @click="getUserData('measuresUser')"
+        placeholder="请选择"
       />
-      <van-field name="measuresAdministrationFile[]" label=" ">
+
+      <van-field name="measuresAdministrationFile[]" label="上传附件">
         <template #input>
           <van-uploader
             multiple
@@ -296,6 +287,7 @@
           </van-uploader>
         </template>
       </van-field>
+
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
@@ -309,13 +301,13 @@
       <van-field
         v-model="form.measuresEmergency"
         name="measuresEmergency"
-        label="应急措施"
+        label=""
         type="textarea"
-        rows="1"
+        rows="3"
         autosize
         placeholder="请输入"
       />
-      <van-field name="measuresEmergencyFile[]" label=" ">
+      <van-field name="measuresEmergencyFile[]" label="上传附件">
         <template #input>
           <van-uploader
             multiple
@@ -326,6 +318,7 @@
             @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
           >
             <template slot="default">
+              <!-- 11111111111 -->
               <div
                 style="
                     width: 2.13333rem;
@@ -348,7 +341,7 @@
           </van-uploader>
         </template>
       </van-field>
-      <!-- v-if="this.$route.params.isView" -->
+
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
@@ -360,77 +353,23 @@
         参考依据
       </div>
       <van-field
-        readonly
-        required
-        name="trouble"
-        :value="form.trouble"
+        clickable
+        name="referenceBasis"
+        :value="form.referenceBasis"
         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"
+        @click="selectData('referenceBasis', 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-field
+        readonly
+        v-model="form.level"
+        required
+        name="level"
+        label="风险等级"
+        placeholder="请选择"
+        @click="seletGrade"
+        :rules="[{ required: true, message: '风险等级不能为空' }]"
       />
-      </van-popup>
-      <!-- 楼层弹出层 -->
-      <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>
-      <!-- 准事故类型 -->
-      <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
-        >
-      </div>
-    </van-form>
       <van-dialog
         v-model="showGradeDialog"
         title="风险评测配置"
@@ -490,19 +429,116 @@
               ><van-button
                 size="small"
                 plain
+                native-type="button"
                 type="info"
                 @click="showGradeDialog = false"
                 >取消</van-button
               ></van-col
             >
             <van-col span="6"
-            ><van-button size="small" type="info" @click="goResultPage"
+              ><van-button
+                size="small"
+                type="info"
+                native-type="button"
+                @click="goResultPage"
                 >开始测评</van-button
               ></van-col
             >
           </van-row>
         </div>
       </van-dialog>
+      <!-- 楼层弹出层 -->
+      <van-popup
+        v-model="ShowfloorList"
+        position="bottom"
+        :style="{ height: '100%' }"
+      >
+        <selectFloor
+          :listdata="floorSource"
+          @closeSlect="closeSlectfloor"
+          @saveSlect="saveSlectfloor"
+        ></selectFloor>
+      </van-popup>
+
+      <!-- 单选弹出层 -->
+      <van-popup v-model="showSelect" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="dictValue"
+          :columns="columnsData"
+          @confirm="saveSelect"
+          @cancel="showSelect = false"
+        />
+      </van-popup>
+      <!-- 复选弹出层 -->
+      <van-popup
+        v-model="showCheckSelect"
+        position="bottom"
+        :style="{ height: '100%' }"
+      >
+        <selectList
+          :listdata="columnsCheckData"
+          @closeSlect="showCheckSelect = false"
+          @saveSlect="saveCheckSelect"
+        ></selectList>
+      </van-popup>
+
+      <!-- 房间弹出层 -->
+      <van-popup v-model="showSource" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="name"
+          :columns="columnsSource"
+          @confirm="onConSource"
+          @cancel="showSource = false"
+        />
+      </van-popup>
+      <!-- 管控责任单位 -->
+      <van-popup
+        v-model="measuresDept"
+        position="bottom"
+        :style="{ height: '100%' }"
+      >
+        <div
+          class="van-picker__toolbar"
+          style="position: absolute;width: 100%;top: 0;"
+        >
+          <button
+            type="button"
+            class="van-picker__cancel"
+            v-on:click="
+              {
+                form.measuresDeptId = 0;
+                projectDept = false;
+              }
+            "
+          >
+            取消</button
+          ><button type="button" class="van-picker__confirm" @click="closeDept">
+            确认
+          </button>
+        </div>
+        <div style="display:flex;margin-top: 44px;">
+          <selectDept @changeDept="changeDept"></selectDept>
+        </div>
+      </van-popup>
+      <!-- 管控责任人 -->
+      <van-popup v-model="showTrouble" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="nickName"
+          :columns="columnsTrouble"
+          @confirm="onConTrouble"
+          @cancel="showTrouble = false"
+        />
+      </van-popup>
+
+      <div style="margin: 16px 16px 0">
+        <van-button round block type="info" native-type="submit"
+          >提交</van-button
+        >
+      </div>
+    </van-form>
     <!-- v-if="this.$route.params.isView"  -->
     <div style="margin: 10px 16px 0px; padding-bottom: 16px">
       <van-button round block type="warning" @click.native="cancel"

src/views/riskProject/add/inherentRisks.vue

@@ -162,13 +162,26 @@ export default {
     //   this.postList();
   },
   methods: {
-    delInherent() {
+    delInherent(item) {
       Dialog.confirm({
         title: "删除固有风险",
         message: "是否确认删除？"
       })
         .then(() => {
           // on confirm
+          getFun(`/risk/plan/inherent/delete/${item.id}`).then(res => {
+            this.$toast.success(res.msg);
+            this.riskList(
+              this.planId,
+              this.buildingId,
+              this.value1,
+              this.value2
+            );
+            // });
+          });
+          {
+            inherentId;
+          }
         })
         .catch(() => {
           // on cancel