diff --git a/src/api/device-boot/Business.ts b/src/api/device-boot/Business.ts index 707f9d99..cc031e6e 100644 --- a/src/api/device-boot/Business.ts +++ b/src/api/device-boot/Business.ts @@ -8,6 +8,7 @@ export function addNode(data: any) { data: data }) } + //修改前置机 export function updateNode(data: any) { return createAxios({ @@ -16,6 +17,7 @@ export function updateNode(data: any) { data: data }) } + //删除前置机 export function delNode(data: any) { return createAxios({ @@ -24,6 +26,7 @@ export function delNode(data: any) { params: { id: data } }) } + //终端台账树 export function getTerminalTree() { return createAxios({ @@ -31,6 +34,19 @@ export function getTerminalTree() { method: 'get' }) } + +/** + * 总计出3层，提供给表单选择具体的终端、母线、监测点 + * 终端台账树 + * 等级：0-项目名称；1- 工程名称；2-单位；3-部门；4-终端；5-母线；6-监测点 + */ +export function getTerminalSelectTree(level: number) { + return createAxios({ + url: '/device-boot/terminalTree/getTerminalSelectTree?level=' + level, + method: 'get' + }) +} + //查询节点内容 export function queryTerminal(data: any) { return createAxios({ @@ -39,6 +55,7 @@ export function queryTerminal(data: any) { params: data }) } + //删除设备 export function delTerminal(data: any) { return createAxios({ @@ -47,6 +64,7 @@ export function delTerminal(data: any) { params: data }) } + //获取前置机 export function nodeAllList() { return createAxios({ @@ -54,32 +72,35 @@ export function nodeAllList() { method: 'get' }) } + //修改数据 -export function updateTerminal(query:any) { +export function updateTerminal(query: any) { return createAxios({ url: `/device-boot/device/updateTerminal`, method: 'put', data: { - ...query, + ...query } }) } + //提交数据 -export function addTerminal(query:any) { +export function addTerminal(query: any) { return createAxios({ url: '/device-boot/device/addTerminal', - method: 'post', - data: { - ...query, - } - }) -} -//查询终端程序版本升级日志 -export function getTerminalUpLog(data:any) { - return createAxios({ - url: '/device-boot/version/getTerminalUpLog', method: 'post', - params: data, + data: { + ...query + } + }) +} + +//查询终端程序版本升级日志 +export function getTerminalUpLog(data: any) { + return createAxios({ + url: '/device-boot/version/getTerminalUpLog', + method: 'post', + params: data }) } diff --git a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue index 3cef8bc1..5e14dfa1 100644 --- a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue +++ b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue @@ -76,7 +76,7 @@ const attributeFormRef = ref() const bpmnInstances = () => (window as any)?.bpmnInstances const resetAttributesList = () => { - console.log(window, 'windowwindowwindowwindowwindowwindowwindow') + // console.log(window, 'windowwindowwindowwindowwindowwindowwindow') bpmnElement.value = bpmnInstances().bpmnElement otherExtensionList.value = [] // 其他扩展配置 bpmnElementProperties.value = @@ -105,7 +105,7 @@ const openAttributesForm = (attr, index) => { }) } const removeAttributes = (attr, index) => { - console.log(attr, 'attr') + // console.log(attr, 'attr') ElMessageBox.confirm('确认移除该属性吗？', '提示', { confirmButtonText: '确 认', cancelButtonText: '取 消' @@ -123,7 +123,7 @@ const removeAttributes = (attr, index) => { .catch(() => console.info('操作取消')) } const saveAttribute = () => { - console.log(propertyForm.value, 'propertyForm.value') + // console.log(propertyForm.value, 'propertyForm.value') const { name, value } = propertyForm.value if (editingPropertyIndex.value !== -1) { bpmnInstances().modeling.updateModdleProperties( diff --git a/src/views/pqs/supervise/retire/components/equipment.vue b/src/views/pqs/supervise/retire/components/equipment.vue index 1f808d1e..e6764f90 100644 --- a/src/views/pqs/supervise/retire/components/equipment.vue +++ b/src/views/pqs/supervise/retire/components/equipment.vue @@ -3,33 +3,34 @@ + - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + diff --git a/src/views/pqs/supervise/retire/detail.vue b/src/views/pqs/supervise/retire/detail.vue new file mode 100644 index 00000000..402dad63 --- /dev/null +++ b/src/views/pqs/supervise/retire/detail.vue @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/src/views/pqs/supervise/retire/deviceQuitPopup.vue b/src/views/pqs/supervise/retire/deviceQuitPopup.vue new file mode 100644 index 00000000..b7bbd999 --- /dev/null +++ b/src/views/pqs/supervise/retire/deviceQuitPopup.vue @@ -0,0 +1,228 @@ + + + + diff --git a/src/views/pqs/supervise/retire/index.vue b/src/views/pqs/supervise/retire/index.vue index ba851fc7..2760cff4 100644 --- a/src/views/pqs/supervise/retire/index.vue +++ b/src/views/pqs/supervise/retire/index.vue @@ -1,35 +1,115 @@ + - - - diff --git a/src/views/system/bpm/category/categoryPopup.vue b/src/views/system/bpm/category/categoryPopup.vue new file mode 100644 index 00000000..909a68b6 --- /dev/null +++ b/src/views/system/bpm/category/categoryPopup.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/views/system/bpm/category/index.vue b/src/views/system/bpm/category/index.vue new file mode 100644 index 00000000..074e4d6b --- /dev/null +++ b/src/views/system/bpm/category/index.vue @@ -0,0 +1,113 @@ + + + + diff --git a/src/views/system/bpm/model/modelPopup.vue b/src/views/system/bpm/model/modelPopup.vue index d566a013..76b89abb 100644 --- a/src/views/system/bpm/model/modelPopup.vue +++ b/src/views/system/bpm/model/modelPopup.vue @@ -1,69 +1,85 @@