diff --git a/riis-web/public/webconfig.js b/riis-web/public/webconfig.js index 8a7c508..1294c0a 100644 --- a/riis-web/public/webconfig.js +++ b/riis-web/public/webconfig.js @@ -2,6 +2,6 @@ window.webConfig = { "webApiBaseUrl": "http://192.168.1.20:8090/", "wsApiBaseUrl": "ws://192.168.1.20:8090/", "webApiMonitorUrl": "http://192.168.1.20:18080", - "answeringUrl":"http://121.37.111.42:8083/ui/chat/431e83302d0bbfbe", + "answeringUrl":"http://121.37.111.42:8080/ui/chat/a9d56e68484c5594", "webSystemTitle":"标题" } \ No newline at end of file diff --git a/riis-web/src/api/question/index.ts b/riis-web/src/api/question/index.ts new file mode 100644 index 0000000..59c2283 --- /dev/null +++ b/riis-web/src/api/question/index.ts @@ -0,0 +1,42 @@ +import request from '@/utils/request'; + +//获取所有角色 +export function getAlgorithmClassTree(params:any){ + return request({ + url: '/algorithm/algorithm-class/getAlgorithmClassTree' , + method: 'get', + params: params + }); +} +//查询算法部件的参数 +export function getAlgorithmDeviceParams(params:any){ + return request({ + url: '/algorithm/algorithm-device/getAlgorithmDeviceParams' , + method: 'post', + params: params + }); + } +//查询算法部件的参数曲线 +export function getAlgorithmDeviceCurve(params:any){ + return request({ + url: '/algorithm/algorithm-device/getAlgorithmDeviceCurve' , + method: 'post', + params: params + }); +} +//根据算法id过去参数名称 +export function getAlgorithmParamsNameList(params:any){ + return request({ + url: '/algorithm/algorithm-params/getAlgorithmParamsNameList' , + method: 'get', + params: params + }); +} +//调用算法分析 +export function callAlgorithmAnalyse(params:any){ + return request({ + url: '/algorithm/algorithm-params/callAlgorithmAnalyse' , + method: 'post', + params: params + }); +} \ No newline at end of file diff --git a/riis-web/src/assets/navigation/110tu.png b/riis-web/src/assets/navigation/110tu.png new file mode 100644 index 0000000..bd28420 Binary files /dev/null and b/riis-web/src/assets/navigation/110tu.png differ diff --git a/riis-web/src/components/Pagination/page.vue b/riis-web/src/components/Pagination/page.vue index e387c3d..bd30379 100644 --- a/riis-web/src/components/Pagination/page.vue +++ b/riis-web/src/components/Pagination/page.vue @@ -60,7 +60,7 @@ const props = defineProps({ }, }); const pcode = ref(10) -const inputgo = ref() +const inputgo = ref(1) const arr_product = ref([ { lable: 10, diff --git a/riis-web/src/views/basedata/3DModelSet/index.vue b/riis-web/src/views/basedata/3DModelSet/index.vue index d4a7419..b592abc 100644 --- a/riis-web/src/views/basedata/3DModelSet/index.vue +++ b/riis-web/src/views/basedata/3DModelSet/index.vue @@ -404,7 +404,7 @@ - @@ -871,28 +814,7 @@ onMounted(() => {
关联信号
-
-
-
-
分类导航
-
- - - - - - - - -
+
@@ -904,16 +826,6 @@ onMounted(() => { - - - - - - 搜索 重置 diff --git a/riis-web/src/views/collectmonitor/datasurvey/index.vue b/riis-web/src/views/collectmonitor/datasurvey/index.vue index f8a4256..17eae27 100644 --- a/riis-web/src/views/collectmonitor/datasurvey/index.vue +++ b/riis-web/src/views/collectmonitor/datasurvey/index.vue @@ -107,7 +107,7 @@ function getsignadata() { }) } function gettabledata() { - if (detaall.value.length > 0) { + if (detaall.value) { tableform.value.startDate = formatDate(detaall.value[0]) tableform.value.endDate = formatDate(detaall.value[1]) } else { @@ -278,7 +278,7 @@ function gettoday() { :row-class-name="tableRowClassName" :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px' }"> - + @@ -342,7 +342,7 @@ function gettoday() { .text_top { width: 100%; - margin-top:20px ; + margin-top:30px ; .text_top_title { display: flex; @@ -377,24 +377,24 @@ function gettoday() { align-items: center; .content_one_title { width: 114px; - height: 75px; + height: 50px; text-align: center; - line-height: 75px; + line-height: 50px; border-top: 1px solid #00397c; border-left: 1px solid #00397c; background-color: #002562; - font-size: 16px; + font-size: 14px; color: #B5D7FF; } .content_one_text { width: 267px; - height: 75px; + height: 50px; text-align: center; - line-height: 75px; + line-height: 50px; border-top: 1px solid #00397c; border-left: 1px solid #00397c; - font-size: 16px; + font-size: 14px; color: #B5D7FF; } } diff --git a/riis-web/src/views/collectmonitor/environmentalMonitoring/index.vue b/riis-web/src/views/collectmonitor/environmentalMonitoring/index.vue index 470788f..15fc4cd 100644 --- a/riis-web/src/views/collectmonitor/environmentalMonitoring/index.vue +++ b/riis-web/src/views/collectmonitor/environmentalMonitoring/index.vue @@ -47,6 +47,7 @@ const hutotal: any = ref('') const environment_data = ref([]) // const treeloading = ref(false) function getEnvironment() { + treeloading.value = true if (tableData.value) { environment_params.value.startDate = tableData.value[0] @@ -57,15 +58,16 @@ function getEnvironment() { } environment_params.value.signalId = signalId.value getdeviceworkdata(environment_params.value).then((res: any) => { + treeloading.value = false environment_data.value = res.data.records environment_params.value.size = res.data.size environment_params.value.current = res.data.current hutotal.value = res.data.total - + }) } function environmentReset() { - environmentInfo + // environmentInfo if (tableData.value) { tableData.value.length = 0 } @@ -121,12 +123,14 @@ const environmentInfo: any = ref([]) // } function getInit() { + let params = { stationId: userStore.stationId } getDeviceWorkData(params).then((res: any) => { - environmentInfo.value = res.data + signalId.value = res.data[0].signalId + }) } @@ -152,8 +156,9 @@ function currency(list: any, itemcode: any) { const EquipmentType: any = ref([]) function gettype() { getDeviceByType({ dictcode: 'system' }).then((res: any) => { + // debugger EquipmentType.value = res.data - signalId.value = res.data[0].signalId + getEnvironment() getechartdata() }) @@ -182,33 +187,33 @@ function getechartdata() { drawEchart() }) function drawEchart() { - let myChart = echarts.init(document.getElementById("deviceEachers") as HTMLDivElement); - myChart.setOption({ - title: { - text: '' - }, - tooltip: { - trigger: 'axis' - }, - legend: { - data: ['Step Start', 'Step Middle', 'Step End'] - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true - }, - toolbox: { - feature: { - saveAsImage: {} - } - }, - xAxis: echartdata.value.xAxis, - yAxis: echartdata.value.yAxis, - series: echartdata.value.series - }) -} + let myChart = echarts.init(document.getElementById("deviceEachers") as HTMLDivElement); + myChart.setOption({ + title: { + text: '' + }, + tooltip: { + trigger: 'axis' + }, + legend: { + data: ['Step Start', 'Step Middle', 'Step End'] + }, + grid: { + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true + }, + toolbox: { + feature: { + saveAsImage: {} + } + }, + xAxis: echartdata.value.xAxis, + yAxis: echartdata.value.yAxis, + series: echartdata.value.series + }) + } } @@ -240,14 +245,14 @@ function getechartdata() { 重置
- - - + + diff --git a/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue b/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue index b252bbd..7d12f86 100644 --- a/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue +++ b/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue @@ -12,6 +12,12 @@ import Page from '@/components/Pagination/page.vue' import { useUserStore } from '@/store/modules/user'; import Eldialog from '@/components/seccmsdialog/eldialog.vue'; import wavEcharts from '@/components/wavEcharts/index.vue'; +import dayjs from 'dayjs' +function today(){ + let startTime = dayjs().startOf('day').format('YYYY-MM-DD HH:mm:ss') + let endTime = dayjs().format('YYYY-MM-DD HH:mm:ss') + tableData.value = [startTime,endTime] +} const userStore = useUserStore(); const url = userStore.webApiBaseUrl; function getData() { @@ -78,9 +84,10 @@ onBeforeUnmount(() => { }) onMounted(() => { getInit() + today() }) -const tableData = ref([]) +const tableData:any = ref([]) const treeloading = ref(false) const environment_data = ref([ @@ -95,7 +102,8 @@ const params: any = ref({ endDate: '', }) function getdata() { - if (tableData.value.length != 0) { + console.log(tableData.value) + if (tableData.value) { params.value.startDate = tableData.value[0] params.value.endDate = tableData.value[1] } else { @@ -233,7 +241,7 @@ function open(row: any) {
- @@ -253,15 +261,15 @@ function open(row: any) { :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px' }"> - + - + - +