运营期修改

.env.development

@@ -5,8 +5,8 @@ VUE_APP_TITLE = 共享电动车管理系统
 ENV = 'development'
 
 # 共享电动车管理系统/开发环境
-VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
-# VUE_APP_BASE_API = 'http://localhost:8088'
+VUE_APP_BASE_API = 'http://192.168.2.46:8088'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/components/AreaMap/index.vue

@@ -116,8 +116,8 @@ export default {
       console.log("接收参数", this.pathList);
       console.log("接收参数", this.lon);
       console.log("接收参数", this.lat);
-      this.lon2 = this.lon === undefined ? 120.35218 : this.lon;
+      this.lon2 = this.lon === null ? 120.35218 : this.lon;
-      this.lat2 = this.lat === undefined ? 26.944335 : this.lat;
+      this.lat2 = this.lat === null ? 26.944335 : this.lat;
       // console.log(typeof JSON.parse(this.pathList));
       await AMapLoader.load({
         key: globalConfig.aMap.key, // 申请好的Web端开发者Key，首次调用 load 时必填

src/views/system/area/areaSet.vue

@@ -208,18 +208,18 @@
                             </el-form-item>
                             <div class="tips">开启后当进入运营区域外内将进行断电</div>
                         </el-col>
-                        <el-col :span="12">
+                         <el-col :span="12">
-                            <el-form-item label="最大预约时间(分)" label-width="120" class="switch-item">
+                            <el-form-item label="骑行押金" label-width="120" class="switch-item" prop="deposit"> 
-                                <el-input-number style="width: 100%" v-model="form.timeoutMinutes"
+                                <el-input-number style="width: 100%" v-model="form.deposit"
-                                    placeholder="车辆可最长预约多少分钟"></el-input-number>
+                                    placeholder="骑行前需要充值的押金"></el-input-number>
                             </el-form-item>
-                            <div class="tips">设置车辆的最大可以预约时间</div>
+                            <div class="tips">设置骑行前需要缴纳的押金金额</div>
                         </el-col>
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="收费方式" label-width="120" class="switch-item">
+                            <el-form-item label="收费方式" label-width="120" class="switch-item"  prop="ruleIds">
-                                <el-select v-model="form.ruleIds" multiple placeholder="请选择收费方式">
+                                <el-select v-model="form.ruleIds" multiple placeholder="请选择收费方式" >
                                     <el-option v-for="item in ruleOptions" :key="item.ruleId" :label="item.name"
                                         :value="item.ruleId"></el-option>
                                 </el-select>
@@ -235,15 +235,16 @@
                         </el-col>
                     </el-row>
                     <el-row>
+                       
                         <el-col :span="12">
-                            <el-form-item label="骑行押金" label-width="120" class="switch-item">
+                            <el-form-item label="最大预约时间(分)" label-width="120" class="switch-item">
-                                <el-input-number style="width: 100%" v-model="form.deposit"
+                                <el-input-number style="width: 100%" v-model="form.timeoutMinutes"
-                                    placeholder="骑行前需要充值的押金"></el-input-number>
+                                    placeholder="车辆可最长预约多少分钟"></el-input-number>
                             </el-form-item>
-                            <div class="tips">设置骑行前需要缴纳的押金金额</div>
+                            <div class="tips">设置车辆的最大可以预约时间</div>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="预约服务费" label-width="120" class="switch-item">
+                            <el-form-item label="预约服务费（元）" label-width="120" class="switch-item">
                                 <el-input-number style="width: 100%" v-model="form.appointmentServiceFee"
                                     placeholder="预约时每十分钟的计费"></el-input-number>
                             </el-form-item>
@@ -344,6 +345,9 @@ export default {
                 areaName: [{ required: true, message: "运营区域不能为空", trigger: "blur" }],
                 autoReplacementOrder: [{ required: true, message: "最低电量不能为空", trigger: "blur" }],
                 deptId: [{ required: true, message: "运营商不能为空", trigger: "blur" }],
+                 ruleIds: [{ required: true, message: "收费方式不能为空", trigger: "blur" }],
+                   deposit: [{ required: true, message: "骑行押金不能为空", trigger: "blur" }],
+                
             },
         }
     },
@@ -351,6 +355,8 @@ export default {
         const areaId = this.$route.params && this.$route.params.areaId;
         if (areaId) {
             this.getArea(areaId);
+        }else{
+            this.reset()
         }
         this.getCityList();
         this.userName = this.$store.state.user.name;
@@ -360,6 +366,57 @@ export default {
         console.log(this.dictList, 'dictdict');
     },
     methods: {
+    reset() {
+      this.form = {
+        areaTime:'1',
+        areaId: null,
+        areaName: null,
+        boundaryStr: null,
+        longitude: null,
+        latitude: null,
+        // parkingPoint: null,
+        agreement: '<p><strong style=\\"color: rgb(68, 68, 68);\\">亲爱的用户，为了确保您的骑行安全，</strong></p><p><strong style=\\"color: rgb(68, 68, 68);\\">请务必遵守以下骑行提示： </strong></p><p><span style=\\"color: rgb(136, 136, 136);\\">仅限16岁及以上用户使用。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">为确保安全，后座不允许载人。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">请务必佩戴安全头盔，保护自身安全。 </span></p><p><span style=\\"color: rgb(136, 136, 136);\\">注意道路状况，避开坑洼，小心骑行。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">请在规定的地点还车，避免随意停放。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">不逆行、不闯红灯，遵守所有交通法规。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">骑行时不要使用手机，保持注意力集中。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">避免急刹车和急转弯，保持适当的车速。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">夜间骑行时，确保车灯和反光标识正常。</span></p><p><br></p><p><strong style=\\"color: rgb(68, 68, 68);\\">紧急情况处理：</strong></p><p><span style=\\"color: rgb(136, 136, 136);\\">如有紧急情况，请及时拨打客服电话。</span></p><p><span style=\\"color: rgb(136, 136, 136);\\">感谢您的理解与配合，祝您骑行愉快。</span></p>',
+        createBy: null,
+        createTime: null,
+        status: '1',
+        deptId: null,
+        contact: null,
+        phone: null,
+        autoReplacementOrder: 10,
+        remark: null,
+        province: null,
+        city: null,
+        county: null,
+        provinceList: [],
+        cityList: [],
+        countyList: [],
+        ruleIds: [],
+        areaOutOutage: true,
+        parkingOutDispatch: true,
+        areaOutDispatch: true,
+        noRidingOutage: true,
+        authentication: true,
+        msgSwitch: false,
+        parkingReturn: true,
+        areaOutReturn: true,
+        isDepositDeduction: true,
+        returnVerify: false,
+        deposit: 200,
+        customService: true,
+        undercharge: 10,
+        dispatchFee:10,
+        vehicleManagementFee:10,
+        error:5,
+        timeoutMinutes:30,
+        appointmentServiceFee:2,
+
+
+
+
+
+      };
+      this.resetForm("form");
+    },
         submitForm() {
             this.$refs["form"].validate(valid => {
                 if (valid) {
@@ -387,6 +444,14 @@ export default {
                         data[`serviceName${index + 1}`] = service.name;
                         data[`servicePhone${index + 1}`] = service.phone;
                     });
+                    if (data.isDepositDeduction === '1' && data.returnVerify === '1') {
+                        this.$modal.msgError("押金抵扣和拍照审核不能同时开启");
+                        return
+                    }
+                    if(data.serviceName1==''&&data.servicePhone1==''){
+                         this.$modal.msgError("最少添加一个客服电话");
+                          return
+                    }
                     if (this.form.areaId != null) {
                         updateArea2({ areaId: this.form.areaId, boundary: this.form.boundary, boundaryStr: this.form.boundaryStr }).then(response => {
                             this.$modal.msgSuccess("修改成功");
@@ -617,7 +682,7 @@ export default {
 .tips {
     font-size: 14px;
     color: #888;
-    margin-top: -20px;
+    margin-top: -10px;
 }
 
 ::v-deep .el-form-item__content::after {

src/views/system/area/index.vue

@@ -59,7 +59,7 @@
       <el-table-column label="停车区" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <router-link :to="'/system/area-parking/index/' + scope.row.areaId" class="link-type">
-            <span>去设置</span>
+            <span>设置({{scope.row.parkingAreaNum}})</span>
           </router-link>
         </template>
       </el-table-column>
@@ -67,14 +67,14 @@
       <el-table-column label="禁停区" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <router-link :to="'/system/area-noparking/index/' + scope.row.areaId" class="link-type">
-            <span>去设置</span>
+            <span>设置({{scope.row.noParkingAreaNum}})</span>
           </router-link>
         </template>
       </el-table-column>
       <el-table-column label="禁行区" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <router-link :to="'/system/area-noriding/index/' + scope.row.areaId" class="link-type">
-            <span>去设置</span>
+           <span>设置({{scope.row.bannedRidingAreaNum}})</span>
           </router-link>
         </template>
       </el-table-column>