修改兼容性

master
suixy 3 months ago
parent 993785ba89
commit 4ed24230d0

@ -60,9 +60,10 @@
"swiper": "^11.2.8",
"uuid": "^11.0.5",
"vform3-builds": "^3.0.10",
"vue": "3.4.34",
"vue": "3.5.21",
"vue-barcode": "^1.3.0",
"vue-cropper": "1.1.1",
"vue-datepicker-next": "1.0.3",
"vue-draggable-resizable": "^3.0.0",
"vue-i18n": "9.10.2",
"vue-json-pretty": "2.4.0",

@ -50,9 +50,9 @@ import { countTaskWaitByCurrentUser } from '@/api/workflow/task';
const badge = ref(0);
const getBadge = () => {
if (onlyOneChild.value.meta?.title === '我的待办' || props.item?.meta?.title === '我的任务') {
countTaskWaitByCurrentUser().then(e => {
badge.value = e.data;
});
// countTaskWaitByCurrentUser().then(e => {
// badge.value = e.data;
// });
}
};
onMounted(() => {

@ -0,0 +1,63 @@
export function getHoursBetween(startHourStr, endHourStr) {
const startHour = new Date(startHourStr)
let endHour = new Date(endHourStr)
let nowDate = new Date()
nowDate.setHours(nowDate.getHours() - 1);
if (endHour.getTime() > nowDate.getTime()) {
endHour = nowDate
}
const hours = []
while (startHour <= endHour) {
const hourString = `${startHour.getFullYear()}-${String(startHour.getMonth() + 1).padStart(2, '0')}-${String(startHour.getDate()).padStart(2, '0')} ${String(startHour.getHours()).padStart(2, '0')}:00:00`
hours.push(hourString)
startHour.setTime(startHour.getTime() + 60 * 60 * 1000)
}
// return hours;
return hours.sort((a, b) => new Date(b) - new Date(a))
}
export function getDatesBetween(startDateStr, endDateStr) {
const startDate = new Date(startDateStr)
let endDate = new Date(endDateStr)
let nowDate = new Date()
nowDate.setHours(nowDate.getHours() - 1);
if (endDate.getTime() > nowDate.getTime()) {
endDate = nowDate
}
const dates = []
while (startDate <= endDate) {
dates.push(`${startDate.getFullYear()}-${String(startDate.getMonth() + 1).padStart(2, '0')}-${String(startDate.getDate()).padStart(2, '0')}`)
startDate.setDate(startDate.getDate() + 1)
}
// return dates;
return dates.sort((a, b) => new Date(b) - new Date(a))
}
export function getMonthsBetween(startMonthStr, endMonthStr) {
const result = []
const startDate = new Date(startMonthStr + '-01')
let endDate = new Date(endMonthStr + '-01')
const currentDate = new Date(startDate)
let nowDate = new Date()
nowDate.setHours(nowDate.getHours() - 1);
if (endDate.getTime() > nowDate.getTime()) {
endDate = nowDate
}
while (currentDate <= endDate) {
const year = currentDate.getFullYear()
const month = String(currentDate.getMonth() + 1).padStart(2, '0')
result.push(`${year}-${month}`)
currentDate.setMonth(currentDate.getMonth() + 1)
}
return result.sort((a, b) => new Date(b) - new Date(a))
}
export function getYearsBetween(startYearStr, endYearStr) {
const result = []
const startYear = Number(startYearStr.substring(0, 4))
const endYear = Number(endYearStr.substring(0, 4))
for (let i = startYear; i <= endYear; i++) {
result.push(`${i}`)
}
return result.sort((a, b) => new Date(b) - new Date(a))
}

@ -280,8 +280,8 @@ import {
addBaseMonitorWorkUnit,
updateBaseMonitorWorkUnit
} from '@/api/ems/base/baseMonitorWorkUnit'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import { getWorkUnitTrees } from '@/api/ems/base/baseWorkUnit'

@ -280,8 +280,8 @@ import {
addBaseMonitorWorkUnit,
updateBaseMonitorWorkUnit
} from '@/api/ems/base/baseMonitorWorkUnit'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import { getWorkUnitTrees } from '@/api/ems/base/baseWorkUnit'

@ -168,8 +168,8 @@ import {
addBaseWorkUnit,
updateBaseWorkUnit
} from '@/api/ems/base/baseWorkUnit'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
export default {
name: 'BaseWorkUnit',

@ -168,8 +168,8 @@ import {
addBaseWorkUnit,
updateBaseWorkUnit
} from '@/api/ems/base/baseWorkUnit'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
export default {
name: 'BaseWorkUnit',

@ -272,8 +272,8 @@ import {
updateRecordDnbInstant
} from '@/api/ems/record/recordDnbInstant'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
export default {

@ -244,8 +244,8 @@ import {
updateRecordSteamInstant, latestSteamInstantList
} from '@/api/ems/record/recordSteamInstant'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
export default {

@ -244,8 +244,8 @@ import {
updateRecordSteamInstant, latestSteamInstantList
} from '@/api/ems/record/recordSteamInstant'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
export default {

@ -269,12 +269,11 @@ import {
updateRecordSteamInstant, getExpendSum
} from '@/api/ems/record/recordSteamInstant'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import DatePicker from 'vue2-datepicker';
import 'vue2-datepicker/index.css';
import 'vue2-datepicker/locale/zh-cn';
import DatePicker from 'vue-datepicker-next';
import 'vue-datepicker-next/index.css';
export default {
name: 'RecordSteamInstant',

@ -269,8 +269,8 @@ import {
updateRecordSteamInstant, getExpendSum
} from '@/api/ems/record/recordSteamInstant'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import DatePicker from 'vue2-datepicker';
import 'vue2-datepicker/index.css';

@ -231,8 +231,8 @@ import {
updateRecordWaterInstant
} from '@/api/ems/record/recordWaterInstant'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
export default {

@ -231,8 +231,8 @@ import {
updateRecordWaterInstant
} from '@/api/ems/record/recordWaterInstant'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
export default {

@ -75,7 +75,7 @@ import {
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo';
import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring';
import { parseTime } from '@/utils/ruoyi';
import Chart from '@/components/Charts/Chart';
import Chart from '@/components/chart.vue';
import * as echarts from 'echarts';
import type { ElTree } from 'element-plus';

@ -73,8 +73,8 @@ import {
} from '@/api/ems/record/recordIOTInstant'
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -74,7 +74,7 @@ import { ref, reactive, watch, onMounted, getCurrentInstance } from 'vue';
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo';
import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring';
import { parseTime } from '@/utils/ruoyi';
import Chart from '@/components/Charts/Chart';
import Chart from '@/components/chart.vue';
import * as echarts from 'echarts';
import type { ElTree } from 'element-plus';

@ -76,8 +76,8 @@ import {
} from '@/api/ems/record/recordIOTInstant'
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -74,7 +74,7 @@ import { ref, reactive, watch, onMounted, getCurrentInstance } from 'vue';
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo';
import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring';
import { parseTime } from '@/utils/ruoyi';
import Chart from '@/components/Charts/Chart';
import Chart from '@/components/chart.vue';
import * as echarts from 'echarts';
import type { ElTree } from 'element-plus';

@ -76,8 +76,8 @@ import {
} from '@/api/ems/record/recordIOTInstant'
import {getMonitorInfoTree} from '@/api/ems/base/baseMonitorInfo'
import {iotInstantMonitoring} from '@/api/ems/report/TemperatureHumidityMonitoring'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import {parseTime} from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -76,8 +76,8 @@ import {
} from '@/api/ems/record/recordIOTInstant'
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -69,7 +69,7 @@ import { ref, reactive, watch, onMounted, getCurrentInstance, ComponentInternalI
import { iotInstantList } from '@/api/ems/record/recordIOTInstant';
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo';
import { parseTime } from '@/utils/ruoyi';
import Chart from '@/components/Charts/Chart';
import Chart from '@/components/chart.vue';
import * as echarts from 'echarts';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;

@ -70,8 +70,8 @@ import {
getRecordIOTInstant, iotInstantList
} from '@/api/ems/record/recordIOTInstant'
import {getMonitorInfoTree} from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import {parseTime} from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -98,9 +98,8 @@
import * as echarts from 'echarts'
import {pointSteamInstantList} from "@/api/ems/report/reportPointSteam";
import {listRecordSteamInstant, steamInstantAvg, steamInstantList} from "@/api/ems/record/recordSteamInstant";
import DatePicker from 'vue2-datepicker';
import 'vue2-datepicker/index.css';
import 'vue2-datepicker/locale/zh-cn';
import DatePicker from 'vue-datepicker-next';
import 'vue-datepicker-next/index.css';
export default {
name: 'currentSteamCurve',
@ -673,4 +672,3 @@
}
</style>

@ -96,9 +96,8 @@
import * as echarts from 'echarts'
import {pointSteamInstantList} from "@/api/ems/report/reportPointSteam";
import {listRecordSteamInstant, steamInstantAvg, steamInstantList} from "@/api/ems/record/recordSteamInstant";
import DatePicker from 'vue2-datepicker';
import 'vue2-datepicker/index.css';
import 'vue2-datepicker/locale/zh-cn';
import DatePicker from 'vue-datepicker-next';
import 'vue-datepicker-next/index.css';
export default {
name: 'currentSteamCurve',
@ -840,4 +839,3 @@
content: "\e6a8"; /* 使用现有的element-ui图标字体 */
}
</style>

@ -89,8 +89,8 @@
<script>
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -89,8 +89,8 @@
<script>
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -69,8 +69,8 @@
<script>
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -69,8 +69,8 @@
<script>
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -68,7 +68,7 @@ import { useRoute } from 'vue-router';
import { dnbInstantList } from '@/api/ems/record/recordDnbInstant';
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo';
import { parseTime } from '@/utils/ruoyi';
import Chart from '@/components/Charts/Chart';
import Chart from '@/components/chart.vue';
import * as echarts from 'echarts';
import type { ElTree } from 'element-plus';
import type { EChartsOption } from 'echarts';

@ -70,8 +70,8 @@ import {
getRecordDnbInstant, dnbInstantList
} from '@/api/ems/record/recordDnbInstant'
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -148,8 +148,8 @@
import {
energyPreviewReportList
} from '@/api/ems/report/reportPort.js'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import * as echarts from 'echarts'
import {
getHoursBetween,

@ -148,8 +148,8 @@
import {
energyPreviewReportList
} from '@/api/ems/report/reportPort.js'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import * as echarts from 'echarts'
import {
getHoursBetween,

@ -111,8 +111,8 @@
<script>
import { getWorkUnitTrees } from '@/api/ems/base/baseWorkUnit'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { energyStatisticalReportList } from '@//api/ems/report/reportPort.js'
import { parseTime } from '@//utils/ruoyi'

@ -111,8 +111,8 @@
<script>
import { getWorkUnitTrees } from '@/api/ems/base/baseWorkUnit'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { energyStatisticalReportList } from '@//api/ems/report/reportPort.js'
import { parseTime } from '@//utils/ruoyi'

@ -91,8 +91,8 @@
<script>
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -91,8 +91,8 @@
<script>
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from 'vue3-treeselect';
import 'vue3-treeselect/dist/vue3-treeselect.css';
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'

@ -1,9 +1,14 @@
import { UserConfig, ConfigEnv, loadEnv, defineConfig } from 'vite';
import { ConfigEnv, defineConfig, loadEnv, UserConfig } from 'vite';
import basicSsl from '@vitejs/plugin-basic-ssl';
import Icons from 'unplugin-icons/vite';
import IconsResolver from 'unplugin-icons/resolver';
import Components from 'unplugin-vue-components/vite';
import createPlugins from './vite/plugins';
import path from 'path';
export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
const env = loadEnv(mode, process.cwd());
return {
@ -19,17 +24,30 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
},
// https://cn.vitejs.dev/config/#resolve-extensions
plugins: createPlugins(env, command === 'build'),
plugins: [createPlugins(env, command === 'build'), basicSsl(),
Components({
resolvers: [
IconsResolver({
compiler: 'vue3'
})
]
}),
Icons({
compiler: 'vue3'
})],
server: {
host: '0.0.0.0',
port: Number(env.VITE_APP_PORT),
// https: true,
open: true,
proxy: {
[env.VITE_APP_BASE_API]: {
target: 'http://localhost:6080',
// target: 'http://localhost:6080',
// target: 'https://frp-off.com:47543',
// target: 'http://192.168.100.102:6080',
// target: 'http://192.168.100.100:6080',
// target: 'http://192.168.137.1:6080',
// target: 'http://175.27.215.92:6080/prod-api',
// target: 'http://1.13.177.47:6080',
target: 'http://192.168.0.15:6080',
changeOrigin: true,
ws: true,
rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
@ -44,6 +62,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
target: 'http://localhost:6083',
changeOrigin: true,
ws: true,
secure: false,
rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
},
'/deva-api': {

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save