zhangchao/Visualize-electronic-fences
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 直播流点位

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Ironsp
2026-05-26 09:54:16 +08:00
parent 988cf99a03
commit 0b2606bdf4
5 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/equipmentList/list.vue
View File

@@ -483,10 +483,10 @@ const onMonitorDrawClick = (e: MouseEvent) => {
// 添加新的报警区域到数组
const newArea: AlarmAreaData = {
deviceId: form.value.id,
x1: Number(point1RightPctOfWidth.toFixed(4)),
y1: Number(point1TopPctOfHeight.toFixed(4)),
x2: Number(point2RightPctOfWidth.toFixed(4)),
y2: Number(point2TopPctOfHeight.toFixed(4))
x1: Math.round(point1RightPctOfWidth),
y1: Math.round(point1TopPctOfHeight),
x2: Math.round(point2RightPctOfWidth),
y2: Math.round(point2TopPctOfHeight)
};
payload.value.push(newArea);
console.log('[监控区域] 两点千分比坐标', newArea);

8
src/views/systemList/role/role.vue
View File

@@ -39,19 +39,19 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="角色编号" prop="roleId" width="120" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="角色描述" prop="roleKey" :show-overflow-tooltip="true" width="200" />
<el-table-column label="操作人(需接口)" prop="roleKey" :show-overflow-tooltip="true" width="200" />
<el-table-column label="角色描述" prop="remark" :show-overflow-tooltip="true" width="200" />
<el-table-column label="操作人" prop="createBy" :show-overflow-tooltip="true" width="200" />
<el-table-column label="排序" prop="roleSort" width="100" />
<el-table-column label="状态" align="center" width="100">
<template #default="scope">
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime">
<!-- <el-table-column label="创建时间" align="center" prop="createTime">
<template #default="scope">
<span>{{ proxy.parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column fixed="right" label="操作" width="280" align="center">
<template #default="scope">

21
src/views/systemList/user/user.vue
View File

@@ -96,22 +96,29 @@
<el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column v-if="columns[0].visible" key="userId" label="用户编号" align="center" prop="userId" />
<el-table-column v-if="columns[1].visible" key="userName" label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
<el-table-column v-if="columns[0].visible" key="userId" label="用户账号" align="center" prop="userId" />
<el-table-column v-if="columns[1].visible" key="roleName" label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" />
<el-table-column v-if="columns[2].visible" key="nickName" label="操作人" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column
v-if="columns[3].visible"
key="createTime"
label="添加时间"
align="center"
prop="createTime"
:show-overflow-tooltip="true"
/>
<el-table-column v-if="columns[4].visible" key="phonenumber" label="排序" align="center" prop="phonenumber" width="120" />
<el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
<template #default="scope">
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
<el-table-column v-if="columns[6].visible" label="创建时间" align="center" prop="createTime" width="160">
<!-- <el-table-column v-if="columns[6].visible" label="创建时间" align="center" prop="createTime" width="160">
<template #default="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
<template #default="scope">