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

src/views/riskProject/add/addPresent.vue

@@ -113,9 +113,9 @@
             alt=""
             style="position: relative;top: 32%;transform: translateY(-50%);"
           />
-          风险源图片
+          风险图片
         </div>
-        <van-field name="hdPicture1" label="风险源图片">
+        <van-field name="hdPicture1" label="风险图片">
           <template #input>
             <van-uploader
               @delete="deleteFile(...arguments, 'pictureFile')"
@@ -156,8 +156,10 @@
               alt=""
               style="position: relative;top: 32%;transform: translateY(-50%);"
             />
-          技术措施
+             已采取的管控措施 
           </div>
+          <van-field label="技术措施">
+            <template #input>
               <van-field
                 v-model="form.measuresProject"
                 name="measuresProject"
@@ -166,8 +168,11 @@
                 rows="3"
                 autosize
                 placeholder="请输入"
+                style="padding-left: 0;padding-top: 0;"
               />
-        <van-field name="measuresProjectFile[]" label="上传附件">
+           </template>
+          </van-field>
+          <van-field name="measuresProjectFile[]" label="技术措施附件">
             <template #input>
               <van-uploader
                 multiple
@@ -200,17 +205,8 @@
               </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
                   v-model="form.measuresAdministration"
                   name="measuresAdministration"
@@ -219,34 +215,11 @@
                   rows="3"
                   autosize
                   placeholder="请输入"
+                    style="padding-left: 0;padding-top: 0;"
                 />
-
-        <van-field
-          v-model="form.measuresDeptName"
-          name="measuresDeptName"
-          label="管控责任单位 "
-          type="textarea"
-          rows="1"
-          autosize
-          @click="
-            {
-              measuresDept = true;
-            }
-          "
-          placeholder="请选择"
-        />
-        <van-field
-          v-model="form.measuresUserName"
-          name="measuresUserName"
-          label="管控责任人 "
-          type="textarea"
-          rows="1"
-          autosize
-          @click="getUserData('measuresUser')"
-          placeholder="请选择"
-        />
-
-        <van-field name="measuresAdministrationFile[]" label="上传附件">
+          </template>
+          </van-field>
+          <van-field name="measuresAdministrationFile[]" label="管控措施附件">
             <template #input>
               <van-uploader
                 multiple
@@ -279,17 +252,8 @@
               </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
                 v-model="form.measuresEmergency"
                 name="measuresEmergency"
@@ -298,8 +262,11 @@
                 rows="3"
                 autosize
                 placeholder="请输入"
+                  style="padding-left: 0;padding-top: 0;"
               />
-        <van-field name="measuresEmergencyFile[]" label="上传附件">
+              </template>
+          </van-field>
+          <van-field name="measuresEmergencyFile[]" label="应急措施附件">
             <template #input>
               <van-uploader
                 multiple
@@ -334,7 +301,35 @@
             </template>
           </van-field>
 
-        <div
+      <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"
+          />
+        <!-- <div
           style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
         >
           <img
@@ -342,13 +337,13 @@
             alt=""
             style="position: relative;top: 32%;transform: translateY(-50%);"
           />
-          参考依据
-        </div>
+          判断依据
+        </div> -->
         <van-field
           clickable
           name="referenceBasis"
           :value="form.referenceBasis"
-          label="参考依据"
+          label="判断依据"
           placeholder="请选择"
           @click="selectData('referenceBasis', false)"
         />

src/views/riskProject/taskLedger/presentDetail.vue

@@ -114,9 +114,9 @@
             alt=""
             style="position: relative;top: 32%;transform: translateY(-50%);"
           />
-          风险源图片
+          风险图片
         </div>
-        <van-field name="hdPicture1" label="风险源图片">
+        <van-field name="hdPicture1" label="风险图片">
           <template #input>
             <van-uploader
               disabled
@@ -158,8 +158,10 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-          技术措施
+        已采取的管控措施
       </div>
+       <van-field label="技术措施">
+            <template #input>
       <van-field
         readonly
         v-model="form.measuresProject"
@@ -169,12 +171,15 @@
         rows="3"
         autosize
         placeholder="请输入"
+       style="padding-left: 0;padding-top: 0;"
               />
-        <van-field name="measuresProjectFile[]" label="上传附件">
+           </template>
+          </van-field>
+      <van-field name="measuresProjectFile[]" label="技术措施附件">
         <template #input>
           <van-uploader
-              disabled
             multiple
+            disabled
             :max-count="5"
             upload-text="最多上传五个"
             v-model="measuresProjectFile"
@@ -205,16 +210,8 @@
         </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.measuresAdministration"
@@ -224,30 +221,11 @@
         rows="3"
         autosize
         placeholder="请输入"
+          style="padding-left: 0;padding-top: 0;"
                 />
-
-        <van-field
-          readonly
-          v-model="form.measuresDeptName"
-          name="measuresDeptName"
-          label="管控责任单位 "
-          type="textarea"
-          rows="1"
-          autosize
-          placeholder="请选择"
-        />
-        <van-field
-          readonly
-          v-model="form.measuresUserName"
-          name="measuresUserName"
-          label="管控责任人 "
-          type="textarea"
-          rows="1"
-          autosize
-          placeholder="请选择"
-        />
-
-        <van-field name="measuresAdministrationFile[]" label="上传附件">
+          </template>
+          </van-field>
+      <van-field name="measuresAdministrationFile[]" label="管控措施附件">
         <template #input>
           <van-uploader
             multiple
@@ -256,6 +234,7 @@
             upload-text="最多上传五个"
             v-model="measuresAdministrationFile"
             accept="file"
+            @delete="deleteFile(...arguments, 'measuresAdministrationFile')"
           >
             <template slot="default">
               <div
@@ -280,17 +259,8 @@
           </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.measuresEmergency"
@@ -300,8 +270,11 @@
         rows="3"
         autosize
         placeholder="请输入"
+      style="padding-left: 0;padding-top: 0;"
               />
-        <van-field name="measuresEmergencyFile[]" label="上传附件">
+              </template>
+          </van-field>
+      <van-field name="measuresEmergencyFile[]" label="应急措施附件">
         <template #input>
           <van-uploader
           disabled
@@ -337,23 +310,45 @@
         </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%);"
+ <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
           />
-          参考依据
-        </div>
         <van-field
           readonly
           clickable
           name="referenceBasis"
           :value="form.referenceBasis"
-          label="参考依据"
+          label="判断依据"
           placeholder="请选择"
+          
         />
         <van-field
           readonly

src/views/riskProject/taskLedger/tabDetail.vue

@@ -85,6 +85,11 @@
         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
         v-model="form.safetyWarningSigns"
@@ -143,9 +148,9 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        风险源图片
+        风险图片
       </div>
-      <van-field name="hdPicture1" label="风险源图片">
+      <van-field name="hdPicture1" label="风险图片">
         <template #input>
           <van-uploader
             @delete="deleteFile(...arguments, 'pictureFile')"
@@ -187,8 +192,10 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        技术措施
+        应采取的管控措施
       </div>
+       <van-field label="技术措施">
+            <template #input>
       <van-field
         readonly
         v-model="form.measuresProject"
@@ -198,8 +205,11 @@
         rows="3"
         autosize
         placeholder="请输入"
+       style="padding-left: 0;padding-top: 0;"
               />
-      <van-field name="measuresProjectFile[]" label="上传附件">
+           </template>
+          </van-field>
+      <van-field name="measuresProjectFile[]" label="技术措施附件">
         <template #input>
           <van-uploader
             multiple
@@ -234,16 +244,8 @@
         </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.measuresAdministration"
@@ -253,30 +255,11 @@
         rows="3"
         autosize
         placeholder="请输入"
+          style="padding-left: 0;padding-top: 0;"
                 />
-
-      <van-field
-        readonly
-        v-model="form.measuresDeptName"
-        name="measuresDeptName"
-        label="管控责任单位 "
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请选择"
-      />
-      <van-field
-        readonly
-        v-model="form.measuresUserName"
-        name="measuresUserName"
-        label="管控责任人 "
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请选择"
-      />
-
-      <van-field name="measuresAdministrationFile[]" label="上传附件">
+          </template>
+          </van-field>
+      <van-field name="measuresAdministrationFile[]" label="管控措施附件">
         <template #input>
           <van-uploader
             multiple
@@ -310,62 +293,8 @@
           </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
-        readonly
-        v-model="form.hazardSourceName"
-        name="hazardSourceName"
-        label="危险源名称 "
-        type="textarea"
-        rows="1"
-        autosize
-        placeholder="请输入"
-      />
-      <van-field name="majorHazardSource" label="是否存在重大危险源">
+        <van-field label="应急措施">
             <template #input>
-          <van-switch disabled v-model="form.majorHazardSource" size="20" />
-        </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
-        readonly
-        v-model="form.majorHazardSourceDescription"
-        name="majorHazardSourceDescription"
-        label=""
-        type="textarea"
-        rows="3"
-        autosize
-        placeholder="请输入"
-      />
-      <div
-        style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
-      >
-        <img
-          src="@/assets/accidentIcon/bookmark.svg"
-          alt=""
-          style="position: relative;top: 32%;transform: translateY(-50%);"
-        />
-        应急措施
-      </div>
       <van-field
         readonly
         v-model="form.measuresEmergency"
@@ -375,8 +304,11 @@
         rows="3"
         autosize
         placeholder="请输入"
+      style="padding-left: 0;padding-top: 0;"
               />
-      <van-field name="measuresEmergencyFile[]" label="上传附件">
+              </template>
+          </van-field>
+      <van-field name="measuresEmergencyFile[]" label="应急措施附件">
         <template #input>
           <van-uploader
             multiple
@@ -412,6 +344,38 @@
         </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
+          />
+
       <div
         style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
       >
@@ -420,16 +384,49 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        参考依据
+        重大危险源管理
       </div>
+      <van-field name="majorHazardSource" label="是否为重大危险源">
+        <template #input>
+          <van-switch disabled v-model="form.majorHazardSource" size="20" />
+        </template>
+      </van-field>
+      <van-field
+        readonly
+        v-model="form.hazardSourceName"
+        name="hazardSourceName"
+        label="危险源名称 "
+        type="textarea"
+        rows="1"
+        autosize
+        placeholder="请输入"
+      />
+      
+
+       <van-field label="重大危险源描述" :required="form.majorHazardSource">
+        <template #input>
+        <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>
+
       <van-field
         readonly
         clickable
         name="referenceBasis"
         :value="form.referenceBasis"
-        label="参考依据"
+        label="判断依据"
         placeholder="请选择"
-        :rules="[{ required: true, message: '事故类型不能为空' }]"
+        :rules="[{ required: true, message: '判断依据不能为空' }]"
       />
     </van-form>
   </div>
@@ -482,7 +479,9 @@ export default {
       id: "",
       isTimely: 1,
       active: 0,
-      form: {},
+      form: {
+        specialEquipment:false
+      },
       projectId: "", // 所属工程
       projectName: "", // 所属工程
       projectDirectorName: "", // 所属工程