Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-02-21 1baed91dd6c4cfc8a230c2857132ef6302cc4f3c

 admin/src/views/business/miniproSetting.vue

@@ -1,7 +1,7 @@
<template>
  <TableLayout :permissions="['business:baseparam:query']">
    <!-- 搜索表单 -->
    <el-form ref="form" slot="search-form" :model="form" label-width="130px" label-suffix="：">
    <el-form ref="form" slot="search-form" :model="form" label-width="160px" label-suffix="：">

      <el-form-item label="主页主题">
        <el-input v-model="form.projectName" placeholder="请输入主页主题"></el-input>
@@ -10,7 +10,8 @@
        <el-input v-model="form.serverPhone" placeholder="请输入服务电话"></el-input>
      </el-form-item>
      <el-form-item label="押金金额">
        <el-input v-model="form.rentDeposit" @change="changeVal(form.rentDeposit,1)" type="number" placeholder="请输入押金金额"></el-input>
        <el-input v-model="form.rentDeposit" @change="changeVal(form.rentDeposit, 1)" type="number"
          placeholder="请输入押金金额"></el-input>
        <div class="tips">请输入需要缴纳的押金金额(单位：元)</div>
      </el-form-item>
      <el-form-item label="营业时间">
@@ -21,24 +22,50 @@
          v-model="form.businessEndtime"></el-time-picker>
      </el-form-item>
      <el-form-item label="免费骑行时长">
        <el-input v-model="form.freeRentTime" type="number" @change="changeVal(form.freeRentTime,2)" placeholder="请输入免费骑行时长"></el-input>
        <el-input v-model="form.freeRentTime" type="number" @change="changeVal(form.freeRentTime, 2)"
          placeholder="请输入免费骑行时长"></el-input>
        <div class="tips">免费骑行时长，单位：分钟</div>
      </el-form-item>
      <el-form-item label="满载预警(%)" prop="name">
        <div style="display: flex;">
          低于<el-input style="width: 80px;" v-model="form.warnMin" @change="changeVal(form.warnMin,3)" type="number" placeholder="最小值"></el-input>
          或高于<el-input style="width: 80px;" v-model="form.warnMax" @change="changeVal(form.warnMax,4)" type="number" placeholder="最大值"></el-input>
          低于<el-input style="width: 80px;" v-model="form.warnMin" @change="changeVal(form.warnMin, 3)" type="number"
            placeholder="最小值"></el-input>
          或高于<el-input style="width: 80px;" v-model="form.warnMax" @change="changeVal(form.warnMax, 4)" type="number"
            placeholder="最大值"></el-input>
          会想钉钉群发送预警
        </div>
        <div class="tips">当车辆满载超过以上配置时，提示管理员</div>
      </el-form-item>
      <el-form-item label="电动车临时停车限制">
        <el-radio v-model="form.pauseBikeType" :label="0">停车点内停车</el-radio>
        <el-radio v-model="form.pauseBikeType" :label="1">运营区内停车</el-radio>
      </el-form-item>
      <el-form-item label="电动车临时自动关锁">
        <el-input v-model="form.pauseAutoCloseTime"
          oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
          type="number"></el-input>
        <div class="placeholder9">临停超过配置时长，系统会自动关锁并进行结算，单位：分钟</div>
      </el-form-item>
      <el-form-item label="电动车电压设置">
        <div style="display: flex;">
          低电压预警值<el-input style="width: 80px;"
            oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
            v-model="form.lowBikeVoltage" type="number"></el-input>
          伏，满电电压 <el-input style="width: 80px;"
            oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
            v-model="form.fullBikeVoltage" type="number"></el-input>
        </div>
      </el-form-item>
      <el-form-item label="运营区域设置">
        <el-button type="primary" @click="handleDraw">查看/编辑</el-button>
        <div class="placeholder9">点击按钮可查看/编辑运营区域，用户只能在运营区域内扫码骑行</div>
      </el-form-item>
<!--      <el-form-item label="预警钉钉群地址">-->
<!--        <el-input v-model="form.warnDingdingUrl" placeholder="请输入预警钉钉群地址"></el-input>-->
<!--      </el-form-item>-->
      <el-form-item label="租赁须知主图">
        <div style="display: flex;">
          <UploadAvatarImage
            :file="{ 'imgurlfull': form.leaseNoticeUrl, 'imgurl': leaseNoticeUrl }"
          <UploadAvatarImage :file="{ 'imgurlfull': form.leaseNoticeUrl, 'imgurl': leaseNoticeUrl }"
            :uploadData="uploadData" tipsLabel="" @uploadSuccess="uploadOutSuccess" @uploadEnd="isUploading=false"
            @uploadBegin="isUploading=true" />
            <div class="tips">
@@ -58,14 +85,8 @@
<!--          </el-upload>-->
          <div class="tips">
            <div>
              <el-upload
                class="upload-demo"
                ref="upload"
                :action="uploadImgUrl"
                :show-file-list="false"
                accept=".mp4"
                :data="{ folder: 'bike', }"
                :on-success="handleAvatarSuccess">
              <el-upload class="upload-demo" ref="upload" :action="uploadImgUrl" :show-file-list="false" accept=".mp4"
                :data="{ folder: 'bike', }" :on-success="handleAvatarSuccess">
                <el-button slot="trigger" size="small" type="primary">上传视频</el-button>
                <div slot="tip" class="el-upload__tip">只能上传mp4格式，建议不超过50M</div>
              </el-upload>
@@ -97,16 +118,9 @@
          至
          <el-time-picker placeholder="结束时间" value-format="yyyy-MM-dd HH:mm:ss" format='HH:mm'
            v-model="form.stopServeEndtime"></el-time-picker> -->
            <el-date-picker
              v-model="value1"
              type="datetimerange"
              @change="selectDate"
              range-separator="至"
              start-placeholder="开始时间"
              end-placeholder="结束时间"
              format="yyyy-MM-dd HH:mm:ss"
              value-format="yyyy-MM-dd HH:mm:ss"
            ></el-date-picker>
          <el-date-picker v-model="value1" type="datetimerange" @change="selectDate" range-separator="至"
            start-placeholder="开始时间" end-placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
          <div class="tips">停止服务开始时间至结束时间</div>
        </el-form-item>
      </template>
@@ -115,6 +129,7 @@
          @click="saveSetting">保存配置项</el-button>
      </el-form-item>
    </el-form>
    <AMap @change="changeMap" ref="MapRef" />
  </TableLayout>
</template>

@@ -123,9 +138,10 @@
import { getMiniProgrammeDTO, updateById } from '@/api/business/minproSetting'
import UploadAvatarImage from '@/components/common/UploadAvatarImage.vue'
import RichEditor from '@/components/common/RichEditor.vue'
import AMap from './components/Map.vue'
export default {
  name: 'BaseParam',
  components: { TableLayout, UploadAvatarImage, RichEditor },
  components: { TableLayout, UploadAvatarImage, RichEditor, AMap },
  data () {
    return {
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
@@ -166,6 +182,10 @@
      })
  },
  methods: {
    changeMap(e) {
      console.log('e', e)
      this.$set(this.form, 'parkLatLngList', JSON.stringify(e))
    },
    changeVal (val, type) {
      if (type === 1) {
        if (this.form.rentDeposit < 0) {
@@ -185,6 +205,15 @@
        }
      }
    },
    handleDraw() {
      this.$refs.MapRef.isShowModal = true
      this.$nextTick(() => {
        if (this.form.parkLatLngList) {
          this.$refs.MapRef.polygons = JSON.parse(this.form.parkLatLngList)
        }
        this.$refs.MapRef.initMap()
      })
    },
    handleAvatarSuccess (res, file) {
      console.log(res.data.url)
      this.form.rentTipsVideo = res.data.url