diff --git a/env/.env.development b/env/.env.development index e550644..c78f0dc 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,5 +4,6 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file +#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' +#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' +VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file diff --git a/env/.env.production b/env/.env.production index a3c7897..99f7ca7 100644 --- a/env/.env.production +++ b/env/.env.production @@ -4,6 +4,4 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = true # 是否开启sourcemap VITE_SHOW_SOURCEMAP = false - -#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' diff --git a/manifest.config.ts b/manifest.config.ts index a2fb3c4..9630047 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -17,8 +17,8 @@ export default defineManifestConfig({ name: VITE_APP_TITLE, appid: VITE_UNI_APPID, description: '', - versionName: '1.1.22', - versionCode: '20250530', + versionName: '2.0.0', + versionCode: '20250603', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ diff --git a/src/manifest.json b/src/manifest.json index 628535c..43a36a8 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name": "数智产销", "appid": "__UNI__9F097F0", "description": "", - "versionName": "1.1.22", - "versionCode": "20250530", + "versionName": "2.0.0", + "versionCode": "20250603", "transformPx": false, "app-plus": { "usingComponents": true, diff --git a/src/pages-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue index 54acc33..23df1bd 100644 --- a/src/pages-humanResource/absence/index.vue +++ b/src/pages-humanResource/absence/index.vue @@ -86,7 +86,6 @@ let loading = false const queryLeave = (e) => { - console.log('----', range.value) let param = { sysOrgCode: orgCode.value, begin: range.value[0], diff --git a/src/pages-humanResource/personnel/detail.vue b/src/pages-humanResource/personnel/detail.vue index 2aceab1..beda14a 100644 --- a/src/pages-humanResource/personnel/detail.vue +++ b/src/pages-humanResource/personnel/detail.vue @@ -17,7 +17,7 @@ + :src="'https://szcx.zyyt.sinopec.com/jeecg-boot/sys/common/static/' + imgUrl"> diff --git a/src/pages-operate/file/detail.vue b/src/pages-operate/file/detail.vue index 5931e0a..f5c78f6 100644 --- a/src/pages-operate/file/detail.vue +++ b/src/pages-operate/file/detail.vue @@ -34,7 +34,6 @@ const appStore = useAppStore() const dataSource = ref({}) - var ifH5 = false; const onlinePreview = (url) => { uni.navigateTo({ @@ -50,9 +49,6 @@ onLoad((options) => { getData(options.data) - //#ifdef H5 || MP-WEIXIN - ifH5 = true; - //#endif }) diff --git a/src/pages-operate/file/index.vue b/src/pages-operate/file/index.vue index 3fef5f0..428f5e0 100644 --- a/src/pages-operate/file/index.vue +++ b/src/pages-operate/file/index.vue @@ -18,12 +18,13 @@ - + - - {{item.time}} - - + + {{ item.time }} + + {{item.depart.length > 19 ? item.depart.substring(0, 18) + '...': item.depart}} @@ -54,7 +55,6 @@ const list = ref([]) //文件列表 const keyword = ref('') //查询绑定值 const type = ref('') //绑定查询文件种类 - var ifH5 = false; const getList = (e) => { loading = true; @@ -118,7 +118,11 @@ zdmc: formatSearchkey() }).then((res) => { if (res.success) { - list.value = [...list.value, ...formatObj(res.result.records, 'zdmc', 'updateTime2', 'zbbm', + const recordsWithColor = res.result.records.map(item => ({ + ...item, + color: DateDiff(item.updateTime2) // 假设 updateTime2 是时间字段 + })); + list.value = [...list.value, ...formatObj(recordsWithColor, 'zdmc', 'updateTime2', 'zbbm', 'sszd')] } loading = false @@ -152,7 +156,11 @@ flfgmc: formatSearchkey() }).then((res) => { if (res.success) { - list.value = [...list.value, ...formatObj(res.result.records, 'flfgmc', 'updateTime2', + const recordsWithColor = res.result.records.map(item => ({ + ...item, + color: DateDiff(item.updateTime2) // 假设 updateTime2 是时间字段 + })); + list.value = [...list.value, ...formatObj(recordsWithColor, 'flfgmc', 'updateTime2', 'fabubumen', 'mingcheng')] } loading = false @@ -188,6 +196,21 @@ list.value = [] getList(1) } + + const DateDiff = (time) => { + var today = new Date(); + time = new Date(time); + var days = parseInt((today - time) / 1000 / 60 / 60 / 24); //当前时间-更新时间 + if (days < 90) { //三个月内 + return '#ff0000'; // red + } else if (days > 90 && days < 180) { + return '#aa00ff'; // purple + } else if (days > 180 && days < 365) { + return '#00c861'; // green + } else { + return ''; // black + } + } onReachBottom(() => { if (loading) return @@ -198,9 +221,6 @@ onLoad((options) => { type.value = options.title getList(1) - //#ifdef H5 || MP-WEIXIN - ifH5 = true; - //#endif }); @@ -242,11 +262,6 @@ display: flex; align-items: center; font-size: 12px; - color: #666; - - .meta-text { - margin-left: 4px; - } } } diff --git a/src/pages-operate/sc/index.vue b/src/pages-operate/sc/index.vue index 9725e73..e8d57d4 100644 --- a/src/pages-operate/sc/index.vue +++ b/src/pages-operate/sc/index.vue @@ -76,10 +76,10 @@ let insFlag = res.result.insFlag if (url) { if (isH5()) { - fileUrl.value = 'https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent( + fileUrl.value = 'https://szcx.zyyt.sinopec.com/preview/onlinePreview?url=' + encodeURIComponent( Base64.encode(baseUrl + url)) } else { - fileUrl.value = 'https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent( + fileUrl.value = 'https://szcx.zyyt.sinopec.com/preview/onlinePreview?url=' + encodeURIComponent( new base64().encode(baseUrl + url)) } } else if (/^-?\d+$/.test(quote) && !insFlag) { diff --git a/src/pages-work/components/common/echartUtil.ts b/src/pages-work/components/common/echartUtil.ts index ecb2932..6292639 100644 --- a/src/pages-work/components/common/echartUtil.ts +++ b/src/pages-work/components/common/echartUtil.ts @@ -1063,7 +1063,6 @@ export function disposeGridLayout(compName, chartOption, config, chartData) { chartOption.grid.bottom = 30; // #endif } - console.log('---chartOption--',chartOption); return chartOption; } /** diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 8829503..1b981c6 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -9,7 +9,7 @@