Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit f8985748 by 李君
Options

Merge branch 'master' of http://git.keliuyun.com:55676/luoxinlin/vion-tools 

# Conflicts:
#	public/config.js
#	src/Request/PublicAxiosInstance.js
2 parents d5bca493 a8e9e79c
Inline Side-by-side
Showing 7 changed files with 254 additions and 8 deletions
public/config.js
window._serverHost = ['localhost', '192.168.1.161'].includes(window.location.hostname) ? 'store.keliuyun.com' : window.location.host window._serverHost = ['localhost', '192.168.1.165'].includes(window.location.hostname) ? '36.112.68.214:33333' : window.location.host
window._baseUrl = ['localhost', '192.168.1.161'].includes(window.location.hostname) ? 'https://store.keliuyun.com/btool/' : `https://${window._serverHost}/btool/` window._baseUrl = ['localhost', '192.168.1.165'].includes(window.location.hostname) ? 'http://36.112.68.214:33333/btool/' : `https://${window._serverHost}/btool/`
window._baseImgUrl = ['localhost', '192.168.1.161'].includes(window.location.hostname) ? 'https://store.keliuyun.com/images/' : `${window.location.origin}/images/` window._baseImgUrl = ['localhost', '192.168.1.39'].includes(window.location.hostname) ? 'https://store.keliuyun.com/images/' : `${window.location.origin}/images/`
window._socketUrl = ['localhost', '192.168.1.161'].includes(window.location.hostname) ? `wss://${window._serverHost}/` : `wss://${window._serverHost}/` window._socketUrl = ['localhost', '192.168.1.165'].includes(window.location.hostname) ? `wss://${window._serverHost}/` : `wss://${window._serverHost}/`
const log = console.log.bind(console) const log = console.log.bind(console)
src/Request/PublicAxiosInstance.js
...@@ -4,7 +4,7 @@ import Cookies from "js-cookie" ...@@ -4,7 +4,7 @@ import Cookies from "js-cookie"
import {getTimestampString} from "@/PublicUtil/PublicUtil" import {getTimestampString} from "@/PublicUtil/PublicUtil"
import {ElMessage} from 'element-plus' import {ElMessage} from 'element-plus'
// 创建 axios 的一个实例 // 创建 axios 的一个实例
let baseURL = ['localhost', '192.168.1.39'].includes(window.location.hostname) ? '' : window._baseUrl let baseURL = ['localhost', '192.168.1.28'].includes(window.location.hostname) ? '' : window._baseUrl
const axiosInstance = axios.create( const axiosInstance = axios.create(
{ {
baseURL: baseURL baseURL: baseURL
...@@ -21,7 +21,7 @@ axiosInstance.interceptors.request.use( ...@@ -21,7 +21,7 @@ axiosInstance.interceptors.request.use(
type: 'warning' type: 'warning'
}) })
setTimeout(()=>{ setTimeout(()=>{
let url = ['localhost', '192.168.1.39'].includes(window.location.hostname) ? 'http://36.112.68.214:33333/' : window.location.origin let url = ['localhost', '192.168.1.28'].includes(window.location.hostname) ? 'http://36.112.68.214:33333/' : window.location.origin
// if(url.includes('36.112.68.214')){ // if(url.includes('36.112.68.214')){
// url = 'http://36.112.68.214:33333/' // url = 'http://36.112.68.214:33333/'
// } // }
...@@ -45,7 +45,7 @@ axiosInstance.interceptors.response.use( ...@@ -45,7 +45,7 @@ axiosInstance.interceptors.response.use(
type: 'warning' type: 'warning'
}) })
setTimeout(()=>{ setTimeout(()=>{
let url = ['localhost', '192.168.1.39'].includes(window.location.hostname) ? 'http://36.112.68.214:33333/' : window.location.origin let url = ['localhost', '192.168.1.28'].includes(window.location.hostname) ? 'http://36.112.68.214:33333/' : window.location.origin
// if(url.includes('36.112.68.214')){ // if(url.includes('36.112.68.214')){
// url = 'http://36.112.68.214:33333/' // url = 'http://36.112.68.214:33333/'
// } // }
......
src/router/index.js
...@@ -57,6 +57,10 @@ const menuRoute = [ ...@@ -57,6 +57,10 @@ const menuRoute = [
path: 'Featurematching', path: 'Featurematching',
component: () => import("@/views/Featurematching/Featurematching.vue") component: () => import("@/views/Featurematching/Featurematching.vue")
}, },
{
path: 'equipmentDataRetransmission',
component: () => import("@/views/equipmentDataRetransmission/equipmentDataRetransmission.vue"),
},
] ]
}, },
] ]
......
src/views/Main/Main.vue
...@@ -91,12 +91,19 @@ ...@@ -91,12 +91,19 @@
<span style="padding: 0 5px">数据重放</span> <span style="padding: 0 5px">数据重放</span>
</div> </div>
</a-menu-item> </a-menu-item>
<a-menu-item :key="'/Main/equipmentDataRetransmission'">
<div class="flex-vertical-center">
<img :src="require('./Icons/2.svg')" style="height: auto;width:20px"/>
<span style="padding: 0 5px">设备数据重传</span>
</div>
</a-menu-item>
<a-menu-item :key="'/Main/Featurematching'"> <a-menu-item :key="'/Main/Featurematching'">
<div class="flex-vertical-center"> <div class="flex-vertical-center">
<img :src="require('./Icons/2.svg')" style="height: auto;width:20px"/> <img :src="require('./Icons/2.svg')" style="height: auto;width:20px"/>
<span style="padding: 0 5px">特征匹配</span> <span style="padding: 0 5px">特征匹配</span>
</div> </div>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</el-aside> </el-aside>
<el-main> <el-main>
......
src/views/equipmentDataRetransmission/api.js 0 → 100644
import axiosInstance from "@/Request/PublicAxiosInstance"
import {filterEmptyValueInObject} from "@/PublicUtil/PublicUtil"
class DataReplay {
getDeviceList(data) {
return axiosInstance.request(
{
method: 'GET',
url: `/devices/all`,
params: filterEmptyValueInObject(
data
)
}
)
}
}
const DataReplayApi = new DataReplay()
export default DataReplayApi
src/views/equipmentDataRetransmission/equipmentDataRetransmission.vue 0 → 100644
<template>
<a-form :model="queryForm" layout="inline" :label-col="{ style: { width: '70px' } }">
<a-form-item label="集团：">
<a-select v-model:value="queryForm.account_id"
style="width: 200px"
:options="accountList"
@change="onAccountChange"
optionFilterProp="label"
show-search
>
</a-select>
</a-form-item>
<a-form-item label="广场：">
<a-select v-model:value="queryForm.plaza_id"
mode="multiple"
:maxTagCount="1"
@change="onPlazaChange"
style="width: 200px"
:options="plazaList"
optionFilterProp="label"
show-search
>
</a-select>
</a-form-item>
<a-form-item label="选择设备：">
<a-select v-model:value="queryForm.device_id"
style="width: 300px"
mode="multiple"
:maxTagCount="1"
optionFilterProp="label"
:options="deviceList"
show-search
></a-select>
</a-form-item>
<a-form-item label="选择日期：">
<a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" style="width: 150px"/>
</a-form-item>
<a-form-item label="选择时间：">
<a-time-picker v-model:value="queryForm.startTime" style="width: 100px"/>
<a-time-picker v-model:value="queryForm.endTime" style="width: 100px"/>
</a-form-item>
<a-form-item>
<a-button type="primary" @click="confirmSearch" style="margin-right: 10px;">查询</a-button>
<a-button type="primary" @click="implement">执行</a-button>
</a-form-item>
</a-form>
<a-table :dataSource="deviceList" v-loading="isLoading" :rowKey="record=>record.serialnum" :columns="columns" :pagination="false">
</a-table>
</template>
<script>
import {reactive, ref, toRaw} from 'vue'
import moment from 'moment'
import {isArray} from '@/PublicUtil/Judgment'
import snapshotRecordApi from '@/views/SnapshotCluster/SnapshotRecord/SnapshotRecordApi'
import api from './api.js'
import axios from 'axios'
export default{
setup(){
const accountList = ref([])
const plazaList = ref([])
const deviceList = ref([])
const columns = ref([
{
title: '序号',
align:'center',
dataIndex: "index",
},
{
title: 'IP配置',
dataIndex: 'localIp',
align:'center',
},
{
title: '设备序列号',
dataIndex: 'serialnum',
align:'center',
},
{
title: '数据重传状态',
dataIndex: 'retransmission',
align:'center',
},
{
title: '设备重启状态',
dataIndex: 'restart',
align:'center',
}
])
const queryForm = reactive(
{
account_id: '',
plaza_id: [],
device_id: [],
date: moment().format('YYYY-MM-DD'),
startTime: moment().format('YYYY-MM-DD 08:00:00'),
endTime: moment().format('YYYY-MM-DD 23:59:59'),
}
)
const getAccountList = function() {
queryForm.account_id = []
accountList.value = []
snapshotRecordApi.getAccountList().then(
(r) => {
if (isArray(r))
{
for (const item of r)
{
accountList.value.push(
{
value: item.id,
label: item.name,
}
)
}
}
}
)
}
const onAccountChange = function() {
getPlazaList()
}
const getPlazaList = function() {
queryForm.plaza_id = []
plazaList.value = []
snapshotRecordApi.getPlazaList(
{
account_id: queryForm.account_id.toString()
}
).then(
(r) => {
if (isArray(r))
{
for (const item of r)
{
plazaList.value.push(
{
value: item.id,
label: item.name,
}
)
}
}
}
)
}
const onPlazaChange = function(){
queryForm.device_id = []
deviceList.value = []
getDevice()
}
const getDevice = function(){
// 获取设备
const rawData = toRaw(queryForm)
const data = {
mallIds: rawData.plaza_id.toString()
}
api.getDeviceList(data).then(
(r) => {
if (isArray(r))
{
for (var i = 0; i < r.length; i++) {
r[i].index = i+1
r[i].label = r[i].serialnum+"——"+r[i].localIp
r[i].value = r[i].serialnum
deviceList.value.push(r[i])
}
}
}
)
}
const confirmSearch = function(){
queryForm.device_id = []
deviceList.value = []
getDevice()
}
const implement = function(){
deviceList.value.forEach(item=>{
queryForm.device_id.forEach(serialnum=>{
if(item.serialnum == serialnum){
if(item.localIp){
axios({
method:'GET',
url: 'http://'+item.localIp+':8080/do/CboxWebClient/resultresend?starttime='+moment(queryForm.date).format('YYYY-MM-DD')+' '+moment(queryForm.startTime).format('HH:mm:ss')+'&endtime='+moment(queryForm.date).format('YYYY-MM-DD')+' '+moment(queryForm.endTime).format('HH:mm:ss')
}).then(result=>{
console.log(result)
})
}
}
})
})
}
const __main = function() {
getAccountList()
}
__main()
return{
deviceList,
accountList,
plazaList,
columns,
queryForm,
onAccountChange,
confirmSearch,
implement,
onPlazaChange
}
}
}
</script>
<style>
</style>
\ No newline at end of file \ No newline at end of file
vue.config.js
...@@ -58,7 +58,7 @@ module.exports = { ...@@ -58,7 +58,7 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/': { '/': {
target: 'https://store.keliuyun.com/btool/', target: 'http://36.112.68.214:33333/btool/',
changeOrigin: true changeOrigin: true
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!