提交代码

src/views/gas/courtyardNetworkManagement/index.vue

@@ -183,14 +183,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="发现问题" prop="findProblem">
-          <el-select v-model="form.findProblem" placeholder="请选择发现问题">
-            <el-option
+          <el-radio-group v-model="form.findProblem">
+            <el-radio
               v-for="dict in dict.type.find_problem"
               :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="照片" prop="photoList">
           <imageUpload v-model="form.photoList" :disabled="disabled"/>

src/views/gas/regulatorBox/index.vue

@@ -35,15 +35,15 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['gas:regulatorBox:add']"-->
-<!--        >新增-->
-<!--        </el-button>-->
+        <!--        <el-button-->
+        <!--          type="primary"-->
+        <!--          plain-->
+        <!--          icon="el-icon-plus"-->
+        <!--          size="mini"-->
+        <!--          @click="handleAdd"-->
+        <!--          v-hasPermi="['gas:regulatorBox:add']"-->
+        <!--        >新增-->
+        <!--        </el-button>-->
       </el-col>
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
@@ -88,8 +88,8 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键" align="center" prop="id" v-if="false"/>
       <el-table-column label="小区名称" align="center" prop="areaName"/>
-<!--      <el-table-column label="所属楼宇" align="center" prop="buildingName"/>-->
-<!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
+      <!--      <el-table-column label="所属楼宇" align="center" prop="buildingName"/>-->
+      <!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
       <el-table-column label="管理所" align="center" prop="administrativeOffice">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.administrative_office" :value="scope.row.administrativeOffice"/>
@@ -167,11 +167,13 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="商服" prop="businessService">
-              <el-switch
-                v-model="form.businessService"
-                active-text="是"
-                inactive-text="否">
-              </el-switch>
+              <el-radio-group v-model="form.businessService">
+                <el-radio
+                  v-for="dict in dict.type.business_service"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -248,11 +250,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="是否泄露" prop="isThereALeak">
-              <el-switch
-                v-model="form.isThereALeak"
-                active-text="是"
-                inactive-text="否">
-              </el-switch>
+              <el-radio-group v-model="form.isThereALeak">
+                <el-radio
+                  v-for="dict in dict.type.yes_and_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -308,10 +312,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="伴热带" prop="xtv">
-              <el-select v-model="form.xtv" placeholder="请选择伴热带" style="width: 100%">
+            <el-form-item label="主副路交替" prop="manOfAccessoryAlternating">
+              <el-radio-group v-model="form.manOfAccessoryAlternating">
+                <el-radio
+                  v-for="dict in dict.type.secondary_roads"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="过滤器" prop="filter">
+              <el-select v-model="form.filter" placeholder="请选择过滤器" style="width: 100%">
                 <el-option
-                  v-for="dict in dict.type.xtv"
+                  v-for="dict in dict.type.filter"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -320,34 +335,67 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item label="当前主路" prop="mainRoad" v-show="form.manOfAccessoryAlternating == '1'">
+              <el-input v-model="form.mainRoad" placeholder="请输入当前主路"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否开启伴热带" prop="isNotXtv">
+                <el-radio-group v-model="form.isNotXtv">
+                  <el-radio
+                    v-for="dict in dict.type.on_off"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >{{dict.label}}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="伴热带" prop="xtv">
+              <el-radio-group v-model="form.xtv">
+                <el-radio
+                  v-for="dict in dict.type.xtv"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="有无控温器" prop="thermostat">
-              <el-switch
-                v-model="form.thermostat"
-                active-text="是"
-                inactive-text="否">
-              </el-switch>
+              <el-radio-group v-model="form.thermostat">
+                <el-radio
+                  v-for="dict in dict.type.yes_or_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="有无防爆开关" prop="explosionProofSwitch">
-              <el-switch
-                v-model="form.explosionProofSwitch"
-                active-text="是"
-                inactive-text="否">
-              </el-switch>
+              <el-radio-group v-model="form.explosionProofSwitch">
+                <el-radio
+                  v-for="dict in dict.type.yes_or_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="切断器测试" prop="cutterTested">
-              <el-switch
-                v-model="form.cutterTested"
-                active-text="是"
-                inactive-text="否">
-              </el-switch>
+              <el-radio-group v-model="form.cutterTested">
+                <el-radio
+                  v-for="dict in dict.type.cutoff_test_certification"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="切断器(放散阀)测试情况" prop="disconnectorTestStatus">
+            <el-form-item label="切断器(放散阀)测试情况" prop="disconnectorTestStatus" v-show="form.cutterTested == '1'">
               <el-select v-model="form.disconnectorTestStatus" placeholder="请选择切断器(放散阀)测试情况"
                          style="width: 100%">
                 <el-option
@@ -360,7 +408,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="切断压力(主路)" prop="cutOffPressureMain">
+            <el-form-item label="切断压力(主路)" prop="cutOffPressureMain" v-show="form.cutterTested == '1'">
               <el-input type="text" @input="(v)=>(form.cutOffPressureMain=v.replace(/[^\d.]/g,''))"
                         v-model="form.cutOffPressureMain" placeholder="请输入切断压力(主路)">
                 <template slot="append">KPa</template>
@@ -368,7 +416,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="切断压力(副路)" prop="cutOffPressureAccessory">
+            <el-form-item label="切断压力(副路)" prop="cutOffPressureAccessory" v-show="form.cutterTested == '1'">
               <el-input type="text" @input="(v)=>(form.cutOffPressureAccessory=v.replace(/[^\d.]/g,''))"
                         v-model="form.cutOffPressureAccessory" placeholder="请输入切断压力(副路)">
                 <template slot="append">KPa</template>
@@ -376,7 +424,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="放散压力" prop="releasePressure">
+            <el-form-item label="放散压力" prop="releasePressure" v-show="form.cutterTested == '1'">
               <el-input type="text" @input="(v)=>(form.releasePressure=v.replace(/[^\d.]/g,''))"
                         v-model="form.releasePressure" placeholder="请输入放散压力">
                 <template slot="append">MPa</template>
@@ -384,32 +432,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="主副路交替" prop="manOfAccessoryAlternating">
-              <el-switch
-                v-model="form.manOfAccessoryAlternating"
-                active-text="是"
-                inactive-text="否">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="当前主路" prop="mainRoad">
-              <el-input v-model="form.mainRoad" placeholder="请输入当前主路"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="过滤器" prop="filter">
-              <el-select v-model="form.filter" placeholder="请选择过滤器" style="width: 100%">
-                <el-option
-                  v-for="dict in dict.type.filter"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
             <el-form-item label="调压设施特例" prop="specialCaseOfPressureRegulatingFacilities">
               <el-select v-model="form.specialCaseOfPressureRegulatingFacilities" placeholder="请选择调压设施特例"
                          style="width: 100%">
@@ -437,8 +459,7 @@
           <el-col :span="8">
             <el-form-item label="超期巡检原因" prop="reasonForOverdueInspection">
               <el-select v-model="form.reasonForOverdueInspection" clearable placeholder="请选择超期巡检原因"
-                         style="width: 100%"
-                         @change="upcqyy">
+                         style="width: 100%">
                 <el-option
                   v-for="dict in dict.type.reason_for_overdue_inspection"
                   :key="dict.value"
@@ -448,21 +469,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="超期巡检其他原因" prop="otherReasonsForOverdueInspection">
-              <el-input v-model="form.otherReasonsForOverdueInspection" placeholder="请输入超期巡检其他原因"
-                        @blur="upcq"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="阀井测试" prop="valveWellTesting">
-              <el-switch
-                v-model="form.valveWellTesting"
-                active-text="是"
-                inactive-text="否">
-              </el-switch>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="阀井测试" prop="valveWellTesting">-->
+<!--              <el-switch-->
+<!--                v-model="form.valveWellTesting"-->
+<!--                active-text="是"-->
+<!--                inactive-text="否">-->
+<!--              </el-switch>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item label="阀井情况" prop="valveWellCondition">
               <el-select v-model="form.valveWellCondition" placeholder="请选择阀井情况" style="width: 100%">
@@ -511,7 +526,11 @@ import {getWorker} from "@/api/gas/user";
 
 export default {
   name: "RegulatorBox",
-  dicts: ['appearance','administrative_office', 'square_brick', 'guardrail', 'foundation', 'pressure_gage', 'valve', 'voltage_regulator', 'xtv', 'disconnector_test_status', 'filter', 'special_case_of_pressure_regulating_facilities', 'overdue_inspection_days', 'reason_for_overdue_inspection', 'valve_well_condition'],
+  dicts: ['appearance', 'administrative_office', 'square_brick', 'business_service',
+    'yes_and_no','on_off','yes_or_no','cutoff_test_certification','secondary_roads',
+    'guardrail', 'foundation', 'pressure_gage', 'valve', 'voltage_regulator', 'xtv',
+    'disconnector_test_status', 'filter', 'special_case_of_pressure_regulating_facilities',
+    'overdue_inspection_days', 'reason_for_overdue_inspection', 'valve_well_condition'],
   data() {
     return {
       buildingList: [], // 楼宇集合
@@ -651,12 +670,9 @@ export default {
         reasonForOverdueInspection: [
           {required: true, message: "超期巡检原因不能为空", trigger: "change"}
         ],
-        otherReasonsForOverdueInspection: [
-          {required: true, message: "超期巡检其他原因不能为空", trigger: "blur"}
-        ],
-        valveWellTesting: [
-          {required: true, message: "阀井测试不能为空", trigger: "blur"}
-        ],
+        // valveWellTesting: [
+        //   {required: true, message: "阀井测试不能为空", trigger: "blur"}
+        // ],
         valveWellCondition: [
           {required: true, message: "阀井情况不能为空", trigger: "change"}
         ]
@@ -674,20 +690,6 @@ export default {
         this.workerList = req.data
       })
     },
-    upcqyy() {
-      if (this.form.reasonForOverdueInspection != undefined && this.form.reasonForOverdueInspection != "") {
-        this.rules.otherReasonsForOverdueInspection[0].required = false
-      } else {
-        this.rules.otherReasonsForOverdueInspection[0].required = true
-      }
-    },
-    upcq() {
-      if (this.form.otherReasonsForOverdueInspection != undefined && this.form.otherReasonsForOverdueInspection != "") {
-        this.rules.reasonForOverdueInspection[0].required = false
-      } else {
-        this.rules.reasonForOverdueInspection[0].required = true
-      }
-    },
     // 小区下拉
     getAreaList() {
       getAreaList().then(req => this.areaList = req.data)
@@ -741,6 +743,7 @@ export default {
         exportPressureAccessory: undefined,
         closingPressureMain: undefined,
         closingPressureAccessory: undefined,
+        isNotXtv: undefined,
         xtv: undefined,
         thermostat: false,
         explosionProofSwitch: false,
@@ -754,8 +757,7 @@ export default {
         specialCaseOfPressureRegulatingFacilities: undefined,
         overdueInspectionDays: undefined,
         reasonForOverdueInspection: undefined,
-        otherReasonsForOverdueInspection: undefined,
-        valveWellTesting: false,
+        // valveWellTesting: false,
         valveWellCondition: undefined,
         photoList: "",
         remarks: undefined,