2022-12-14 肖辉 用户管理模块-新建用户密码校验修改 智能巡查模块-预警研判样式修改

odc.xiaohui

2022-12-14 b624ceba2053f5f9d82a63ea0682ca87ca54dc12

2022-12-14
肖辉
用户管理模块-新建用户密码校验修改
智能巡查模块-预警研判样式修改

 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/views/intelligentPatrol/illegalSearch/index.vue

@@ -23,7 +23,7 @@
        <!-- 按钮区域 -->
        <div class="main-btns">
          <div class="main-btns-left">
<!--            <el-button icon="el-icon-download">下载图片</el-button>-->
            <el-button icon="el-icon-download">下载图片</el-button>
            <el-button icon="el-icon-folder" @click="exportTableData">导出</el-button>
          </div>
          <div class="main-btns-right">
@@ -33,8 +33,8 @@
        </div>
        <!-- 数据展示 -->
        <el-table ref="multipleTable"
          :header-cell-style="{ background: '#06122c', 'font-size': '12px', color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px' }"
          :data="tableData" style="width: 100%" :row-class-name="tableRowClassName">
                  :header-cell-style="{ background: '#06122c', 'font-size': '12px', color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px' }"
                  :data="tableData" style="width: 100%" :row-class-name="tableRowClassName">
          <el-table-column type="selection" min-width="5">
          </el-table-column>
          <el-table-column prop="code" label="事件编号" min-width="10">

 src/views/operate/images/index.vue

@@ -313,6 +313,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;