Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-12-14 69bbb6561e224ad43a108adf04e2fb3104107fe1

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

# Conflicts:
#	src/views/operate/images/index.vue

 package-lock.json

@@ -1951,29 +1951,6 @@
        "webpack-merge": "^5.7.3",
        "webpack-virtual-modules": "^0.4.2",
        "whatwg-fetch": "^3.6.2"
      },
      "dependencies": {
        "@vue/vue-loader-v15": {
          "version": "npm:vue-loader@15.10.1",
          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
          "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
          "dev": true,
          "requires": {
            "@vue/component-compiler-utils": "^3.1.0",
            "hash-sum": "^1.0.2",
            "loader-utils": "^1.1.0",
            "vue-hot-reload-api": "^2.3.0",
            "vue-style-loader": "^4.1.0"
          },
          "dependencies": {
            "hash-sum": {
              "version": "1.0.2",
              "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
              "dev": true
            }
          }
        }
      }
    },
    "@vue/cli-shared-utils": {
@@ -2080,6 +2057,27 @@
          "version": "2.1.2",
          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
          "dev": true
        }
      }
    },
    "@vue/vue-loader-v15": {
      "version": "npm:vue-loader@15.10.1",
      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
      "dev": true,
      "requires": {
        "@vue/component-compiler-utils": "^3.1.0",
        "hash-sum": "^1.0.2",
        "loader-utils": "^1.1.0",
        "vue-hot-reload-api": "^2.3.0",
        "vue-style-loader": "^4.1.0"
      },
      "dependencies": {
        "hash-sum": {
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
          "dev": true
        }
      }
@@ -9350,7 +9348,7 @@
    },
    "vue-hot-reload-api": {
      "version": "2.3.4",
      "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
      "dev": true
    },

 src/components/map/index.vue

 src/views/intelligentPatrol/illegalSearch/index.vue

 src/views/intelligentPatrol/studyJudge/index.vue

@@ -1,31 +1,45 @@
<template>
  <div class="study-judge">
    <div class="study-judge-header">
      <span
        >您有<span @click="openDialogTable">{{ countData.review }}</span
        >条待审核报警信息,今日立案{{ countData.register }}条,再学习{{
          countData.study
        }}条</span
      >
    </div>
    <!--    <div class="study-judge-header">-->
    <!--      <span-->
    <!--        >您有{{ countData.review }}条待审核报警信息,今日立案{{-->
    <!--          countData.register-->
    <!--        }}条,再学习{{ countData.study }}条</span-->
    <!--      >-->
    <!--    </div>-->
    <div class="study-judge-main">
      <div class="sjm-header">
      <!--      <div class="sjm-header">-->
      <!--        <div class="sjm-header-left">-->
      <!--          <span class="moni-name">监控点位名称: {{ currentEvent.name }} </span>-->
      <!--          <span class="moni-area">{{ currentEvent.street }}</span>-->
      <!--          <span>{{ currentEvent.address }}</span>-->
      <!--        </div>-->
      <!--        <div class="sjm-header-right">-->
      <!--          <el-button size="small" @click="createVideo(currentEvent, 'live')"-->
      <!--            >实时预览</el-button-->
      <!--          >-->
      <!--          <el-button size="small" @click="createVideo(currentEvent, 'playback')"-->
      <!--            >录像回放</el-button-->
      <!--          >-->
      <!--        </div>-->
      <!--      </div>-->
      <div class="sjm-content">
        <div class="sjm-content-left">
          <!--          <div class="sjm-header-left">-->
          <!--            <span class="moni-name">监控点位名称: {{ currentEvent.name }} </span>-->
          <!--            <span class="moni-area">{{ currentEvent.street }}</span>-->
          <!--            <span>{{ currentEvent.address }}</span>-->
          <!--          </div>-->
          <span
          >您有{{ countData.review }}条待审核报警信息,今日立案{{
              countData.register
            }}条,再学习{{ countData.study }}条</span
          >
        <div class="sjm-header-left">
          <span class="moni-name">监控点位名称: {{ currentEvent.name }} </span>
          <span class="moni-area">{{ currentEvent.street }}</span>
          <span>{{ currentEvent.address }}</span>
        </div>
        <div class="sjm-header-right">
          <el-button size="small" @click="createVideo(currentEvent, 'live')"
            >实时预览
          </el-button>
          <el-button size="small" @click="createVideo(currentEvent, 'playback')"
            >录像回放
          </el-button>
        </div>
      </div>
      <div class="sjm-content">
        <div class="sjm-content-left">
          <div
            class="img-item"
            v-for="(item, index) in imageList"
@@ -40,28 +54,13 @@
          <div class="img-item" v-for="item in imageList" :key="item.id">
            <img :src="item" />
          </div>
        </div>
        <div class="sjm-content-center">
          <div class="map">
            <MyMap :point="point" :zoom="zoom" :mark="mark"></MyMap>

            <!-- <iframe
              style="height: 488px; min-width: 460px"
              src="https://183.245.159.161:8282/OneMap/index.html#/OneMap?code=2&clientVersion=&skin=white&locale=zh&otherAuthor=allowable"
            ></iframe> -->
          </div>
        </div>
        <div class="sjm-content-right">
          <div class="card-box">
            <div class="card-header">
              <span>报警记录--{{ currentEvent.algoName }}</span>
            </div>
            <el-form
              ref="currentEvent"
              label-width="120px"
              :model="eventInfoData"
              :rules="rules"
            >
              label-position="left"
              class="left-form">
              <el-form-item label="事件编号:">
                <span>{{ currentEvent.code }}</span>
              </el-form-item>
@@ -77,6 +76,48 @@
              <el-form-item label="持续时间:">
                <span>{{ currentEvent.conntinueTime }}</span>
              </el-form-item>
          </el-form>
        </div>
        <div class="sjm-content-center">
          <div class="map">
            <MyMap></MyMap>
          </div>
          <!-- <iframe src="https://183.245.159.161:8282/OneMap/index.html#/OneMap?code=2&clientVersion=&skin=white&locale=zh&otherAuthor=allowable"></iframe> -->
        </div>
        <div class="sjm-content-right">
          <div class="card-box">
            <div class="but-live">
              <el-button size="small" @click="createVideo(currentEvent, 'live')"
              >实时预览</el-button
              >
              <el-button size="small" @click="createVideo(currentEvent, 'playback')"
              >录像回放</el-button
              >
            </div>
            <div class="card-header">
              <span>报警记录--{{ currentEvent.algoName }}</span>
            </div>
            <el-form
                ref="currentEvent"
                label-width="120px"
                :model="eventInfoData"
                :rules="rules"
            >
              <!--              <el-form-item label="事件编号:">-->
              <!--                <span>{{ currentEvent.code }}</span>-->
              <!--              </el-form-item>-->
              <!--              <el-form-item label="事件等级:">-->
              <!--                <span>{{ currentEvent.grade }}</span>-->
              <!--              </el-form-item>-->
              <!--              <el-form-item label="首次报警时间:">-->
              <!--                <span>{{ currentEvent.alarmTime }}</span>-->
              <!--              </el-form-item>-->
              <!--              <el-form-item label="最近报警时间:">-->
              <!--                <span>{{ currentEvent.currentAlarmTime }}</span>-->
              <!--              </el-form-item>-->
              <!--              <el-form-item label="持续时间:">-->
              <!--                <span>{{ currentEvent.conntinueTime }}</span>-->
              <!--              </el-form-item>-->
              <el-form-item label="关联店铺" prop="store">
                <el-select
                  v-model="eventInfoData.store"
@@ -103,8 +144,8 @@
                    :label="item.id"
                    v-for="item in stateList"
                    :key="item.id"
                    >{{ item.label }}
                  </el-radio>
                  >{{ item.label }}</el-radio
                  >
                </el-radio-group>
              </el-form-item>
              <el-form-item label="大类名称:" prop="categoryId">
@@ -151,11 +192,11 @@
                <el-button
                  :disabled="currentPage === 1"
                  @click="pageChange('prev')"
                  >上一条
                </el-button>
                >上一条</el-button
                >
                <el-button @click.native.prevent="handleConfirm"
                  >确认
                </el-button>
                >确认</el-button
                >
                <el-button @click="pageChange('next')">下一条</el-button>
              </el-form-item>
            </el-form>
@@ -182,9 +223,6 @@
        <div id="dom1" class="dom1"></div>
      </div>
    </el-dialog>
    <el-dialog :visible.sync="isShowTable" title="报警信息" width="1200px">
      <inspection-table />
    </el-dialog>
  </div>
</template>

@@ -195,12 +233,11 @@
import { FILE_ORIGINAL_URL } from "@/utils";
import { validateCarNum } from "@/utils/validate";
import MyDispatch from "@/components/dispatch";
import InspectionTable from "@/views/intelligentPatrol/studyJudge/inspectionTable/index.vue";

import MyMap from "@/components/map";

export default {
  components: { MyDispatch, MyMap, InspectionTable },
  components: { MyDispatch, MyMap },
  created() {
    this.getInspectionData();
    this.initEventParams();
@@ -257,7 +294,6 @@
        review: 0,
        register: 0,
      },
      isShowTable: false,
      currentEvent: {},
      stateList: [
        {
@@ -323,15 +359,9 @@
      domId: "dom1",
      ctrl: "ctrl1",
      playType: "live",
      point: null,
      mark: null,
      zoom: null,
    };
  },
  methods: {
    openDialogTable() {
      this.isShowTable = true;
    },
    pageChange(type) {
      if (type === "next") {
        this.currentPage += 1;
@@ -346,12 +376,6 @@
        .getInspectionData({ current: this.currentPage })
        .then(({ records }) => {
          this.currentEvent = records[0];
          this.point = {
            x: this.currentEvent.longitude,
            y: this.currentEvent.latitude,
          };
          this.zoom = 19;
          this.mark = { title: this.currentEvent.address };
          if (this.currentEvent?.picData) {
            this.imageList = this.currentEvent.picData
              .split(",")
@@ -625,6 +649,7 @@
          margin-left: 4vw;
        }
      }

      .sjm-header-right {
        flex: 1;
        display: flex;
@@ -643,11 +668,12 @@

      .sjm-content-left {
        line-height: 4.8vh;

        .left-form> ::v-deep.el-form-item__label{
          font-size: 16px!important;
        }
        .img-item {
          display: flex;
          flex-direction: column;

          img {
            width: 15vw;
            height: 20vh;
@@ -659,11 +685,12 @@
        }
      }

      .sjm-content-center {
        width: calc(100% - 800px);
      }
      .sjm-content-right {
        .card-box {
          .but-live{
            padding-left: 48px;
            line-height: 4.8vh;
          }
          .card-header {
            padding-left: 48px;
            line-height: 4.8vh;
@@ -675,7 +702,7 @@

  .el-form {
    ::v-deep .el-form-item {
      margin-bottom: 15px;
      margin-bottom: 5px;
    }

    ::v-deep .el-form-item__label {
@@ -689,7 +716,7 @@
}

.map {
  height: 100%;
  height: 488px;
  min-width: 460px;
}
</style>

 src/views/operate/images/index.vue

@@ -312,6 +312,7 @@
          .deleteImageResource({ id: id })
          .then(() => {
            this.$message.success("操作成功");
            this.getImageResourceList();
          })
          .catch((err) => this.$message.error(`${err}`));
      });

 src/views/operate/images/updateUser/index.vue

@@ -11,7 +11,7 @@
          ref="user"
          style="width: 100%"
        >
          <el-form-item prop="belongToId" label="所属事件编号" v-if="true">
          <!-- <el-form-item prop="belongToId" label="所属事件编号" v-if="true">
            <el-input v-model="imagedata.code"></el-input>
          </el-form-item>
          <el-form-item prop="eventSource" label="事件来源">
@@ -24,7 +24,14 @@
              v-model="getCategory(imagedata.category).label"
            ></el-input>
          </el-form-item>
          <el-form-item prop="type" label="类型">
          
          <el-form-item prop="regionName" label="社区名称">
            <el-input v-model="imagedata.regionName"></el-input>
          </el-form-item>
          <el-form-item prop="id" label="图片Id">
            <el-input v-model="imagedata.id"></el-input>
          </el-form-item> -->
          <!-- <el-form-item prop="type" label="类型" v-show="false">
            <el-select v-model="imagedata.type">
              <el-option
                v-for="item in getResourceType()"
@@ -33,13 +40,7 @@
                :value="item.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item prop="regionName" label="社区名称">
            <el-input v-model="imagedata.regionName"></el-input>
          </el-form-item>
          <el-form-item prop="id" label="图片Id">
            <el-input v-model="imagedata.id"></el-input>
          </el-form-item>
          </el-form-item> -->
          <el-form-item prop="url" label="图片:" min-width="8"> 
            <my-upload
              :picture-list="imageList"
@@ -93,27 +94,27 @@
        type: "",
      },
      rules: {
        belongToId: [
          { required: true, trigger: "blur", message: "请输入所属事件编号" },
        ],
        eventSource: [
          { required: true, trigger: "blur", message: "请输入事件来源" },
        ],
        regionName: [
          { required: true, trigger: "blur", message: "请输入社区名称" },
        ],
        id: [{ required: true, trigger: "blur", message: "请输入图片Id" }],
        category: [
          { required: true, trigger: "blue", message: "请输入问题类型" },
        ],
        // belongToId: [
        //   { required: true, trigger: "blur", message: "请输入所属事件编号" },
        // ],
        // eventSource: [
        //   { required: true, trigger: "blur", message: "请输入事件来源" },
        // ],
        // regionName: [
        //   { required: true, trigger: "blur", message: "请输入社区名称" },
        // ],
        // id: [{ required: true, trigger: "blur", message: "请输入图片Id" }],
        // category: [
        //   { required: true, trigger: "blue", message: "请输入问题类型" },
        // ],
        url: [{ required: true, validator: validateImageUrl }],
        type: [
          {
            required: true,
            trigger: ["blur", "change"],
            message: "请选择类型",
          },
        ],
        // type: [
        //   {
        //     required: true,
        //     trigger: ["blur", "change"],
        //     message: "请选择类型",
        //   },
        // ],
      },
      isDisabled: false,
      imageList: [],
@@ -133,6 +134,7 @@
    onSubmit() {
      this.$refs.user.validate((valid) => {
        if (valid) {
          this.imagedata.type="03";
          const params = Object.assign({}, this.imagedata);
          delete params.regionName;
          delete params.category;

 src/views/systemSetting/baseSetting/user/components/createUser/index.vue

@@ -188,20 +188,32 @@
            }
        };
        const validatePass = (rule, value, callback) => {
            if (!value) {
      //必须包含字母、数字、长度再6-16位之间
      var regex = new RegExp("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$");
      if (value === "") {
                callback(new Error("用户密码不能为空"));
            } else {
                if (value.length < 6 || value.length > 16){
                    callback(new Error("用户密码长度不合法"));
                }else {
                    const rep = /^\w+$/;
                    if (!rep.test(value)) {
                        callback(new Error("密码只能是以数字、26个英文字母或者下划线组成的字符串"));
      } else if (value.length < 6 || value.length > 16) {
        callback(new Error("请输⼊6~16位密码"));
      } else if (!regex.test(value)) {
        callback(new Error("密码只能是以数字、26个英文字母组成的字符串"));
                    } else {
                        callback();
                    }
                }
            }

      // if (!value) {
      //     callback(new Error("用户密码不能为空"));
      // } else {
      //     if (value.length < 6 || value.length > 16){
      //         callback(new Error("用户密码长度不合法"));
      //     }else {
      //         const rep = /^\w+$/;
      //         if (!rep.test(value)) {
      //             callback(new Error("密码只能是以数字、26个英文字母或者下划线组成的字符串"));
      //         } else {
      //             callback();
      //         }
      //     }
      // }
        };
        const validateTruename = (rule, value, callback) => {
            if (!value) {