From ddf24b26ea76a43e3852dde31b6faa813b2cf99a Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期三, 26 三月 2025 14:53:05 +0800
Subject: [PATCH] 1
---
src/views/dry/bigScreen/BigWorkShop.vue | 29 +++++++--
src/api/common/api.ts | 138 +++++++++++++++++++++++-----------------------
2 files changed, 92 insertions(+), 75 deletions(-)
diff --git a/src/api/common/api.ts b/src/api/common/api.ts
index 47d5cfb..467fd3e 100644
--- a/src/api/common/api.ts
+++ b/src/api/common/api.ts
@@ -1,101 +1,101 @@
-import { defHttp } from '/@/utils/http/axios';
-import { message } from 'ant-design-vue';
-import { useGlobSetting } from '/@/hooks/setting';
-const globSetting = useGlobSetting();
-const baseUploadUrl = globSetting.uploadUrl;
+import { defHttp } from '/@/utils/http/axios'
+import { message } from 'ant-design-vue'
+import { useGlobSetting } from '/@/hooks/setting'
+const globSetting = useGlobSetting()
+const baseUploadUrl = globSetting.uploadUrl
enum Api {
- positionList = '/sys/position/list',
- userList = '/sys/user/list',
- roleList = '/sys/role/list',
- queryDepartTreeSync = '/sys/sysDepart/queryDepartTreeSync',
- queryTreeList = '/sys/sysDepart/queryTreeList',
- loadTreeData = '/sys/category/loadTreeData',
- loadDictItem = '/sys/category/loadDictItem/',
- getDictItems = '/sys/dict/getDictItems/',
- getTableList = '/sys/user/queryUserComponentData',
- getCategoryData = '/sys/category/loadAllData',
+ positionList = '/sys/position/list',
+ userList = '/sys/user/list',
+ roleList = '/sys/role/list',
+ queryDepartTreeSync = '/sys/sysDepart/queryDepartTreeSync',
+ queryTreeList = '/sys/sysDepart/queryTreeList',
+ loadTreeData = '/sys/category/loadTreeData',
+ loadDictItem = '/sys/category/loadDictItem/',
+ getDictItems = '/sys/dict/getDictItems/',
+ getTableList = '/sys/user/queryUserComponentData',
+ getCategoryData = '/sys/category/loadAllData',
}
/**
* 涓婁紶鐖惰矾寰�
*/
-export const uploadUrl = `${baseUploadUrl}/sys/common/upload`;
+export const uploadUrl = `${baseUploadUrl}/sys/common/upload`
/**
* 鑱屽姟鍒楄〃
* @param params
*/
export const getPositionList = (params) => {
- return defHttp.get({ url: Api.positionList, params });
-};
+ return defHttp.get({ url: Api.positionList, params })
+}
/**
* 鐢ㄦ埛鍒楄〃
* @param params
*/
export const getUserList = (params) => {
- return defHttp.get({ url: Api.userList, params });
-};
+ return defHttp.get({ url: Api.userList, params })
+}
/**
* 瑙掕壊鍒楄〃
* @param params
*/
export const getRoleList = (params) => {
- return defHttp.get({ url: Api.roleList, params });
-};
+ return defHttp.get({ url: Api.roleList, params })
+}
/**
* 寮傛鑾峰彇閮ㄩ棬鏍戝垪琛�
*/
export const queryDepartTreeSync = (params?) => {
- return defHttp.get({ url: Api.queryDepartTreeSync, params });
-};
+ return defHttp.get({ url: Api.queryDepartTreeSync, params })
+}
/**
* 鑾峰彇閮ㄩ棬鏍戝垪琛�
*/
export const queryTreeList = (params?) => {
- return defHttp.get({ url: Api.queryTreeList, params });
-};
+ return defHttp.get({ url: Api.queryTreeList, params })
+}
/**
* 鍒嗙被瀛楀吀鏍戞帶浠� 鍔犺浇鑺傜偣
*/
export const loadTreeData = (params?) => {
- return defHttp.get({ url: Api.loadTreeData, params });
-};
+ return defHttp.get({ url: Api.loadTreeData, params })
+}
/**
* 鏍规嵁瀛楀吀code鍔犺浇瀛楀吀text
*/
export const loadDictItem = (params?) => {
- return defHttp.get({ url: Api.loadDictItem, params });
-};
+ return defHttp.get({ url: Api.loadDictItem, params })
+}
/**
* 鏍规嵁瀛楀吀code鍔犺浇瀛楀吀text
*/
export const getDictItems = (dictCode) => {
- return defHttp.get({ url: Api.getDictItems + dictCode }, { joinTime: false });
-};
+ return defHttp.get({ url: Api.getDictItems + dictCode }, { joinTime: false })
+}
/**
* 閮ㄩ棬鐢ㄦ埛modal閫夋嫨鍒楄〃鍔犺浇list
*/
export const getTableList = (params) => {
- return defHttp.get({ url: Api.getTableList, params });
-};
+ return defHttp.get({ url: Api.getTableList, params })
+}
/**
* 鍔犺浇鍏ㄩ儴鍒嗙被瀛楀吀鏁版嵁
*/
export const loadCategoryData = (params) => {
- return defHttp.get({ url: Api.getCategoryData, params });
-};
+ return defHttp.get({ url: Api.getCategoryData, params })
+}
/**
* 鏂囦欢涓婁紶
*/
export const uploadFile = (params, success) => {
- return defHttp.uploadFile({ url: uploadUrl }, params, { success });
-};
+ return defHttp.uploadFile({ url: uploadUrl }, params, { success })
+}
/**
* 涓嬭浇鏂囦欢
* @param url 鏂囦欢璺緞
@@ -104,26 +104,26 @@
* @returns {*}
*/
export const downloadFile = (url, fileName?, parameter?) => {
- return getFileblob(url, parameter).then((data) => {
- if (!data || data.size === 0) {
- message.warning('鏂囦欢涓嬭浇澶辫触');
- return;
- }
- if (typeof window.navigator.msSaveBlob !== 'undefined') {
- window.navigator.msSaveBlob(new Blob([data]), fileName);
- } else {
- let url = window.URL.createObjectURL(new Blob([data]));
- let link = document.createElement('a');
- link.style.display = 'none';
- link.href = url;
- link.setAttribute('download', fileName);
- document.body.appendChild(link);
- link.click();
- document.body.removeChild(link); //涓嬭浇瀹屾垚绉婚櫎鍏冪礌
- window.URL.revokeObjectURL(url); //閲婃斁鎺塨lob瀵硅薄
- }
- });
-};
+ return getFileblob(url, parameter).then((data) => {
+ if (!data || data.size === 0) {
+ message.warning('鏂囦欢涓嬭浇澶辫触')
+ return
+ }
+ if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ window.navigator.msSaveBlob(new Blob([data]), fileName)
+ } else {
+ const url = window.URL.createObjectURL(new Blob([data]))
+ const link = document.createElement('a')
+ link.style.display = 'none'
+ link.href = url
+ link.setAttribute('download', fileName)
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link) //涓嬭浇瀹屾垚绉婚櫎鍏冪礌
+ window.URL.revokeObjectURL(url) //閲婃斁鎺塨lob瀵硅薄
+ }
+ })
+}
/**
* 涓嬭浇鏂囦欢 鐢ㄤ簬excel瀵煎嚭
@@ -132,19 +132,19 @@
* @returns {*}
*/
export const getFileblob = (url, parameter) => {
- return defHttp.get(
- {
- url: url,
- params: parameter,
- responseType: 'blob',
- },
- { isTransformResponse: false }
- );
-};
+ return defHttp.get(
+ {
+ url: url,
+ params: parameter,
+ responseType: 'blob',
+ },
+ { isTransformResponse: false }
+ )
+}
/**
* 銆愮敤浜庤瘎璁哄姛鑳姐�戣嚜瀹氫箟鏂囦欢涓婁紶-鏂规硶
*/
export const uploadMyFile = (url, data) => {
- return defHttp.uploadMyFile(url, data);
-};
+ return defHttp.uploadMyFile(url, data)
+}
diff --git a/src/views/dry/bigScreen/BigWorkShop.vue b/src/views/dry/bigScreen/BigWorkShop.vue
index 1ed239e..e823370 100644
--- a/src/views/dry/bigScreen/BigWorkShop.vue
+++ b/src/views/dry/bigScreen/BigWorkShop.vue
@@ -301,7 +301,7 @@
const steamAvg = ref(0)
const wattAvg = ref(0)
- console.log(userStore.dictItems.title)
+ // console.log(userStore.dictItems.title)
userStore.dictItems.title?.forEach((element) => {
if (element.value === 'bigscreentitle') {
title.value = element.text
@@ -316,7 +316,7 @@
function listAllEqp() {
listAll({ enable: 'Y' })
.then((result) => {
- console.log(`output->result`, result)
+ // (`output->result`, result)
eqps.value = result
result.forEach((item) => {
@@ -325,7 +325,7 @@
updateRealTime()
})
.catch((err) => {
- console.log(`output->err`, err)
+ // console.log(`output->err`, err)
})
}
@@ -342,7 +342,7 @@
function queryWorkShopStatistics() {
let tenantId = userStore.getTenant
defHttp.get({ url: '/dry/real/workshopStatistics', params: { tenantid: tenantId } }).then((res) => {
- console.log(`output->res`, res)
+ // console.log(`output->res`, res)
steam.value = res.steam
watt.value = res.watt
envHum.value = res.envHum
@@ -386,7 +386,7 @@
})
}
function gotoeqp(num) {
- console.log('璺宠浆鏈哄彴', num)
+ //console.log('璺宠浆鏈哄彴', num)
if (num < eqpCodes.value.length) {
router.push({ path: '/bigEqp', query: { num: num } })
}
@@ -408,9 +408,26 @@
}
function showInfo(data) {
- return data ? (data.fault ? data.fault : data.warning ? data.warning : data.level ? data.level : '绌洪棽') : '绌洪棽'
+ return data ? (data.fault ? data.fault : data.warning ? data.warning : data.orderStatus ? covertStatus(data.orderStatus+'') : '绌洪棽') : '绌洪棽'
}
+ function covertStatus(status){
+ //console.log('status',status)
+ switch (status) {
+ case '0':
+ return '鍑嗗闃舵'
+ case '1':
+ return '涓婃枡闃舵'
+ case '2':
+ return '骞茬嚗闃舵'
+ case '3':
+ return '鏆傚仠'
+ case '4':
+ return '骞茬嚗瀹屾垚'
+
+ }
+ }
+ console.log("router-param", router.currentRoute.value.params.tenant);
getNowTime()
listAllEqp()
onMounted(() => {
--
Gitblit v1.9.3