Dev yf'

src/views/riskProject/add/inherentRisks.vue

@@ -256,6 +256,8 @@ export default {
       return new Promise((resolve, reject) => {
         getFun(`/risk/plan/floor/list/${id}`)
           .then(res => {
+            console.log(res.data);
+            res.data = [{ name: "全部" }, ...res.data];
             this.floorListData = res.data;
             this.changeBuild(res.data[0].name);
             this.option0 = this.changeData(res.data);
@@ -271,6 +273,8 @@ export default {
       return new Promise((resolve, reject) => {
         getFun(`/risk/plan/room/list/${id}`)
           .then(res => {
+            if (!res.data) res.data = [];
+            res.data = [{ id: "-1", name: "全部" }, ...res.data];
             this.option2 = this.changeData(res.data);
             this.value2 = res.data[0].id || 0;
             resolve(res.data);
@@ -291,8 +295,8 @@ export default {
         var paramsJson = {};
         if (floorId || roomId) {
           paramsJson = {
-            floorId,
-            roomId
+            floorId: floorId == -1 ? null : floorId,
+            roomId: roomId == -1 ? null : roomId
           };
         } else {
           paramsJson = {};
@@ -331,7 +335,9 @@ export default {
       if (this.value0) {
         let arr = this.floorListData.filter(item => item.name == this.value0)[0]
           .children;
-
+        console.log(arr);
+        if (!arr) arr = [];
+        arr = [{ id: "-1", name: "全部" }, ...arr];
         this.option1 = this.changeData(arr);
         this.value1 = arr[0].id;
         this.roomList(this.value1);

src/views/riskProject/add/taskList.vue

@@ -632,12 +632,12 @@ export default {
     performTasks() {
       sessionStorage.setItem(
         "buildingId",
-        this.messageList.riskBuildingListDtos[0].buildingId
+        this.messageList.detailsDto.buildingIds
       );
       sessionStorage.setItem("planId", this.messageList.id);
       sessionStorage.setItem(
         "buildingName",
-        this.messageList.riskBuildingListDtos[0].buildingName
+        this.messageList.detailsDto.buildingNames
       );
       sessionStorage.setItem(
         "projectId",
@@ -652,8 +652,8 @@ export default {
         name: "riskInherent",
         params: {
           id: this.messageList.id,
-          buildingId: this.messageList.riskBuildingListDtos[0].buildingId,
-          buildingName: this.messageList.riskBuildingListDtos[0].buildingName
+          buildingId: this.messageList.detailsDto.buildingIds,
+          buildingName: this.messageList.detailsDto.buildingNames
         }
       });
     },

src/views/riskProject/taskLedger/tabDetail.vue

@@ -85,11 +85,18 @@
         placeholder="请选择"
         :rules="[{ required: true, message: '风险点类型不能为空' }]"
       />
-      <van-field required name="specialEquipment" label="是否为特种设备"  v-show="form.pointType=='设备设施类'"> 
-            <template #input>
-              <van-switch disabled v-model="form.specialEquipment" size="20" />
-            </template>
-          </van-field>
+      <van-field
+        required
+        name="specialEquipment"
+        label="是否为特种设备"
+        v-show="form.pointType == '设备设施类'"
+      >
+        <template #input>
+          <span style="margin-right: 10px;color: red;">否</span>
+          <van-switch disabled v-model="form.specialEquipment" size="20" />
+          <span style="margin-left: 10px;color: green;">是</span>
+        </template>
+      </van-field>
       <!-- 多选 -->
       <van-field
         v-model="form.safetyWarningSigns"
@@ -194,21 +201,21 @@
         />
         应采取的管控措施
       </div>
-       <van-field label="技术措施">
-            <template #input>
-      <van-field
-        readonly
-        v-model="form.measuresProject"
-        name="measuresProject"
-        label=""
-        type="textarea"
-        rows="3"
-        autosize
-        placeholder="请输入"
-       style="padding-left: 0;padding-top: 0;"
-              />
-           </template>
-          </van-field>
+      <van-field label="技术措施">
+        <template #input>
+          <van-field
+            readonly
+            v-model="form.measuresProject"
+            name="measuresProject"
+            label=""
+            type="textarea"
+            rows="3"
+            autosize
+            placeholder="请输入"
+            style="padding-left: 0;padding-top: 0;"
+          />
+        </template>
+      </van-field>
       <van-field name="measuresProjectFile[]" label="技术措施附件">
         <template #input>
           <van-uploader
@@ -244,22 +251,22 @@
         </template>
       </van-field>
 
-        <van-field label="管控措施">
-            <template #input>
-      <van-field
-        readonly
-        v-model="form.measuresAdministration"
-        name="measuresAdministration"
-        label=""
-        type="textarea"
-        rows="3"
-        autosize
-        placeholder="请输入"
-          style="padding-left: 0;padding-top: 0;"
-                />
-          </template>
-          </van-field>
-      <van-field name="measuresAdministrationFile[]" label="管控措施附件">
+      <van-field label="管理措施">
+        <template #input>
+          <van-field
+            readonly
+            v-model="form.measuresAdministration"
+            name="measuresAdministration"
+            label=""
+            type="textarea"
+            rows="3"
+            autosize
+            placeholder="请输入"
+            style="padding-left: 0;padding-top: 0;"
+          />
+        </template>
+      </van-field>
+      <van-field name="measuresAdministrationFile[]" label="管理措施附件">
         <template #input>
           <van-uploader
             multiple
@@ -293,21 +300,21 @@
           </van-uploader>
         </template>
       </van-field>
-        <van-field label="应急措施">
-            <template #input>
-      <van-field
-        readonly
-        v-model="form.measuresEmergency"
-        name="measuresEmergency"
-        label=""
-        type="textarea"
-        rows="3"
-        autosize
-        placeholder="请输入"
-      style="padding-left: 0;padding-top: 0;"
-              />
-              </template>
-          </van-field>
+      <van-field label="应急措施">
+        <template #input>
+          <van-field
+            readonly
+            v-model="form.measuresEmergency"
+            name="measuresEmergency"
+            label=""
+            type="textarea"
+            rows="3"
+            autosize
+            placeholder="请输入"
+            style="padding-left: 0;padding-top: 0;"
+          />
+        </template>
+      </van-field>
       <van-field name="measuresEmergencyFile[]" label="应急措施附件">
         <template #input>
           <van-uploader
@@ -344,7 +351,7 @@
         </template>
       </van-field>
 
-       <van-field
+      <van-field
         v-model="form.measuresDeptName"
         name="measuresDeptName"
         label="管控责任单位 "
@@ -364,17 +371,17 @@
         placeholder="请输入"
         readonly
       />
-       <van-field
-            v-model="form.measuresUserPhone"
-            name="measuresUserPhone"
-            label="管控责任人联系方式"
-            type="textarea"
-            rows="1"
-            autosize
-            placeholder="请输入"
-            maxlength="11"
-            readonly
-          />
+      <van-field
+        v-model="form.measuresUserPhone"
+        name="measuresUserPhone"
+        label="管控责任人联系方式"
+        type="textarea"
+        rows="1"
+        autosize
+        placeholder="请输入"
+        maxlength="11"
+        readonly
+      />
 
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
@@ -388,7 +395,9 @@
       </div>
       <van-field name="majorHazardSource" label="是否为重大危险源">
         <template #input>
+          <span style="margin-right: 10px;color: red;">否</span>
           <van-switch disabled v-model="form.majorHazardSource" size="20" />
+          <span style="margin-left: 10px;color: green;">是</span>
         </template>
       </van-field>
       <van-field
@@ -401,21 +410,20 @@
         autosize
         placeholder="请输入"
       />
-      
 
-       <van-field label="重大危险源描述" :required="form.majorHazardSource">
+      <van-field label="重大危险源描述" :required="form.majorHazardSource">
         <template #input>
-        <van-field
-          readonly
-          v-model="form.majorHazardSourceDescription"
-          name="majorHazardSourceDescription"
-          label=""
-          type="textarea"
-          rows="3"
-          autosize
-          placeholder="请输入"
+          <van-field
+            readonly
+            v-model="form.majorHazardSourceDescription"
+            name="majorHazardSourceDescription"
+            label=""
+            type="textarea"
+            rows="3"
+            autosize
+            placeholder="请输入"
             style="padding-left: 0;padding-top: 0;"
-                />
+          />
         </template>
       </van-field>
 
@@ -480,7 +488,7 @@ export default {
       isTimely: 1,
       active: 0,
       form: {
-        specialEquipment:false
+        specialEquipment: false
       },
       projectId: "", // 所属工程
       projectName: "", // 所属工程