Merge remote-tracking branch 'origin/master'

zengh

2021-03-22 f93da055f8cf021a00832ff87cef6a5be2760945

Merge remote-tracking branch 'origin/master'

 package-lock.json

@@ -1894,6 +1894,17 @@
        "postcss-value-parser": "^4.1.0"
      }
    },
    "avue-plugin-map": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/avue-plugin-map/-/avue-plugin-map-1.0.1.tgz",
      "integrity": "sha512-QpGiCJZxF/DptoJrZnZWwQSxA2oBI7S8Wog3CEh9EhwrAKb+I0Ct8PWO+hBH2Q+tXTv/glhSWMh9aUbQa0/YIg==",
      "requires": {
        "axios": "^0.18.0",
        "element-ui": "^2.4.6",
        "vue": "^2.5.17",
        "vue-router": "^3.0.1"
      }
    },
    "avue-plugin-ueditor": {
      "version": "0.1.7",
      "resolved": "https://registry.npm.taobao.org/avue-plugin-ueditor/download/avue-plugin-ueditor-0.1.7.tgz",

 package.json

@@ -11,6 +11,7 @@
    "test:e2e": "vue-cli-service test:e2e"
  },
  "dependencies": {
    "avue-plugin-map": "^1.0.1",
    "avue-plugin-ueditor": "^0.1.4",
    "axios": "^0.18.0",
    "babel-polyfill": "^6.26.0",

 public/index.html

@@ -16,6 +16,8 @@
  <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.7.5/index.css">
  <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
  <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
  <script type="text/javascript" src='https://webapi.amap.com/maps?v=1.4.11&key=7ab53b28352e55dc5754699add0ad862&plugin=AMap.PlaceSearch'></script>
  <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
  <link rel="icon" href="img/1.jpg">
  <title>物联网安保云服务平台</title>
  <style>

 src/api/system/tenant.js

@@ -2,7 +2,7 @@

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-system/tenant/list',
    url: '/api/blade-system/tenant/page',
    method: 'get',
    params: {
      ...params,

 src/page/index/logo.vue

@@ -724,8 +724,7 @@
                param: {
                  PktType: "Talk",
                  accessToken: result.data.data.accessToken,
                  // deviceCode: form.channelNumber,
                  deviceCode: "001241945990",
                  deviceCode: this.form.serialNumber,
                },
              },
            })

 src/views/realTimePolice/real.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-03-17 15:21:33
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-03-20 18:12:42
 * @Last Modified time: 2021-03-22 09:29:16
 */
<template>
  <basic-container>
@@ -1197,7 +1197,7 @@
        .then((res) => {
          newAxios
            .get(
              `https://web.byisf.com:18000/GetPlayUrl?deviceCode=001241945990&chl=${this.form.channelNumber}`
              `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${this.form.serialNumber}&chl=${this.form.channelNumber}`
            )
            .then((result) => {
              this.videoSource = result.data.data.m3u8;
@@ -1231,7 +1231,6 @@
        this.hls.destroy();
      }
    },

    // 历史视频打开关闭事件
    openOldVideoBox() {
      var dom = document.getElementById("real_old_video");
@@ -1302,8 +1301,7 @@
                param: {
                  PktType: "Talk",
                  accessToken: result.data.data.accessToken,
                  // deviceCode: form.channelNumber,
                  deviceCode: "001241945990",
                  deviceCode: this.form.serialNumber,
                },
              },
            })

 src/views/system/tenant.vue

@@ -47,6 +47,10 @@
                slot="expireTime">
        <el-tag>{{ row.expireTime ? row.expireTime : '不限制' }}</el-tag>
      </template>
      <template slot-scope="{ row }" slot="jfzt">
        <i class="el-icon-check client-jf" v-if="row.type == '0'"></i>
        <i class="el-icon-close client-qf" v-else-if="row.type == '1'"></i>
      </template>
    </avue-crud>
    <el-dialog title="租户授权配置"
               append-to-body
@@ -66,6 +70,7 @@
<script>
import {getList, getDetail, remove, update, add, setting, datasource} from "@/api/system/tenant";
import {mapGetters} from "vuex";
import AvueMap from 'avue-plugin-map'

export default {
  data() {
@@ -95,10 +100,9 @@
        dialogClickModal: false,
        column: [
          {
            label: "租户ID",
            label: "用户ID",
            prop: "tenantId",
            width: 100,
            search: true,
            addDisplay: false,
            editDisplay: false,
            span: 24,
@@ -109,10 +113,10 @@
            }]
          },
          {
            label: "租户名称",
            label: "用户名称",
            prop: "tenantName",
            search: true,
            width: 180,
            width: 190,
            span: 24,
            rules: [{
              required: true,
@@ -137,11 +141,25 @@
            width: 150,
          },
          {
            label: "联系地址",
            prop: "address",
            label: '坐标',
            prop: 'test',
            hide: true,
            span: 24,
            minRows: 2,
            type: "textarea",
            component: "avueMap",
            clickChild: (obj) => {
              console.log(123,obj)
              this.form.jd = obj.latitude
              this.form.wd = obj.longitude
            },
          },
          {
            label: "经度",
            prop: "jd",
            hide: true,
          },
          {
            label: "纬度",
            prop: "wd",
            hide: true,
          },
          {
@@ -161,11 +179,96 @@
            editDisplay: false,
          },
          {
            label: "缴费状态",
            prop: "jfzt",
            width: 80,
            slot: true,
            align: "center",
            addDisplay: false,
            editDisplay: false,
          },
          {
            label: "类型",
            prop: "types",
            span: 11,
            width: 60,
          },
          {
            label: "省份",
            prop: "province",
            hide: true,
            search: true,
            searchSpan: 3,
            searchLabelWidth: 45,
            placeholder: "省份",
            type: "select",
            props: {
              label: "name",
              value: "code"
            },
            cascaderItem: ["city", "district"],
            dicUrl: "/api/blade-system/region/select",
            span: 6,
            className: "cityClass1"
          },
          {
            label: "地市",
            prop: "city",
            hide: true,
            type: "select",
            searchPlaceholder: "地市",
            placeholder: "地市",
            searchLabelWidth: 1,
            searchSpan: 2,
            search: true,
            props: {
              label: "name",
              value: "code"
            },
            dicUrl: "/api/blade-system/region/select?code={{key}}",
            span: 3,
            labelWidth: "0",
            className: "cityClass2"
          },
          {
            label: "区县",
            searchSpan: 2,
            hide: true,
            searchLabelWidth: 1,
            searchPlaceholder: "区县",
            placeholder: "区县",
            search: true,
            prop: "district",
            type: "select",
            props: {
              label: "name",
              value: "code"
            },
            dicUrl: "/api/blade-system/region/select?code={{key}}",
            span: 3,
            labelWidth: "0",
            className: "cityClass3"
          },
          {
            label: "联系地址",
            prop: "address",
            span: 24,
            minRows: 2,
            type: "textarea",
            hide: true,
          },
          {
            label: "绑定域名",
            prop: "domain",
            span: 24,
          },
          {
            label: "营业信息",
            prop: "information",
            hide: true,
            span: 24,
          },
          {
            label: "系统背景",
            prop: "backgroundUrl",
            type: 'upload',