diff --git a/src/api/cs-device-boot/cloudDeviceEntry.ts b/src/api/cs-device-boot/cloudDeviceEntry.ts index 5fb5885..a04c8fa 100644 --- a/src/api/cs-device-boot/cloudDeviceEntry.ts +++ b/src/api/cs-device-boot/cloudDeviceEntry.ts @@ -144,3 +144,11 @@ export function queryPushResult() { method: 'post' }) } +//查询升级日志 +export function getByDevId(data: any) { + return createAxios({ + url: '/cs-device-boot/csUpgradeLogs/getByDevId', + method: 'get', + params:data + }) +} diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue index 85aa5fd..3c04ded 100644 --- a/src/views/govern/cloudDeviceEntry/index.vue +++ b/src/views/govern/cloudDeviceEntry/index.vue @@ -2,60 +2,40 @@
- +
- + {{ nodeLevel == 0 ? '新增工程' : nodeLevel == 1 - ? '新增项目' - : nodeLevel == 2 - ? '新增设备' - : nodeLevel == 3 - ? '新增监测点' - : '新增监测点' + ? '新增项目' + : nodeLevel == 2 + ? '新增设备' + : nodeLevel == 3 + ? '新增监测点' + : '新增监测点' }} - + 修改 删除 - + 下一步 - + 撤 销 @@ -73,8 +53,7 @@ + style="width: 16px; margin-right: 8px; color: var(--el-color-primary)" /> 当前操作节点： @@ -88,228 +67,107 @@
- + - - + + - - - + :rules="{ required: true, message: '请选择省', trigger: 'change' }"> + + - - - + :rules="{ required: true, message: '请选择市', trigger: 'change' }"> + + - - + + - - + :rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]"> + -
- - +
+ +
- - + ]"> + - - + :rules="[{ required: true, message: '请输入地址', trigger: 'blur' }]"> + - - + :rules="[{ required: true, message: '请输入描述', trigger: 'blur' }]"> + - - - + ]"> + + - + {{ item.name }} @@ -317,24 +175,16 @@ - - + :rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]"> +
@@ -342,314 +192,163 @@
-
- - +
+ +
- - + ]"> + - - - + + + :value="item.value || item.id"> - - - + ]"> + + - - + ]"> + - - + }"> + - - - + + + - - + + - - + - + :disabled="!(pageStatus == 2 && nodeLevel == 2)"> + - - + + - - - + + + - - + + - - + :prop="'deviceInfoList[' + bIndex + '].upgrade'"> + @@ -668,24 +367,16 @@ {{ accessLoading ? '接入中' : '接入' }} --> - - + :rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]"> +
@@ -693,501 +384,222 @@
-
- - +
+ +
- - + }"> + - - - + }"> + + - - - + }"> + + - - - - - - -
- - - : - - -
- - -
- - - : - - -
- - - - - - - - - - - - - - - - - - + }"> + + - - +
+ - - + "> + + : + + +
- +
+ + + : + + +
+ + - - + }"> + + - - - - + + + - - - - - + + - + + + + + + + }"> - + @@ -1195,62 +607,91 @@ - + + + + + + + + + + + + + + + + + + + + + + + }"> - - + + - + }"> - + @@ -1258,167 +699,85 @@
- + - - + + - - + + - - + +
- - + + "> : - +
- - + + "> : - +
- - + + - - + + - + @@ -1436,39 +795,24 @@ - +
- +

指令下发日志:

-
-
+ "> +
{{ log.message }}
@@ -2874,7 +2218,7 @@ const resetAllForms = () => { project.name = '' project.area = '' project.description = '' - ;(project.sort = 0), (project.topoId = '') + ; (project.sort = 0), (project.topoId = '') }) // 清空设备表单 @@ -3349,6 +2693,64 @@ const tabChange = (type: string, e: any) => { connectionMethod.value = formData.value.deviceInfoList[e.index].devAccessMethod } } +// 电压等级变化 +const volGradeChange = (e, row) => { + let capacity = 10 + switch (e) { + case '500': + capacity = 4500 + break + case '330': + capacity = 3000 + break + case '220': + capacity = 2000 + break + case '110': + capacity = 750 + break + case '35': + capacity = 259 + break + case '10': + capacity = 100 + break + case '6': + capacity = 100 + break + case '0.38': + capacity = 10 + break + case '20': + capacity = 200 + break + case '66': + capacity = 500 + break + case '750': + capacity = 7000 + break + case '800': + capacity = 7000 + break + case '1000': + capacity = 9000 + break + } + setTimeout(() => { + setTheDefaultValue(capacity, e * 1000, e < 1 ? e * 1000 : 100, row) + }, 0) + +} +const setTheDefaultValue = (capacity: number, pt1: number, pt2: number, row: any) => { + row.basicCapacity = capacity + row.protocolCapacity = capacity + row.shortCircuitCapacity = capacity + row.devCapacity = capacity + + row.ptRatio = pt1 + row.pt2Ratio = pt2 +} const treedata = (selectedNodeId?: string) => { if (selectedNodeId) { diff --git a/src/views/govern/manage/programVersion/comp/deviceLog.vue b/src/views/govern/manage/programVersion/comp/deviceLog.vue index 87584f6..34eb528 100644 --- a/src/views/govern/manage/programVersion/comp/deviceLog.vue +++ b/src/views/govern/manage/programVersion/comp/deviceLog.vue @@ -28,6 +28,7 @@ import { ref, reactive } from 'vue' import { defaultAttribute } from '@/components/table/defaultAttribute' import { ElMessage } from 'element-plus' import { mainHeight } from '@/utils/layout' +import { getByDevId } from '@/api/cs-device-boot/cloudDeviceEntry' const layout1 = mainHeight(100, 2) // 弹框显示控制 const dialogVisible = ref(false) @@ -60,9 +61,14 @@ const getResultText = (result) => { // 打开弹框 const open = (row) => { - title.value = `${row.name}_升级日志` + title.value = `${row.name}_升级日志` dialogVisible.value = true - + getByDevId({ + devId: row.id + }).then((res) => { + tableData = res.data + }) + } // 加载表格数据 diff --git a/src/views/govern/manage/programVersion/index.vue b/src/views/govern/manage/programVersion/index.vue index fc58caa..074ab88 100644 --- a/src/views/govern/manage/programVersion/index.vue +++ b/src/views/govern/manage/programVersion/index.vue @@ -66,7 +66,7 @@ const DevTypeOptions = ref() const icdList = ref() const tableHeaderRef = ref() const { push, options, currentRoute } = useRouter() -const tableStore = new TableStore({ +const tableStore: any = new TableStore({ url: '/cs-device-boot/EquipmentDelivery/version/page', method: 'POST', column: [ @@ -101,7 +101,7 @@ const tableStore = new TableStore({ 2: '在线' } }, - { title: '更新时间', field: 'updateTime', minWidth: '150', formatter: (row: any) => { return row.cellValue || '/' } ,sortable: true}, + { title: '更新时间', field: 'updateTime', minWidth: '150', formatter: (row: any) => { return row.cellValue || '/' }, sortable: true }, { title: '修改人员', field: 'updateByName', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } }, { title: '操作', @@ -123,7 +123,7 @@ const tableStore = new TableStore({ upgradeRef.value.open({ id: [row.id], devModel: row.devModel, - version:row.version + version: row.version }) } @@ -212,6 +212,6 @@ tableStore.table.params.upgrade = '' provide('tableStore', tableStore) onMounted(() => { getQuery() - tableHeaderRef.value.onComSearch() + tableStore.index() })