Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop

src/views/drawCanvas/riskView.vue

@@ -275,7 +275,7 @@ export default {
                 item.position.isDraggable = false;
                 item.position.isResizable = false;
               }
-              if (!this.isViews || item.position.type == "thorough") {
+              if (!this.isViews ) {
                 //添加页面不显示颜色
                 item.position.c = "#e6e5e5";
               } else {
@@ -293,7 +293,7 @@ export default {
                 // }else if (item.score>=0 && item.score <= 6) { //差
                 //     item.position.c = this.colorList[0]
                 // }
-                item.position.c = this.colorList[Math.floor(Math.random() * 4)];
+                item.position.c = item.color;
               }
               this.layout.push(item.position);
             });

src/views/riskProject/add/addCurrent.vue

@@ -96,9 +96,19 @@
             @click="selectData('pointType', true)"
             :rules="[{ required: true, message: '风险点类型不能为空' }]"
           />
-           <van-field required label="是否为特种设备"  v-show="form.pointType=='设备设施类'"> 
+          <van-field
+            required
+            label="是否为特种设备"
+            v-show="form.pointType == '设备设施类'"
+          >
             <template #input>
-              <van-switch v-model="form.specialEquipment" size="20" name="specialEquipment" />
+              <span style="margin-right: 10px;color: red;">否</span>
+              <van-switch
+                v-model="form.specialEquipment"
+                size="20"
+                name="specialEquipment"
+              />
+              <span style="margin-left: 10px;color: green;">是</span>
             </template>
           </van-field>
           <!-- 多选 -->
@@ -167,18 +177,18 @@
             风险图片
           </div>
           <van-field name="hdPicture1" label="风险图片">
-          <template #input>
-            <van-uploader
-              @delete="deleteFile(...arguments, 'pictureFile')"
-              multiple
-              :max-count="5"
-              upload-text="最多上传五个"
-              v-model="uploaderImg"
-            >
-              <template slot="default">
-                <!-- 11111111111 -->
-                <div
-                  style="
+            <template #input>
+              <van-uploader
+                @delete="deleteFile(...arguments, 'pictureFile')"
+                multiple
+                :max-count="5"
+                upload-text="最多上传五个"
+                v-model="uploaderImg"
+              >
+                <template slot="default">
+                  <!-- 11111111111 -->
+                  <div
+                    style="
                                       width: 2.13333rem;
                                       height: 2.13333rem;
                                       background: #f7f8fa;
@@ -187,18 +197,18 @@
                                       justify-content: center;
                                       flex-direction: column;
                                   "
-                >
-                  <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>
+                  >
+                    <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;"
           >
@@ -207,7 +217,7 @@
               alt=""
               style="position: relative;top: 32%;transform: translateY(-50%);"
             />
-             应采取的管控措施 
+            应采取的管控措施
           </div>
           <van-field label="技术措施">
             <template #input>
@@ -221,7 +231,7 @@
                 placeholder="请输入"
                 style="padding-left: 0;padding-top: 0;"
               />
-           </template>
+            </template>
           </van-field>
           <van-field name="measuresProjectFile[]" label="技术措施附件">
             <template #input>
@@ -256,21 +266,21 @@
               </van-uploader>
             </template>
           </van-field>
-           <van-field label="管控措施">
+          <van-field label="管理措施">
             <template #input>
               <van-field
-                  v-model="form.measuresAdministration"
-                  name="measuresAdministration"
-                  label=""
-                  type="textarea"
-                  rows="3"
-                  autosize
-                  placeholder="请输入"
-                    style="padding-left: 0;padding-top: 0;"
-                />
-          </template>
+                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 name="measuresAdministrationFile[]" label="管理措施附件">
             <template #input>
               <van-uploader
                 multiple
@@ -303,7 +313,7 @@
               </van-uploader>
             </template>
           </van-field>
-           <van-field label="应急措施">
+          <van-field label="应急措施">
             <template #input>
               <van-field
                 v-model="form.measuresEmergency"
@@ -313,9 +323,9 @@
                 rows="3"
                 autosize
                 placeholder="请输入"
-                  style="padding-left: 0;padding-top: 0;"
+                style="padding-left: 0;padding-top: 0;"
               />
-              </template>
+            </template>
           </van-field>
           <van-field name="measuresEmergencyFile[]" label="应急措施附件">
             <template #input>
@@ -356,30 +366,43 @@
             v-model="form.measuresDeptName"
             name="measuresDeptName"
             label="管控责任单位 "
-            type="textarea"
+            type="input"
             rows="1"
             autosize
             placeholder="请输入"
+            list="measure-deptname"
+            @input="measuresDeptNameChange"
           />
-          <select>
-            <option>JAVA</option>
-            <option>C++</option>
-            <option>C+</option>
-          </select>
+          <datalist id="measure-deptname">
+            <option
+              :value="item.measuresDeptName"
+              v-for="item in measureDeptList"
+              :key="item.measuresDeptName"
+            ></option>
+          </datalist>
           <van-field
             v-model="form.measuresUserName"
             name="measuresUserName"
             label="管控责任人 "
-            type="textarea"
+            type="input"
             rows="1"
             autosize
             placeholder="请输入"
+            list="measure-name"
+            @input="measuresUserNameChange"
           />
-           <van-field
+          <datalist id="measure-name">
+            <option
+              v-for="item in measureNameList"
+              :key="item.measuresUserName"
+              :value="item.measuresUserName"
+            ></option>
+          </datalist>
+          <van-field
             v-model="form.measuresUserPhone"
             name="measuresUserPhone"
             label="管控责任人联系方式"
-            type="textarea"
+            type="input"
             rows="1"
             autosize
             placeholder="请输入"
@@ -396,13 +419,15 @@
             />
             重大危险源管理
           </div>
-         
+
           <van-field name="majorHazardSource" label="是否为重大危险源">
             <template #input>
+              <span style="margin-right: 10px;color: red;">否</span>
               <van-switch v-model="form.majorHazardSource" size="20" />
+              <span style="margin-left: 10px;color: green;">是</span>
             </template>
           </van-field>
-            <van-field
+          <van-field
             :disabled="!form.majorHazardSource"
             v-model="form.hazardSourceName"
             :required="form.majorHazardSource"
@@ -412,24 +437,35 @@
             rows="1"
             autosize
             placeholder="请输入"
-            :key="form.majorHazardSource+'123'"
-            :rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
+            :key="form.majorHazardSource + '123'"
+            :rules="
+              form.majorHazardSource
+                ? [{ required: true, message: '危险源名称不能为空' }]
+                : []
+            "
           />
-         <van-field label="重大危险源描述" :disabled="!form.majorHazardSource" :required="form.majorHazardSource">
-          <template #input>
+          <van-field
+            label="重大危险源描述"
+            :disabled="!form.majorHazardSource"
+            :required="form.majorHazardSource"
+          >
+            <template #input>
               <van-field
-                :disabled="!form.majorHazardSource" 
+                :disabled="!form.majorHazardSource"
                 v-model="form.majorHazardSourceDescription"
                 name="majorHazardSourceDescription"
                 type="textarea"
                 rows="3"
                 autosize
                 placeholder="请输入"
-                :key="form.majorHazardSource+'456'"
-                :rules="form.majorHazardSource?[{ required: true, message: '重大危险源描述不能为空' }]:[]"
+                :key="form.majorHazardSource + '456'"
+                :rules="
+                  form.majorHazardSource
+                    ? [{ required: true, message: '重大危险源描述不能为空' }]
+                    : []
+                "
                 style="padding-left: 0;padding-top: 0;"
-                
-                  />
+              />
             </template>
           </van-field>
           <van-field
@@ -438,16 +474,22 @@
             readonly
             clickable
             name="referenceBasis"
-            :value="form.referenceBasis=='null'?'':form.referenceBasis"
+            :value="form.referenceBasis == 'null' ? '' : form.referenceBasis"
             label="判断依据"
             placeholder="请选择"
-            :key="form.majorHazardSource+'789'"
-            :rules="form.majorHazardSource?[{ required: true, message: '判断依据不能为空' }]:[]"
-           @click="()=>{
-            if(form.majorHazardSource){
-              selectData('referenceBasis', false)
-            }
-          }"
+            :key="form.majorHazardSource + '789'"
+            :rules="
+              form.majorHazardSource
+                ? [{ required: true, message: '判断依据不能为空' }]
+                : []
+            "
+            @click="
+              () => {
+                if (form.majorHazardSource) {
+                  selectData('referenceBasis', false);
+                }
+              }
+            "
           />
           <!-- <div
             style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
@@ -459,7 +501,7 @@
             />
             判断依据
           </div> -->
-          
+
           <van-dialog
             v-model="showGradeDialog"
             title="风险评测配置"
@@ -627,7 +669,13 @@
             />
           </van-popup>
           <div style="margin: 16px 16px 0">
-            <van-button round block type="info" native-type="submit"
+            <van-button
+              :loading="loadingStatus"
+              :loading-text="loadingText"
+              round
+              block
+              type="info"
+              native-type="submit"
               >提交</van-button
             >
           </div>
@@ -853,6 +901,10 @@ export default {
   },
   data() {
     return {
+      loadingStatus: false,
+      loadingText: "提交...",
+      measureNameList: [],
+      measureDeptList: [],
       showIndex: null,
       measuresDept: false,
       ShowfloorList: false,
@@ -877,7 +929,7 @@ export default {
       id: "",
       isTimely: 1,
       active: 0,
-      form: { },
+      form: {},
       projectId: "", // 所属工程
       projectName: "", // 所属工程
       projectDirectorName: "", // 所属工程
@@ -954,6 +1006,25 @@ export default {
     }
   },
   methods: {
+    measuresUserNameChange(e) {
+      getFun(
+        `/risk/plan/inherent/getResponsibilityPersons?personName=${e}&projectId=${this.form.projectId}`
+      ).then(res => {
+        this.measureNameList = res.data;
+        this.measureNameList.forEach(item => {
+          if (item.measuresUserName == e)
+            this.form.measuresUserPhone = item.measuresUserPhone;
+        });
+        console.log(e, 1111);
+      });
+    },
+    measuresDeptNameChange(e) {
+      getFun(
+        `/risk/plan/inherent/getResponsibilityUnits?unitName=${e}&projectId=${this.form.projectId}`
+      ).then(res => {
+        this.measureDeptList = res.data;
+      });
+    },
     // 详情
     goDetail(data) {
       sessionStorage.setItem("inherentId", this.inherentId);
@@ -1302,7 +1373,8 @@ export default {
       // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
       var formDataJson = this.jsonToFormData(this.form);
       let url = "/risk/plan/inherent";
-      (values.hdPicture1||[]).forEach(item => {
+      this.loadingStatus = true;
+      (values.hdPicture1 || []).forEach(item => {
         if (item.file) {
           formDataJson.append("pictureFile[]", item.file);
         } else {
@@ -1337,11 +1409,13 @@ export default {
             message: "提交成功",
             duration: 2000
           });
+          this.loadingStatus = false;
           history.go(-1);
         })
         .catch(() => {
           this.$toast.clear();
           this.$toast.fail("提交失败,请稍后再试");
+          this.loadingStatus = false;
         });
       this.$toast.clear();
     },
@@ -1463,12 +1537,12 @@ export default {
     }
   },
   watch: {
-    'form.pointType'(val,old){
-      if(old){
-        if(val=='设备设施类'){
-          this.form.specialEquipment = false
-        }else{
-          this.form.specialEquipment=''
+    "form.pointType"(val, old) {
+      if (old) {
+        if (val == "设备设施类") {
+          this.form.specialEquipment = false;
+        } else {
+          this.form.specialEquipment = "";
         }
       }
     }

src/views/riskProject/add/addInherent.vue

@@ -94,11 +94,21 @@
         @click="selectData('pointType', true)"
         :rules="[{ required: true, message: '风险点类型不能为空' }]"
       />
-       <van-field required label="是否为特种设备"  v-show="form.pointType=='设备设施类'"> 
-            <template #input>
-              <van-switch name="specialEquipment" v-model="form.specialEquipment" size="20" />
-            </template>
-          </van-field>
+      <van-field
+        required
+        label="是否为特种设备"
+        v-show="form.pointType == '设备设施类'"
+      >
+        <template #input>
+          <span style="margin-right: 10px;color: red;">否</span>
+          <van-switch
+            name="specialEquipment"
+            v-model="form.specialEquipment"
+            size="20"
+          />
+          <span style="margin-left: 10px;color: green;">是</span>
+        </template>
+      </van-field>
       <!-- 多选 -->
       <van-field
         v-model="form.safetyWarningSigns"
@@ -197,42 +207,42 @@
         </template>
       </van-field>
       <div
-            style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
+        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 label="技术措施">
+        <template #input>
+          <van-field
+            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
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="measuresProjectFile"
+            accept="file"
+            @delete="deleteFile(...arguments, 'measuresProjectFile')"
           >
-            <img
-              src="@/assets/accidentIcon/bookmark.svg"
-              alt=""
-              style="position: relative;top: 32%;transform: translateY(-50%);"
-            />
-             应采取的管控措施 
-          </div>
-          <van-field label="技术措施">
-            <template #input>
-              <van-field
-                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
-                multiple
-                :max-count="5"
-                upload-text="最多上传五个"
-                v-model="measuresProjectFile"
-                accept="file"
-                @delete="deleteFile(...arguments, 'measuresProjectFile')"
-              >
-                <template slot="default">
-                  <div
-                    style="
+            <template slot="default">
+              <div
+                style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -241,45 +251,45 @@
                                     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>
-           <van-field label="管控措施">
-            <template #input>
-              <van-field
-                  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
-                :max-count="5"
-                upload-text="最多上传五个"
-                v-model="measuresAdministrationFile"
-                accept="file"
-                @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
               >
-                <template slot="default">
-                  <div
-                    style="
+                <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>
+      <van-field label="管理措施">
+        <template #input>
+          <van-field
+            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
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="measuresAdministrationFile"
+            accept="file"
+            @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
+          >
+            <template slot="default">
+              <div
+                style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -288,46 +298,46 @@
                                     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>
-           <van-field label="应急措施">
-            <template #input>
-              <van-field
-                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
-                multiple
-                :max-count="5"
-                upload-text="最多上传五个"
-                v-model="measuresEmergencyFile"
-                accept="file"
-                @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
               >
-                <template slot="default">
-                  <!-- 11111111111 -->
-                  <div
-                    style="
+                <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>
+      <van-field label="应急措施">
+        <template #input>
+          <van-field
+            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
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="measuresEmergencyFile"
+            accept="file"
+            @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
                     width: 2.13333rem;
                     height: 2.13333rem;
                     background: #f7f8fa;
@@ -336,18 +346,18 @@
                     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>
+              >
+                <img
+                  src="@/assets/upload/file.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
             </template>
-          </van-field>
+          </van-uploader>
+        </template>
+      </van-field>
       <van-field
         v-model="form.measuresDeptName"
         name="measuresDeptName"
@@ -356,11 +366,15 @@
         rows="1"
         autosize
         placeholder="请输入"
-        list="measure-deptname-input"
-         @input="measuresDeptNameChange"
+        list="measure-deptname"
+        @input="measuresDeptNameChange"
       />
       <datalist id="measure-deptname">
-          <option value="Chocolate" v-for="item in measureDeptList" :key="item.id"/>
+        <option
+          :value="item.measuresDeptName"
+          v-for="item in measureDeptList"
+          :key="item.measuresDeptName"
+        ></option>
       </datalist>
       <van-field
         v-model="form.measuresUserName"
@@ -373,19 +387,23 @@
         list="measure-name"
         @input="measuresUserNameChange"
       />
-        <datalist id="measure-name">
-            <option value="Chocolate" v-for="item in measureNameList" :key="item.id"/>
-        </datalist>
-       <van-field
-            v-model="form.measuresUserPhone"
-            name="measuresUserPhone"
-            label="管控责任人联系方式"
-            type="input"
-            rows="1"
-            autosize
-            placeholder="请输入"
-            maxlength="11"
-          />
+      <datalist id="measure-name">
+        <option
+          v-for="item in measureNameList"
+          :key="item.measuresUserName"
+          :value="item.measuresUserName"
+        ></option>
+      </datalist>
+      <van-field
+        v-model="form.measuresUserPhone"
+        name="measuresUserPhone"
+        label="管控责任人联系方式"
+        type="input"
+        rows="1"
+        autosize
+        placeholder="请输入"
+        maxlength="11"
+      />
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
@@ -396,30 +414,39 @@
         />
         重大危险源管理
       </div>
-     
+
       <van-field name="majorHazardSource" label="是否为重大危险源">
         <template #input>
+          <span style="margin-right: 10px;color: red;">否</span>
           <van-switch v-model="form.majorHazardSource" size="20" />
+          <span style="margin-left: 10px;color: green;">是</span>
         </template>
       </van-field>
       <van-field
-            :disabled="!form.majorHazardSource"
-            v-model="form.hazardSourceName"
-            :required="form.majorHazardSource"
-            name="hazardSourceName"
-            label="危险源名称 "
-            type="textarea"
-            rows="1"
-            autosize
-            placeholder="请输入"
-            :key="form.majorHazardSource+'456'"
-            :rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
-          />
-          <van-field label="重大危险源描述" :disabled="!form.majorHazardSource"
-            :required="form.majorHazardSource">
-          <template #input>
+        :disabled="!form.majorHazardSource"
+        v-model="form.hazardSourceName"
+        :required="form.majorHazardSource"
+        name="hazardSourceName"
+        label="危险源名称 "
+        type="textarea"
+        rows="1"
+        autosize
+        placeholder="请输入"
+        :key="form.majorHazardSource + '456'"
+        :rules="
+          form.majorHazardSource
+            ? [{ required: true, message: '危险源名称不能为空' }]
+            : []
+        "
+      />
+      <van-field
+        label="重大危险源描述"
+        :disabled="!form.majorHazardSource"
+        :required="form.majorHazardSource"
+      >
+        <template #input>
           <van-field
-          :disabled="!form.majorHazardSource" 
+            :disabled="!form.majorHazardSource"
             v-model="form.majorHazardSourceDescription"
             name="majorHazardSourceDescription"
             label=""
@@ -427,30 +454,40 @@
             rows="3"
             autosize
             placeholder="请输入"
-            :key="form.majorHazardSource+'123'"
-            :rules="form.majorHazardSource?[{ required: true, message: '重大危险源描述不能为空' }]:[]"
-              style="padding-left: 0;padding-top: 0;"
+            :key="form.majorHazardSource + '123'"
+            :rules="
+              form.majorHazardSource
+                ? [{ required: true, message: '重大危险源描述不能为空' }]
+                : []
+            "
+            style="padding-left: 0;padding-top: 0;"
           />
-          </template>
-          </van-field>
+        </template>
+      </van-field>
 
-          <van-field
-            :disabled="!form.majorHazardSource"
-            :required="form.majorHazardSource"
-            readonly
-            clickable
-            name="referenceBasis"
-            :value="form.referenceBasis=='null'?'':form.referenceBasis"
-            label="判断依据"
-            placeholder="请选择"
-            :key="form.majorHazardSource+'7'"
-            :rules="form.majorHazardSource?[{ required: true, message: '判断依据不能为空' }]:[]"
-           @click="()=>{
-            if(form.majorHazardSource){
-              selectData('referenceBasis', false)
+      <van-field
+        :disabled="!form.majorHazardSource"
+        :required="form.majorHazardSource"
+        readonly
+        clickable
+        name="referenceBasis"
+        :value="form.referenceBasis == 'null' ? '' : form.referenceBasis"
+        label="判断依据"
+        placeholder="请选择"
+        :key="form.majorHazardSource + '7'"
+        :rules="
+          form.majorHazardSource
+            ? [{ required: true, message: '判断依据不能为空' }]
+            : []
+        "
+        @click="
+          () => {
+            if (form.majorHazardSource) {
+              selectData('referenceBasis', false);
             }
-          }"
-          />
+          }
+        "
+      />
       <van-dialog
         v-model="showGradeDialog"
         title="风险评测配置"
@@ -615,7 +652,13 @@
       </van-popup>
 
       <div style="margin: 16px 16px 0">
-        <van-button round block type="info" native-type="submit"
+        <van-button
+          :loading="loadingStatus"
+          :loading-text="loadingText"
+          round
+          block
+          type="info"
+          native-type="submit"
           >提交</van-button
         >
       </div>
@@ -682,8 +725,10 @@ export default {
   },
   data() {
     return {
-      measureNameList:[],
-      measureDeptList:[],
+      loadingStatus: false,
+      loadingText: "提交...",
+      measureNameList: [],
+      measureDeptList: [],
       measuresDept: false,
       ShowfloorList: false,
       floorSource: [],
@@ -708,7 +753,7 @@ export default {
       isTimely: 1,
       active: 0,
       form: {
-        specialEquipment:''
+        specialEquipment: ""
       },
       projectId: "", // 所属工程
       projectName: "", // 所属工程
@@ -720,14 +765,7 @@ export default {
       factor: "", //风险因素
       showFactor: false,
       columnsFactor: [],
-      messageList: [
-        {
-          title: "回显风险源名称",
-          time: "2022-12-12",
-          name: "Mr.周",
-          state: 1
-        }
-      ],
+      messageList: [],
       source: "", //风险源
       userPrefix: "", //风险源
       showSource: false,
@@ -799,21 +837,24 @@ export default {
 
   methods: {
     /* swp add */
-    measuresUserNameChange(e){
-        this.getMeasureList(e)
-    },
-    measuresDeptNameChange(e){
-      this.getMeasureList(e)
+    measuresUserNameChange(e) {
+      getFun(
+        `/risk/plan/inherent/getResponsibilityPersons?personName=${e}&projectId=${this.form.projectId}`
+      ).then(res => {
+        this.measureNameList = res.data;
+        this.measureNameList.forEach(item => {
+          if (item.measuresUserName == e)
+            this.form.measuresUserPhone = item.measuresUserPhone;
+        });
+        console.log(e, 1111);
+      });
     },
-    getMeasureList(search){
-      getFun('').then(res => {
-          if (isSinge) {
-          
-          } else {
-            this.columnsCheckData = res.data;
-            this.showCheckSelect = true;
-          }
-        })
+    measuresDeptNameChange(e) {
+      getFun(
+        `/risk/plan/inherent/getResponsibilityUnits?unitName=${e}&projectId=${this.form.projectId}`
+      ).then(res => {
+        this.measureDeptList = res.data;
+      });
     },
     /* swp add end */
     // 项目负责人
@@ -1037,6 +1078,7 @@ export default {
       // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
       var formDataJson = this.jsonToFormData(this.form);
       let url = "/risk/plan/inherent";
+      this.loadingStatus = true;
       values.hdPicture1.forEach(item => {
         if (item.file) {
           formDataJson.append("pictureFile[]", item.file);
@@ -1065,6 +1107,7 @@ export default {
           formDataJson.append("measuresAdministrationFile[]", item.fileId);
         }
       });
+
       postFun(url, formDataJson)
         .then(res => {
           this.$toast.clear();
@@ -1072,11 +1115,13 @@ export default {
             message: "提交成功",
             duration: 2000
           });
+          this.loadingStatus = false;
           history.go(-1);
         })
         .catch(() => {
           this.$toast.clear();
           this.$toast.fail("提交失败,请稍后再试");
+          this.loadingStatus = false;
         });
       this.$toast.clear();
     },
@@ -1240,12 +1285,12 @@ export default {
     }
   },
   watch: {
-    'form.pointType'(val,old){
-        if(val=='设备设施类'){
-          this.form.specialEquipment = false
-        }else{
-          this.form.specialEquipment = ''
-        }
+    "form.pointType"(val, old) {
+      if (val == "设备设施类") {
+        this.form.specialEquipment = false;
+      } else {
+        this.form.specialEquipment = "";
+      }
     }
   }
 };

src/views/riskProject/add/addPresent.vue

@@ -149,42 +149,42 @@
           </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%);"
+          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 label="技术措施">
+          <template #input>
+            <van-field
+              v-model="form.measuresProject"
+              name="measuresProject"
+              label=""
+              type="textarea"
+              rows="3"
+              autosize
+              placeholder="请输入"
+              style="padding-left: 0;padding-top: 0;"
             />
-             已采取的管控措施 
-          </div>
-          <van-field label="技术措施">
-            <template #input>
-              <van-field
-                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
-                multiple
-                :max-count="5"
-                upload-text="最多上传五个"
-                v-model="measuresProjectFile"
-                accept="file"
-                @delete="deleteFile(...arguments, 'measuresProjectFile')"
-              >
-                <template slot="default">
-                  <div
-                    style="
+          </template>
+        </van-field>
+        <van-field name="measuresProjectFile[]" label="技术措施附件">
+          <template #input>
+            <van-uploader
+              multiple
+              :max-count="5"
+              upload-text="最多上传五个"
+              v-model="measuresProjectFile"
+              accept="file"
+              @delete="deleteFile(...arguments, 'measuresProjectFile')"
+            >
+              <template slot="default">
+                <div
+                  style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -193,45 +193,45 @@
                                     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>
-           <van-field label="管控措施">
-            <template #input>
-              <van-field
-                  v-model="form.measuresAdministration"
-                  name="measuresAdministration"
-                  label=""
-                  type="textarea"
-                  rows="3"
-                  autosize
-                  placeholder="请输入"
-                    style="padding-left: 0;padding-top: 0;"
-                />
+                >
+                  <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>
-          <van-field name="measuresAdministrationFile[]" label="管控措施附件">
-            <template #input>
-              <van-uploader
-                multiple
-                :max-count="5"
-                upload-text="最多上传五个"
-                v-model="measuresAdministrationFile"
-                accept="file"
-                @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
-              >
-                <template slot="default">
-                  <div
-                    style="
+        </van-field>
+        <van-field label="管理措施">
+          <template #input>
+            <van-field
+              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
+              :max-count="5"
+              upload-text="最多上传五个"
+              v-model="measuresAdministrationFile"
+              accept="file"
+              @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
+            >
+              <template slot="default">
+                <div
+                  style="
                                     width: 2.13333rem;
                                     height: 2.13333rem;
                                     background: #f7f8fa;
@@ -240,46 +240,46 @@
                                     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>
-           <van-field label="应急措施">
-            <template #input>
-              <van-field
-                v-model="form.measuresEmergency"
-                name="measuresEmergency"
-                label=""
-                type="textarea"
-                rows="3"
-                autosize
-                placeholder="请输入"
-                  style="padding-left: 0;padding-top: 0;"
-              />
+                >
+                  <img
+                    src="@/assets/upload/file.png"
+                    alt=""
+                    style="width: 0.64rem; height: 0.64rem"
+                  />
+                  <span class="van-uploader__upload-text">最多上传五个</span>
+                </div>
               </template>
-          </van-field>
-          <van-field name="measuresEmergencyFile[]" label="应急措施附件">
-            <template #input>
-              <van-uploader
-                multiple
-                :max-count="5"
-                upload-text="最多上传五个"
-                v-model="measuresEmergencyFile"
-                accept="file"
-                @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
-              >
-                <template slot="default">
-                  <!-- 11111111111 -->
-                  <div
-                    style="
+            </van-uploader>
+          </template>
+        </van-field>
+        <van-field label="应急措施">
+          <template #input>
+            <van-field
+              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
+              multiple
+              :max-count="5"
+              upload-text="最多上传五个"
+              v-model="measuresEmergencyFile"
+              accept="file"
+              @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
+            >
+              <template slot="default">
+                <!-- 11111111111 -->
+                <div
+                  style="
                     width: 2.13333rem;
                     height: 2.13333rem;
                     background: #f7f8fa;
@@ -288,47 +288,65 @@
                     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>
+                >
+                  <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>
 
-      <van-field
-        v-model="form.measuresDeptName"
-        name="measuresDeptName"
-        label="管控责任单位 "
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请输入"
-      />
-      <van-field
-        v-model="form.measuresUserName"
-        name="measuresUserName"
-        label="管控责任人 "
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请输入"
-      />
-       <van-field
-            v-model="form.measuresUserPhone"
-            name="measuresUserPhone"
-            label="管控责任人联系方式"
-            type="textarea"
-            rows="1"
-            autosize
-            placeholder="请输入"
-            maxlength="11"
-          />
+        <van-field
+          v-model="form.measuresDeptName"
+          name="measuresDeptName"
+          label="管控责任单位 "
+          type="input"
+          rows="1"
+          autosize
+          placeholder="请输入"
+          list="measure-deptname"
+          @input="measuresDeptNameChange"
+        />
+        <datalist id="measure-deptname">
+          <option
+            :value="item.measuresDeptName"
+            v-for="item in measureDeptList"
+            :key="item.measuresDeptName"
+          ></option>
+        </datalist>
+        <van-field
+          v-model="form.measuresUserName"
+          name="measuresUserName"
+          label="管控责任人 "
+          type="input"
+          rows="1"
+          autosize
+          placeholder="请输入"
+          list="measure-name"
+          @input="measuresUserNameChange"
+        />
+        <datalist id="measure-name">
+          <option
+            v-for="item in measureNameList"
+            :key="item.measuresUserName"
+            :value="item.measuresUserName"
+          ></option>
+        </datalist>
+        <van-field
+          v-model="form.measuresUserPhone"
+          name="measuresUserPhone"
+          label="管控责任人联系方式"
+          type="input"
+          rows="1"
+          autosize
+          placeholder="请输入"
+          maxlength="11"
+        />
         <!-- <div
           style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
         >
@@ -525,7 +543,13 @@
         </van-popup>
 
         <div style="margin: 16px 16px 0">
-          <van-button round block type="info" native-type="submit"
+          <van-button
+            :loading="loadingStatus"
+            :loading-text="loadingText"
+            round
+            block
+            type="info"
+            native-type="submit"
             >提交</van-button
           >
         </div>
@@ -571,6 +595,10 @@ export default {
   },
   data() {
     return {
+      loadingStatus: false,
+      loadingText: "提交...",
+      measureNameList: [],
+      measureDeptList: [],
       isEdit: false,
       existingId: 0,
       measuresDept: false,
@@ -667,6 +695,25 @@ export default {
     }
   },
   methods: {
+    measuresUserNameChange(e) {
+      getFun(
+        `/risk/plan/inherent/getResponsibilityPersons?personName=${e}&projectId=${this.form.projectId}`
+      ).then(res => {
+        this.measureNameList = res.data;
+        this.measureNameList.forEach(item => {
+          if (item.measuresUserName == e)
+            this.form.measuresUserPhone = item.measuresUserPhone;
+        });
+        console.log(e, 1111);
+      });
+    },
+    measuresDeptNameChange(e) {
+      getFun(
+        `/risk/plan/inherent/getResponsibilityUnits?unitName=${e}&projectId=${this.form.projectId}`
+      ).then(res => {
+        this.measureDeptList = res.data;
+      });
+    },
     // 请求详情数据
     postReturnEcho() {
       this.$toast.loading({
@@ -731,37 +778,11 @@ export default {
             this.form.factor = res.data.factor;
             this.form.type = res.data.type;
             this.form.planId = res.data.planId;
-
-            this.uploaderImg = (res.data.pictureFile || []).map(item => {
-              return {
-                ...item,
-                url: item.filePath
-              };
-            });
-            this.measuresProjectFile = (res.data.measuresProjectFile || []).map(
-              item => {
-                return {
-                  ...item,
-                  url: item.filePath
-                };
-              }
-            );
-            this.measuresAdministrationFile = (
-              res.data.measuresAdministrationFile || []
-            ).map(item => {
-              return {
-                ...item,
-                url: item.filePath
-              };
-            });
-            this.measuresEmergencyFile = (
-              res.data.measuresEmergencyFile || []
-            ).map(item => {
-              return {
-                ...item,
-                url: item.filePath
-              };
-            });
+            this.form.measuresProject = res.data.measuresProject;
+            this.form.measuresAdministration = res.data.measuresAdministration;
+            this.form.measuresDeptName = res.data.measuresDeptName;
+            this.form.measuresUserName = res.data.measuresUserName;
+            this.form.measuresUserPhone = res.data.measuresUserPhone;
             this.$forceUpdate();
           })
           .catch(() => {
@@ -975,6 +996,7 @@ export default {
       // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
       var formDataJson = this.jsonToFormData(this.form);
       // let url = "/risk/plan/inherent";
+      this.loadingStatus = true;
       let url = "/risk/plan/existing";
       values.hdPicture1.forEach(item => {
         if (item.file) {
@@ -1011,11 +1033,13 @@ export default {
             message: "提交成功",
             duration: 2000
           });
+          this.loadingStatus = false;
           history.go(-1);
         })
         .catch(() => {
           this.$toast.clear();
           this.$toast.fail("提交失败,请稍后再试");
+          this.loadingStatus = false;
         });
       this.$toast.clear();
     },

src/views/riskProject/add/index.vue

@@ -258,7 +258,13 @@
       </van-popup>
 
       <div style="margin: 16px 16px 0">
-        <van-button round block type="info" native-type="submit"
+        <van-button
+          :loading="loadingStatus"
+          :loading-text="loadingText"
+          round
+          block
+          type="info"
+          native-type="submit"
           >提交</van-button
         >
       </div>
@@ -297,6 +303,8 @@ export default {
   },
   data() {
     return {
+      loadingStatus: false,
+      loadingText: "提交...",
       taskId: "",
       text: "创建任务",
       id: "",
@@ -504,12 +512,13 @@ export default {
       }
     },
     onSubmit(values) {
-      this.$toast.loading({
-        message: "加载中...",
-        forbidClick: true,
-        loadingType: "spinner",
-        duration: 0
-      });
+      // this.$toast.loading({
+      //   message: "加载中...",
+      //   forbidClick: true,
+      //   loadingType: "spinner",
+      //   duration: 0
+      // });
+      this.loadingStatus = true;
       let url = "/risk/plan";
       postFun(url, this.form)
         .then(res => {
@@ -518,11 +527,13 @@ export default {
             message: "提交成功",
             duration: 2000
           });
+          this.loadingStatus = false;
           history.go(-1);
         })
         .catch(() => {
           this.$toast.clear();
           this.$toast.fail("提交失败,请稍后再试");
+          this.loadingStatus = false;
         });
       this.$toast.clear();
     },

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/resultPage.vue

@@ -3,8 +3,8 @@
         <LHeader :text="text"></LHeader>
         <div class="section">
             <p>该次测评风险值为：</p>
-            <div class="resultScore">
-                <p style="font-weight: bold;font-size: 20px;">{{ this.$route.params.score }}</p>
+            <div class="resultScore" :style="{ background: backgroundColor}" >
+                <p style="font-weight: bold;font-size: 20px;color: white;">{{ this.$route.params.score }}</p>
             </div>
             <p>本次评估结果评定为：{{ level }}</p>
             <van-divider></van-divider>
@@ -34,7 +34,8 @@ import LHeader from "@/components/header.vue";
             return{
                 text:'测评结果',
                 score:0,
-                level:''
+                level:'',
+                backgroundColor:'',
             }
         },
         created(){
@@ -45,6 +46,8 @@ import LHeader from "@/components/header.vue";
                 getFun(`/risk/plan/matrix/score/${this.$route.params.score}`).then(res=>{
                     this.level = res.data.level
                     this.score  = res.data.max
+
+                    this.backgroundColor=this.level=='一般风险'?"#FFFF00":this.level=='较小风险'?"#0091EA":this.level=='较大风险'?"#FF9800":this.level=='重大风险'?"#FF4433":"orange";
                 })
             },
             resetClose(){
@@ -88,6 +91,6 @@ import LHeader from "@/components/header.vue";
         border-radius: 50%;
         margin: 0 auto;
     }
-    
+
 }
-</style>
\ No newline at end of file
+</style>

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/presentDetail.vue

@@ -150,45 +150,45 @@
             </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 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
-            multiple
-            disabled
-            :max-count="5"
-            upload-text="最多上传五个"
-            v-model="measuresProjectFile"
-            accept="file"
-            @delete="deleteFile(...arguments, 'measuresProjectFile')"
-          >
-            <template slot="default">
-              <div
-                style="
+        <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 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
+              multiple
+              disabled
+              :max-count="5"
+              upload-text="最多上传五个"
+              v-model="measuresProjectFile"
+              accept="file"
+              @delete="deleteFile(...arguments, 'measuresProjectFile')"
+            >
+              <template slot="default">
+                <div
+                  style="
                                       width: 2.13333rem;
                                       height: 2.13333rem;
                                       background: #f7f8fa;
@@ -197,48 +197,48 @@
                                       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>
+                >
+                  <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>
 
-        <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;"
-                />
+        <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
-            disabled
-            :max-count="5"
-            upload-text="最多上传五个"
-            v-model="measuresAdministrationFile"
-            accept="file"
-            @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
-          >
-            <template slot="default">
-              <div
-                style="
+        </van-field>
+        <van-field name="measuresAdministrationFile[]" label="管理措施附件">
+          <template #input>
+            <van-uploader
+              multiple
+              disabled
+              :max-count="5"
+              upload-text="最多上传五个"
+              v-model="measuresAdministrationFile"
+              accept="file"
+              @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
+            >
+              <template slot="default">
+                <div
+                  style="
                                       width: 2.13333rem;
                                       height: 2.13333rem;
                                       background: #f7f8fa;
@@ -247,48 +247,48 @@
                                       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>
-        <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;"
-              />
+                >
+                  <img
+                    src="@/assets/upload/file.png"
+                    alt=""
+                    style="width: 0.64rem; height: 0.64rem"
+                  />
+                  <span class="van-uploader__upload-text">最多上传五个</span>
+                </div>
               </template>
-          </van-field>
-      <van-field name="measuresEmergencyFile[]" label="应急措施附件">
-        <template #input>
-          <van-uploader
-          disabled
-            multiple
-            :max-count="5"
-            upload-text="最多上传五个"
-            v-model="measuresEmergencyFile"
-            accept="file"
-            @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
-          >
-            <template slot="default">
-              <!-- 11111111111 -->
-              <div
-                style="
+            </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 name="measuresEmergencyFile[]" label="应急措施附件">
+          <template #input>
+            <van-uploader
+              disabled
+              multiple
+              :max-count="5"
+              upload-text="最多上传五个"
+              v-model="measuresEmergencyFile"
+              accept="file"
+              @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
+            >
+              <template slot="default">
+                <!-- 11111111111 -->
+                <div
+                  style="
                     width: 2.13333rem;
                     height: 2.13333rem;
                     background: #f7f8fa;
@@ -297,50 +297,50 @@
                     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>
+                >
+                  <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>
 
- <van-field
-        v-model="form.measuresDeptName"
-        name="measuresDeptName"
-        label="管控责任单位 "
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请输入"
-        readonly
-      />
-      <van-field
-        v-model="form.measuresUserName"
-        name="measuresUserName"
-        label="管控责任人 "
-        type="textarea"
-        rows="1"
-        autosize
-        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.measuresDeptName"
+          name="measuresDeptName"
+          label="管控责任单位 "
+          type="textarea"
+          rows="1"
+          autosize
+          placeholder="请输入"
+          readonly
+        />
+        <van-field
+          v-model="form.measuresUserName"
+          name="measuresUserName"
+          label="管控责任人 "
+          type="textarea"
+          rows="1"
+          autosize
+          placeholder="请输入"
+          readonly
+        />
+        <van-field
+          v-model="form.measuresUserPhone"
+          name="measuresUserPhone"
+          label="管控责任人联系方式"
+          type="textarea"
+          rows="1"
+          autosize
+          placeholder="请输入"
+          maxlength="11"
+          readonly
+        />
         <van-field
           readonly
           clickable
@@ -348,7 +348,6 @@
           :value="form.referenceBasis"
           label="判断依据"
           placeholder="请选择"
-          
         />
         <van-field
           readonly

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: "", // 所属工程

vue.config.js

@@ -9,11 +9,11 @@ module.exports = {
     proxy: {
       //配置跨域
       "/app-api": {
-        target: "http://192.168.4.232:8080/", //这里是后台的地址
+        // target: "http://192.168.4.232:8080/", //这里是后台的地址
         // target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
         // target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
         // target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
-        // target: 'http://localhost:8081/', //这里是后台的地址
+        target: 'http://localhost:8081/', //这里是后台的地址
         ws: true,
         changOrigin: true //允许跨域
         // logLevel: 'debug',  // 显示代理调试信息