diff --git a/package.json b/package.json index 94ea10e..1220b45 100644 --- a/package.json +++ b/package.json @@ -31,19 +31,22 @@ "jsencrypt": "3.3.1", "nprogress": "0.2.0", "pinia": "2.0.22", + "splitpanes": "^3.1.5", "vee-validate": "4.5.8", "vkbeautify": "^0.99.3", "vue": "3.2.45", "vue-baidu-map-3x": "^1.0.34", "vue-cropper": "1.0.3", - "vue-router": "4.1.4" + "vue-draggable-plus": "^0.3.0", + "vue-router": "4.1.4", + "vuedraggable": "^2.24.3" }, "devDependencies": { "@vitejs/plugin-vue": "3.1.0", "@vue/compiler-sfc": "3.2.45", "sass": "1.56.1", - "unplugin-auto-import": "0.11.4", - "vite": "3.2.3", + "unplugin-auto-import": "^0.11.5", + "vite": "^3.2.3", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" diff --git a/src/api/model/asset/info.js b/src/api/model/asset/info.js new file mode 100644 index 0000000..cd17192 --- /dev/null +++ b/src/api/model/asset/info.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询资产信息列表 +export function listInfo(query) { + return request({ + url: '/model/dcBaseAssetInfo/list', + method: 'get', + params: query + }) +} + +// 查询资产信息详细 +export function getInfo(id) { + return request({ + url: '/model/dcBaseAssetInfo/' + id, + method: 'get' + }) +} + +// 新增资产信息 +export function addInfo(data) { + return request({ + url: '/model/dcBaseAssetInfo', + method: 'post', + data: data + }) +} + +// 修改资产信息 +export function updateInfo(data) { + return request({ + url: '/model/dcBaseAssetInfo', + method: 'put', + data: data + }) +} + +// 删除资产信息 +export function delInfo(id) { + return request({ + url: '/model/dcBaseAssetInfo/' + id, + method: 'delete' + }) +} + +// 导出资产信息 +export function exportInfo(query) { + return request({ + url: '/${baseUrl}/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/model/asset/params.js b/src/api/model/asset/params.js new file mode 100644 index 0000000..1d027d9 --- /dev/null +++ b/src/api/model/asset/params.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询资产参数列表 +export function listParams(query) { + return request({ + url: '/model/dcBaseAssetParams/list', + method: 'get', + params: query + }) +} + +// 查询资产参数详细 +export function getParams(id) { + return request({ + url: '/model/dcBaseAssetParams/' + id, + method: 'get' + }) +} + +// 新增资产参数 +export function addParams(data) { + return request({ + url: '/model/dcBaseAssetParams', + method: 'post', + data: data + }) +} + +// 修改资产参数 +export function updateParams(data) { + return request({ + url: '/model/dcBaseAssetParams', + method: 'put', + data: data + }) +} + +// 删除资产参数 +export function delParams(id) { + return request({ + url: '/model/dcBaseAssetParams/' + id, + method: 'delete' + }) +} + +// 导出资产参数 +export function exportParams(query) { + return request({ + url: '/${baseUrl}/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/assets/icons/png/simple.png b/src/assets/icons/png/simple.png new file mode 100644 index 0000000..e9e4f88 Binary files /dev/null and b/src/assets/icons/png/simple.png differ diff --git a/src/assets/icons/svg/wifi-green.svg b/src/assets/icons/svg/wifi-green.svg new file mode 100644 index 0000000..e5f8dc0 --- /dev/null +++ b/src/assets/icons/svg/wifi-green.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/wifi-red.svg b/src/assets/icons/svg/wifi-red.svg new file mode 100644 index 0000000..3b5c2c0 --- /dev/null +++ b/src/assets/icons/svg/wifi-red.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/CustomMonitorView/index.vue b/src/components/CustomMonitorView/index.vue new file mode 100644 index 0000000..23a5d09 --- /dev/null +++ b/src/components/CustomMonitorView/index.vue @@ -0,0 +1,101 @@ + + + + + + \ No newline at end of file diff --git a/src/components/luckysheet/index.vue b/src/components/luckysheet/index.vue index bf056a5..492bcd6 100644 --- a/src/components/luckysheet/index.vue +++ b/src/components/luckysheet/index.vue @@ -1,16 +1,50 @@ diff --git a/src/views/model/asset/index.vue b/src/views/model/asset/index.vue new file mode 100644 index 0000000..028efc7 --- /dev/null +++ b/src/views/model/asset/index.vue @@ -0,0 +1,341 @@ + + + diff --git a/src/views/model/asset/params.vue b/src/views/model/asset/params.vue new file mode 100644 index 0000000..fb271b3 --- /dev/null +++ b/src/views/model/asset/params.vue @@ -0,0 +1,285 @@ + + + diff --git a/src/views/model/heatapiconf/heatMainOperatorLog.vue b/src/views/model/heatapiconf/heatMainOperatorLog.vue index e7df1b5..c7e9e1a 100644 --- a/src/views/model/heatapiconf/heatMainOperatorLog.vue +++ b/src/views/model/heatapiconf/heatMainOperatorLog.vue @@ -6,11 +6,11 @@ + v-for="dict in dc_operator_type" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> diff --git a/src/views/model/params/index.vue b/src/views/model/params/index.vue index d136e83..99c2622 100644 --- a/src/views/model/params/index.vue +++ b/src/views/model/params/index.vue @@ -418,6 +418,7 @@ const sortItemMap = ref({}); const queryParamFilter = ref({}); const sortProps = ref([]); const names = ref([]); + const contrlFlag = ref([ {label: '可控', value: true, elTagType: 'default', elTagClass: null}, {label: '不可控', value: false, elTagType: 'default', elTagClass: null} @@ -426,6 +427,7 @@ const enabled = ref([ {label: '有效', value: true, elTagType: 'default', elTagClass: null}, {label: '无效', value: false, elTagType: 'default', elTagClass: null} ]); + const contrlFlagTable = ref([ {label: '可控', value: 'true', elTagType: 'default', elTagClass: null}, {label: '不可控', value: 'false', elTagType: 'default', elTagClass: null}