|
@@ -69,9 +69,9 @@
|
|
|
<a-button v-if="!record.devInfoList" type="success" size="small"
|
|
|
style="margin-right:10px">删除</a-button>
|
|
|
</a-popconfirm>
|
|
|
- <!-- <a-button type="primary" v-if="!record.devInfoList" size="small" @click="debugClick(record)">{{
|
|
|
- record.debugTitle }}</a-button> -->
|
|
|
- <a-button type="primary" size="small" @click="debugClick({debugTitle:'调试'})">调试</a-button>
|
|
|
+ <a-button type="primary" v-if="!record.devInfoList" size="small" @click="debugClick(record)">{{
|
|
|
+ record.debugTitle }}</a-button>
|
|
|
+
|
|
|
</template>
|
|
|
<template #bodyCell="{ column, text }">
|
|
|
<template v-if="column.dataIndex === 'valueJc' && text">
|
|
@@ -115,9 +115,11 @@
|
|
|
<!-- 调试弹窗 -->
|
|
|
<a-modal style="top: 300px; left: 360px" v-model:visible="visibleModalDebug" :width="450" title="调试信息"
|
|
|
@ok="handleOkDebug" @cancel="handleCancelDebug">
|
|
|
- <a-form :model="startupDataDebug" labelAlign="right" :label-col="{ span: 12 }" :wrapper-col="{ span: 12 }">
|
|
|
+ <a-form :model="startupDataDebug" labelAlign="right" :label-col="{ span: 12 }"
|
|
|
+ :wrapper-col="{ span: 12 }">
|
|
|
<a-form-item label="风速">
|
|
|
- <a-input type="number" v-model:value="startupDataDebug.speed" placeholder="请输入" style="width: 260px" />
|
|
|
+ <a-input type="number" v-model:value="startupDataDebug.speed" placeholder="请输入"
|
|
|
+ style="width: 260px" />
|
|
|
</a-form-item>
|
|
|
<a-form-item label="风向">
|
|
|
<a-select v-model:value="startupDataDebug.direction" style="width: 260px">
|
|
@@ -125,11 +127,13 @@
|
|
|
}}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
- <a-form-item label="密码">
|
|
|
- <a-input type="password" v-model:value="startupDataDebug.pwd" placeholder="请输入" style="width: 260px"/>
|
|
|
+ <a-form-item label="密码">
|
|
|
+ <a-input type="password" v-model:value="startupDataDebug.pwd" placeholder="请输入"
|
|
|
+ style="width: 260px" />
|
|
|
</a-form-item>
|
|
|
- <a-form-item label="浮动范围">
|
|
|
- <a-input type="number" v-model:value="startupDataDebug.range" placeholder="请输入" style="width: 260px" />
|
|
|
+ <a-form-item label="浮动范围">
|
|
|
+ <a-input type="number" v-model:value="startupDataDebug.range" placeholder="请输入"
|
|
|
+ style="width: 260px" />
|
|
|
</a-form-item>
|
|
|
</a-form>
|
|
|
</a-modal>
|
|
@@ -367,7 +371,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script setup lang="ts">
|
|
|
-import { ref, nextTick, reactive, onMounted, onUnmounted,inject } from 'vue';
|
|
|
+import { ref, nextTick, reactive, onMounted, onUnmounted, inject } from 'vue';
|
|
|
import { usePermission } from '/@/hooks/web/usePermission';
|
|
|
import {
|
|
|
subStationList,
|
|
@@ -391,8 +395,10 @@ import { columnsDetail, columns, deviceColumns } from '../safetyList.data';
|
|
|
import HistoryTable from './HistoryTable.vue';
|
|
|
import customHeader from '/@/components/vent/customHeader.vue';
|
|
|
import operateRecord from './operateRecord.vue'
|
|
|
+import { AesEncryption } from '/@/utils/cipher';
|
|
|
+import { loginCipher } from '/@/settings/encryptionSetting';
|
|
|
+
|
|
|
|
|
|
- const globalConfig = inject('globalConfig');
|
|
|
let expandedRowKeys = reactive<any[]>([])
|
|
|
const { hasPermission } = usePermission();
|
|
|
let activeKey = ref('device');
|
|
@@ -474,8 +480,8 @@ let paramId = ref('');
|
|
|
let startupDataDebug = reactive({
|
|
|
speed: '',
|
|
|
direction: '',
|
|
|
- pwd:'',
|
|
|
- range:'',
|
|
|
+ pwd: '',
|
|
|
+ range: '',
|
|
|
});
|
|
|
let visibleModalDebug = ref(false);
|
|
|
let debugFlag = ref('');
|
|
@@ -894,8 +900,8 @@ function debugClick(record) {
|
|
|
//正在调试中
|
|
|
startupDataDebug.speed = '';
|
|
|
startupDataDebug.direction = '';
|
|
|
- startupDataDebug.pwd=''
|
|
|
- startupDataDebug.range=''
|
|
|
+ startupDataDebug.pwd = ''
|
|
|
+ startupDataDebug.range = ''
|
|
|
visibleModalDebug.value = true;
|
|
|
debugFlag.value = 'device';
|
|
|
debugDeviceId.value = record.id;
|
|
@@ -961,14 +967,14 @@ function handleCancelEdit() {
|
|
|
}
|
|
|
//调试确认
|
|
|
async function handleOkDebug() {
|
|
|
-
|
|
|
+ const encryption = new AesEncryption({ key: loginCipher.key, iv: loginCipher.iv });
|
|
|
let res = await updateDebugStatus({
|
|
|
stationId: debugStationId.value,
|
|
|
deviceId: debugDeviceId.value,
|
|
|
speed: startupDataDebug.speed,
|
|
|
direction: startupDataDebug.direction,
|
|
|
- pwd:startupDataDebug.pwd || globalConfig?.simulatedPassword,
|
|
|
- range:startupDataDebug.range,
|
|
|
+ range: startupDataDebug.range,
|
|
|
+ pwd: encryption.encryptByAES(startupDataDebug.pwd),
|
|
|
debugFlag: '1',
|
|
|
});
|
|
|
if (res) {
|