diff --git a/src/api/device-boot/Business.ts b/src/api/device-boot/Business.ts index 848c0ae2..a6d45c0c 100644 --- a/src/api/device-boot/Business.ts +++ b/src/api/device-boot/Business.ts @@ -126,3 +126,19 @@ export function selectUserList(data: any) { data }) } +//查询列表 +export function getStatusManageList(data: any) { + return createAxios({ + url: '/device-boot/maintain/getStatusManageList', + method: 'post', + data + }) +} +//设置终端状态 +export function updateRunFlagManage(data: any) { + return createAxios({ + url: '/device-boot/maintain/updateRunFlagManage', + method: 'post', + data + }) +} diff --git a/src/api/device-boot/icd.ts b/src/api/device-boot/icd.ts new file mode 100644 index 00000000..f542cbdc --- /dev/null +++ b/src/api/device-boot/icd.ts @@ -0,0 +1,34 @@ +import createAxios from '@/utils/request' + +// icd删除 +export function delIcdPath(data: any) { + return createAxios({ + url: '/device-boot/icd/delIcdPath', + method: 'post', + data + }) +} +// 查询icd全部信息 +export function getIcdList() { + return createAxios({ + url: '/device-boot/icd/getIcdList', + method: 'post', + + }) +} +// 新增icd模型 +export function addIcdPath(data: any) { + return createAxios({ + url: '/device-boot/icd/addIcdPath', + method: 'post', + data + }) +} +// 更新icd模型 +export function updateIcdPath(data: any) { + return createAxios({ + url: '/device-boot/icd/updateIcdPath', + method: 'post', + data + }) +} diff --git a/src/api/device-boot/modelManage.ts b/src/api/device-boot/modelManage.ts new file mode 100644 index 00000000..9bb32e14 --- /dev/null +++ b/src/api/device-boot/modelManage.ts @@ -0,0 +1,34 @@ +import createAxios from '@/utils/request' + +// 新增装置型号 +export function addDevType(data: any) { + return createAxios({ + url: '/device-boot/devType/addDevType', + method: 'post', + data + }) +} +// 删除新装置型号 +export function delDevType(data: any) { + return createAxios({ + url: '/device-boot/devType/delDevType', + method: 'post', + data + }) +} +// 更新装置型号 +export function updateDevType(data: any) { + return createAxios({ + url: '/device-boot/devType/updateDevType', + method: 'post', + data + }) +} +// 查询装置型号全部信息 +export function getDevTypeList() { + return createAxios({ + url: '/device-boot/devType/getDevTypeList', + method: 'post', + + }) +} \ No newline at end of file diff --git a/src/views/pqs/business/terminal/ProgramManagement/index.vue b/src/views/pqs/business/terminal/ProgramManagement/index.vue index 4333ec64..68854cdc 100644 --- a/src/views/pqs/business/terminal/ProgramManagement/index.vue +++ b/src/views/pqs/business/terminal/ProgramManagement/index.vue @@ -64,7 +64,7 @@ v-bind="defaultAttribute" :data="treeData" show-overflow - :tree-config="{ transform: true, parentField: 'uPid',rowField:'uId' }" + :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }" :scroll-y="{ enabled: true }" > @@ -182,8 +182,9 @@ import TableStore from '@/utils/tableStore' import { defaultAttribute } from '@/components/table/defaultAttribute' import TableHeader from '@/components/table/header/index.vue' import { mainHeight } from '@/utils/layout' -import { getTerminalUpLog } from '@/api/device-boot/Business.ts' +import { getTerminalUpLog } from '@/api/device-boot/Business' import XEUtils from 'xe-utils' +import { getDevTypeList } from '@/api/device-boot/modelManage' import { debounce } from 'lodash-es' import { useDictData } from '@/stores/dictData' defineOptions({ @@ -193,7 +194,7 @@ defineOptions({ const pageHeight = mainHeight(83) const dialogHeight = mainHeight(300) const dictData = useDictData() -const teriminaloption: any = dictData.getBasicData('Dev_Type') +const teriminaloption: any = ref([]) const teriminalstatusoption = ref([ { name: '全部', id: '' }, { name: '投运', id: 0 }, @@ -256,16 +257,14 @@ tableStore.table.params.searchEvent = '' tableStore.table.params.filterName = '' provide('tableStore', tableStore) - - const tree2List = (list: any, id: any) => { //存储结果的数组 let arr: any = [] // 遍历 tree 数组 list.forEach((item: any) => { item.uPid = id - item.uId = (Math.random() * 1000) - + item.uId = Math.random() * 1000 + // 判断item是否存在children if (!item.children) return arr.push(item) // 函数递归,对children数组进行tree2List的转换 @@ -280,10 +279,12 @@ const tree2List = (list: any, id: any) => { return arr } - tableStore.table.params.searchValue = '' tableStore.table.params.searchState = 0 onMounted(() => { + getDevTypeList().then(res => { + teriminaloption.value = res.data + }) tableStore.index() }) const add = () => {} @@ -316,7 +317,7 @@ const format = (percentage: any) => { const formFilter = (row: any) => { let title = '/' if (row.cellValue != null) { - teriminaloption.forEach((item: any) => { + teriminaloption.value.forEach((item: any) => { if (item.id == row.cellValue) { title = item.name } diff --git a/src/views/pqs/business/terminal/TerminalManagement/components/detail.vue b/src/views/pqs/business/terminal/TerminalManagement/components/detail.vue new file mode 100644 index 00000000..b62671d4 --- /dev/null +++ b/src/views/pqs/business/terminal/TerminalManagement/components/detail.vue @@ -0,0 +1,112 @@ + + + diff --git a/src/views/pqs/business/terminal/TerminalManagement/components/disposition.vue b/src/views/pqs/business/terminal/TerminalManagement/components/disposition.vue new file mode 100644 index 00000000..50342c14 --- /dev/null +++ b/src/views/pqs/business/terminal/TerminalManagement/components/disposition.vue @@ -0,0 +1,130 @@ + + + diff --git a/src/views/pqs/business/terminal/TerminalManagement/index.vue b/src/views/pqs/business/terminal/TerminalManagement/index.vue index 7cb7f9b4..21619739 100644 --- a/src/views/pqs/business/terminal/TerminalManagement/index.vue +++ b/src/views/pqs/business/terminal/TerminalManagement/index.vue @@ -3,47 +3,89 @@
- - + + + + @@ -68,88 +110,65 @@ - +
- - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/views/system/icd/index.vue b/src/views/system/icd/index.vue index 7c7a3eef..067c8897 100644 --- a/src/views/system/icd/index.vue +++ b/src/views/system/icd/index.vue @@ -20,7 +20,7 @@ - + { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } + }, + { field: 'name', title: 'icd名称' }, + { field: 'path', title: 'icd路径', minWidth: 250 }, + { field: 'createBy', title: '创建人' }, + { field: 'createTime', title: '创建时间' }, + { field: 'updateBy', title: '修改人' }, + { field: 'updateTime', title: '修改时间' }, { title: '操作', width: '220', @@ -76,7 +87,27 @@ const tableStore: any = new TableStore({ render: 'basicButton', click: async row => { - taskFormRef.value.open('编辑icd文件', row) + taskFormFlag.value = true + setTimeout(() => { + taskFormRef.value.open('编辑icd文件', row) + }, 10) + } + }, + { + name: 'edit', + title: '下载', + type: 'primary', + icon: 'el-icon-EditPen', + render: 'basicButton', + click: async row => { + getFileNameAndFilePath({ filePath: row.path }).then(res => { + const link = document.createElement('a') + link.href = res.data.url + link.download = res.data.name + document.body.appendChild(link) + link.click() + document.body.removeChild(link) + }) } }, @@ -93,7 +124,7 @@ const tableStore: any = new TableStore({ title: '确定删除?' }, click: row => { - deleteTimer([row.id]).then(res => { + delIcdPath([row.id]).then(res => { ElMessage.success('删除成功') tableStore.index() }) @@ -103,7 +134,9 @@ const tableStore: any = new TableStore({ } ], - loadCallback: () => {} + loadCallback: () => { + taskFormFlag.value = false + } }) tableStore.table.params.searchValue = '' tableStore.table.params.searchState = '' @@ -111,6 +144,7 @@ tableStore.table.params.searchState = '' provide('tableStore', tableStore) const add = () => { + taskFormFlag.value = true setTimeout(() => { taskFormRef.value.open('新增icd文件') }, 10) diff --git a/src/views/system/modelManage/form.vue b/src/views/system/modelManage/form.vue new file mode 100644 index 00000000..561f7f23 --- /dev/null +++ b/src/views/system/modelManage/form.vue @@ -0,0 +1,81 @@ + + diff --git a/src/views/system/modelManage/index.vue b/src/views/system/modelManage/index.vue new file mode 100644 index 00000000..bc3c90d3 --- /dev/null +++ b/src/views/system/modelManage/index.vue @@ -0,0 +1,155 @@ + +