修改

祖安之光

2026-03-17 ad001f76b662c8d1ddebe8aca090ed225b98fdf9

修改

 src/views/contract/components/applyForm/selectEnterprise.vue

@@ -127,15 +127,15 @@
            listQuery:{
                filter: {enterprisename:"",safetysupervision:"烟花爆竹批发经营",province:"",city:"",district:"",street:""},
                pageIndex: 1,
                pageSize:10
                pageSize: 10
            },
            provinceList:[],
            cityList:[],
            districtList:[],
            streetList:[],
            safetySuperVisionList:[],
            districtList: [],
            streetList: [],
            safetySuperVisionList: [],
            superiorDepartmentVisible:false,
            superiorDepartmentListData:[],
            superiorDepartmentListData: [],
        }
    },
    created(){

 src/views/monitorAlert/storeAreaManage/components/deviceDialog.vue

@@ -10,12 +10,12 @@
            <el-table-column label="序号" type="index" align="center"></el-table-column>
            <el-table-column label="设备名称" prop="deviceName" align="center"></el-table-column>
            <el-table-column label="设备ID" prop="deviceId" align="center"></el-table-column>
            <el-table-column label="设备类型" prop="deviceId" align="center">
            <!-- <el-table-column label="设备类型" prop="deviceId" align="center">
                <template slot-scope="scope">
                    {{scope.row.deviceType == 1?'温湿度':'摄像头'}}
                </template>
            </el-table-column>
            <el-table-column label="分组ID" prop="groupId" align="center"></el-table-column>
            <el-table-column label="分组ID" prop="groupId" align="center"></el-table-column> -->
            <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
                <template slot-scope="scope">
                    <el-button type="text" @click="openAdd('修改设备',scope.row)">修改</el-button>
@@ -34,7 +34,7 @@
                <el-form-item label="设备ID:" prop="deviceId">
                    <el-input v-model.trim="deviceForm.deviceId"/>
                </el-form-item>
                <el-form-item label="类型:" prop="deviceType">
                <!-- <el-form-item label="类型:" prop="deviceType">
                    <el-select v-model="deviceForm.deviceType" placeholder="请选择类型">
                        <el-option key="1" label="温湿度" :value="1"></el-option>
                        <el-option key="2" label="摄像头" :value="2"></el-option>
@@ -42,7 +42,7 @@
                </el-form-item>
                <el-form-item label="分组ID:" prop="groupId">
                    <el-input v-model.trim="deviceForm.groupId"/>
                </el-form-item>
                </el-form-item> -->
            </el-form>
            <span slot="footer" class="dialog-footer">
                <el-button @click="addVisible = false">取 消</el-button>
@@ -90,9 +90,7 @@
                },
                formRules:{
                    deviceName:[{ required: true, message: '请输入设备名称', trigger: 'change' },],
                    deviceId:[{ required: true, message: '请输入设备id', trigger: 'change' },],
                    deviceType:[{ required: true, message: '请输入设备类型', trigger: 'change' },],
                    groupId:[{ required: true, message: '请输入分组id', trigger: 'change' },]
                    deviceId:[{ required: true, message: '请输入设备id', trigger: 'change' },]
                }
            }
        },

 src/views/monitorAlert/warningInfo/index.vue

@@ -25,14 +25,8 @@
                </div>
                <div class="basic_search" style="margin-right: 10px;padding-top: 10px">
                    <span>报警类型：</span>
                    <el-select v-model="listQuery.filter.alarmType" clearable filterable>
                        <el-option key="1" label="超员作业" :value="1"></el-option>
                        <el-option key="2" label="堵塞通道" :value="2"></el-option>
                        <el-option key="3" label="超高超量" :value="3"></el-option>
                        <el-option key="4" label="非法入侵" :value="4"></el-option>
                        <el-option key="5" label="摄像头遮挡偏移" :value="5"></el-option>
                        <el-option key="6" label="温度" :value="6"></el-option>
                        <el-option key="7" label="湿度" :value="7"></el-option>
                    <el-select v-model="listQuery.filter.algoModel" clearable filterable>
                        <el-option v-for="(item,index) in typeList" :key="index" :label="item.name" :value="item.name"></el-option>
                    </el-select>
                </div>
                <div class="basic_search">
@@ -58,11 +52,7 @@
                <el-table-column label="企业" prop="companyName" align="center"></el-table-column>
                <el-table-column label="仓库" prop="storeName" align="center"></el-table-column>
                <el-table-column label="库房" prop="storeroomName" align="center"></el-table-column>
                <el-table-column label="报警类型" prop="alarmType" align="center">
                    <template slot-scope="scope">
                        {{getTypeName(scope.row.alarmType)}}
                    </template>
                </el-table-column>
                <el-table-column label="报警类型" prop="algoModel" align="center"></el-table-column>
                <el-table-column label="报警状态" prop="alarmStatus" align="center">
                    <template slot-scope="scope">
                        {{ scope.row.alarmStatus == 1?'已销警':'未销警' }}
@@ -123,39 +113,35 @@
                    alarmStatus: null,
                    companyCode: '',
                    companyName: '',
                    alarmType: null
                    algoModel: ''
                },
                pageIndex:1,
                pageSize:10
            },
            typeList: [
                {
                    name: '超员作业',
                    name: '吸烟检测',
                    value: 1
                },
                {
                    name: '堵塞通道',
                    name: '逃生通道堵塞',
                    value: 2
                },
                {
                    name: '超高超量',
                    name: '区域入侵',
                    value: 3
                },
                {
                    name: '非法入侵',
                    name: '人员数量超限',
                    value: 4
                },
                {
                    name: '摄像头遮挡偏移',
                    name: '明火检测',
                    value: 5
                },
                {
                    name: '温度',
                    name: '预置标记检测',
                    value: 6
                },
                {
                    name: '湿度',
                    value: 7
                }
            ]
        }
@@ -194,9 +180,6 @@
                    message: '已取消'
                });
            });
        },
        getTypeName(type){
            return this.typeList.find(i=>i.value == type).name
        },
        async getDataList() {
            if(this.validTime.length>0){
@@ -241,7 +224,7 @@
                    alarmStatus: null,
                    companyCode: '',
                    companyName: '',
                    alarmType: null
                    algoModel: ''
                },
                pageIndex:1,
                pageSize:10

 src/views/patrol/checkinfo.vue

@@ -199,6 +199,16 @@
                        <span>{{ scope.row.ismend | parseMend(scope.row.ismend) }}</span>
                    </template>
                </el-table-column>
                <el-table-column label="现场照片" prop="scenephoto" align="center" >
                    <template slot-scope="scope">
                        <el-image v-if="scope.row.scenephoto" style="width: 40px;height: 40px;" :src="scope.row.scenephoto" :preview-src-list="[scope.row.scenephoto]"></el-image>
                    </template>
                </el-table-column>
                <el-table-column label="电子签名" prop="signature" align="center" >
                    <template slot-scope="scope">
                        <el-image v-if="scope.row.signature" style="width: 40px;height: 40px;" :src="scope.row.signature" :preview-src-list="[scope.row.signature]"></el-image>
                    </template>
                </el-table-column>
                <el-table-column
                    label="检查人"
                    prop="checkname"