Merge branch 'master' of http://47.92.161.104:10080/yanliming/jp-charging-station-portal

src/views/charging/chargingDevice-detail.vue

@@ -401,7 +401,68 @@ import stationUserRelationApi from "@/api/base/stationUserRelation";
 export default {
   props: ["businessKey", "title"],
   computed: {
-    
+    validateCurrent() {
+      return this.formModel.groupId!=null && this.formModel.groupId.length!=0
+    },
+    ruleValidate(){
+        return {
+          type: [
+            { required: true, message: "充电桩类型不能为空", trigger: "blur" }
+          ],
+          deviceNo: [
+            { required: true, message: "桩号不能为空", trigger: "blur" }
+          ],
+          name: [
+            { required: true, message: "桩名不能为空", trigger: "blur" }
+          ],
+          stationId: [
+            { required: true, message: "所属站点不能为空", trigger: "blur" }
+          ],
+          category: [
+            { required: true, message: "通讯协议不能为空", trigger: "blur" }
+          ],
+          manufacturer: [
+            { required: true, message: "生产厂家不能为空", trigger: "blur" }
+          ],
+          templateId: [
+            { required: true, message: "收费模式不能为空", trigger: "blur" }
+          ],
+          preDeductHour: [
+            { required: true, message: "预扣小时不能为空", trigger: "blur" }
+          ],
+          numOfChannel: [
+            { required: true, message: "通道数不能为空", trigger: "blur" }
+          ],
+          urlPrefix: [
+            { required: true, message: "二维码前缀不能为空", trigger: "blur" }
+          ],
+          interfaceType: [
+            { required: true, message: "接口类型不能为空", trigger: "blur" }
+          ],
+          chargingType: [
+            { required: true, message: "充电类型不能为空", trigger: "blur" }
+          ],
+          chargingPower: [
+            { required: true, message: "充电功率不能为空", trigger: "blur" }
+          ],
+          loss: [
+            { required: true, message: "充电功率不能为空", trigger: "blur" }
+          ],
+          openBind: [
+            { required: true, message: "是否开放绑定不能为空", trigger: "blur" }
+          ],
+          startTime: [{ required: true, message: "起始时间不能为空", trigger: "blur" }],
+          endTime: [{ required: true, message: "结束时间不能为空", trigger: "blur" }],
+          electricityPrice: [{ required: true, message: "电价不能为空", trigger: "blur" }],
+          servicePrice: [{ required: true, message: "服务费不能为空", trigger: "blur" }],
+          stationElectricityGroup: [{ required: true, message: "价格分组不能为空", trigger: "blur" }],
+          roundingMinute: [
+            { required: true, message: "超时凑整不能为空", trigger: "blur" },
+            { type: 'number', min: -1, max: 59, message: '分钟范围只能在-1到59' }
+          ],
+          current:[ {required: this.validateCurrent,message: '电流不能为空',trigger: 'blur'}]
+      }
+    }
   },
   data() {
     return {
@@ -466,63 +527,7 @@ export default {
       categoryList: [],
       manufacturerList: [],
       stationElectricityGroupList: [],
-      dsecList: ["一档", "二档", "三档", "四档", "五档", "六档", "七档", "八档", "九档", "十档"],
-      ruleValidate: {
-          type: [
-            { required: true, message: "充电桩类型不能为空", trigger: "blur" }
-          ],
-          deviceNo: [
-            { required: true, message: "桩号不能为空", trigger: "blur" }
-          ],
-          name: [
-            { required: true, message: "桩名不能为空", trigger: "blur" }
-          ],
-          stationId: [
-            { required: true, message: "所属站点不能为空", trigger: "blur" }
-          ],
-          category: [
-            { required: true, message: "通讯协议不能为空", trigger: "blur" }
-          ],
-          manufacturer: [
-            { required: true, message: "生产厂家不能为空", trigger: "blur" }
-          ],
-          templateId: [
-            { required: true, message: "收费模式不能为空", trigger: "blur" }
-          ],
-          preDeductHour: [
-            { required: true, message: "预扣小时不能为空", trigger: "blur" }
-          ],
-          numOfChannel: [
-            { required: true, message: "通道数不能为空", trigger: "blur" }
-          ],
-          urlPrefix: [
-            { required: true, message: "二维码前缀不能为空", trigger: "blur" }
-          ],
-          interfaceType: [
-            { required: true, message: "接口类型不能为空", trigger: "blur" }
-          ],
-          chargingType: [
-            { required: true, message: "充电类型不能为空", trigger: "blur" }
-          ],
-          chargingPower: [
-            { required: true, message: "充电功率不能为空", trigger: "blur" }
-          ],
-          loss: [
-            { required: true, message: "充电功率不能为空", trigger: "blur" }
-          ],
-          openBind: [
-            { required: true, message: "是否开放绑定不能为空", trigger: "blur" }
-          ],
-          startTime: [{ required: true, message: "起始时间不能为空", trigger: "blur" }],
-          endTime: [{ required: true, message: "结束时间不能为空", trigger: "blur" }],
-          electricityPrice: [{ required: true, message: "电价不能为空", trigger: "blur" }],
-          servicePrice: [{ required: true, message: "服务费不能为空", trigger: "blur" }],
-          stationElectricityGroup: [{ required: true, message: "价格分组不能为空", trigger: "blur" }],
-          roundingMinute: [
-            { required: true, message: "超时凑整不能为空", trigger: "blur" },
-            { type: 'number', min: -1, max: 59, message: '分钟范围只能在-1到59' }
-          ]
-      }
+      dsecList: ["一档", "二档", "三档", "四档", "五档", "六档", "七档", "八档", "九档", "十档"]
     };
   },
   methods: {

src/views/inspection/inspectionUser-detail.vue

@@ -57,7 +57,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="自定义授权电表" prop="authorizedStationEnabled">
+        <el-form-item label="自定义授权充电站" prop="authorizedStationEnabled">
           <el-switch
             v-model="formModel.authorizedStationEnabled"
             active-color="#13ce66"
@@ -67,7 +67,7 @@
           ></el-switch>
         </el-form-item>
         <el-form-item
-          label="授权电表"
+          label="授权充电站"
           prop="roleId"
           v-show="formModel.authorizedStationEnabled"
         >