liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

Merge branch 'main' of http://47.107.152.87:3000/liubiao/dyf-vue-ui

Browse Source
This commit is contained in:
liub
2025-09-15 16:31:21 +08:00
parent 128e4f4074 0653974969
commit b7192b761e
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -56,9 +56,9 @@
"@types/js-cookie": "3.0.6", "@types/js-cookie": "3.0.6",
"@types/node": "^22.13.4", "@types/node": "^22.13.4",
"@types/nprogress": "0.2.3", "@types/nprogress": "0.2.3",
"@unocss/preset-attributify": "66.0.0", "@unocss/preset-attributify": "^66.0.0",
"@unocss/preset-icons": "66.0.0", "@unocss/preset-icons": "^66.0.0",
"@unocss/preset-uno": "66.0.0", "@unocss/preset-uno": "^66.0.0",
"@vitejs/plugin-vue": "5.2.3", "@vitejs/plugin-vue": "5.2.3",
"@vue/compiler-sfc": "3.5.13", "@vue/compiler-sfc": "3.5.13",
"@vue/eslint-config-prettier": "10.2.0", "@vue/eslint-config-prettier": "10.2.0",
@ -72,7 +72,7 @@
"sass": "1.87.0", "sass": "1.87.0",
"terser": "^5.43.1", "terser": "^5.43.1",
"typescript": "~5.8.3", "typescript": "~5.8.3",
"unocss": "66.0.0", "unocss": "^66.0.0",
"unplugin-auto-import": "19.1.2", "unplugin-auto-import": "19.1.2",
"unplugin-icons": "22.1.0", "unplugin-icons": "22.1.0",
"unplugin-vue-components": "28.5.0", "unplugin-vue-components": "28.5.0",

1
src/api/FenceManager/mapOpt.ts
View File

@ -145,7 +145,6 @@ function DrawCicle(points, raduis, dragEnd) {
radius: raduis ? raduis : 1000, //半径 radius: raduis ? raduis : 1000, //半径
borderWeight: 3, borderWeight: 3,
strokeColor: "#FF33FF", strokeColor: "#FF33FF",
strokeOpacity: 1,
strokeWeight: 6, strokeWeight: 6,
strokeOpacity: 0.2, strokeOpacity: 0.2,
fillOpacity: 0.4, fillOpacity: 0.4,

11
src/views/equipmentAlarmRecord/index.vue
View File

@ -34,9 +34,8 @@
<el-select v-model="queryParams.deviceAction"> <el-select v-model="queryParams.deviceAction">
<el-option value="0" label="强制报警"></el-option> <el-option value="0" label="强制报警"></el-option>
<el-option value="1" label="撞击闯入"></el-option> <el-option value="1" label="撞击闯入"></el-option>
<el-option value="2" label="手动报警"></el-option> <el-option value="2" label="自动报警"></el-option>
<el-option value="3" label="电子围栏告警"></el-option> <el-option value="3" label="电子围栏告警"></el-option>
<el-option value="4" label="强制告警"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="报警时间" style="width: 308px"> <el-form-item label="报警时间" style="width: 308px">
@ -95,15 +94,12 @@
<template v-else-if="item.deviceAction === 1">撞击闯入 <template v-else-if="item.deviceAction === 1">撞击闯入
<span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span> <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
</template> </template>
<template v-else-if="item.deviceAction === 2">手动报警 <template v-else-if="item.deviceAction === 2">自动报警
<span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span> <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
</template> </template>
<template v-else-if="item.deviceAction === 3">电子围栏告警 <template v-else-if="item.deviceAction === 3">电子围栏告警
<span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span> <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
</template> </template>
<template v-else-if="item.deviceAction === 4">强制告警
<span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
</template>
</div> </div>
<div class="label">报警地点：</div> <div class="label">报警地点：</div>
<div class="alearmADD"> <div class="alearmADD">
@ -132,9 +128,8 @@
<template #default="scope"> <template #default="scope">
<el-tag type="danger" v-if="scope.row.deviceAction == 0">强制报警</el-tag> <el-tag type="danger" v-if="scope.row.deviceAction == 0">强制报警</el-tag>
<el-tag type="danger" v-if="scope.row.deviceAction == 1">撞击闯入</el-tag> <el-tag type="danger" v-if="scope.row.deviceAction == 1">撞击闯入</el-tag>
<el-tag type="danger" v-if="scope.row.deviceAction == 2">手动报警</el-tag> <el-tag type="danger" v-if="scope.row.deviceAction == 2">自动报警</el-tag>
<el-tag type="danger" v-if="scope.row.deviceAction == 3">电子围栏告警</el-tag> <el-tag type="danger" v-if="scope.row.deviceAction == 3">电子围栏告警</el-tag>
<el-tag type="danger" v-if="scope.row.deviceAction == 4">强制告警</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报警持续时间" align="center" prop="durationTime" width="180"> <el-table-column label="报警持续时间" align="center" prop="durationTime" width="180">

2
src/views/index.vue
View File

@ -368,7 +368,7 @@ const initAlarmBarChart = () => {
const alarmTypeMap = [ const alarmTypeMap = [
{ name: '强制报警', field: 'alarmForced' }, // alarmForced { name: '强制报警', field: 'alarmForced' }, // alarmForced
{ name: '撞击闯入', field: 'intrusionImpact' }, // intrusionImpact { name: '撞击闯入', field: 'intrusionImpact' }, // intrusionImpact
{ name: '手动报警', field: 'alarmManual' }, // alarmManual { name: '自动报警', field: 'alarmManual' }, // alarmManual
{ name: '电子围栏', field: 'fenceElectronic' } // fenceElectronic { name: '电子围栏', field: 'fenceElectronic' } // fenceElectronic
]; ];

5
uno.config.ts
View File

@ -29,5 +29,8 @@ export default defineConfig({
fonts: {} fonts: {}
}) })
], ],
transformers: [transformerDirectives(), transformerVariantGroup()] transformers: [
transformerDirectives(),
transformerVariantGroup()
]
}); });