luobisheng
2022-12-09 b0363e2c04f6ef825f8dffc46e318af762941dac
关联商铺修改,社区街道参数修改
5个文件已修改
54 ■■■■■ 已修改文件
src/views/layout/components/Header/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/device/grid/components/main/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/device/point/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/video/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/layout/components/Header/index.vue
@@ -9,10 +9,7 @@
    </div>
    <!-- 右侧菜单 -->
    <div class="header-right">
      <!-- 搜索框 -->
      <div class="menu-right__item search">
        <el-input suffix-icon="el-icon-search" v-model="keyword" placeholder="请输入搜索内容"></el-input>
      </div>
      <div class="menu-right__item search"></div>
      <!-- 登录用户 -->
      <div class="menu-right__item user" @mousemove="flag.user = true" @mouseleave="flag.user = false">
        <el-avatar :size="20" :src="user.user.icon" v-if="user.user.icon"></el-avatar>
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -83,8 +83,9 @@
                        </el-form-item>
                        <!-- 关联商铺名称 -->
                        <el-form-item class="optionItems" label="关联商铺名称:" prop="shopName">
                            <el-input placeholder="请填写关联商铺名称" v-model="vio.shopName"
                                :disabled="vio.linkShop === 1 ?false : true"></el-input>
                          <el-select v-model="vio.shopName" :disabled="vio.linkShop === 0" placeholder="请填写关联商铺名称">
                            <el-option v-for="store in storeList" :key="store.id" :value="store.id" :label="store.storeName"></el-option>
                          </el-select>
                        </el-form-item>
                    </div>
                    <!-- 填写车牌号 -->
@@ -141,6 +142,7 @@
import { validateName, validatePhone, validateCarNum, validateCardId } from '@/utils/validate'
import { getTypeList } from '@/utils/helper'
import { parseTime } from "@/utils/index"
import { getStoreInfoList } from "@/api/operate/storeManagement";
export default {
    components: {
        MyMap
@@ -209,17 +211,6 @@
                callback(new Error('报警时间不能为空'))
            }
        }
        const checkCarNumber = (rule, value, callback) => {
            if (value) {
                if (validateCarNum(value)) {
                    callback();
                } else {
                    callback(new Error('请输入正确的车牌号'));
                }
            } else {
                callback(new Error("车牌号不能为空"))
            }
        }
        const checkName = (rule, value, callback) => {
            if (value) {
                validateName(value) ? callback() : callback(new Error('请输入正确的姓名'))
@@ -263,7 +254,6 @@
            vio: {
                actionCause: "",//案由
                carNumber: "",//车牌号
                // category:1,//1:违规2:违建
                categoryId: '',//大类
                communityId: '',//所属社区
                description: '',//问题描述
@@ -286,12 +276,6 @@
                        required: true, trigger: 'blur', validator: checkCause,
                    }
                ],
                // //车牌号
                // carNumber: [
                //     {
                //         required: true, trigger: 'blur', validator: checkCarNumber
                //     }
                // ],
                //大类
                categoryId: [
                    {
@@ -383,6 +367,7 @@
            streetList: [],
            communityList: [],
            anYouList: [],
            storeList: []
        }
    },
    created() {
@@ -391,6 +376,7 @@
        setBigKindList();
        getStreetList(0);
        getEventLevel();
        this.getShopList();
    },
    methods: {
        handleStop() {
@@ -541,7 +527,17 @@
            if (e.target.value) {
                this.vio.actionCause = e.target.value;
            }
        }
        },
      getShopList() {
        getStoreInfoList({ current: 1, size: 100 })
            .then(({ list }) => {
              this.storeList = list;
            })
            .catch(err => {
              this.$message.error(err)
            })
      }
    },
    props: ['mytype', 'changeDialog', 'refresh']
}
src/views/systemSetting/device/grid/components/main/index.vue
@@ -25,8 +25,6 @@
              <span>{{filterRole(scope.row.roles)}}</span>
            </template>
          </el-table-column>
          <!-- <el-table-column prop="departName" label="所属部门" min-width="8">
          </el-table-column> -->
          <el-table-column prop="jobTitle" label="所属职务" min-width="8">
          </el-table-column>
          <el-table-column prop="createTime" label="创建时间" min-width="10">
src/views/systemSetting/device/point/index.vue
@@ -171,7 +171,6 @@
::v-deep .el-tree-node__label {
  line-height: 30px;
  font-size: 14px;
  // color: rgb(75, 155, 183);
}
</style>
<script>
@@ -196,8 +195,8 @@
    getVideoPointList(data) {
      let communityId, streetId;
      if (data) {
        communityId = data.id;
        streetId = data.parentId;
        communityId = data.parentId;
        streetId = data.id;
      }
      videoPoint
        .getVideoPointList({
src/views/video/index.vue
@@ -157,8 +157,8 @@
    getVideoPointList(data) {
      let communityId, streetId;
      if (data) {
        communityId = data.parentId;
        streetId = data.id;
        communityId = data.id;
        streetId = data.parentId;
      }
      videoPoint
        .getVideoPointList({