Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 21755519 by 李金轩
Options

完成版

1 parent 076ce683
Inline Side-by-side
Showing 5 changed files with 85 additions and 88 deletions
package-lock.json
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"name": "label-cloud", "name": "label-cloud",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"ant-design-vue": "^2.2.0-beta.5", "ant-design-vue": "^2.2.8",
"axios": "^0.21.1", "axios": "^0.21.1",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"element-plus": "^1.0.2-beta.28", "element-plus": "^1.0.2-beta.28",
...@@ -37,17 +37,6 @@ ...@@ -37,17 +37,6 @@
"vue-cli-plugin-element-plus": "~0.0.13" "vue-cli-plugin-element-plus": "~0.0.13"
} }
}, },
"node_modules/@ant-design-vue/use": {
"version": "0.0.1-alpha.10",
"resolved": "https://registry.npmjs.org/@ant-design-vue/use/-/use-0.0.1-alpha.10.tgz",
"integrity": "sha512-og9a6Glx3X/8WHPasTTNRBPg+e5Jsp6J7gKH2dQ1/HDvMTYP/BCy08HrUfvTk9crkGc0kbxDmY+7M8KEtC80zw==",
"dependencies": {
"async-validator": "^3.4.0",
"lodash-es": "^4.17.15",
"resize-observer-polyfill": "^1.5.1",
"vue": "^3.0.0"
}
},
"node_modules/@ant-design/colors": { "node_modules/@ant-design/colors": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-5.1.1.tgz", "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-5.1.1.tgz",
...@@ -2721,11 +2710,10 @@ ...@@ -2721,11 +2710,10 @@
} }
}, },
"node_modules/ant-design-vue": { "node_modules/ant-design-vue": {
"version": "2.2.0-beta.5", "version": "2.2.8",
"resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.2.0-beta.5.tgz", "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.2.8.tgz",
"integrity": "sha512-g9OQC38j1gnunQ00Pll3bI809E1yuJBv5jz5fj+rv/OiLieqxPYSDKBvjZLOf7scMPJrPvo+Jv8DVlSpA3A7hQ==", "integrity": "sha512-3graq9/gCfJQs6hznrHV6sa9oDmk/D1H3Oo0vLdVpPS/I61fZPk8NEyNKCHpNA6fT2cx6xx9U3QS63uuyikg/Q==",
"dependencies": { "dependencies": {
"@ant-design-vue/use": "^0.0.1-0",
"@ant-design/icons-vue": "^6.0.0", "@ant-design/icons-vue": "^6.0.0",
"@babel/runtime": "^7.10.5", "@babel/runtime": "^7.10.5",
"@simonwep/pickr": "~1.8.0", "@simonwep/pickr": "~1.8.0",
...@@ -2737,6 +2725,7 @@ ...@@ -2737,6 +2725,7 @@
"lodash-es": "^4.17.15", "lodash-es": "^4.17.15",
"moment": "^2.27.0", "moment": "^2.27.0",
"omit.js": "^2.0.0", "omit.js": "^2.0.0",
"resize-observer-polyfill": "^1.5.1",
"scroll-into-view-if-needed": "^2.2.25", "scroll-into-view-if-needed": "^2.2.25",
"shallow-equal": "^1.0.0", "shallow-equal": "^1.0.0",
"vue-types": "^3.0.0", "vue-types": "^3.0.0",
...@@ -15207,17 +15196,6 @@ ...@@ -15207,17 +15196,6 @@
} }
}, },
"dependencies": { "dependencies": {
"@ant-design-vue/use": {
"version": "0.0.1-alpha.10",
"resolved": "https://registry.npmjs.org/@ant-design-vue/use/-/use-0.0.1-alpha.10.tgz",
"integrity": "sha512-og9a6Glx3X/8WHPasTTNRBPg+e5Jsp6J7gKH2dQ1/HDvMTYP/BCy08HrUfvTk9crkGc0kbxDmY+7M8KEtC80zw==",
"requires": {
"async-validator": "^3.4.0",
"lodash-es": "^4.17.15",
"resize-observer-polyfill": "^1.5.1",
"vue": "^3.0.0"
}
},
"@ant-design/colors": { "@ant-design/colors": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-5.1.1.tgz", "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-5.1.1.tgz",
...@@ -17462,11 +17440,10 @@ ...@@ -17462,11 +17440,10 @@
} }
}, },
"ant-design-vue": { "ant-design-vue": {
"version": "2.2.0-beta.5", "version": "2.2.8",
"resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.2.0-beta.5.tgz", "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.2.8.tgz",
"integrity": "sha512-g9OQC38j1gnunQ00Pll3bI809E1yuJBv5jz5fj+rv/OiLieqxPYSDKBvjZLOf7scMPJrPvo+Jv8DVlSpA3A7hQ==", "integrity": "sha512-3graq9/gCfJQs6hznrHV6sa9oDmk/D1H3Oo0vLdVpPS/I61fZPk8NEyNKCHpNA6fT2cx6xx9U3QS63uuyikg/Q==",
"requires": { "requires": {
"@ant-design-vue/use": "^0.0.1-0",
"@ant-design/icons-vue": "^6.0.0", "@ant-design/icons-vue": "^6.0.0",
"@babel/runtime": "^7.10.5", "@babel/runtime": "^7.10.5",
"@simonwep/pickr": "~1.8.0", "@simonwep/pickr": "~1.8.0",
...@@ -17478,6 +17455,7 @@ ...@@ -17478,6 +17455,7 @@
"lodash-es": "^4.17.15", "lodash-es": "^4.17.15",
"moment": "^2.27.0", "moment": "^2.27.0",
"omit.js": "^2.0.0", "omit.js": "^2.0.0",
"resize-observer-polyfill": "^1.5.1",
"scroll-into-view-if-needed": "^2.2.25", "scroll-into-view-if-needed": "^2.2.25",
"shallow-equal": "^1.0.0", "shallow-equal": "^1.0.0",
"vue-types": "^3.0.0", "vue-types": "^3.0.0",
package.json
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"dev": "vue-cli-service serve" "dev": "vue-cli-service serve"
}, },
"dependencies": { "dependencies": {
"ant-design-vue": "^2.2.0-beta.5", "ant-design-vue": "^2.2.8",
"axios": "^0.21.1", "axios": "^0.21.1",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"element-plus": "^1.0.2-beta.28", "element-plus": "^1.0.2-beta.28",
......
public/config.js
// window._baseUrl = ['localhost', '192.168.1.104'].includes(window.location.hostname) ? 'http://store.keliuyun.com:9998' : '' window._baseUrl = ['localhost', '192.168.1.104'].includes(window.location.hostname) ? 'http://store.keliuyun.com:9998' : ''
window._baseUrl = 'http://36.112.68.214:9999' // window._baseUrl = 'http://36.112.68.214:9999'
const log = console.log.bind(console) const log = console.log.bind(console)
src/Request/PublicAxiosInstance.js
...@@ -15,7 +15,7 @@ axiosInstance.interceptors.request.use( ...@@ -15,7 +15,7 @@ axiosInstance.interceptors.request.use(
config => { config => {
if (['localhost', '192.168.1.104'].includes(window.location.hostname)) if (['localhost', '192.168.1.104'].includes(window.location.hostname))
{ {
config.headers.Authorization = '2c74d6cb-e060-4fbf-9ebe-60f67313de91' config.headers.Authorization = '6196e80b-a10d-4318-b669-50e96b52b042'
} }
else else
{ {
......
src/views/DataRepair/DataRepair.vue
...@@ -81,60 +81,15 @@ ...@@ -81,60 +81,15 @@
</a-form-item> </a-form-item>
</a-form> </a-form>
<a-table :dataSource="dataList" v-loading="isLoading" :columns="[ <a-table :dataSource="dataList" v-loading="isLoading" :columns="columns" :pagination="false">
{
title: '监控点名称',
dataIndex: 'gatename',
align:'center',
},
{
title: '设备号',
dataIndex: 'deviceSerialnum',
align:'center',
},
{
title: '通道号',
dataIndex: 'channelSerialnum',
align:'center',
},
{
title: '参考数据条数',
dataIndex: 'sourceCount',
align:'center',
},
{
title: '实际数据条数',
dataIndex: 'targetCount',
align:'center',
},
{
title: '参考数据量',
dataIndex: 'sourceInnum',
align:'center',
},
{
title: '实际数据量',
dataIndex: 'targetInnum',
align:'center',
},
{
title: '状态',
dataIndex: 'status',
align:'center',
slots: {
customRender: 'status',
},
},
{
title: '操作',
dataIndex: 'address',
align:'center',
},
]" :pagination="false">
<template #status="{ text }"> <template #status="{ text }">
<span :class="getClass(text)">{{ text }}</span> <span :class="getClass(text)">{{ text }}</span>
</template> </template>
<template #operation="{ record }">
<div>
<a-button @click="deleteRecord(record)" type="primary" danger>删除任务</a-button>
</div>
</template>
</a-table> </a-table>
</template> </template>
...@@ -145,9 +100,61 @@ import moment from 'moment' ...@@ -145,9 +100,61 @@ import moment from 'moment'
import snapshotRecordApi from '@/views/SnapshotCluster/SnapshotRecord/SnapshotRecordApi' import snapshotRecordApi from '@/views/SnapshotCluster/SnapshotRecord/SnapshotRecordApi'
import {isArray} from '@/PublicUtil/Judgment' import {isArray} from '@/PublicUtil/Judgment'
import {filterEmptyValueInObject, formatDate, formatTime} from '@/PublicUtil/PublicUtil' import {filterEmptyValueInObject, formatDate, formatTime} from '@/PublicUtil/PublicUtil'
import peopleReContrastApi from '@/views/PeopleReContrast/PeopleReContrastApi'
import dataRepairApi from '@/views/DataRepair/DataRepairApi' import dataRepairApi from '@/views/DataRepair/DataRepairApi'
import clusterResultApi from '@/views/SnapshotCluster/ClusterResult/ClusterResultApi'
const columns = [
{
title: '监控点名称',
dataIndex: 'gatename',
align: 'center',
},
{
title: '设备号',
dataIndex: 'deviceSerialnum',
align: 'center',
},
{
title: '通道号',
dataIndex: 'channelSerialnum',
align: 'center',
},
{
title: '参考数据条数',
dataIndex: 'sourceCount',
align: 'center',
},
{
title: '实际数据条数',
dataIndex: 'targetCount',
align: 'center',
},
{
title: '参考数据量',
dataIndex: 'sourceInnum',
align: 'center',
},
{
title: '实际数据量',
dataIndex: 'targetInnum',
align: 'center',
},
{
title: '状态',
dataIndex: 'status',
align: 'center',
slots: {
customRender: 'status',
},
},
{
title: '操作',
dataIndex: 'operation',
align: 'center',
slots: {
customRender: 'operation',
},
},
]
export default { export default {
setup() { setup() {
...@@ -414,6 +421,16 @@ export default { ...@@ -414,6 +421,16 @@ export default {
} }
} }
const deleteRecord = function({channelSerialnum}) {
dataList.value = dataList.value.filter(
item => item.channelSerialnum !== channelSerialnum
)
queryForm.channel_id = queryForm.channel_id.filter(
item => item !== channelSerialnum
)
}
const __main = function() { const __main = function() {
getAccountList() getAccountList()
} }
...@@ -432,6 +449,7 @@ export default { ...@@ -432,6 +449,7 @@ export default {
resultList, resultList,
dataList, dataList,
queryForm, queryForm,
columns,
// function // function
onAccountChange, onAccountChange,
onPlazaChange, onPlazaChange,
...@@ -439,6 +457,7 @@ export default { ...@@ -439,6 +457,7 @@ export default {
preview, preview,
repair, repair,
getClass, getClass,
deleteRecord,
} }
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!