Merge branch 'tx'

# Conflicts: # .env.production # src/views/system/partner/index.vue
2024-10-24 15:22:27 +08:00 · 2024-10-24 15:22:27 +08:00 · fb8a772662
commit fb8a772662
parent c8b92c58b2 13853473a0
7 changed files with 306 additions and 40 deletions
--- a/.env.development
+++ b/.env.development
@ -6,7 +6,10 @@ ENV = 'development'

 # 电动车租赁系统/开发环境
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.2.21:8090'
+# VUE_APP_BASE_API = 'http://192.168.2.21:8090'
+# VUE_APP_BASE_API = 'https://zc.chuangtewl.com'
+VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
+

 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/.env.production
+++ b/.env.production
@ -6,4 +6,6 @@ ENV = 'production'

 # 电动车租赁系统/生产环境
 # VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = 'http://192.168.2.21:8090'
+# VUE_APP_BASE_API = 'https://zc.chuangtewl.com'
 VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
--- a/.env.staging
+++ b/.env.staging
@ -8,4 +8,6 @@ ENV = 'staging'

 # 电动车租赁系统/测试环境
 # VUE_APP_BASE_API = '/stage-api'
-VUE_APP_BASE_API = 'http://192.168.2.21:8090'
+# VUE_APP_BASE_API = 'http://192.168.2.21:8090'
+VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
+
--- a/src/components/AreaMap/index.vue
+++ b/src/components/AreaMap/index.vue
@ -0,0 +1,235 @@
+<template>
+  <div class="container">
+    <div id="container"></div>
+    <div class="input-card-left">
+      <div style="color: red;">tips：双击区域可重新编辑</div>
+      <div style="color: red;">点击新建--左键开始建立停车区--右键完成建立--点击结束编辑才会最终生效</div>
+    </div>
+    <div class="input-card-right">
+      <el-button @click="createPolygon()">新建</el-button>
+      <!-- <el-button @click="polyEditor.open()">开始编辑</el-button> -->
+      <el-button @click="editClose">结束编辑</el-button>
+      <el-button @click="changeMapStyle()">切换地图</el-button>
+      <el-button @click="clearPolygon()">清除多边形</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import AMapLoader from "@amap/amap-jsapi-loader";
+import globalConfig from '@/utils/config/globalConfig'
+var polyEditor = "";
+function calculateCenter(mapList) {
+  var total = mapList.length;
+  var X = 0,
+    Y = 0,
+    Z = 0;
+  mapList.map((item) => {
+    var lng = (item[0] * Math.PI) / 180;
+    var lat = (item[1] * Math.PI) / 180;
+    var x, y, z;
+    x = Math.cos(lat) * Math.cos(lng);
+    y = Math.cos(lat) * Math.sin(lng);
+    z = Math.sin(lat);
+    X += x;
+    Y += y;
+    Z += z;
+  });
+  X = X / total;
+  Y = Y / total;
+  Z = Z / total;
+  var Lng = Math.atan2(Y, X);
+  var Hyp = Math.sqrt(X * X + Y * Y);
+  var Lat = Math.atan2(Z, Hyp);
+  let center = new AMap.LngLat((Lng * 180) / Math.PI, (Lat * 180) / Math.PI);
+  return center;
+}
+
+export default {
+  name: "AreaMap",
+  data() {
+    return {
+      map: null,
+      // polyEditor: null,
+      coordList: "",
+      timer: "",
+      status:true,
+      lon2: null,
+      lat2: null
+    };
+  },
+  props: ["pathList", "dataId","lon","lat","zoom"],
+  mounted() {
+    if (this.dataId) {
+      this.start();
+      console.log("修改");
+    } else {
+      this.echart();
+      console.log("添加");
+    }
+  },
+  methods: {
+    clearPolygon() {
+      this.status=false
+      if (polyEditor) {
+        polyEditor.close();  // 关闭多边形编辑器
+      }
+
+      // 移除地图上的所有多边形对象
+      this.map.getAllOverlays('polygon').forEach(polygon => {
+        this.map.remove(polygon);
+      });
+
+      // 如果需要，也可以清空与多边形相关的其他状态或数据
+      this.coordList = '';
+      this.$emit("mapList", '');
+
+      this.$emit("center", '');
+    },
+    changeMapStyle() {
+      // 创建一个默认的图层组件
+      let defaultLayer = new AMap.TileLayer();
+      // 创建一个卫星图图层组件
+      let satelliteLayer = new AMap.TileLayer.Satellite();
+      let roadNetLayer = new AMap.TileLayer.RoadNet();
+      // 将默认图层添加到地图中
+      this.map.add(defaultLayer);
+      // 获取当前地图显示的图层
+      let currentLayer = this.map.getLayers()[0]; // 假设默认图层在第一个位置
+      // 切换图层
+      if (this.type == 'default') {
+        // console.log(1111111)
+        //获取地图图层数据
+        this.map.setLayers([defaultLayer]); // 切换回默认图层
+        this.type = 'Satellite';
+      } else {
+        console.log(222222)
+        this.map.setLayers([satelliteLayer, roadNetLayer]); // 切换到卫星图图层
+        this.type = 'default';
+      }
+    },
+    start() {
+      this.timer = setInterval(this.echart, 1000); // 注意: 第一个参数为方法名的时候不要加括号;
+    },
+    async echart() {
+      clearInterval(this.timer);
+      console.log("接收参数", this.pathList);
+      console.log("接收参数", this.lon);
+      console.log("接收参数", this.lat);
+      this.lon2 = this.lon === null ? 120.35218 : this.lon;
+      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 时必填
+        version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: [
+          "AMap.ToolBar",
+          "AMap.Driving",
+          "AMap.PolygonEditor",
+          "AMap.PlaceSearch",
+        ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      }).then((AMap) => {
+        this.map = new AMap.Map("container", {
+          //设置地图容器id
+          viewMode: "3D", //是否为3D地图模式
+          zoom: this.zoom?this.zoom:13, //初始化地图级别
+          center: [this.lon2, this.lat2], // 初始化地图中心点位置
+        });
+        this.map.setFitView();
+      })
+        .catch((e) => {
+          console.log(e);
+        });
+      this.initEditor();
+
+    },
+    initEditor() {
+      var path1 = []
+      if (this.dataId) {
+        path1 = JSON.parse(this.pathList) || [];
+
+      }
+
+      var polygon1 = new AMap.Polygon({
+        path: path1,
+      });
+      this.map.add([polygon1]);
+      polyEditor = new AMap.PolygonEditor(this.map);
+      // console.log(polyEditor);
+      // console.dir(polyEditor);
+      polyEditor.on("add", (data) => {
+        // console.log(data);
+        this.coordList = data.lnglat;
+        var polygon = data.target;
+        polygon.on("dblclick", () => {
+          polyEditor.setTarget(polygon);
+          polyEditor.open();
+        });
+      });
+      polygon1.on("dblclick", () => {
+        polyEditor.setTarget(polygon1);
+        polyEditor.open();
+      });
+
+      return polyEditor;
+    },
+    createPolygon() {
+      this.status=true
+      polyEditor.close();
+      polyEditor.setTarget();
+      polyEditor.open();
+    },
+    editClose: function () {
+      // console.log("this", this);
+
+      let that = this;
+      polyEditor.on("end", function (event) {
+        // event.target 即为编辑后的多边形对象
+        //多边形的坐标
+        this.coordList = event.target.getPath();
+        // console.log("coordList", this.coordList);
+        let mapList = [];
+        this.coordList.forEach((v) => {
+          // console.log("v", v.lng, "--", v.lat);
+          mapList.push([v.lng, v.lat]);
+        });
+        let center = calculateCenter(mapList);
+        console.log(mapList,'mapListmapList');
+        that.$emit("mapList", mapList);
+
+        that.$emit("center", center);
+
+      });
+      polyEditor.close();
+    },
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+#container {
+  width: 100%;
+  height: 700px;
+}
+
+.container {
+  position: relative;
+  border: 1px solid rgb(204, 204, 204);
+
+  .input-card-right {
+    position: absolute;
+    bottom: 15px;
+    right: 15px;
+  }
+  .input-card-left {
+    position: absolute;
+    top: 5px;
+    left: 20px;
+    font-size: 13px;
+    line-height: 20px;
+  }
+}
+</style>
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@ -129,6 +129,16 @@
 <!--        <el-form-item label="边界值" prop="boundaryStr">-->
 <!--          <el-input v-model="form.boundaryStr" type="textarea" placeholder="请输入内容" />-->
 <!--        </el-form-item>-->
+        <area-map
+          :key="key"
+          v-model="form.boundaryStr"
+          :dataId="form.areaId"
+          :pathList="form.boundaryStr"
+          :lon="form.longitude"
+          :lat="form.latitude"
+          @center="center"
+          @mapList="mapList"  
+        />
        <el-form-item label="经度" prop="longitude">
          <el-input v-model="form.longitude" placeholder="请输入经度" />
        </el-form-item>
@ -160,10 +170,12 @@
 </template>

 <script>
+import AreaMap from "@/components/AreaMap";
 import { listArea, getArea, delArea, addArea, updateArea } from "@/api/rl/area";

 export default {
  name: "Area",
+  components: { AreaMap },
  data() {
    return {
      // 遮罩层
@ -200,6 +212,7 @@ export default {
        areaTimeStart: null,
        areaTimeEnd: null
      },
+      key: 0,
      // 表单参数
      form: {},
      // 表单校验
@ -297,6 +310,7 @@ export default {
        }
      });
    },
+    
    /** 删除按钮操作 */
    handleDelete(row) {
      const areaIds = row.areaId || this.ids;
@ -312,7 +326,16 @@ export default {
      this.download('system/area/export', {
        ...this.queryParams
      }, `area_${new Date().getTime()}.xlsx`)
-    }
+    },
+    center(data) {
+      this.form.longitude = data.lng;
+      this.form.latitude = data.lat;
+    },
+    mapList(data) {
+      let mapListJson = JSON.stringify(data);
+      console.log("mapListJson:" + mapListJson);
+      this.form.boundaryStr = mapListJson;
+    },
  }
 };
 </script>
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@ -42,7 +42,7 @@
        />
      </el-form-item>
      <el-form-item label="在线状态" prop="onlineStatus">
-        <el-select v-model="queryParams.onlineStatus" placeholder="请选择在线状态"  style="width: 100px;" clearable>
+        <el-select v-model="queryParams.onlineStatus" placeholder="请选择在线状态"  style="flex-basis: 100px;" clearable>
          <el-option
            v-for="dict in dict.type.as_online_status"
            :key="dict.value"
@ -251,6 +251,22 @@
            @click="refresh(scope.row)"
            v-hasPermi="['system:device:refresh']"
          >更新</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-refresh"
+            @click="refresh(scope.row)"
+            v-hasPermi="['system:device:refresh']"
+            v-if="scope.row.status==0"
+          >上架</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-refresh"
+            @click="refresh(scope.row)"
+            v-hasPermi="['system:device:refresh']"
+            v-else
+          >下架</el-button>
          <el-button
            size="mini"
            type="text"
--- a/src/views/system/partner/index.vue
+++ b/src/views/system/partner/index.vue
@ -186,14 +186,22 @@
              <el-option v-for="item in agentList" :key="item.agentId" :label="item.name+'  ' +item.contact" :value="item.agentId">
              </el-option>
            </el-select>
+              <!-- <el-select v-model="form.cityId" placeholder="请选择代理城市">
+                <el-option
+                  v-for="item in cityOptions"
+                  :key="item.cityId"
+                  :label="item.name"
+                  :value="item.cityId"
+                ></el-option>
+              </el-select> -->
            </el-form-item>
-
+           
          </el-col>
          <el-col :span="12">
            <el-form-item label="角色">
-              <el-select v-model="form.roleIds" placeholder="请选择角色">
+              <el-select v-model="form.roleIds"  placeholder="请选择角色">
                <el-option
-                  v-for="item in filteredRoleOptions"
+                  v-for="item in roleOptions"
                  :key="item.roleId"
                  :label="item.roleName"
                  :value="item.roleId"
@ -203,10 +211,10 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row v-if="form.roleIds == 4">
+        <el-row>
          <el-col :span="12">
-            <el-form-item label="分账比例(%)" label-width="100" prop="inputDividendProportion">
-              <el-input style="width: 64%" v-model="inputDividendProportion" placeholder="请输入分账比例" maxlength="11"  @input="handleInput"/>
+            <el-form-item label="分账比例(%)" label-width="100" prop="dividendProportion">
+              <el-input style="width: 64%" v-model="form.dividendProportion" placeholder="请输入分账比例" maxlength="11" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@ -235,7 +243,7 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col :span="12" v-if="form.roleIds == 4">
+          <el-col :span="12">
            <el-form-item label="分账状态" prop="dividendStatus">
              <el-radio-group v-model="form.dividendStatus">
                <el-radio
@ -276,11 +284,6 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
  name: "User",
  dicts: ['sys_normal_disable', 'sys_user_sex','et_dividend_item','rl_user_type','rl_dividend_switch'],
-  computed: {
-    filteredRoleOptions() {
-      return this.roleOptions.filter(item => item.roleKey !== 'common' && item.roleKey !== 'agent');
-    },
-  },
  components: { Treeselect },
  data() {
    return {
@ -318,7 +321,6 @@ export default {
      form: {
        dividendStatus: "0"
      },
-      inputDividendProportion: 30, // 用于输入的百分比
      defaultProps: {
        children: "children",
        label: "label"
@ -367,11 +369,9 @@ export default {
        agentList:[],
      // 表单校验
      rules: {
-        agentId: [
-          { required: true, message: "请选择代理商", trigger: "blur" },
-        ],
        dividendProportion: [
          { required: true, message: "分账比例不能为空", trigger: "blur" },
+          { pattern: /^\d+$/, message: '分账比例必须为正整数', trigger: 'blur' }
        ],
        cityId: [
          { required: true, message: "代理城市不能为空", trigger: "blur" },
@ -409,7 +409,7 @@ export default {
    setTimeout(() => {
      console.log(this.dicts,'dictsdicts');
    }, 200);
-
+   
    // this.getDeptTree();
    this.getConfigKey("sys.user.initPassword").then(response => {
      this.initPassword = response.msg;
@ -418,20 +418,11 @@ export default {
    this.getAgentList()
  },
  methods: {
-    handleInput() {
-      // 当输入时，将输入的百分比转换为原始值
-      console.log(111111111111)
-      const proportion = parseFloat(this.inputDividendProportion);
-      if (!isNaN(proportion)) {
-        console.log(22222222222)
-        this.form.dividendProportion = proportion / 100;
-      }
-    },
    getAgentList() {
      let data = {
        pageNum: 1,
        pageSize: 30,
-
+       
      }
      listAgent(this.addDateRange(data)).then(response => {
        console.log(response,'responseresponseresponse');
@ -442,7 +433,7 @@ export default {
 				// 		}));
          console.log( this.options,' this.options this.options');
      });
-
+     
    },
    formatDividendProportion(row) {
      let dividendProportion = row.dividendProportion;
@ -576,11 +567,9 @@ export default {
        this.roleOptions = response.roles;
        this.areaOptions = response.areas;
        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds[0]);
+        this.$set(this.form, "roleIds", response.roleIds);
+        // console.log(1111111111111)
        this.$set(this.form, "areas", response.areas);
-        this.form.roleIds = response.roleIds[0]; // 取出第一个角色 ID
-        console.log("回显-=====roleIds[0]",response.roleIds[0])
-        this.inputDividendProportion = this.form.dividendProportion * 100;
        this.open = true;
        this.title = "修改系统用户";
        this.form.password = "";
@ -614,10 +603,6 @@ export default {
    submitForm: function() {
      this.$refs["form"].validate(valid => {
        this.form.userType = '03';
-        this.form.roleIds = [this.form.roleIds];
-        console.log("提交roleIds=========="+this.form.roleIds)
-        this.form.dividendProportion = this.inputDividendProportion; // 转换为0.3
-        // console.log('保存的分账比例:', this.form.dividendProportion);
        this.form.dividendStatus = this.form.dividendStatus === "1" ? 1:0;
        if (valid) {
          if (this.form.userId != undefined) {