@@ -2921,8 +2939,8 @@
-
- ![]()
+
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
-
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
+
@@ -65,7 +65,7 @@
+
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
- ({})
watch(() => dataForm.value.productId, (newVal) => {
if (dialogStatus.value === 'detail' || isFirst.value) { return }
if (newVal) {
- // dataForm.value.devcode = ''
- dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
+ dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0]?.deviceType || ''
+ if (!dataForm.value.deviceType) {
+ disabledInstruction.value = true
+ ElMessage.warning('该设备不支持指令下发')
+ return
+ }
+ disabledInstruction.value = false
dataForm.value.deviceTypeName = productList.value.filter((item: any) => item.id === newVal)[0].deviceTypeName
deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
- // console.log(dataForm.value, 'dataForm.value')
dataForm.value.devCodeList = []
+ currentProduct.value = productList.value.filter((item: any) => item.id === newVal)[0]
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
+ const currentProductConfig = productConfig.value.filter((item: any) => currentProduct.value.deviceTypeName.includes(item.deviceName) && currentProduct.value.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instruction.value[currentProductConfig[0].value] = true
+ }
+ }
+ else {
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
}
}, {
deep: true,
@@ -243,22 +563,24 @@
const computeOptions = (val: any[]) => {
return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
}
+
+
-
-
+
-
+
+ style="width: 100%;" clearable filterable :disabled="disabledInstruction || dialogStatus === 'addOther'">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index cb9b144..ab03661 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -8,13 +8,14 @@
import type { FormRules } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictByCode } from '@/api/system/dict'
-import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { addInstruction, addInstructionOther, removeInstruction } from '@/api/home/device/instruction'
import { getDeviceTypeListPage } from '@/api/home/device/type'
import { getProductListPage } from '@/api/home/device/product'
import { getDeviceListPage } from '@/api/home/device/device'
import useUserStore from '@/store/modules/user'
import indexDB from '@/utils/indexDB'
import { indexDBHandler } from '@/utils/sessionData'
+import { instructionProductList } from './instruction'
const emits = defineEmits(['refresh'])
const $route = useRoute()
const $router = useRouter()
@@ -42,6 +43,46 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+ // 'ncx13': '1', // 备用
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}) // 表单
const textMap: { [key: string]: string } = {
edit: '编辑',
@@ -49,14 +90,91 @@
addOther: '新增',
detail: '详情',
} // 表头显示标题
+
+const validatemhk01 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('浓度低报值不能为空'))
+ }
+ else {
+ if (Number(value) >= 5 && Number(value) <= 25) {
+ callback()
+ }
+ else {
+ callback(new Error('浓度低报值需在5-25之间'))
+ }
+ }
+}
+const validatemhk03 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('设备采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 30) {
+ callback()
+ }
+ else {
+ callback(new Error('设备采样周期需在1-30之间'))
+ }
+ }
+}
+const validatemhk04 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('上传采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 1440) {
+ callback()
+ }
+ else {
+ callback(new Error('上传采样周期需在1-1440之间'))
+ }
+ }
+}
+const validatemhk05 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback()
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 65535) {
+ callback()
+ }
+ else {
+ callback(new Error('GPS告警距离需在1-1440之间'))
+ }
+ }
+}
const rules: FormRules = {
productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
- devCodeList: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+ devCodeList: [{ required: true, message: '设备编号必选', trigger: ['blur', 'change'] }],
collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
-} // 前端校验规则
+ // 北分麦哈克-管网哨兵
+ mhk01: [{ required: true, validator: validatemhk01, trigger: ['blur', 'change'] }], // 浓度低报值
+ mhk03: [{ required: true, validator: validatemhk03, trigger: ['blur', 'change'] }], // 设备采样周期
+ mhk04: [{ required: true, validator: validatemhk04, trigger: ['blur', 'change'] }], // 上传采样周期
+ mhk05: [{ required: false, validator: validatemhk05, trigger: ['blur', 'change'] }], // GPS告警距离
+
+ // 诺成新-燃气智能警示桩
+ ncx01: [{ required: true, message: '第一次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx02: [{ required: true, message: '第二次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx03: [{ required: true, message: '左侧线长度不能为空', trigger: ['blur', 'change'] }],
+ ncx04: [{ required: true, message: '右侧线长度不能为空', trigger: ['blur', 'change'] }],
+
+ // 百瑞生-管网哨兵
+ brs4: [{ required: true, message: '报警低阈值不能为空', trigger: ['blur', 'change'] }],
+ brs5: [{ required: true, message: '报警高阈值不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 当前指令类型
+const instruction = ref<{ [key: string]: boolean }>({
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+})
+// 当前支持下发配置的产品
+const productConfig = ref(instructionProductList)
// 重置表单
const resetForm = () => {
dataForm.value = {
@@ -75,15 +193,57 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}
}
const disabledBtn = ref(false)
// 初始化对话框
const isFirst = ref(true)
const initDialog = (dialogStatusValue: string, row: any) => {
+ disabledInstruction.value = false
dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
disabledBtn.value = false
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
if (dialogStatus.value === 'add') { // 如果是新增，清除验证
resetForm()
dataFormRef.value?.resetFields()
@@ -91,10 +251,15 @@
dataForm.value.operatorName = user.name
}
else if (dialogStatus.value === 'addOther') {
+ isFirst.value = false
resetForm()
dataFormRef.value?.resetFields()
const data = JSON.parse($route.query.row as string)
dataForm.value = data
+ console.log([data.devcode])
+ setTimeout(() => {
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ }, 100)
// dataForm.value.devcode = data.devcode
// dataForm.value.deviceType = data.deviceType
dataForm.value.operator = user.id
@@ -104,6 +269,70 @@
dataForm.value = {
...JSON.parse(JSON.stringify(row)),
}
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ deviceList.value = deviceAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
+ // 北京无线电
+ if (dataForm.value.instructionTypeCustrom === 'bjwxd') {
+ instruction.value.bjwxd = true
+ // 解析指令回显
+ if (dataForm.value.framecontent) {
+ const framecontent = dataForm.value.framecontent.split(';').map((item: string) => ({ name: item.split(':')[0], value: item.split(':')[1] }))
+ framecontent.forEach((item: { name: string, value: string }) => {
+ dataForm.value[item.name] = item.value
+ })
+ }
+ }
+
+ // 北分麦哈克-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'bfmhkGwsb') {
+ instruction.value.bfmhkGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`mhk${item.command}`] = item.value
+ })
+ }
+ }
+ // 百瑞生-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'brsGwsb') {
+ instruction.value.brsGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`brs${item.command}`] = item.value
+ })
+ }
+ }
+ // 诺成新-燃气智能警示桩
+ else if (dataForm.value.instructionTypeCustrom === 'ncxRqznjsz') {
+ instruction.value.ncxRqznjsz = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ if (item.command === 'time') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 1}`] = `${item.substring(0, 2)}:00`
+ })
+ }
+ else if (item.command === 'length') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 3}`] = item
+ })
+ }
+ else if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ result.forEach((item: string, index: number) => {
+ dataForm.value[`ncx${index + 5 >= 10 ? '' : '0'}${index + 5}`] = item
+ })
+ }
+ })
+ }
+ }
}
setTimeout(() => {
isFirst.value = false
@@ -117,10 +346,81 @@
const createData = () => {
dataFormRef.value.validate((valid: any) => {
if (valid) {
- dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
- dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
- disabledBtn.value = true
- addInstruction(dataForm.value).then((response) => {
+ let otherData = {} as { [key: string]: any }
+ // 北京无线电-燃气终端
+ if (instruction.value.bjwxd) {
+ dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+ dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+ otherData = JSON.parse(JSON.stringify(dataForm.value))
+ for (const i in otherData) {
+ // 清除其余字段
+ if (i.includes('mhk') || i.includes('ncx') || i.includes('brs')) {
+ otherData[i] = undefined
+ }
+ }
+ }
+ else {
+ otherData.typeId = dataForm.value.deviceType
+ otherData.productId = dataForm.value.productId
+ otherData.devCodeList = dataForm.value.devCodeList
+ // 整理不同产品的指令
+ // 北分麦哈克-管网哨兵
+ if (instruction.value.bfmhkGwsb) {
+ const instructionMHK = []
+ for (const i in dataForm.value) {
+ if (i.includes('mhk') && String(dataForm.value[i])) {
+ instructionMHK.push({
+ command: i.replace('mhk', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionMHK
+ }
+ // .诺成新-燃气智能警示桩
+ else if (instruction.value.ncxRqznjsz) {
+ const instructionNCX = []
+ for (const i in dataForm.value) {
+ if (i.includes('ncx')) {
+ instructionNCX.push({
+ command: i.replace('ncx', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ const instructionNCXresult = []
+ // 上报时间指令
+ const instructionTime = ['01', '02']
+ const time = instructionNCX.filter(item => instructionTime.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'time', value: time.map((item: string) => item.replace(':', '')).join() })
+ // 侧线长度
+ const instructionLength = ['03', '04']
+ const length = instructionNCX.filter(item => instructionLength.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'length', value: length.join() })
+ // 报警等
+ const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
+ const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+ alarm.push('1')
+ instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+ otherData.commandConfigList = instructionNCXresult
+ }
+ // 百瑞生-管网哨兵
+ else if (instruction.value.brsGwsb) {
+ const instructionBRS = []
+ for (const i in dataForm.value) {
+ if (i.includes('brs') && String(dataForm.value[i])) {
+ instructionBRS.push({
+ command: i.replace('brs', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionBRS
+ }
+ }
+ // console.log(otherData, 'otherData')
+ disabledBtn.value = true;
+ (instruction.value.bjwxd ? addInstruction(otherData) : addInstructionOther(otherData)).then((response) => {
if (response.code === 200) {
ElMessage({
message: '添加成功',
@@ -185,7 +485,7 @@
}))
// 产品
getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
- productList.value = res.data.rows.map((item: any) => ({
+ productList.value = res.data.rows.filter((item: any) => productConfig.value.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
...item,
name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
id: item.id,
@@ -217,16 +517,36 @@
})
}
fetchDict()
-
+// 禁用指令
+const disabledInstruction = ref(false)
+// 当前选中的产品
+const currentProduct = ref
+
@@ -65,7 +65,7 @@
+
-
+
确认
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
- ({})
watch(() => dataForm.value.productId, (newVal) => {
if (dialogStatus.value === 'detail' || isFirst.value) { return }
if (newVal) {
- // dataForm.value.devcode = ''
- dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
+ dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0]?.deviceType || ''
+ if (!dataForm.value.deviceType) {
+ disabledInstruction.value = true
+ ElMessage.warning('该设备不支持指令下发')
+ return
+ }
+ disabledInstruction.value = false
dataForm.value.deviceTypeName = productList.value.filter((item: any) => item.id === newVal)[0].deviceTypeName
deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
- // console.log(dataForm.value, 'dataForm.value')
dataForm.value.devCodeList = []
+ currentProduct.value = productList.value.filter((item: any) => item.id === newVal)[0]
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
+ const currentProductConfig = productConfig.value.filter((item: any) => currentProduct.value.deviceTypeName.includes(item.deviceName) && currentProduct.value.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instruction.value[currentProductConfig[0].value] = true
+ }
+ }
+ else {
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
}
}, {
deep: true,
@@ -243,22 +563,24 @@
const computeOptions = (val: any[]) => {
return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
}
+
+
-
-
+
-
+
+ style="width: 100%;" clearable filterable :disabled="disabledInstruction || dialogStatus === 'addOther'">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index cb9b144..ab03661 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -8,13 +8,14 @@
import type { FormRules } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictByCode } from '@/api/system/dict'
-import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { addInstruction, addInstructionOther, removeInstruction } from '@/api/home/device/instruction'
import { getDeviceTypeListPage } from '@/api/home/device/type'
import { getProductListPage } from '@/api/home/device/product'
import { getDeviceListPage } from '@/api/home/device/device'
import useUserStore from '@/store/modules/user'
import indexDB from '@/utils/indexDB'
import { indexDBHandler } from '@/utils/sessionData'
+import { instructionProductList } from './instruction'
const emits = defineEmits(['refresh'])
const $route = useRoute()
const $router = useRouter()
@@ -42,6 +43,46 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+ // 'ncx13': '1', // 备用
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}) // 表单
const textMap: { [key: string]: string } = {
edit: '编辑',
@@ -49,14 +90,91 @@
addOther: '新增',
detail: '详情',
} // 表头显示标题
+
+const validatemhk01 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('浓度低报值不能为空'))
+ }
+ else {
+ if (Number(value) >= 5 && Number(value) <= 25) {
+ callback()
+ }
+ else {
+ callback(new Error('浓度低报值需在5-25之间'))
+ }
+ }
+}
+const validatemhk03 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('设备采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 30) {
+ callback()
+ }
+ else {
+ callback(new Error('设备采样周期需在1-30之间'))
+ }
+ }
+}
+const validatemhk04 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('上传采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 1440) {
+ callback()
+ }
+ else {
+ callback(new Error('上传采样周期需在1-1440之间'))
+ }
+ }
+}
+const validatemhk05 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback()
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 65535) {
+ callback()
+ }
+ else {
+ callback(new Error('GPS告警距离需在1-1440之间'))
+ }
+ }
+}
const rules: FormRules = {
productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
- devCodeList: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+ devCodeList: [{ required: true, message: '设备编号必选', trigger: ['blur', 'change'] }],
collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
-} // 前端校验规则
+ // 北分麦哈克-管网哨兵
+ mhk01: [{ required: true, validator: validatemhk01, trigger: ['blur', 'change'] }], // 浓度低报值
+ mhk03: [{ required: true, validator: validatemhk03, trigger: ['blur', 'change'] }], // 设备采样周期
+ mhk04: [{ required: true, validator: validatemhk04, trigger: ['blur', 'change'] }], // 上传采样周期
+ mhk05: [{ required: false, validator: validatemhk05, trigger: ['blur', 'change'] }], // GPS告警距离
+
+ // 诺成新-燃气智能警示桩
+ ncx01: [{ required: true, message: '第一次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx02: [{ required: true, message: '第二次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx03: [{ required: true, message: '左侧线长度不能为空', trigger: ['blur', 'change'] }],
+ ncx04: [{ required: true, message: '右侧线长度不能为空', trigger: ['blur', 'change'] }],
+
+ // 百瑞生-管网哨兵
+ brs4: [{ required: true, message: '报警低阈值不能为空', trigger: ['blur', 'change'] }],
+ brs5: [{ required: true, message: '报警高阈值不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 当前指令类型
+const instruction = ref<{ [key: string]: boolean }>({
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+})
+// 当前支持下发配置的产品
+const productConfig = ref(instructionProductList)
// 重置表单
const resetForm = () => {
dataForm.value = {
@@ -75,15 +193,57 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}
}
const disabledBtn = ref(false)
// 初始化对话框
const isFirst = ref(true)
const initDialog = (dialogStatusValue: string, row: any) => {
+ disabledInstruction.value = false
dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
disabledBtn.value = false
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
if (dialogStatus.value === 'add') { // 如果是新增，清除验证
resetForm()
dataFormRef.value?.resetFields()
@@ -91,10 +251,15 @@
dataForm.value.operatorName = user.name
}
else if (dialogStatus.value === 'addOther') {
+ isFirst.value = false
resetForm()
dataFormRef.value?.resetFields()
const data = JSON.parse($route.query.row as string)
dataForm.value = data
+ console.log([data.devcode])
+ setTimeout(() => {
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ }, 100)
// dataForm.value.devcode = data.devcode
// dataForm.value.deviceType = data.deviceType
dataForm.value.operator = user.id
@@ -104,6 +269,70 @@
dataForm.value = {
...JSON.parse(JSON.stringify(row)),
}
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ deviceList.value = deviceAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
+ // 北京无线电
+ if (dataForm.value.instructionTypeCustrom === 'bjwxd') {
+ instruction.value.bjwxd = true
+ // 解析指令回显
+ if (dataForm.value.framecontent) {
+ const framecontent = dataForm.value.framecontent.split(';').map((item: string) => ({ name: item.split(':')[0], value: item.split(':')[1] }))
+ framecontent.forEach((item: { name: string, value: string }) => {
+ dataForm.value[item.name] = item.value
+ })
+ }
+ }
+
+ // 北分麦哈克-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'bfmhkGwsb') {
+ instruction.value.bfmhkGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`mhk${item.command}`] = item.value
+ })
+ }
+ }
+ // 百瑞生-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'brsGwsb') {
+ instruction.value.brsGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`brs${item.command}`] = item.value
+ })
+ }
+ }
+ // 诺成新-燃气智能警示桩
+ else if (dataForm.value.instructionTypeCustrom === 'ncxRqznjsz') {
+ instruction.value.ncxRqznjsz = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ if (item.command === 'time') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 1}`] = `${item.substring(0, 2)}:00`
+ })
+ }
+ else if (item.command === 'length') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 3}`] = item
+ })
+ }
+ else if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ result.forEach((item: string, index: number) => {
+ dataForm.value[`ncx${index + 5 >= 10 ? '' : '0'}${index + 5}`] = item
+ })
+ }
+ })
+ }
+ }
}
setTimeout(() => {
isFirst.value = false
@@ -117,10 +346,81 @@
const createData = () => {
dataFormRef.value.validate((valid: any) => {
if (valid) {
- dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
- dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
- disabledBtn.value = true
- addInstruction(dataForm.value).then((response) => {
+ let otherData = {} as { [key: string]: any }
+ // 北京无线电-燃气终端
+ if (instruction.value.bjwxd) {
+ dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+ dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+ otherData = JSON.parse(JSON.stringify(dataForm.value))
+ for (const i in otherData) {
+ // 清除其余字段
+ if (i.includes('mhk') || i.includes('ncx') || i.includes('brs')) {
+ otherData[i] = undefined
+ }
+ }
+ }
+ else {
+ otherData.typeId = dataForm.value.deviceType
+ otherData.productId = dataForm.value.productId
+ otherData.devCodeList = dataForm.value.devCodeList
+ // 整理不同产品的指令
+ // 北分麦哈克-管网哨兵
+ if (instruction.value.bfmhkGwsb) {
+ const instructionMHK = []
+ for (const i in dataForm.value) {
+ if (i.includes('mhk') && String(dataForm.value[i])) {
+ instructionMHK.push({
+ command: i.replace('mhk', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionMHK
+ }
+ // .诺成新-燃气智能警示桩
+ else if (instruction.value.ncxRqznjsz) {
+ const instructionNCX = []
+ for (const i in dataForm.value) {
+ if (i.includes('ncx')) {
+ instructionNCX.push({
+ command: i.replace('ncx', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ const instructionNCXresult = []
+ // 上报时间指令
+ const instructionTime = ['01', '02']
+ const time = instructionNCX.filter(item => instructionTime.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'time', value: time.map((item: string) => item.replace(':', '')).join() })
+ // 侧线长度
+ const instructionLength = ['03', '04']
+ const length = instructionNCX.filter(item => instructionLength.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'length', value: length.join() })
+ // 报警等
+ const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
+ const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+ alarm.push('1')
+ instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+ otherData.commandConfigList = instructionNCXresult
+ }
+ // 百瑞生-管网哨兵
+ else if (instruction.value.brsGwsb) {
+ const instructionBRS = []
+ for (const i in dataForm.value) {
+ if (i.includes('brs') && String(dataForm.value[i])) {
+ instructionBRS.push({
+ command: i.replace('brs', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionBRS
+ }
+ }
+ // console.log(otherData, 'otherData')
+ disabledBtn.value = true;
+ (instruction.value.bjwxd ? addInstruction(otherData) : addInstructionOther(otherData)).then((response) => {
if (response.code === 200) {
ElMessage({
message: '添加成功',
@@ -185,7 +485,7 @@
}))
// 产品
getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
- productList.value = res.data.rows.map((item: any) => ({
+ productList.value = res.data.rows.filter((item: any) => productConfig.value.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
...item,
name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
id: item.id,
@@ -217,16 +517,36 @@
})
}
fetchDict()
-
+// 禁用指令
+const disabledInstruction = ref(false)
+// 当前选中的产品
+const currentProduct = ref
+
@@ -65,7 +65,7 @@
+
-
+
确认
diff --git a/src/views/home/device/instruction/components/instruction.ts b/src/views/home/device/instruction/components/instruction.ts
new file mode 100644
index 0000000..a1e686f
--- /dev/null
+++ b/src/views/home/device/instruction/components/instruction.ts
@@ -0,0 +1,54 @@
+export const instructionProductList = [
+ {
+ deviceName: "燃气智能监测终端",
+ manufacturerName: "北京无线电计量测试研究所",
+ value: "bjwxd",
+ instruction: {
+ }
+ },
+ {
+ deviceName: "管网哨兵",
+ manufacturerName: "百瑞生",
+ value: "brsGwsb",
+ instruction: {
+ "4": "浓度报警低阈值",
+ "5": "浓度报警高阈值",
+ "7": "低温阈值",
+ "8": "高温阈值",
+ "11": "传感器采集间隔",
+ "12": "采样深度",
+ "15": "预热时间",
+ "19": "防盗使能-",
+ "20": "振动监测-",
+ "28": "振动采样使能-",
+ "29": "振动阈值1",
+ "30": "振动阈值2"
+ }
+ },
+ {
+ deviceName: "管网哨兵",
+ manufacturerName: "麦哈克",
+ value: "bfmhkGwsb",
+ instruction: {
+ "01": "浓度低报值",
+ "02": "浓度高报值",
+ "03": "设备采样周期",
+ "04": "上传采样周期",
+ "05": "GPS 告警距离",
+ "06": "设备安装位置-",
+ "07": "清除安装位置-",
+ "08": "重启设备-"
+ }
+ },
+ {
+ deviceName: "智能警示桩",
+ manufacturerName: "诺成新",
+ value: "ncxRqznjsz",
+ instruction: {
+ "time": '第一次上报时间,第二次上报时间',
+ "length": '左侧线长度,右侧线长度',
+ "switch": '倾斜报警-,破坏报警-,甲烷泄漏报警-,左侧断线报警-,右侧断线报警-,左侧振动报警-,右侧振动报警-,语音报警-,备用-'
+ }
+ }
+]
+// 注意 instruction属性中 有的名字带 - 表示 该属性为 开关类型 其余为输入值类型
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
- ({})
watch(() => dataForm.value.productId, (newVal) => {
if (dialogStatus.value === 'detail' || isFirst.value) { return }
if (newVal) {
- // dataForm.value.devcode = ''
- dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
+ dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0]?.deviceType || ''
+ if (!dataForm.value.deviceType) {
+ disabledInstruction.value = true
+ ElMessage.warning('该设备不支持指令下发')
+ return
+ }
+ disabledInstruction.value = false
dataForm.value.deviceTypeName = productList.value.filter((item: any) => item.id === newVal)[0].deviceTypeName
deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
- // console.log(dataForm.value, 'dataForm.value')
dataForm.value.devCodeList = []
+ currentProduct.value = productList.value.filter((item: any) => item.id === newVal)[0]
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
+ const currentProductConfig = productConfig.value.filter((item: any) => currentProduct.value.deviceTypeName.includes(item.deviceName) && currentProduct.value.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instruction.value[currentProductConfig[0].value] = true
+ }
+ }
+ else {
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
}
}, {
deep: true,
@@ -243,22 +563,24 @@
const computeOptions = (val: any[]) => {
return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
}
+
+
-
-
+
-
+
+ style="width: 100%;" clearable filterable :disabled="disabledInstruction || dialogStatus === 'addOther'">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index cb9b144..ab03661 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -8,13 +8,14 @@
import type { FormRules } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictByCode } from '@/api/system/dict'
-import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { addInstruction, addInstructionOther, removeInstruction } from '@/api/home/device/instruction'
import { getDeviceTypeListPage } from '@/api/home/device/type'
import { getProductListPage } from '@/api/home/device/product'
import { getDeviceListPage } from '@/api/home/device/device'
import useUserStore from '@/store/modules/user'
import indexDB from '@/utils/indexDB'
import { indexDBHandler } from '@/utils/sessionData'
+import { instructionProductList } from './instruction'
const emits = defineEmits(['refresh'])
const $route = useRoute()
const $router = useRouter()
@@ -42,6 +43,46 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+ // 'ncx13': '1', // 备用
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}) // 表单
const textMap: { [key: string]: string } = {
edit: '编辑',
@@ -49,14 +90,91 @@
addOther: '新增',
detail: '详情',
} // 表头显示标题
+
+const validatemhk01 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('浓度低报值不能为空'))
+ }
+ else {
+ if (Number(value) >= 5 && Number(value) <= 25) {
+ callback()
+ }
+ else {
+ callback(new Error('浓度低报值需在5-25之间'))
+ }
+ }
+}
+const validatemhk03 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('设备采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 30) {
+ callback()
+ }
+ else {
+ callback(new Error('设备采样周期需在1-30之间'))
+ }
+ }
+}
+const validatemhk04 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('上传采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 1440) {
+ callback()
+ }
+ else {
+ callback(new Error('上传采样周期需在1-1440之间'))
+ }
+ }
+}
+const validatemhk05 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback()
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 65535) {
+ callback()
+ }
+ else {
+ callback(new Error('GPS告警距离需在1-1440之间'))
+ }
+ }
+}
const rules: FormRules = {
productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
- devCodeList: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+ devCodeList: [{ required: true, message: '设备编号必选', trigger: ['blur', 'change'] }],
collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
-} // 前端校验规则
+ // 北分麦哈克-管网哨兵
+ mhk01: [{ required: true, validator: validatemhk01, trigger: ['blur', 'change'] }], // 浓度低报值
+ mhk03: [{ required: true, validator: validatemhk03, trigger: ['blur', 'change'] }], // 设备采样周期
+ mhk04: [{ required: true, validator: validatemhk04, trigger: ['blur', 'change'] }], // 上传采样周期
+ mhk05: [{ required: false, validator: validatemhk05, trigger: ['blur', 'change'] }], // GPS告警距离
+
+ // 诺成新-燃气智能警示桩
+ ncx01: [{ required: true, message: '第一次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx02: [{ required: true, message: '第二次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx03: [{ required: true, message: '左侧线长度不能为空', trigger: ['blur', 'change'] }],
+ ncx04: [{ required: true, message: '右侧线长度不能为空', trigger: ['blur', 'change'] }],
+
+ // 百瑞生-管网哨兵
+ brs4: [{ required: true, message: '报警低阈值不能为空', trigger: ['blur', 'change'] }],
+ brs5: [{ required: true, message: '报警高阈值不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 当前指令类型
+const instruction = ref<{ [key: string]: boolean }>({
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+})
+// 当前支持下发配置的产品
+const productConfig = ref(instructionProductList)
// 重置表单
const resetForm = () => {
dataForm.value = {
@@ -75,15 +193,57 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}
}
const disabledBtn = ref(false)
// 初始化对话框
const isFirst = ref(true)
const initDialog = (dialogStatusValue: string, row: any) => {
+ disabledInstruction.value = false
dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
disabledBtn.value = false
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
if (dialogStatus.value === 'add') { // 如果是新增，清除验证
resetForm()
dataFormRef.value?.resetFields()
@@ -91,10 +251,15 @@
dataForm.value.operatorName = user.name
}
else if (dialogStatus.value === 'addOther') {
+ isFirst.value = false
resetForm()
dataFormRef.value?.resetFields()
const data = JSON.parse($route.query.row as string)
dataForm.value = data
+ console.log([data.devcode])
+ setTimeout(() => {
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ }, 100)
// dataForm.value.devcode = data.devcode
// dataForm.value.deviceType = data.deviceType
dataForm.value.operator = user.id
@@ -104,6 +269,70 @@
dataForm.value = {
...JSON.parse(JSON.stringify(row)),
}
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ deviceList.value = deviceAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
+ // 北京无线电
+ if (dataForm.value.instructionTypeCustrom === 'bjwxd') {
+ instruction.value.bjwxd = true
+ // 解析指令回显
+ if (dataForm.value.framecontent) {
+ const framecontent = dataForm.value.framecontent.split(';').map((item: string) => ({ name: item.split(':')[0], value: item.split(':')[1] }))
+ framecontent.forEach((item: { name: string, value: string }) => {
+ dataForm.value[item.name] = item.value
+ })
+ }
+ }
+
+ // 北分麦哈克-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'bfmhkGwsb') {
+ instruction.value.bfmhkGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`mhk${item.command}`] = item.value
+ })
+ }
+ }
+ // 百瑞生-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'brsGwsb') {
+ instruction.value.brsGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`brs${item.command}`] = item.value
+ })
+ }
+ }
+ // 诺成新-燃气智能警示桩
+ else if (dataForm.value.instructionTypeCustrom === 'ncxRqznjsz') {
+ instruction.value.ncxRqznjsz = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ if (item.command === 'time') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 1}`] = `${item.substring(0, 2)}:00`
+ })
+ }
+ else if (item.command === 'length') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 3}`] = item
+ })
+ }
+ else if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ result.forEach((item: string, index: number) => {
+ dataForm.value[`ncx${index + 5 >= 10 ? '' : '0'}${index + 5}`] = item
+ })
+ }
+ })
+ }
+ }
}
setTimeout(() => {
isFirst.value = false
@@ -117,10 +346,81 @@
const createData = () => {
dataFormRef.value.validate((valid: any) => {
if (valid) {
- dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
- dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
- disabledBtn.value = true
- addInstruction(dataForm.value).then((response) => {
+ let otherData = {} as { [key: string]: any }
+ // 北京无线电-燃气终端
+ if (instruction.value.bjwxd) {
+ dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+ dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+ otherData = JSON.parse(JSON.stringify(dataForm.value))
+ for (const i in otherData) {
+ // 清除其余字段
+ if (i.includes('mhk') || i.includes('ncx') || i.includes('brs')) {
+ otherData[i] = undefined
+ }
+ }
+ }
+ else {
+ otherData.typeId = dataForm.value.deviceType
+ otherData.productId = dataForm.value.productId
+ otherData.devCodeList = dataForm.value.devCodeList
+ // 整理不同产品的指令
+ // 北分麦哈克-管网哨兵
+ if (instruction.value.bfmhkGwsb) {
+ const instructionMHK = []
+ for (const i in dataForm.value) {
+ if (i.includes('mhk') && String(dataForm.value[i])) {
+ instructionMHK.push({
+ command: i.replace('mhk', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionMHK
+ }
+ // .诺成新-燃气智能警示桩
+ else if (instruction.value.ncxRqznjsz) {
+ const instructionNCX = []
+ for (const i in dataForm.value) {
+ if (i.includes('ncx')) {
+ instructionNCX.push({
+ command: i.replace('ncx', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ const instructionNCXresult = []
+ // 上报时间指令
+ const instructionTime = ['01', '02']
+ const time = instructionNCX.filter(item => instructionTime.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'time', value: time.map((item: string) => item.replace(':', '')).join() })
+ // 侧线长度
+ const instructionLength = ['03', '04']
+ const length = instructionNCX.filter(item => instructionLength.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'length', value: length.join() })
+ // 报警等
+ const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
+ const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+ alarm.push('1')
+ instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+ otherData.commandConfigList = instructionNCXresult
+ }
+ // 百瑞生-管网哨兵
+ else if (instruction.value.brsGwsb) {
+ const instructionBRS = []
+ for (const i in dataForm.value) {
+ if (i.includes('brs') && String(dataForm.value[i])) {
+ instructionBRS.push({
+ command: i.replace('brs', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionBRS
+ }
+ }
+ // console.log(otherData, 'otherData')
+ disabledBtn.value = true;
+ (instruction.value.bjwxd ? addInstruction(otherData) : addInstructionOther(otherData)).then((response) => {
if (response.code === 200) {
ElMessage({
message: '添加成功',
@@ -185,7 +485,7 @@
}))
// 产品
getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
- productList.value = res.data.rows.map((item: any) => ({
+ productList.value = res.data.rows.filter((item: any) => productConfig.value.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
...item,
name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
id: item.id,
@@ -217,16 +517,36 @@
})
}
fetchDict()
-
+// 禁用指令
+const disabledInstruction = ref(false)
+// 当前选中的产品
+const currentProduct = ref
+
@@ -65,7 +65,7 @@
+
-
+
确认
diff --git a/src/views/home/device/instruction/components/instruction.ts b/src/views/home/device/instruction/components/instruction.ts
new file mode 100644
index 0000000..a1e686f
--- /dev/null
+++ b/src/views/home/device/instruction/components/instruction.ts
@@ -0,0 +1,54 @@
+export const instructionProductList = [
+ {
+ deviceName: "燃气智能监测终端",
+ manufacturerName: "北京无线电计量测试研究所",
+ value: "bjwxd",
+ instruction: {
+ }
+ },
+ {
+ deviceName: "管网哨兵",
+ manufacturerName: "百瑞生",
+ value: "brsGwsb",
+ instruction: {
+ "4": "浓度报警低阈值",
+ "5": "浓度报警高阈值",
+ "7": "低温阈值",
+ "8": "高温阈值",
+ "11": "传感器采集间隔",
+ "12": "采样深度",
+ "15": "预热时间",
+ "19": "防盗使能-",
+ "20": "振动监测-",
+ "28": "振动采样使能-",
+ "29": "振动阈值1",
+ "30": "振动阈值2"
+ }
+ },
+ {
+ deviceName: "管网哨兵",
+ manufacturerName: "麦哈克",
+ value: "bfmhkGwsb",
+ instruction: {
+ "01": "浓度低报值",
+ "02": "浓度高报值",
+ "03": "设备采样周期",
+ "04": "上传采样周期",
+ "05": "GPS 告警距离",
+ "06": "设备安装位置-",
+ "07": "清除安装位置-",
+ "08": "重启设备-"
+ }
+ },
+ {
+ deviceName: "智能警示桩",
+ manufacturerName: "诺成新",
+ value: "ncxRqznjsz",
+ instruction: {
+ "time": '第一次上报时间,第二次上报时间',
+ "length": '左侧线长度,右侧线长度',
+ "switch": '倾斜报警-,破坏报警-,甲烷泄漏报警-,左侧断线报警-,右侧断线报警-,左侧振动报警-,右侧振动报警-,语音报警-,备用-'
+ }
+ }
+]
+// 注意 instruction属性中 有的名字带 - 表示 该属性为 开关类型 其余为输入值类型
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 8def02a..e7b515a 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -11,10 +11,12 @@
import { getProductListPage } from '@/api/home/device/product'
import { getDictByCode } from '@/api/system/dict'
import { shortcuts } from '@/utils/common'
+import { instructionProductList } from './components/instruction'
const $route = useRoute()
// 字典
const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
const statusList = ref<{ id: string; name: string; value: string }[]>([]) // 下发状态
// 表格数据
const list = ref([
@@ -27,7 +29,7 @@
{ text: '指令内容', value: 'framecontentDesc', align: 'center' },
{ text: '下发状态', value: 'statusName', align: 'center', width: '120' },
{ text: '操作人员', value: 'operatorName', align: 'center', width: '120' },
- { text: '备注', value: 'maker', align: 'center' },
+ { text: '备注', value: 'maker', align: 'center', width: '180' },
{ text: '操作时间', value: 'writetime', align: 'center', width: '180' },
])
// 最终展示列
@@ -69,12 +71,123 @@
...item,
statusName: statusList.value[statusList.value.findIndex(citem => item.status === citem.value)].name,
deviceTypeName: deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)]?.name || '',
+ framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
+ instructionTypeCustrom: typeInstruction(item.productId), // 产品
}))
total.value = res.data.total
loadingTable.value = false
}).catch(() => {
loadingTable.value = false
})
+
+ // 解析指令内容成文字
+ function solveInstruction(row: any, instruction: string, productId: string) {
+ let result = ''
+ // 判断产品和指令
+ if (!instruction) {
+ result = ''
+ return result
+ }
+ // 当前指令类型
+ const instructionDevice = {
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+ } as { [key: string]: boolean }
+ // 当前支持下发配置的产品
+ const productConfig = instructionProductList
+ // 当前产品
+ for (const i in instructionDevice) {
+ instructionDevice[i] = false
+ }
+ const currentProduct = productAllList.value.filter((item) => item.id === productId)[0] as any
+ const currentProductConfig = productConfig.filter((item: any) => currentProduct.deviceTypeName.includes(item.deviceName) && currentProduct.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instructionDevice[currentProductConfig[0].value] = true
+ }
+ // 北京无线电
+ if (instructionDevice.bjwxd) {
+ result = row.framecontentDesc
+ }
+ // 百瑞生-管网哨兵
+ else if (instructionDevice.brsGwsb) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ const content = currentProductConfig[0].instruction[item.command] || ''
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ return `${content.replace('-', '')}:${content.includes('-') ? (switch1[item.value] || '') : item.value}`
+ })
+ result = solve.join()
+ }
+ // 北分麦哈克-管网哨兵
+ else if (instructionDevice.bfmhkGwsb) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ const content = currentProductConfig[0].instruction[item.command] || ''
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ return `${content.replace('-', '')}:${content.includes('-') ? (switch1[item.value] || '') : item.value}`
+ })
+ result = solve.join()
+ }
+ // 诺成新-燃气智能警示桩
+ else if (instructionDevice.ncxRqznjsz) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ item.value = result.join()
+ }
+ const content = (currentProductConfig[0].instruction[item.command] || '').split(',')
+ const value = item.value.split(',')
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ const str = content.map((citem: string, index: number) => {
+ if (item.command === 'time') {
+ return `${citem}:${value[index].substring(0, 2)}点`
+ }
+ else {
+ return `${citem.replace('-', '')}:${citem.includes('-') ? (switch1[value[index]] || '') : value[index]}`
+ }
+ })
+ return str.join()
+ })
+ result = solve.join()
+ console.log(instructionContent, 'instructionContent')
+ }
+ return result
+ }
+ // 当前产品
+ function typeInstruction(productId: string) {
+ let result = ''
+ if (!productId) {
+ result = ''
+ return result
+ }
+ // 当前指令类型
+ const instructionDevice = {
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+ } as { [key: string]: boolean }
+ // 当前支持下发配置的产品
+ const productConfig = instructionProductList
+ // 当前产品
+ for (const i in instructionDevice) {
+ instructionDevice[i] = false
+ }
+ const currentProduct = productAllList.value.filter((item) => item.id === productId)[0] as any
+ const currentProductConfig = productConfig.filter((item: any) => currentProduct.deviceTypeName.includes(item.deviceName) && currentProduct.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instructionDevice[currentProductConfig[0].value] = true
+ result = currentProductConfig[0].value
+ }
+ console.log(result, 'result')
+ return result
+ }
}
// 重置查询条件f
const reset = () => {
@@ -141,6 +254,7 @@
}))
// 产品
const res1 = await getProductListPage({ offset: 1, limit: 99999 })
+ productAllList.value = res1.data.rows
productList.value = res1.data.rows.map((item: any) => ({
name: item.productName || '',
id: item.id,
@@ -155,6 +269,7 @@
fetchData()
// 判断是否 从别处跳转过来
+ console.log(JSON.parse($route.query.row), '其余地方过来')
if ($route.query.row) {
editRef.value.initDialog('addOther', {})
}
@@ -173,26 +288,20 @@
-
+
-
+
-
+
@@ -200,34 +309,28 @@
-
-
+
+
@@ -238,13 +341,16 @@
-
+
查看
-
+
重新下发
-
+
删除
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
-
+
新建
-
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
- ({})
watch(() => dataForm.value.productId, (newVal) => {
if (dialogStatus.value === 'detail' || isFirst.value) { return }
if (newVal) {
- // dataForm.value.devcode = ''
- dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
+ dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0]?.deviceType || ''
+ if (!dataForm.value.deviceType) {
+ disabledInstruction.value = true
+ ElMessage.warning('该设备不支持指令下发')
+ return
+ }
+ disabledInstruction.value = false
dataForm.value.deviceTypeName = productList.value.filter((item: any) => item.id === newVal)[0].deviceTypeName
deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
- // console.log(dataForm.value, 'dataForm.value')
dataForm.value.devCodeList = []
+ currentProduct.value = productList.value.filter((item: any) => item.id === newVal)[0]
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
+ const currentProductConfig = productConfig.value.filter((item: any) => currentProduct.value.deviceTypeName.includes(item.deviceName) && currentProduct.value.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instruction.value[currentProductConfig[0].value] = true
+ }
+ }
+ else {
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
}
}, {
deep: true,
@@ -243,22 +563,24 @@
const computeOptions = (val: any[]) => {
return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
}
+
+
-
-
+
-
+
+ style="width: 100%;" clearable filterable :disabled="disabledInstruction || dialogStatus === 'addOther'">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index cb9b144..ab03661 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -8,13 +8,14 @@
import type { FormRules } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictByCode } from '@/api/system/dict'
-import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { addInstruction, addInstructionOther, removeInstruction } from '@/api/home/device/instruction'
import { getDeviceTypeListPage } from '@/api/home/device/type'
import { getProductListPage } from '@/api/home/device/product'
import { getDeviceListPage } from '@/api/home/device/device'
import useUserStore from '@/store/modules/user'
import indexDB from '@/utils/indexDB'
import { indexDBHandler } from '@/utils/sessionData'
+import { instructionProductList } from './instruction'
const emits = defineEmits(['refresh'])
const $route = useRoute()
const $router = useRouter()
@@ -42,6 +43,46 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+ // 'ncx13': '1', // 备用
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}) // 表单
const textMap: { [key: string]: string } = {
edit: '编辑',
@@ -49,14 +90,91 @@
addOther: '新增',
detail: '详情',
} // 表头显示标题
+
+const validatemhk01 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('浓度低报值不能为空'))
+ }
+ else {
+ if (Number(value) >= 5 && Number(value) <= 25) {
+ callback()
+ }
+ else {
+ callback(new Error('浓度低报值需在5-25之间'))
+ }
+ }
+}
+const validatemhk03 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('设备采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 30) {
+ callback()
+ }
+ else {
+ callback(new Error('设备采样周期需在1-30之间'))
+ }
+ }
+}
+const validatemhk04 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('上传采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 1440) {
+ callback()
+ }
+ else {
+ callback(new Error('上传采样周期需在1-1440之间'))
+ }
+ }
+}
+const validatemhk05 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback()
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 65535) {
+ callback()
+ }
+ else {
+ callback(new Error('GPS告警距离需在1-1440之间'))
+ }
+ }
+}
const rules: FormRules = {
productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
- devCodeList: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+ devCodeList: [{ required: true, message: '设备编号必选', trigger: ['blur', 'change'] }],
collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
-} // 前端校验规则
+ // 北分麦哈克-管网哨兵
+ mhk01: [{ required: true, validator: validatemhk01, trigger: ['blur', 'change'] }], // 浓度低报值
+ mhk03: [{ required: true, validator: validatemhk03, trigger: ['blur', 'change'] }], // 设备采样周期
+ mhk04: [{ required: true, validator: validatemhk04, trigger: ['blur', 'change'] }], // 上传采样周期
+ mhk05: [{ required: false, validator: validatemhk05, trigger: ['blur', 'change'] }], // GPS告警距离
+
+ // 诺成新-燃气智能警示桩
+ ncx01: [{ required: true, message: '第一次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx02: [{ required: true, message: '第二次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx03: [{ required: true, message: '左侧线长度不能为空', trigger: ['blur', 'change'] }],
+ ncx04: [{ required: true, message: '右侧线长度不能为空', trigger: ['blur', 'change'] }],
+
+ // 百瑞生-管网哨兵
+ brs4: [{ required: true, message: '报警低阈值不能为空', trigger: ['blur', 'change'] }],
+ brs5: [{ required: true, message: '报警高阈值不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 当前指令类型
+const instruction = ref<{ [key: string]: boolean }>({
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+})
+// 当前支持下发配置的产品
+const productConfig = ref(instructionProductList)
// 重置表单
const resetForm = () => {
dataForm.value = {
@@ -75,15 +193,57 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}
}
const disabledBtn = ref(false)
// 初始化对话框
const isFirst = ref(true)
const initDialog = (dialogStatusValue: string, row: any) => {
+ disabledInstruction.value = false
dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
disabledBtn.value = false
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
if (dialogStatus.value === 'add') { // 如果是新增，清除验证
resetForm()
dataFormRef.value?.resetFields()
@@ -91,10 +251,15 @@
dataForm.value.operatorName = user.name
}
else if (dialogStatus.value === 'addOther') {
+ isFirst.value = false
resetForm()
dataFormRef.value?.resetFields()
const data = JSON.parse($route.query.row as string)
dataForm.value = data
+ console.log([data.devcode])
+ setTimeout(() => {
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ }, 100)
// dataForm.value.devcode = data.devcode
// dataForm.value.deviceType = data.deviceType
dataForm.value.operator = user.id
@@ -104,6 +269,70 @@
dataForm.value = {
...JSON.parse(JSON.stringify(row)),
}
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ deviceList.value = deviceAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
+ // 北京无线电
+ if (dataForm.value.instructionTypeCustrom === 'bjwxd') {
+ instruction.value.bjwxd = true
+ // 解析指令回显
+ if (dataForm.value.framecontent) {
+ const framecontent = dataForm.value.framecontent.split(';').map((item: string) => ({ name: item.split(':')[0], value: item.split(':')[1] }))
+ framecontent.forEach((item: { name: string, value: string }) => {
+ dataForm.value[item.name] = item.value
+ })
+ }
+ }
+
+ // 北分麦哈克-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'bfmhkGwsb') {
+ instruction.value.bfmhkGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`mhk${item.command}`] = item.value
+ })
+ }
+ }
+ // 百瑞生-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'brsGwsb') {
+ instruction.value.brsGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`brs${item.command}`] = item.value
+ })
+ }
+ }
+ // 诺成新-燃气智能警示桩
+ else if (dataForm.value.instructionTypeCustrom === 'ncxRqznjsz') {
+ instruction.value.ncxRqznjsz = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ if (item.command === 'time') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 1}`] = `${item.substring(0, 2)}:00`
+ })
+ }
+ else if (item.command === 'length') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 3}`] = item
+ })
+ }
+ else if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ result.forEach((item: string, index: number) => {
+ dataForm.value[`ncx${index + 5 >= 10 ? '' : '0'}${index + 5}`] = item
+ })
+ }
+ })
+ }
+ }
}
setTimeout(() => {
isFirst.value = false
@@ -117,10 +346,81 @@
const createData = () => {
dataFormRef.value.validate((valid: any) => {
if (valid) {
- dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
- dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
- disabledBtn.value = true
- addInstruction(dataForm.value).then((response) => {
+ let otherData = {} as { [key: string]: any }
+ // 北京无线电-燃气终端
+ if (instruction.value.bjwxd) {
+ dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+ dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+ otherData = JSON.parse(JSON.stringify(dataForm.value))
+ for (const i in otherData) {
+ // 清除其余字段
+ if (i.includes('mhk') || i.includes('ncx') || i.includes('brs')) {
+ otherData[i] = undefined
+ }
+ }
+ }
+ else {
+ otherData.typeId = dataForm.value.deviceType
+ otherData.productId = dataForm.value.productId
+ otherData.devCodeList = dataForm.value.devCodeList
+ // 整理不同产品的指令
+ // 北分麦哈克-管网哨兵
+ if (instruction.value.bfmhkGwsb) {
+ const instructionMHK = []
+ for (const i in dataForm.value) {
+ if (i.includes('mhk') && String(dataForm.value[i])) {
+ instructionMHK.push({
+ command: i.replace('mhk', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionMHK
+ }
+ // .诺成新-燃气智能警示桩
+ else if (instruction.value.ncxRqznjsz) {
+ const instructionNCX = []
+ for (const i in dataForm.value) {
+ if (i.includes('ncx')) {
+ instructionNCX.push({
+ command: i.replace('ncx', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ const instructionNCXresult = []
+ // 上报时间指令
+ const instructionTime = ['01', '02']
+ const time = instructionNCX.filter(item => instructionTime.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'time', value: time.map((item: string) => item.replace(':', '')).join() })
+ // 侧线长度
+ const instructionLength = ['03', '04']
+ const length = instructionNCX.filter(item => instructionLength.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'length', value: length.join() })
+ // 报警等
+ const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
+ const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+ alarm.push('1')
+ instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+ otherData.commandConfigList = instructionNCXresult
+ }
+ // 百瑞生-管网哨兵
+ else if (instruction.value.brsGwsb) {
+ const instructionBRS = []
+ for (const i in dataForm.value) {
+ if (i.includes('brs') && String(dataForm.value[i])) {
+ instructionBRS.push({
+ command: i.replace('brs', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionBRS
+ }
+ }
+ // console.log(otherData, 'otherData')
+ disabledBtn.value = true;
+ (instruction.value.bjwxd ? addInstruction(otherData) : addInstructionOther(otherData)).then((response) => {
if (response.code === 200) {
ElMessage({
message: '添加成功',
@@ -185,7 +485,7 @@
}))
// 产品
getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
- productList.value = res.data.rows.map((item: any) => ({
+ productList.value = res.data.rows.filter((item: any) => productConfig.value.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
...item,
name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
id: item.id,
@@ -217,16 +517,36 @@
})
}
fetchDict()
-
+// 禁用指令
+const disabledInstruction = ref(false)
+// 当前选中的产品
+const currentProduct = ref
+
@@ -65,7 +65,7 @@
+
-
+
确认
diff --git a/src/views/home/device/instruction/components/instruction.ts b/src/views/home/device/instruction/components/instruction.ts
new file mode 100644
index 0000000..a1e686f
--- /dev/null
+++ b/src/views/home/device/instruction/components/instruction.ts
@@ -0,0 +1,54 @@
+export const instructionProductList = [
+ {
+ deviceName: "燃气智能监测终端",
+ manufacturerName: "北京无线电计量测试研究所",
+ value: "bjwxd",
+ instruction: {
+ }
+ },
+ {
+ deviceName: "管网哨兵",
+ manufacturerName: "百瑞生",
+ value: "brsGwsb",
+ instruction: {
+ "4": "浓度报警低阈值",
+ "5": "浓度报警高阈值",
+ "7": "低温阈值",
+ "8": "高温阈值",
+ "11": "传感器采集间隔",
+ "12": "采样深度",
+ "15": "预热时间",
+ "19": "防盗使能-",
+ "20": "振动监测-",
+ "28": "振动采样使能-",
+ "29": "振动阈值1",
+ "30": "振动阈值2"
+ }
+ },
+ {
+ deviceName: "管网哨兵",
+ manufacturerName: "麦哈克",
+ value: "bfmhkGwsb",
+ instruction: {
+ "01": "浓度低报值",
+ "02": "浓度高报值",
+ "03": "设备采样周期",
+ "04": "上传采样周期",
+ "05": "GPS 告警距离",
+ "06": "设备安装位置-",
+ "07": "清除安装位置-",
+ "08": "重启设备-"
+ }
+ },
+ {
+ deviceName: "智能警示桩",
+ manufacturerName: "诺成新",
+ value: "ncxRqznjsz",
+ instruction: {
+ "time": '第一次上报时间,第二次上报时间',
+ "length": '左侧线长度,右侧线长度',
+ "switch": '倾斜报警-,破坏报警-,甲烷泄漏报警-,左侧断线报警-,右侧断线报警-,左侧振动报警-,右侧振动报警-,语音报警-,备用-'
+ }
+ }
+]
+// 注意 instruction属性中 有的名字带 - 表示 该属性为 开关类型 其余为输入值类型
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 8def02a..e7b515a 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -11,10 +11,12 @@
import { getProductListPage } from '@/api/home/device/product'
import { getDictByCode } from '@/api/system/dict'
import { shortcuts } from '@/utils/common'
+import { instructionProductList } from './components/instruction'
const $route = useRoute()
// 字典
const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
const statusList = ref<{ id: string; name: string; value: string }[]>([]) // 下发状态
// 表格数据
const list = ref([
@@ -27,7 +29,7 @@
{ text: '指令内容', value: 'framecontentDesc', align: 'center' },
{ text: '下发状态', value: 'statusName', align: 'center', width: '120' },
{ text: '操作人员', value: 'operatorName', align: 'center', width: '120' },
- { text: '备注', value: 'maker', align: 'center' },
+ { text: '备注', value: 'maker', align: 'center', width: '180' },
{ text: '操作时间', value: 'writetime', align: 'center', width: '180' },
])
// 最终展示列
@@ -69,12 +71,123 @@
...item,
statusName: statusList.value[statusList.value.findIndex(citem => item.status === citem.value)].name,
deviceTypeName: deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)]?.name || '',
+ framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
+ instructionTypeCustrom: typeInstruction(item.productId), // 产品
}))
total.value = res.data.total
loadingTable.value = false
}).catch(() => {
loadingTable.value = false
})
+
+ // 解析指令内容成文字
+ function solveInstruction(row: any, instruction: string, productId: string) {
+ let result = ''
+ // 判断产品和指令
+ if (!instruction) {
+ result = ''
+ return result
+ }
+ // 当前指令类型
+ const instructionDevice = {
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+ } as { [key: string]: boolean }
+ // 当前支持下发配置的产品
+ const productConfig = instructionProductList
+ // 当前产品
+ for (const i in instructionDevice) {
+ instructionDevice[i] = false
+ }
+ const currentProduct = productAllList.value.filter((item) => item.id === productId)[0] as any
+ const currentProductConfig = productConfig.filter((item: any) => currentProduct.deviceTypeName.includes(item.deviceName) && currentProduct.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instructionDevice[currentProductConfig[0].value] = true
+ }
+ // 北京无线电
+ if (instructionDevice.bjwxd) {
+ result = row.framecontentDesc
+ }
+ // 百瑞生-管网哨兵
+ else if (instructionDevice.brsGwsb) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ const content = currentProductConfig[0].instruction[item.command] || ''
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ return `${content.replace('-', '')}:${content.includes('-') ? (switch1[item.value] || '') : item.value}`
+ })
+ result = solve.join()
+ }
+ // 北分麦哈克-管网哨兵
+ else if (instructionDevice.bfmhkGwsb) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ const content = currentProductConfig[0].instruction[item.command] || ''
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ return `${content.replace('-', '')}:${content.includes('-') ? (switch1[item.value] || '') : item.value}`
+ })
+ result = solve.join()
+ }
+ // 诺成新-燃气智能警示桩
+ else if (instructionDevice.ncxRqznjsz) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ item.value = result.join()
+ }
+ const content = (currentProductConfig[0].instruction[item.command] || '').split(',')
+ const value = item.value.split(',')
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ const str = content.map((citem: string, index: number) => {
+ if (item.command === 'time') {
+ return `${citem}:${value[index].substring(0, 2)}点`
+ }
+ else {
+ return `${citem.replace('-', '')}:${citem.includes('-') ? (switch1[value[index]] || '') : value[index]}`
+ }
+ })
+ return str.join()
+ })
+ result = solve.join()
+ console.log(instructionContent, 'instructionContent')
+ }
+ return result
+ }
+ // 当前产品
+ function typeInstruction(productId: string) {
+ let result = ''
+ if (!productId) {
+ result = ''
+ return result
+ }
+ // 当前指令类型
+ const instructionDevice = {
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+ } as { [key: string]: boolean }
+ // 当前支持下发配置的产品
+ const productConfig = instructionProductList
+ // 当前产品
+ for (const i in instructionDevice) {
+ instructionDevice[i] = false
+ }
+ const currentProduct = productAllList.value.filter((item) => item.id === productId)[0] as any
+ const currentProductConfig = productConfig.filter((item: any) => currentProduct.deviceTypeName.includes(item.deviceName) && currentProduct.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instructionDevice[currentProductConfig[0].value] = true
+ result = currentProductConfig[0].value
+ }
+ console.log(result, 'result')
+ return result
+ }
}
// 重置查询条件f
const reset = () => {
@@ -141,6 +254,7 @@
}))
// 产品
const res1 = await getProductListPage({ offset: 1, limit: 99999 })
+ productAllList.value = res1.data.rows
productList.value = res1.data.rows.map((item: any) => ({
name: item.productName || '',
id: item.id,
@@ -155,6 +269,7 @@
fetchData()
// 判断是否 从别处跳转过来
+ console.log(JSON.parse($route.query.row), '其余地方过来')
if ($route.query.row) {
editRef.value.initDialog('addOther', {})
}
@@ -173,26 +288,20 @@
-
+
-
+
-
+
@@ -200,34 +309,28 @@
-
-
+
+
@@ -238,13 +341,16 @@
-
+
查看
-
+
重新下发
-
+
删除
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 597de16..2be2d51 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -234,7 +234,12 @@
deep: true,
immediate: true,
})
+const currentProduct = ref({})
watch(() => dataForm.value.productId, (newVal) => {
+ if(newVal) {
+ currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
+ console.log(currentProduct.value, 'currentProduct.value')
+ }
if (newVal && dataForm.value.alarmJudgeMethod === '0') {
fetchAlarmEvent(newVal)
}
@@ -311,7 +316,7 @@
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
-
+
新建
-
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
- ({})
watch(() => dataForm.value.productId, (newVal) => {
if (dialogStatus.value === 'detail' || isFirst.value) { return }
if (newVal) {
- // dataForm.value.devcode = ''
- dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
+ dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0]?.deviceType || ''
+ if (!dataForm.value.deviceType) {
+ disabledInstruction.value = true
+ ElMessage.warning('该设备不支持指令下发')
+ return
+ }
+ disabledInstruction.value = false
dataForm.value.deviceTypeName = productList.value.filter((item: any) => item.id === newVal)[0].deviceTypeName
deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
- // console.log(dataForm.value, 'dataForm.value')
dataForm.value.devCodeList = []
+ currentProduct.value = productList.value.filter((item: any) => item.id === newVal)[0]
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
+ const currentProductConfig = productConfig.value.filter((item: any) => currentProduct.value.deviceTypeName.includes(item.deviceName) && currentProduct.value.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instruction.value[currentProductConfig[0].value] = true
+ }
+ }
+ else {
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
}
}, {
deep: true,
@@ -243,22 +563,24 @@
const computeOptions = (val: any[]) => {
return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
}
+
+
-
-
+
-
+
+ style="width: 100%;" clearable filterable :disabled="disabledInstruction || dialogStatus === 'addOther'">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index cb9b144..ab03661 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -8,13 +8,14 @@
import type { FormRules } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictByCode } from '@/api/system/dict'
-import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { addInstruction, addInstructionOther, removeInstruction } from '@/api/home/device/instruction'
import { getDeviceTypeListPage } from '@/api/home/device/type'
import { getProductListPage } from '@/api/home/device/product'
import { getDeviceListPage } from '@/api/home/device/device'
import useUserStore from '@/store/modules/user'
import indexDB from '@/utils/indexDB'
import { indexDBHandler } from '@/utils/sessionData'
+import { instructionProductList } from './instruction'
const emits = defineEmits(['refresh'])
const $route = useRoute()
const $router = useRouter()
@@ -42,6 +43,46 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+ // 'ncx13': '1', // 备用
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}) // 表单
const textMap: { [key: string]: string } = {
edit: '编辑',
@@ -49,14 +90,91 @@
addOther: '新增',
detail: '详情',
} // 表头显示标题
+
+const validatemhk01 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('浓度低报值不能为空'))
+ }
+ else {
+ if (Number(value) >= 5 && Number(value) <= 25) {
+ callback()
+ }
+ else {
+ callback(new Error('浓度低报值需在5-25之间'))
+ }
+ }
+}
+const validatemhk03 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('设备采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 30) {
+ callback()
+ }
+ else {
+ callback(new Error('设备采样周期需在1-30之间'))
+ }
+ }
+}
+const validatemhk04 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('上传采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 1440) {
+ callback()
+ }
+ else {
+ callback(new Error('上传采样周期需在1-1440之间'))
+ }
+ }
+}
+const validatemhk05 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback()
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 65535) {
+ callback()
+ }
+ else {
+ callback(new Error('GPS告警距离需在1-1440之间'))
+ }
+ }
+}
const rules: FormRules = {
productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
- devCodeList: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+ devCodeList: [{ required: true, message: '设备编号必选', trigger: ['blur', 'change'] }],
collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
-} // 前端校验规则
+ // 北分麦哈克-管网哨兵
+ mhk01: [{ required: true, validator: validatemhk01, trigger: ['blur', 'change'] }], // 浓度低报值
+ mhk03: [{ required: true, validator: validatemhk03, trigger: ['blur', 'change'] }], // 设备采样周期
+ mhk04: [{ required: true, validator: validatemhk04, trigger: ['blur', 'change'] }], // 上传采样周期
+ mhk05: [{ required: false, validator: validatemhk05, trigger: ['blur', 'change'] }], // GPS告警距离
+
+ // 诺成新-燃气智能警示桩
+ ncx01: [{ required: true, message: '第一次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx02: [{ required: true, message: '第二次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx03: [{ required: true, message: '左侧线长度不能为空', trigger: ['blur', 'change'] }],
+ ncx04: [{ required: true, message: '右侧线长度不能为空', trigger: ['blur', 'change'] }],
+
+ // 百瑞生-管网哨兵
+ brs4: [{ required: true, message: '报警低阈值不能为空', trigger: ['blur', 'change'] }],
+ brs5: [{ required: true, message: '报警高阈值不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 当前指令类型
+const instruction = ref<{ [key: string]: boolean }>({
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+})
+// 当前支持下发配置的产品
+const productConfig = ref(instructionProductList)
// 重置表单
const resetForm = () => {
dataForm.value = {
@@ -75,15 +193,57 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}
}
const disabledBtn = ref(false)
// 初始化对话框
const isFirst = ref(true)
const initDialog = (dialogStatusValue: string, row: any) => {
+ disabledInstruction.value = false
dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
disabledBtn.value = false
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
if (dialogStatus.value === 'add') { // 如果是新增，清除验证
resetForm()
dataFormRef.value?.resetFields()
@@ -91,10 +251,15 @@
dataForm.value.operatorName = user.name
}
else if (dialogStatus.value === 'addOther') {
+ isFirst.value = false
resetForm()
dataFormRef.value?.resetFields()
const data = JSON.parse($route.query.row as string)
dataForm.value = data
+ console.log([data.devcode])
+ setTimeout(() => {
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ }, 100)
// dataForm.value.devcode = data.devcode
// dataForm.value.deviceType = data.deviceType
dataForm.value.operator = user.id
@@ -104,6 +269,70 @@
dataForm.value = {
...JSON.parse(JSON.stringify(row)),
}
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ deviceList.value = deviceAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
+ // 北京无线电
+ if (dataForm.value.instructionTypeCustrom === 'bjwxd') {
+ instruction.value.bjwxd = true
+ // 解析指令回显
+ if (dataForm.value.framecontent) {
+ const framecontent = dataForm.value.framecontent.split(';').map((item: string) => ({ name: item.split(':')[0], value: item.split(':')[1] }))
+ framecontent.forEach((item: { name: string, value: string }) => {
+ dataForm.value[item.name] = item.value
+ })
+ }
+ }
+
+ // 北分麦哈克-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'bfmhkGwsb') {
+ instruction.value.bfmhkGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`mhk${item.command}`] = item.value
+ })
+ }
+ }
+ // 百瑞生-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'brsGwsb') {
+ instruction.value.brsGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`brs${item.command}`] = item.value
+ })
+ }
+ }
+ // 诺成新-燃气智能警示桩
+ else if (dataForm.value.instructionTypeCustrom === 'ncxRqznjsz') {
+ instruction.value.ncxRqznjsz = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ if (item.command === 'time') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 1}`] = `${item.substring(0, 2)}:00`
+ })
+ }
+ else if (item.command === 'length') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 3}`] = item
+ })
+ }
+ else if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ result.forEach((item: string, index: number) => {
+ dataForm.value[`ncx${index + 5 >= 10 ? '' : '0'}${index + 5}`] = item
+ })
+ }
+ })
+ }
+ }
}
setTimeout(() => {
isFirst.value = false
@@ -117,10 +346,81 @@
const createData = () => {
dataFormRef.value.validate((valid: any) => {
if (valid) {
- dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
- dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
- disabledBtn.value = true
- addInstruction(dataForm.value).then((response) => {
+ let otherData = {} as { [key: string]: any }
+ // 北京无线电-燃气终端
+ if (instruction.value.bjwxd) {
+ dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+ dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+ otherData = JSON.parse(JSON.stringify(dataForm.value))
+ for (const i in otherData) {
+ // 清除其余字段
+ if (i.includes('mhk') || i.includes('ncx') || i.includes('brs')) {
+ otherData[i] = undefined
+ }
+ }
+ }
+ else {
+ otherData.typeId = dataForm.value.deviceType
+ otherData.productId = dataForm.value.productId
+ otherData.devCodeList = dataForm.value.devCodeList
+ // 整理不同产品的指令
+ // 北分麦哈克-管网哨兵
+ if (instruction.value.bfmhkGwsb) {
+ const instructionMHK = []
+ for (const i in dataForm.value) {
+ if (i.includes('mhk') && String(dataForm.value[i])) {
+ instructionMHK.push({
+ command: i.replace('mhk', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionMHK
+ }
+ // .诺成新-燃气智能警示桩
+ else if (instruction.value.ncxRqznjsz) {
+ const instructionNCX = []
+ for (const i in dataForm.value) {
+ if (i.includes('ncx')) {
+ instructionNCX.push({
+ command: i.replace('ncx', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ const instructionNCXresult = []
+ // 上报时间指令
+ const instructionTime = ['01', '02']
+ const time = instructionNCX.filter(item => instructionTime.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'time', value: time.map((item: string) => item.replace(':', '')).join() })
+ // 侧线长度
+ const instructionLength = ['03', '04']
+ const length = instructionNCX.filter(item => instructionLength.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'length', value: length.join() })
+ // 报警等
+ const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
+ const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+ alarm.push('1')
+ instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+ otherData.commandConfigList = instructionNCXresult
+ }
+ // 百瑞生-管网哨兵
+ else if (instruction.value.brsGwsb) {
+ const instructionBRS = []
+ for (const i in dataForm.value) {
+ if (i.includes('brs') && String(dataForm.value[i])) {
+ instructionBRS.push({
+ command: i.replace('brs', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionBRS
+ }
+ }
+ // console.log(otherData, 'otherData')
+ disabledBtn.value = true;
+ (instruction.value.bjwxd ? addInstruction(otherData) : addInstructionOther(otherData)).then((response) => {
if (response.code === 200) {
ElMessage({
message: '添加成功',
@@ -185,7 +485,7 @@
}))
// 产品
getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
- productList.value = res.data.rows.map((item: any) => ({
+ productList.value = res.data.rows.filter((item: any) => productConfig.value.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
...item,
name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
id: item.id,
@@ -217,16 +517,36 @@
})
}
fetchDict()
-
+// 禁用指令
+const disabledInstruction = ref(false)
+// 当前选中的产品
+const currentProduct = ref
+
@@ -65,7 +65,7 @@
+
-
+
确认
diff --git a/src/views/home/device/instruction/components/instruction.ts b/src/views/home/device/instruction/components/instruction.ts
new file mode 100644
index 0000000..a1e686f
--- /dev/null
+++ b/src/views/home/device/instruction/components/instruction.ts
@@ -0,0 +1,54 @@
+export const instructionProductList = [
+ {
+ deviceName: "燃气智能监测终端",
+ manufacturerName: "北京无线电计量测试研究所",
+ value: "bjwxd",
+ instruction: {
+ }
+ },
+ {
+ deviceName: "管网哨兵",
+ manufacturerName: "百瑞生",
+ value: "brsGwsb",
+ instruction: {
+ "4": "浓度报警低阈值",
+ "5": "浓度报警高阈值",
+ "7": "低温阈值",
+ "8": "高温阈值",
+ "11": "传感器采集间隔",
+ "12": "采样深度",
+ "15": "预热时间",
+ "19": "防盗使能-",
+ "20": "振动监测-",
+ "28": "振动采样使能-",
+ "29": "振动阈值1",
+ "30": "振动阈值2"
+ }
+ },
+ {
+ deviceName: "管网哨兵",
+ manufacturerName: "麦哈克",
+ value: "bfmhkGwsb",
+ instruction: {
+ "01": "浓度低报值",
+ "02": "浓度高报值",
+ "03": "设备采样周期",
+ "04": "上传采样周期",
+ "05": "GPS 告警距离",
+ "06": "设备安装位置-",
+ "07": "清除安装位置-",
+ "08": "重启设备-"
+ }
+ },
+ {
+ deviceName: "智能警示桩",
+ manufacturerName: "诺成新",
+ value: "ncxRqznjsz",
+ instruction: {
+ "time": '第一次上报时间,第二次上报时间',
+ "length": '左侧线长度,右侧线长度',
+ "switch": '倾斜报警-,破坏报警-,甲烷泄漏报警-,左侧断线报警-,右侧断线报警-,左侧振动报警-,右侧振动报警-,语音报警-,备用-'
+ }
+ }
+]
+// 注意 instruction属性中 有的名字带 - 表示 该属性为 开关类型 其余为输入值类型
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 8def02a..e7b515a 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -11,10 +11,12 @@
import { getProductListPage } from '@/api/home/device/product'
import { getDictByCode } from '@/api/system/dict'
import { shortcuts } from '@/utils/common'
+import { instructionProductList } from './components/instruction'
const $route = useRoute()
// 字典
const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
const statusList = ref<{ id: string; name: string; value: string }[]>([]) // 下发状态
// 表格数据
const list = ref([
@@ -27,7 +29,7 @@
{ text: '指令内容', value: 'framecontentDesc', align: 'center' },
{ text: '下发状态', value: 'statusName', align: 'center', width: '120' },
{ text: '操作人员', value: 'operatorName', align: 'center', width: '120' },
- { text: '备注', value: 'maker', align: 'center' },
+ { text: '备注', value: 'maker', align: 'center', width: '180' },
{ text: '操作时间', value: 'writetime', align: 'center', width: '180' },
])
// 最终展示列
@@ -69,12 +71,123 @@
...item,
statusName: statusList.value[statusList.value.findIndex(citem => item.status === citem.value)].name,
deviceTypeName: deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)]?.name || '',
+ framecontentDesc: item.framecontentDesc ? item.framecontentDesc : solveInstruction(item, item.framecontent, item.productId),
+ instructionTypeCustrom: typeInstruction(item.productId), // 产品
}))
total.value = res.data.total
loadingTable.value = false
}).catch(() => {
loadingTable.value = false
})
+
+ // 解析指令内容成文字
+ function solveInstruction(row: any, instruction: string, productId: string) {
+ let result = ''
+ // 判断产品和指令
+ if (!instruction) {
+ result = ''
+ return result
+ }
+ // 当前指令类型
+ const instructionDevice = {
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+ } as { [key: string]: boolean }
+ // 当前支持下发配置的产品
+ const productConfig = instructionProductList
+ // 当前产品
+ for (const i in instructionDevice) {
+ instructionDevice[i] = false
+ }
+ const currentProduct = productAllList.value.filter((item) => item.id === productId)[0] as any
+ const currentProductConfig = productConfig.filter((item: any) => currentProduct.deviceTypeName.includes(item.deviceName) && currentProduct.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instructionDevice[currentProductConfig[0].value] = true
+ }
+ // 北京无线电
+ if (instructionDevice.bjwxd) {
+ result = row.framecontentDesc
+ }
+ // 百瑞生-管网哨兵
+ else if (instructionDevice.brsGwsb) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ const content = currentProductConfig[0].instruction[item.command] || ''
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ return `${content.replace('-', '')}:${content.includes('-') ? (switch1[item.value] || '') : item.value}`
+ })
+ result = solve.join()
+ }
+ // 北分麦哈克-管网哨兵
+ else if (instructionDevice.bfmhkGwsb) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ const content = currentProductConfig[0].instruction[item.command] || ''
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ return `${content.replace('-', '')}:${content.includes('-') ? (switch1[item.value] || '') : item.value}`
+ })
+ result = solve.join()
+ }
+ // 诺成新-燃气智能警示桩
+ else if (instructionDevice.ncxRqznjsz) {
+ const instructionContent = JSON.parse(instruction)
+ const solve = instructionContent.map((item: { command: string, value: string }) => {
+ if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ item.value = result.join()
+ }
+ const content = (currentProductConfig[0].instruction[item.command] || '').split(',')
+ const value = item.value.split(',')
+ const switch1 = { 0: '关', 1: '开' } as { [key: string]: string }
+ const str = content.map((citem: string, index: number) => {
+ if (item.command === 'time') {
+ return `${citem}:${value[index].substring(0, 2)}点`
+ }
+ else {
+ return `${citem.replace('-', '')}:${citem.includes('-') ? (switch1[value[index]] || '') : value[index]}`
+ }
+ })
+ return str.join()
+ })
+ result = solve.join()
+ console.log(instructionContent, 'instructionContent')
+ }
+ return result
+ }
+ // 当前产品
+ function typeInstruction(productId: string) {
+ let result = ''
+ if (!productId) {
+ result = ''
+ return result
+ }
+ // 当前指令类型
+ const instructionDevice = {
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+ } as { [key: string]: boolean }
+ // 当前支持下发配置的产品
+ const productConfig = instructionProductList
+ // 当前产品
+ for (const i in instructionDevice) {
+ instructionDevice[i] = false
+ }
+ const currentProduct = productAllList.value.filter((item) => item.id === productId)[0] as any
+ const currentProductConfig = productConfig.filter((item: any) => currentProduct.deviceTypeName.includes(item.deviceName) && currentProduct.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instructionDevice[currentProductConfig[0].value] = true
+ result = currentProductConfig[0].value
+ }
+ console.log(result, 'result')
+ return result
+ }
}
// 重置查询条件f
const reset = () => {
@@ -141,6 +254,7 @@
}))
// 产品
const res1 = await getProductListPage({ offset: 1, limit: 99999 })
+ productAllList.value = res1.data.rows
productList.value = res1.data.rows.map((item: any) => ({
name: item.productName || '',
id: item.id,
@@ -155,6 +269,7 @@
fetchData()
// 判断是否 从别处跳转过来
+ console.log(JSON.parse($route.query.row), '其余地方过来')
if ($route.query.row) {
editRef.value.initDialog('addOther', {})
}
@@ -173,26 +288,20 @@
-
+
-
+
-
+
@@ -200,34 +309,28 @@
-
-
+
+
@@ -238,13 +341,16 @@
-
+
查看
-
+
重新下发
-
+
删除
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 597de16..2be2d51 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -234,7 +234,12 @@
deep: true,
immediate: true,
})
+const currentProduct = ref({})
watch(() => dataForm.value.productId, (newVal) => {
+ if(newVal) {
+ currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
+ console.log(currentProduct.value, 'currentProduct.value')
+ }
if (newVal && dataForm.value.alarmJudgeMethod === '0') {
fetchAlarmEvent(newVal)
}
@@ -311,7 +316,7 @@
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 81c44f6..f4f0d2e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -35,7 +35,7 @@
{ text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
{ text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '240', isCustom: true },
{ text: '判断方式', value: 'alarmJudgeMethodName', align: 'center', width: '100'},
- { text: '报警值', value: 'alarmThreshold', align: 'center', width: '180'},
+ { text: '报警值', value: 'exceptionTypeName', align: 'center', width: '180'},
{ text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
{ text: '更新时间', value: 'ts', align: 'center', width: '110' },
])
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
-
+
新建
-
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
- ({})
watch(() => dataForm.value.productId, (newVal) => {
if (dialogStatus.value === 'detail' || isFirst.value) { return }
if (newVal) {
- // dataForm.value.devcode = ''
- dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
+ dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0]?.deviceType || ''
+ if (!dataForm.value.deviceType) {
+ disabledInstruction.value = true
+ ElMessage.warning('该设备不支持指令下发')
+ return
+ }
+ disabledInstruction.value = false
dataForm.value.deviceTypeName = productList.value.filter((item: any) => item.id === newVal)[0].deviceTypeName
deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
- // console.log(dataForm.value, 'dataForm.value')
dataForm.value.devCodeList = []
+ currentProduct.value = productList.value.filter((item: any) => item.id === newVal)[0]
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
+ const currentProductConfig = productConfig.value.filter((item: any) => currentProduct.value.deviceTypeName.includes(item.deviceName) && currentProduct.value.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instruction.value[currentProductConfig[0].value] = true
+ }
+ }
+ else {
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
}
}, {
deep: true,
@@ -243,22 +563,24 @@
const computeOptions = (val: any[]) => {
return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
}
+
+
-
-
+
-
+
+ style="width: 100%;" clearable filterable :disabled="disabledInstruction || dialogStatus === 'addOther'">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- ×
+ ×
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index cb9b144..ab03661 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -8,13 +8,14 @@
import type { FormRules } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictByCode } from '@/api/system/dict'
-import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { addInstruction, addInstructionOther, removeInstruction } from '@/api/home/device/instruction'
import { getDeviceTypeListPage } from '@/api/home/device/type'
import { getProductListPage } from '@/api/home/device/product'
import { getDeviceListPage } from '@/api/home/device/device'
import useUserStore from '@/store/modules/user'
import indexDB from '@/utils/indexDB'
import { indexDBHandler } from '@/utils/sessionData'
+import { instructionProductList } from './instruction'
const emits = defineEmits(['refresh'])
const $route = useRoute()
const $router = useRouter()
@@ -42,6 +43,46 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+ // 'ncx13': '1', // 备用
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}) // 表单
const textMap: { [key: string]: string } = {
edit: '编辑',
@@ -49,14 +90,91 @@
addOther: '新增',
detail: '详情',
} // 表头显示标题
+
+const validatemhk01 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('浓度低报值不能为空'))
+ }
+ else {
+ if (Number(value) >= 5 && Number(value) <= 25) {
+ callback()
+ }
+ else {
+ callback(new Error('浓度低报值需在5-25之间'))
+ }
+ }
+}
+const validatemhk03 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('设备采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 30) {
+ callback()
+ }
+ else {
+ callback(new Error('设备采样周期需在1-30之间'))
+ }
+ }
+}
+const validatemhk04 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('上传采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 1440) {
+ callback()
+ }
+ else {
+ callback(new Error('上传采样周期需在1-1440之间'))
+ }
+ }
+}
+const validatemhk05 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback()
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 65535) {
+ callback()
+ }
+ else {
+ callback(new Error('GPS告警距离需在1-1440之间'))
+ }
+ }
+}
const rules: FormRules = {
productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
- devCodeList: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+ devCodeList: [{ required: true, message: '设备编号必选', trigger: ['blur', 'change'] }],
collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
-} // 前端校验规则
+ // 北分麦哈克-管网哨兵
+ mhk01: [{ required: true, validator: validatemhk01, trigger: ['blur', 'change'] }], // 浓度低报值
+ mhk03: [{ required: true, validator: validatemhk03, trigger: ['blur', 'change'] }], // 设备采样周期
+ mhk04: [{ required: true, validator: validatemhk04, trigger: ['blur', 'change'] }], // 上传采样周期
+ mhk05: [{ required: false, validator: validatemhk05, trigger: ['blur', 'change'] }], // GPS告警距离
+
+ // 诺成新-燃气智能警示桩
+ ncx01: [{ required: true, message: '第一次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx02: [{ required: true, message: '第二次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx03: [{ required: true, message: '左侧线长度不能为空', trigger: ['blur', 'change'] }],
+ ncx04: [{ required: true, message: '右侧线长度不能为空', trigger: ['blur', 'change'] }],
+
+ // 百瑞生-管网哨兵
+ brs4: [{ required: true, message: '报警低阈值不能为空', trigger: ['blur', 'change'] }],
+ brs5: [{ required: true, message: '报警高阈值不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 当前指令类型
+const instruction = ref<{ [key: string]: boolean }>({
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+})
+// 当前支持下发配置的产品
+const productConfig = ref(instructionProductList)
// 重置表单
const resetForm = () => {
dataForm.value = {
@@ -75,15 +193,57 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}
}
const disabledBtn = ref(false)
// 初始化对话框
const isFirst = ref(true)
const initDialog = (dialogStatusValue: string, row: any) => {
+ disabledInstruction.value = false
dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
disabledBtn.value = false
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
if (dialogStatus.value === 'add') { // 如果是新增，清除验证
resetForm()
dataFormRef.value?.resetFields()
@@ -91,10 +251,15 @@
dataForm.value.operatorName = user.name
}
else if (dialogStatus.value === 'addOther') {
+ isFirst.value = false
resetForm()
dataFormRef.value?.resetFields()
const data = JSON.parse($route.query.row as string)
dataForm.value = data
+ console.log([data.devcode])
+ setTimeout(() => {
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ }, 100)
// dataForm.value.devcode = data.devcode
// dataForm.value.deviceType = data.deviceType
dataForm.value.operator = user.id
@@ -104,6 +269,70 @@
dataForm.value = {
...JSON.parse(JSON.stringify(row)),
}
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ deviceList.value = deviceAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
+ // 北京无线电
+ if (dataForm.value.instructionTypeCustrom === 'bjwxd') {
+ instruction.value.bjwxd = true
+ // 解析指令回显
+ if (dataForm.value.framecontent) {
+ const framecontent = dataForm.value.framecontent.split(';').map((item: string) => ({ name: item.split(':')[0], value: item.split(':')[1] }))
+ framecontent.forEach((item: { name: string, value: string }) => {
+ dataForm.value[item.name] = item.value
+ })
+ }
+ }
+
+ // 北分麦哈克-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'bfmhkGwsb') {
+ instruction.value.bfmhkGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`mhk${item.command}`] = item.value
+ })
+ }
+ }
+ // 百瑞生-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'brsGwsb') {
+ instruction.value.brsGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`brs${item.command}`] = item.value
+ })
+ }
+ }
+ // 诺成新-燃气智能警示桩
+ else if (dataForm.value.instructionTypeCustrom === 'ncxRqznjsz') {
+ instruction.value.ncxRqznjsz = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ if (item.command === 'time') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 1}`] = `${item.substring(0, 2)}:00`
+ })
+ }
+ else if (item.command === 'length') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 3}`] = item
+ })
+ }
+ else if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ result.forEach((item: string, index: number) => {
+ dataForm.value[`ncx${index + 5 >= 10 ? '' : '0'}${index + 5}`] = item
+ })
+ }
+ })
+ }
+ }
}
setTimeout(() => {
isFirst.value = false
@@ -117,10 +346,81 @@
const createData = () => {
dataFormRef.value.validate((valid: any) => {
if (valid) {
- dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
- dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
- disabledBtn.value = true
- addInstruction(dataForm.value).then((response) => {
+ let otherData = {} as { [key: string]: any }
+ // 北京无线电-燃气终端
+ if (instruction.value.bjwxd) {
+ dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+ dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+ otherData = JSON.parse(JSON.stringify(dataForm.value))
+ for (const i in otherData) {
+ // 清除其余字段
+ if (i.includes('mhk') || i.includes('ncx') || i.includes('brs')) {
+ otherData[i] = undefined
+ }
+ }
+ }
+ else {
+ otherData.typeId = dataForm.value.deviceType
+ otherData.productId = dataForm.value.productId
+ otherData.devCodeList = dataForm.value.devCodeList
+ // 整理不同产品的指令
+ // 北分麦哈克-管网哨兵
+ if (instruction.value.bfmhkGwsb) {
+ const instructionMHK = []
+ for (const i in dataForm.value) {
+ if (i.includes('mhk') && String(dataForm.value[i])) {
+ instructionMHK.push({
+ command: i.replace('mhk', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionMHK
+ }
+ // .诺成新-燃气智能警示桩
+ else if (instruction.value.ncxRqznjsz) {
+ const instructionNCX = []
+ for (const i in dataForm.value) {
+ if (i.includes('ncx')) {
+ instructionNCX.push({
+ command: i.replace('ncx', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ const instructionNCXresult = []
+ // 上报时间指令
+ const instructionTime = ['01', '02']
+ const time = instructionNCX.filter(item => instructionTime.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'time', value: time.map((item: string) => item.replace(':', '')).join() })
+ // 侧线长度
+ const instructionLength = ['03', '04']
+ const length = instructionNCX.filter(item => instructionLength.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'length', value: length.join() })
+ // 报警等
+ const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
+ const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+ alarm.push('1')
+ instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+ otherData.commandConfigList = instructionNCXresult
+ }
+ // 百瑞生-管网哨兵
+ else if (instruction.value.brsGwsb) {
+ const instructionBRS = []
+ for (const i in dataForm.value) {
+ if (i.includes('brs') && String(dataForm.value[i])) {
+ instructionBRS.push({
+ command: i.replace('brs', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionBRS
+ }
+ }
+ // console.log(otherData, 'otherData')
+ disabledBtn.value = true;
+ (instruction.value.bjwxd ? addInstruction(otherData) : addInstructionOther(otherData)).then((response) => {
if (response.code === 200) {
ElMessage({
message: '添加成功',
@@ -185,7 +485,7 @@
}))
// 产品
getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
- productList.value = res.data.rows.map((item: any) => ({
+ productList.value = res.data.rows.filter((item: any) => productConfig.value.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
...item,
name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
id: item.id,
@@ -217,16 +517,36 @@
})
}
fetchDict()
-
+// 禁用指令
+const disabledInstruction = ref(false)
+// 当前选中的产品
+const currentProduct = ref
+
@@ -65,7 +65,7 @@
+
@@ -251,6 +251,7 @@
color: #fff;
.title {
+ font-size: 16px;
font-weight: 700;
display: inline-block;
width: 90%;
@@ -259,7 +260,7 @@
text-overflow: ellipsis;
}
- .close {
+ .close1 {
font-size: 22px;
font-weight: 700;
text-align: right;
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
- ({})
watch(() => dataForm.value.productId, (newVal) => {
if (dialogStatus.value === 'detail' || isFirst.value) { return }
if (newVal) {
- // dataForm.value.devcode = ''
- dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
+ dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0]?.deviceType || ''
+ if (!dataForm.value.deviceType) {
+ disabledInstruction.value = true
+ ElMessage.warning('该设备不支持指令下发')
+ return
+ }
+ disabledInstruction.value = false
dataForm.value.deviceTypeName = productList.value.filter((item: any) => item.id === newVal)[0].deviceTypeName
deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
- // console.log(dataForm.value, 'dataForm.value')
dataForm.value.devCodeList = []
+ currentProduct.value = productList.value.filter((item: any) => item.id === newVal)[0]
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
+ const currentProductConfig = productConfig.value.filter((item: any) => currentProduct.value.deviceTypeName.includes(item.deviceName) && currentProduct.value.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instruction.value[currentProductConfig[0].value] = true
+ }
+ }
+ else {
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
}
}, {
deep: true,
@@ -243,22 +563,24 @@
const computeOptions = (val: any[]) => {
return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
}
+
+
-
-
+
-
+
+ style="width: 100%;" clearable filterable :disabled="disabledInstruction || dialogStatus === 'addOther'">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- ×
+ ×
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index cb9b144..ab03661 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -8,13 +8,14 @@
import type { FormRules } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictByCode } from '@/api/system/dict'
-import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { addInstruction, addInstructionOther, removeInstruction } from '@/api/home/device/instruction'
import { getDeviceTypeListPage } from '@/api/home/device/type'
import { getProductListPage } from '@/api/home/device/product'
import { getDeviceListPage } from '@/api/home/device/device'
import useUserStore from '@/store/modules/user'
import indexDB from '@/utils/indexDB'
import { indexDBHandler } from '@/utils/sessionData'
+import { instructionProductList } from './instruction'
const emits = defineEmits(['refresh'])
const $route = useRoute()
const $router = useRouter()
@@ -42,6 +43,46 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+ // 'ncx13': '1', // 备用
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}) // 表单
const textMap: { [key: string]: string } = {
edit: '编辑',
@@ -49,14 +90,91 @@
addOther: '新增',
detail: '详情',
} // 表头显示标题
+
+const validatemhk01 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('浓度低报值不能为空'))
+ }
+ else {
+ if (Number(value) >= 5 && Number(value) <= 25) {
+ callback()
+ }
+ else {
+ callback(new Error('浓度低报值需在5-25之间'))
+ }
+ }
+}
+const validatemhk03 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('设备采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 30) {
+ callback()
+ }
+ else {
+ callback(new Error('设备采样周期需在1-30之间'))
+ }
+ }
+}
+const validatemhk04 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('上传采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 1440) {
+ callback()
+ }
+ else {
+ callback(new Error('上传采样周期需在1-1440之间'))
+ }
+ }
+}
+const validatemhk05 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback()
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 65535) {
+ callback()
+ }
+ else {
+ callback(new Error('GPS告警距离需在1-1440之间'))
+ }
+ }
+}
const rules: FormRules = {
productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
- devCodeList: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+ devCodeList: [{ required: true, message: '设备编号必选', trigger: ['blur', 'change'] }],
collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
-} // 前端校验规则
+ // 北分麦哈克-管网哨兵
+ mhk01: [{ required: true, validator: validatemhk01, trigger: ['blur', 'change'] }], // 浓度低报值
+ mhk03: [{ required: true, validator: validatemhk03, trigger: ['blur', 'change'] }], // 设备采样周期
+ mhk04: [{ required: true, validator: validatemhk04, trigger: ['blur', 'change'] }], // 上传采样周期
+ mhk05: [{ required: false, validator: validatemhk05, trigger: ['blur', 'change'] }], // GPS告警距离
+
+ // 诺成新-燃气智能警示桩
+ ncx01: [{ required: true, message: '第一次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx02: [{ required: true, message: '第二次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx03: [{ required: true, message: '左侧线长度不能为空', trigger: ['blur', 'change'] }],
+ ncx04: [{ required: true, message: '右侧线长度不能为空', trigger: ['blur', 'change'] }],
+
+ // 百瑞生-管网哨兵
+ brs4: [{ required: true, message: '报警低阈值不能为空', trigger: ['blur', 'change'] }],
+ brs5: [{ required: true, message: '报警高阈值不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 当前指令类型
+const instruction = ref<{ [key: string]: boolean }>({
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+})
+// 当前支持下发配置的产品
+const productConfig = ref(instructionProductList)
// 重置表单
const resetForm = () => {
dataForm.value = {
@@ -75,15 +193,57 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}
}
const disabledBtn = ref(false)
// 初始化对话框
const isFirst = ref(true)
const initDialog = (dialogStatusValue: string, row: any) => {
+ disabledInstruction.value = false
dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
disabledBtn.value = false
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
if (dialogStatus.value === 'add') { // 如果是新增，清除验证
resetForm()
dataFormRef.value?.resetFields()
@@ -91,10 +251,15 @@
dataForm.value.operatorName = user.name
}
else if (dialogStatus.value === 'addOther') {
+ isFirst.value = false
resetForm()
dataFormRef.value?.resetFields()
const data = JSON.parse($route.query.row as string)
dataForm.value = data
+ console.log([data.devcode])
+ setTimeout(() => {
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ }, 100)
// dataForm.value.devcode = data.devcode
// dataForm.value.deviceType = data.deviceType
dataForm.value.operator = user.id
@@ -104,6 +269,70 @@
dataForm.value = {
...JSON.parse(JSON.stringify(row)),
}
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ deviceList.value = deviceAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
+ // 北京无线电
+ if (dataForm.value.instructionTypeCustrom === 'bjwxd') {
+ instruction.value.bjwxd = true
+ // 解析指令回显
+ if (dataForm.value.framecontent) {
+ const framecontent = dataForm.value.framecontent.split(';').map((item: string) => ({ name: item.split(':')[0], value: item.split(':')[1] }))
+ framecontent.forEach((item: { name: string, value: string }) => {
+ dataForm.value[item.name] = item.value
+ })
+ }
+ }
+
+ // 北分麦哈克-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'bfmhkGwsb') {
+ instruction.value.bfmhkGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`mhk${item.command}`] = item.value
+ })
+ }
+ }
+ // 百瑞生-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'brsGwsb') {
+ instruction.value.brsGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`brs${item.command}`] = item.value
+ })
+ }
+ }
+ // 诺成新-燃气智能警示桩
+ else if (dataForm.value.instructionTypeCustrom === 'ncxRqznjsz') {
+ instruction.value.ncxRqznjsz = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ if (item.command === 'time') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 1}`] = `${item.substring(0, 2)}:00`
+ })
+ }
+ else if (item.command === 'length') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 3}`] = item
+ })
+ }
+ else if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ result.forEach((item: string, index: number) => {
+ dataForm.value[`ncx${index + 5 >= 10 ? '' : '0'}${index + 5}`] = item
+ })
+ }
+ })
+ }
+ }
}
setTimeout(() => {
isFirst.value = false
@@ -117,10 +346,81 @@
const createData = () => {
dataFormRef.value.validate((valid: any) => {
if (valid) {
- dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
- dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
- disabledBtn.value = true
- addInstruction(dataForm.value).then((response) => {
+ let otherData = {} as { [key: string]: any }
+ // 北京无线电-燃气终端
+ if (instruction.value.bjwxd) {
+ dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+ dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+ otherData = JSON.parse(JSON.stringify(dataForm.value))
+ for (const i in otherData) {
+ // 清除其余字段
+ if (i.includes('mhk') || i.includes('ncx') || i.includes('brs')) {
+ otherData[i] = undefined
+ }
+ }
+ }
+ else {
+ otherData.typeId = dataForm.value.deviceType
+ otherData.productId = dataForm.value.productId
+ otherData.devCodeList = dataForm.value.devCodeList
+ // 整理不同产品的指令
+ // 北分麦哈克-管网哨兵
+ if (instruction.value.bfmhkGwsb) {
+ const instructionMHK = []
+ for (const i in dataForm.value) {
+ if (i.includes('mhk') && String(dataForm.value[i])) {
+ instructionMHK.push({
+ command: i.replace('mhk', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionMHK
+ }
+ // .诺成新-燃气智能警示桩
+ else if (instruction.value.ncxRqznjsz) {
+ const instructionNCX = []
+ for (const i in dataForm.value) {
+ if (i.includes('ncx')) {
+ instructionNCX.push({
+ command: i.replace('ncx', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ const instructionNCXresult = []
+ // 上报时间指令
+ const instructionTime = ['01', '02']
+ const time = instructionNCX.filter(item => instructionTime.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'time', value: time.map((item: string) => item.replace(':', '')).join() })
+ // 侧线长度
+ const instructionLength = ['03', '04']
+ const length = instructionNCX.filter(item => instructionLength.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'length', value: length.join() })
+ // 报警等
+ const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
+ const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+ alarm.push('1')
+ instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+ otherData.commandConfigList = instructionNCXresult
+ }
+ // 百瑞生-管网哨兵
+ else if (instruction.value.brsGwsb) {
+ const instructionBRS = []
+ for (const i in dataForm.value) {
+ if (i.includes('brs') && String(dataForm.value[i])) {
+ instructionBRS.push({
+ command: i.replace('brs', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionBRS
+ }
+ }
+ // console.log(otherData, 'otherData')
+ disabledBtn.value = true;
+ (instruction.value.bjwxd ? addInstruction(otherData) : addInstructionOther(otherData)).then((response) => {
if (response.code === 200) {
ElMessage({
message: '添加成功',
@@ -185,7 +485,7 @@
}))
// 产品
getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
- productList.value = res.data.rows.map((item: any) => ({
+ productList.value = res.data.rows.filter((item: any) => productConfig.value.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
...item,
name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
id: item.id,
@@ -217,16 +517,36 @@
})
}
fetchDict()
-
+// 禁用指令
+const disabledInstruction = ref(false)
+// 当前选中的产品
+const currentProduct = ref
+
@@ -65,7 +65,7 @@
+
@@ -251,6 +251,7 @@
color: #fff;
.title {
+ font-size: 16px;
font-weight: 700;
display: inline-block;
width: 90%;
@@ -259,7 +260,7 @@
text-overflow: ellipsis;
}
- .close {
+ .close1 {
font-size: 22px;
font-weight: 700;
text-align: right;
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index ba2cbf9..0a1c088 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -42,7 +42,7 @@
username: [{ required: true, trigger: ['blur', 'change'], message: '请输入用户名' }],
password: [
{ required: true, trigger: ['blur', 'change'], message: '请输入密码' },
- { min: 6, max: 18, trigger: ['blur', 'change'], message: '密码长度为6到18位' },
+ // { min: 6, max: 18, trigger: ['blur', 'change'], message: '密码长度为6到18位' },
],
})
// 密码类型：password 密码
diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
index 29e3db4..9c471d3 100644
--- a/src/api/home/device/instruction.ts
+++ b/src/api/home/device/instruction.ts
@@ -30,3 +30,11 @@
data,
})
}
+// 新增-其他厂商设备
+export function addInstructionOther(data: any) {
+ return request({
+ url: '/system/busConfig/addOther',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/assets/audio/other.mp3 b/src/assets/audio/other.mp3
new file mode 100644
index 0000000..6ec901f
--- /dev/null
+++ b/src/assets/audio/other.mp3
Binary files differ
diff --git a/src/assets/icons/icon-home1.svg b/src/assets/icons/icon-home1.svg
new file mode 100644
index 0000000..81aa3eb
--- /dev/null
+++ b/src/assets/icons/icon-home1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 7fe6052..5ad2669 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -599,6 +599,7 @@
}
const removeCluster = () => {
if (cluster.value) {
+ map.value.remove(cluster.value)
cluster.value.setMap(null)
cluster.value = ''
}
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 70763c2..54319dd 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -544,9 +544,20 @@
}
}
const changeShow = (type: string) => {
+ mapRef.value.removePolygon()
+ mapRef.value.removeMarker()
+ mapRef.value.removePolyline()
+ mapRef.value.removeMassMarks()
+ mapRef.value.removeMassLine()
+ mapRef.value.removeCluster()
setTimeout(() => {
showStatus.value = type
- // console.log(document.getElementById('map'), '1111')
+ if (type === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
})
setTimeout(() => {
@@ -2857,7 +2868,14 @@
changeShow('administration')
}, 100)
// administration行政 demonstration95示范区
-
+const drawMap = () => {
+ if (showStatus.value === 'administration') {
+ drawBj()
+ }
+ else {
+ drawBj1()
+ }
+}
@@ -2900,14 +2918,14 @@
-
+
-
+
@@ -2921,8 +2939,8 @@
-
- ![]()
+
-
+ ![]()
{{ item.name }}
@@ -3060,7 +3078,7 @@
.amap-legend2 {
/* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */
position: absolute;
- z-index: 9;
+ z-index: 11;
bottom: 10px;
// right: 400px;
right: 21%;
@@ -3076,9 +3094,9 @@
flex-wrap: wrap;
color: #a7ceec;
- img {
- height: 20px;
- width: 20px;
+ .img {
+ height: 26px;
+ width: 26px;
}
.value {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 2c5ff65..08bd356 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -28,7 +28,7 @@
const width = ref(0)
const height = ref(0)
const set = () => {
- height.value = window.innerHeight -10
+ height.value = window.innerHeight - 10
width.value = window.innerWidth
}
set()
@@ -46,9 +46,9 @@
- ({})
watch(() => dataForm.value.productId, (newVal) => {
if (dialogStatus.value === 'detail' || isFirst.value) { return }
if (newVal) {
- // dataForm.value.devcode = ''
- dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
+ dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0]?.deviceType || ''
+ if (!dataForm.value.deviceType) {
+ disabledInstruction.value = true
+ ElMessage.warning('该设备不支持指令下发')
+ return
+ }
+ disabledInstruction.value = false
dataForm.value.deviceTypeName = productList.value.filter((item: any) => item.id === newVal)[0].deviceTypeName
deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
- // console.log(dataForm.value, 'dataForm.value')
dataForm.value.devCodeList = []
+ currentProduct.value = productList.value.filter((item: any) => item.id === newVal)[0]
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
+ const currentProductConfig = productConfig.value.filter((item: any) => currentProduct.value.deviceTypeName.includes(item.deviceName) && currentProduct.value.manufacturerName.includes(item.manufacturerName))
+ if (currentProductConfig.length) {
+ instruction.value[currentProductConfig[0].value] = true
+ }
+ }
+ else {
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
}
}, {
deep: true,
@@ -243,22 +563,24 @@
const computeOptions = (val: any[]) => {
return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
}
+
+
-
-
+
-
+
+ style="width: 100%;" clearable filterable :disabled="disabledInstruction || dialogStatus === 'addOther'">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- ×
+ ×
- ×
+
@@ -135,33 +135,34 @@
}
}
- .close {
- width: 150px;
- height: 70px;
+ .close1 {
+ width: 40px;
+ height: 40px;
z-index: 99;
position: fixed;
- top: 0;
- right: 0;
+ top: 0px;
+ right: 10px;
+ // background: rgb(145 144 144 / 60%);
+ // border-radius: 50%;
/* background-color: antiquewhite; */
- &:hover {
- .icon {
- display: block;
- }
- }
+ // &:hover {
+ // .icon {
+ // display: block;
+ // }
+ // }
- .icon {
- display: none;
- width: 50px;
- height: 50px;
- background: rgb(145 144 144 / 60%);
- border-radius: 50%;
- line-height: 50px;
+ .icon1 {
+ background: url("@/assets/icons/icon-home1.svg") no-repeat center center / cover;
+ display: block;
+ width: 36px;
+ height: 36px;
+ // line-height: 50px;
text-align: center;
- font-size: 18px;
- font-weight: 700;
+ // font-size: 18px;
+ // font-weight: 700;
color: #ccc;
- margin: 10px auto;
+ // margin: 10px auto;
&:hover {
cursor: pointer;
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index cb9b144..ab03661 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -8,13 +8,14 @@
import type { FormRules } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictByCode } from '@/api/system/dict'
-import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { addInstruction, addInstructionOther, removeInstruction } from '@/api/home/device/instruction'
import { getDeviceTypeListPage } from '@/api/home/device/type'
import { getProductListPage } from '@/api/home/device/product'
import { getDeviceListPage } from '@/api/home/device/device'
import useUserStore from '@/store/modules/user'
import indexDB from '@/utils/indexDB'
import { indexDBHandler } from '@/utils/sessionData'
+import { instructionProductList } from './instruction'
const emits = defineEmits(['refresh'])
const $route = useRoute()
const $router = useRouter()
@@ -42,6 +43,46 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+ // 'ncx13': '1', // 备用
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}) // 表单
const textMap: { [key: string]: string } = {
edit: '编辑',
@@ -49,14 +90,91 @@
addOther: '新增',
detail: '详情',
} // 表头显示标题
+
+const validatemhk01 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('浓度低报值不能为空'))
+ }
+ else {
+ if (Number(value) >= 5 && Number(value) <= 25) {
+ callback()
+ }
+ else {
+ callback(new Error('浓度低报值需在5-25之间'))
+ }
+ }
+}
+const validatemhk03 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('设备采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 30) {
+ callback()
+ }
+ else {
+ callback(new Error('设备采样周期需在1-30之间'))
+ }
+ }
+}
+const validatemhk04 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback(new Error('上传采样周期不能为空'))
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 1440) {
+ callback()
+ }
+ else {
+ callback(new Error('上传采样周期需在1-1440之间'))
+ }
+ }
+}
+const validatemhk05 = (rule: any, value: any, callback: any) => {
+ if (value === '') {
+ callback()
+ }
+ else {
+ if (Number(value) >= 1 && Number(value) <= 65535) {
+ callback()
+ }
+ else {
+ callback(new Error('GPS告警距离需在1-1440之间'))
+ }
+ }
+}
const rules: FormRules = {
productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
- devCodeList: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+ devCodeList: [{ required: true, message: '设备编号必选', trigger: ['blur', 'change'] }],
collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
-} // 前端校验规则
+ // 北分麦哈克-管网哨兵
+ mhk01: [{ required: true, validator: validatemhk01, trigger: ['blur', 'change'] }], // 浓度低报值
+ mhk03: [{ required: true, validator: validatemhk03, trigger: ['blur', 'change'] }], // 设备采样周期
+ mhk04: [{ required: true, validator: validatemhk04, trigger: ['blur', 'change'] }], // 上传采样周期
+ mhk05: [{ required: false, validator: validatemhk05, trigger: ['blur', 'change'] }], // GPS告警距离
+
+ // 诺成新-燃气智能警示桩
+ ncx01: [{ required: true, message: '第一次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx02: [{ required: true, message: '第二次上报时间不能为空', trigger: ['blur', 'change'] }],
+ ncx03: [{ required: true, message: '左侧线长度不能为空', trigger: ['blur', 'change'] }],
+ ncx04: [{ required: true, message: '右侧线长度不能为空', trigger: ['blur', 'change'] }],
+
+ // 百瑞生-管网哨兵
+ brs4: [{ required: true, message: '报警低阈值不能为空', trigger: ['blur', 'change'] }],
+ brs5: [{ required: true, message: '报警高阈值不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 当前指令类型
+const instruction = ref<{ [key: string]: boolean }>({
+ bjwxd: false, // 北京无线电
+ brsGwsb: false, // 百瑞生-管网哨兵
+ bfmhkGwsb: false, // 北分麦哈克-管网哨兵
+ ncxRqznjsz: false // 诺成新-燃气智能警示桩
+})
+// 当前支持下发配置的产品
+const productConfig = ref(instructionProductList)
// 重置表单
const resetForm = () => {
dataForm.value = {
@@ -75,15 +193,57 @@
framecontentDesc: '',
writetime: '',
devCodeList: [],
+
+ // 北分麦哈克-管网哨兵
+ 'mhk01': '', // 浓度低报值
+ 'mhk02': 50, // 浓度高报值 不可修改 50（国标要求）
+ 'mhk03': '', // 设备采样周期 1- 30 分钟
+ 'mhk04': '', // 上传采样周期 1- 1440 分钟
+ 'mhk05': '', // GPS告警距离 1 - 65535 米
+ 'mhk06': '1', // 确定设备安装位置 value = 1 生效
+ 'mhk07': '1', // 清除安装位置 value = 1 生效
+ 'mhk08': '1', // 重启设备 value = 1 生效
+
+ // 诺成新-燃气智能警示桩
+ 'ncx01': '', // 第一次上报时间 值，时分（整数）
+ 'ncx02': '', // 第二次上报时间 值，时分（整数）
+ 'ncx03': '', // 左侧线长度 值，单位米
+ 'ncx04': '', // 右侧线长度 值，单位米
+ 'ncx05': '1', // 倾斜报警
+ 'ncx06': '1', // 破坏报警
+ 'ncx07': '1', // 甲烷泄漏报警
+ 'ncx08': '1', // 左侧断线报警
+ 'ncx09': '1', // 右侧断线报警
+ 'ncx10': '1', // 左侧振动报警
+ 'ncx11': '1', // 右侧振动报警
+ 'ncx12': '1', // 语音报警
+
+ // 百瑞生-管网哨兵
+ 'brs4': '', // 浓度报警低阈值 值，%LEL
+ 'brs5': '', // 浓度报警高阈值 值，%LEL
+ 'brs7': '', // 低温阈值
+ 'brs8': '', // 高温阈值
+ 'brs11': '', // 传感器采集间隔 值，单位秒
+ 'brs12': '', // 采样深度
+ 'brs15': '', // 预热时间 值，单位秒
+ 'brs19': '1', // 防盗使能 1开启，0禁用
+ 'brs20': '1', // 振动监测 1开启，0禁用
+ 'brs28': '1', // 振动采样使能 1开启，0禁用
+ 'brs29': '', // 振动阈值1
+ 'brs30': '', // 振动阈值2
}
}
const disabledBtn = ref(false)
// 初始化对话框
const isFirst = ref(true)
const initDialog = (dialogStatusValue: string, row: any) => {
+ disabledInstruction.value = false
dialogStatus.value = dialogStatusValue
dialogFormVisible.value = true
disabledBtn.value = false
+ for (const i in instruction.value) {
+ instruction.value[i] = false
+ }
if (dialogStatus.value === 'add') { // 如果是新增，清除验证
resetForm()
dataFormRef.value?.resetFields()
@@ -91,10 +251,15 @@
dataForm.value.operatorName = user.name
}
else if (dialogStatus.value === 'addOther') {
+ isFirst.value = false
resetForm()
dataFormRef.value?.resetFields()
const data = JSON.parse($route.query.row as string)
dataForm.value = data
+ console.log([data.devcode])
+ setTimeout(() => {
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ }, 100)
// dataForm.value.devcode = data.devcode
// dataForm.value.deviceType = data.deviceType
dataForm.value.operator = user.id
@@ -104,6 +269,70 @@
dataForm.value = {
...JSON.parse(JSON.stringify(row)),
}
+ dataForm.value.devCodeList = [dataForm.value.devcode]
+ deviceList.value = deviceAllList.value.filter((item: any) => item.productId === dataForm.value.productId)
+ // 北京无线电
+ if (dataForm.value.instructionTypeCustrom === 'bjwxd') {
+ instruction.value.bjwxd = true
+ // 解析指令回显
+ if (dataForm.value.framecontent) {
+ const framecontent = dataForm.value.framecontent.split(';').map((item: string) => ({ name: item.split(':')[0], value: item.split(':')[1] }))
+ framecontent.forEach((item: { name: string, value: string }) => {
+ dataForm.value[item.name] = item.value
+ })
+ }
+ }
+
+ // 北分麦哈克-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'bfmhkGwsb') {
+ instruction.value.bfmhkGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`mhk${item.command}`] = item.value
+ })
+ }
+ }
+ // 百瑞生-管网哨兵
+ else if (dataForm.value.instructionTypeCustrom === 'brsGwsb') {
+ instruction.value.brsGwsb = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ dataForm.value[`brs${item.command}`] = item.value
+ })
+ }
+ }
+ // 诺成新-燃气智能警示桩
+ else if (dataForm.value.instructionTypeCustrom === 'ncxRqznjsz') {
+ instruction.value.ncxRqznjsz = true
+ if (dataForm.value.framecontent) {
+ const framecontent = JSON.parse(dataForm.value.framecontent)
+ framecontent.forEach((item: { command: string, value: string }) => {
+ if (item.command === 'time') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 1}`] = `${item.substring(0, 2)}:00`
+ })
+ }
+ else if (item.command === 'length') {
+ const value = item.value.split(',')
+ value.forEach((item: string, index: number) => {
+ dataForm.value[`ncx0${index + 3}`] = item
+ })
+ }
+ else if (item.command === 'switch') {
+ let result = []
+ for (let i = 0; i < item.value.length; i++) {
+ result.push(item.value[i])
+ }
+ result.forEach((item: string, index: number) => {
+ dataForm.value[`ncx${index + 5 >= 10 ? '' : '0'}${index + 5}`] = item
+ })
+ }
+ })
+ }
+ }
}
setTimeout(() => {
isFirst.value = false
@@ -117,10 +346,81 @@
const createData = () => {
dataFormRef.value.validate((valid: any) => {
if (valid) {
- dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
- dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
- disabledBtn.value = true
- addInstruction(dataForm.value).then((response) => {
+ let otherData = {} as { [key: string]: any }
+ // 北京无线电-燃气终端
+ if (instruction.value.bjwxd) {
+ dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+ dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+ otherData = JSON.parse(JSON.stringify(dataForm.value))
+ for (const i in otherData) {
+ // 清除其余字段
+ if (i.includes('mhk') || i.includes('ncx') || i.includes('brs')) {
+ otherData[i] = undefined
+ }
+ }
+ }
+ else {
+ otherData.typeId = dataForm.value.deviceType
+ otherData.productId = dataForm.value.productId
+ otherData.devCodeList = dataForm.value.devCodeList
+ // 整理不同产品的指令
+ // 北分麦哈克-管网哨兵
+ if (instruction.value.bfmhkGwsb) {
+ const instructionMHK = []
+ for (const i in dataForm.value) {
+ if (i.includes('mhk') && String(dataForm.value[i])) {
+ instructionMHK.push({
+ command: i.replace('mhk', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionMHK
+ }
+ // .诺成新-燃气智能警示桩
+ else if (instruction.value.ncxRqznjsz) {
+ const instructionNCX = []
+ for (const i in dataForm.value) {
+ if (i.includes('ncx')) {
+ instructionNCX.push({
+ command: i.replace('ncx', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ const instructionNCXresult = []
+ // 上报时间指令
+ const instructionTime = ['01', '02']
+ const time = instructionNCX.filter(item => instructionTime.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'time', value: time.map((item: string) => item.replace(':', '')).join() })
+ // 侧线长度
+ const instructionLength = ['03', '04']
+ const length = instructionNCX.filter(item => instructionLength.includes(item.command)).map(item => item.value)
+ instructionNCXresult.push({ command: 'length', value: length.join() })
+ // 报警等
+ const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
+ const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+ alarm.push('1')
+ instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+ otherData.commandConfigList = instructionNCXresult
+ }
+ // 百瑞生-管网哨兵
+ else if (instruction.value.brsGwsb) {
+ const instructionBRS = []
+ for (const i in dataForm.value) {
+ if (i.includes('brs') && String(dataForm.value[i])) {
+ instructionBRS.push({
+ command: i.replace('brs', ''),
+ value: dataForm.value[i]
+ })
+ }
+ }
+ otherData.commandConfigList = instructionBRS
+ }
+ }
+ // console.log(otherData, 'otherData')
+ disabledBtn.value = true;
+ (instruction.value.bjwxd ? addInstruction(otherData) : addInstructionOther(otherData)).then((response) => {
if (response.code === 200) {
ElMessage({
message: '添加成功',
@@ -185,7 +485,7 @@
}))
// 产品
getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
- productList.value = res.data.rows.map((item: any) => ({
+ productList.value = res.data.rows.filter((item: any) => productConfig.value.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
...item,
name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
id: item.id,
@@ -217,16 +517,36 @@
})
}
fetchDict()
-
+// 禁用指令
+const disabledInstruction = ref(false)
+// 当前选中的产品
+const currentProduct = ref
+
@@ -65,7 +65,7 @@
+
@@ -251,6 +251,7 @@
color: #fff;
.title {
+ font-size: 16px;
font-weight: 700;
display: inline-block;
width: 90%;
@@ -259,7 +260,7 @@
text-overflow: ellipsis;
}
- .close {
+ .close1 {
font-size: 22px;
font-weight: 700;
text-align: right;
diff --git a/src/views/login-mobile.vue b/src/views/login-mobile.vue
index ba2cbf9..0a1c088 100644
--- a/src/views/login-mobile.vue
+++ b/src/views/login-mobile.vue
@@ -42,7 +42,7 @@
username: [{ required: true, trigger: ['blur', 'change'], message: '请输入用户名' }],
password: [
{ required: true, trigger: ['blur', 'change'], message: '请输入密码' },
- { min: 6, max: 18, trigger: ['blur', 'change'], message: '密码长度为6到18位' },
+ // { min: 6, max: 18, trigger: ['blur', 'change'], message: '密码长度为6到18位' },
],
})
// 密码类型：password 密码
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index cabf099..e6e39fd 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -62,7 +62,7 @@
username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
password: [
{ required: true, trigger: 'blur', message: '请输入密码' },
- { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
+ // { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
],
})