修改组态化

master
夜笙歌 2 months ago
parent daf973c416
commit af3e5f053d

@ -124,6 +124,7 @@
<script setup lang="ts"> <script setup lang="ts">
import axios from 'axios'; import axios from 'axios';
import request from '@/utils/request'; import request from '@/utils/request';
import { isD } from './tool.js';
const comparisonTable = { const comparisonTable = {
starttime: '开始时间', starttime: '开始时间',
@ -197,18 +198,12 @@ const findTier = () => {
params[item.name] = item.test; params[item.name] = item.test;
}); });
// axios.request({ (isD ? request : axios.request)({
// method: constructionDataForm.value.method, method: constructionDataForm.value.method,
// url: constructionDataForm.value.url, url: constructionDataForm.value.url,
// params: constructionDataForm.value.method === 'get' ? params : '', params: constructionDataForm.value.method === 'get' ? params : '',
// data: constructionDataForm.value.method === 'post' ? params : '' data: constructionDataForm.value.method === 'post' ? params : ''
// }).then(res => { }).then(res => {
request({
method: constructionDataForm.value.method,
url: constructionDataForm.value.url,
params: constructionDataForm.value.method === 'get' ? params : '',
data: constructionDataForm.value.method === 'post' ? params : ''
}).then(res => {
let data = res.data; let data = res.data;
if (data.data) { if (data.data) {
Object.keys(data.data?.[0]).forEach(key => { Object.keys(data.data?.[0]).forEach(key => {

@ -20,8 +20,9 @@ import { defineEmits, defineProps, ref } from 'vue';
import { NodeResizer } from '@vue-flow/node-resizer'; import { NodeResizer } from '@vue-flow/node-resizer';
import { Connection } from '@element-plus/icons-vue'; import { Connection } from '@element-plus/icons-vue';
import { Handle, Position } from '@vue-flow/core'; import { Handle, Position } from '@vue-flow/core';
import request from '@/utils/request';
import axios from 'axios'; import axios from 'axios';
import request from '@/utils/request.js'; import { isD } from '../../tool.js';
const props = defineProps({ const props = defineProps({
isView: { isView: {
@ -83,18 +84,12 @@ const getOutputData = () => {
(props.data.customData.inputData || []).forEach((item) => { (props.data.customData.inputData || []).forEach((item) => {
params[item.name] = props.inputData[item.name]; params[item.name] = props.inputData[item.name];
}); });
request({ (isD ? request : axios.request)({
method: props.data.customData.method, method: props.data.customData.method,
url: props.data.customData.url, url: props.data.customData.url,
params: props.data.customData.method === 'get' ? params : '', params: props.data.customData.method === 'get' ? params : '',
data: props.data.customData.method === 'post' ? params : '' data: props.data.customData.method === 'post' ? params : ''
}).then(res => { }).then(res => {
// axios.request({
// method: props.data.customData.method,
// url: props.data.customData.url,
// params: props.data.customData.method === 'get' ? params : '',
// data: props.data.customData.method === 'post' ? params : ''
// }).then(res => {
let output = {}; let output = {};
props.data.customData.outputData.forEach(item => { props.data.customData.outputData.forEach(item => {
output[item.name] = parseData(res.data, item.tier); output[item.name] = parseData(res.data, item.tier);

@ -21,7 +21,8 @@ import { NodeResizer } from '@vue-flow/node-resizer';
import { Connection } from '@element-plus/icons-vue'; import { Connection } from '@element-plus/icons-vue';
import { Handle, Position } from '@vue-flow/core'; import { Handle, Position } from '@vue-flow/core';
import axios from 'axios'; import axios from 'axios';
import request from '@/utils/request.js'; import request from '@/utils/request';
import { isD } from '../../tool.js';
const props = defineProps({ const props = defineProps({
isView: { isView: {
@ -58,16 +59,11 @@ const service = axios.create({
timeout: 10000 timeout: 10000
}); });
const getOutputData = () => { const getOutputData = () => {
request({ (isD ? request : service)({
method: 'post', method: 'post',
url: '/test/getDevice', url: '/test/getDevice',
data: props.inputData data: props.inputData
}).then(res => { }).then(res => {
// service({
// method: 'post',
// url: '/test/getDevice',
// data: props.inputData
// }).then(res => {
props.data.outputData = { props.data.outputData = {
time: res.data?.data?.map(e => e.time), time: res.data?.data?.map(e => e.time),
value: res.data?.data?.map(e => e.value) value: res.data?.data?.map(e => e.value)

@ -109,3 +109,4 @@ const tool = () => {
}; };
}; };
export default tool; export default tool;
export const isD = false;

Loading…
Cancel
Save