ldeyun/jeecgBootUniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into minJeecg

Browse Source 
# Conflicts:
#	env/.env.development
#	manifest.config.ts
#	src/manifest.json
#	src/pages/onlinePreview/detail.vue
This commit is contained in:
lagos 2025-06-04 11:21:52 +08:00
commit 48fca7f96f
21 changed files with 67 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
env/.env.development vendored
View File

@ -4,5 +4,6 @@ NODE_ENV = 'development'
VITE_DELETE_CONSOLE = false VITE_DELETE_CONSOLE = false
# 是否开启sourcemap # 是否开启sourcemap
VITE_SHOW_SOURCEMAP = true VITE_SHOW_SOURCEMAP = true
VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'

4
env/.env.production vendored
View File

@ -4,6 +4,4 @@ NODE_ENV = 'development'
VITE_DELETE_CONSOLE = true VITE_DELETE_CONSOLE = true
# 是否开启sourcemap # 是否开启sourcemap
VITE_SHOW_SOURCEMAP = false VITE_SHOW_SOURCEMAP = false
VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'

4
manifest.config.ts
View File

@ -17,8 +17,8 @@ export default defineManifestConfig({
name: VITE_APP_TITLE, name: VITE_APP_TITLE,
appid: VITE_UNI_APPID, appid: VITE_UNI_APPID,
description: '', description: '',
versionName: '1.1.22', versionName: '2.0.0',
versionCode: '20250530', versionCode: '20250603',
transformPx: false, transformPx: false,
locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
/* 5+App特有相关 */ /* 5+App特有相关 */

4
src/manifest.json
View File

@ -2,8 +2,8 @@
"name": "数智产销", "name": "数智产销",
"appid": "__UNI__9F097F0", "appid": "__UNI__9F097F0",
"description": "", "description": "",
"versionName": "1.1.22", "versionName": "2.0.0",
"versionCode": "20250530", "versionCode": "20250603",
"transformPx": false, "transformPx": false,
"app-plus": { "app-plus": {
"usingComponents": true, "usingComponents": true,

1
src/pages-humanResource/absence/index.vue
View File

@ -86,7 +86,6 @@
let loading = false let loading = false
const queryLeave = (e) => { const queryLeave = (e) => {
console.log('----', range.value)
let param = { let param = {
sysOrgCode: orgCode.value, sysOrgCode: orgCode.value,
begin: range.value[0], begin: range.value[0],

2
src/pages-humanResource/personnel/detail.vue
View File

@ -17,7 +17,7 @@
<wd-col :span="6"> <wd-col :span="6">
<view class="img"> <view class="img">
<image mode="aspectFit" <image mode="aspectFit"
:src="'https://36.112.48.190/jeecg-boot/sys/common/static/' + imgUrl"></image> :src="'https://szcx.zyyt.sinopec.com/jeecg-boot/sys/common/static/' + imgUrl"></image>
</view> </view>
</wd-col> </wd-col>
</wd-row> </wd-row>

4
src/pages-operate/file/detail.vue
View File

@ -34,7 +34,6 @@
const appStore = useAppStore() const appStore = useAppStore()
const dataSource = ref({}) const dataSource = ref({})
var ifH5 = false;
const onlinePreview = (url) => { const onlinePreview = (url) => {
uni.navigateTo({ uni.navigateTo({
@ -50,9 +49,6 @@
onLoad((options) => { onLoad((options) => {
getData(options.data) getData(options.data)
//#ifdef H5 || MP-WEIXIN
ifH5 = true;
//#endif
}) })
</script> </script>

47
src/pages-operate/file/index.vue
View File

@ -18,12 +18,13 @@
<!-- 列表内容 --> <!-- 列表内容 -->
<view v-for="(item, i) in list" :key="i"> <view v-for="(item, i) in list" :key="i">
<wd-card :title="item.title" @click="getList(item.path)"> <wd-card :title="item.title" @click="getList(item.path)">
<view class="card-content"> <view class="card-content meta-info">
<view class="meta-info"> <view class="meta-info">
<wd-icon name="time" size="14px" color="#999"></wd-icon> <wd-icon name="time" size="14px" :style="{ color: item.color }"></wd-icon>
<text class="meta-text">{{item.time}}</text> <text :style="{ color: item.color, marginLeft: '4px' }">{{ item.time }}</text>
<wd-icon name="usergroup" size="14px" color="#999" style="margin-left: auto;"></wd-icon> <wd-icon name="usergroup" size="14px"
<text class="meta-text"> :style="{ color: item.color, marginLeft: 'auto'}"></wd-icon>
<text :style="{ color: item.color, marginLeft: '4px' }">
{{item.depart.length > 19 ? item.depart.substring(0, 18) + '...': item.depart}}</text> {{item.depart.length > 19 ? item.depart.substring(0, 18) + '...': item.depart}}</text>
</view> </view>
</view> </view>
@ -54,7 +55,6 @@
const list = ref([]) //文件列表 const list = ref([]) //文件列表
const keyword = ref('') //查询绑定值 const keyword = ref('') //查询绑定值
const type = ref('') //绑定查询文件种类 const type = ref('') //绑定查询文件种类
var ifH5 = false;
const getList = (e) => { const getList = (e) => {
loading = true; loading = true;
@ -118,7 +118,11 @@
zdmc: formatSearchkey() zdmc: formatSearchkey()
}).then((res) => { }).then((res) => {
if (res.success) { 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')] 'sszd')]
} }
loading = false loading = false
@ -152,7 +156,11 @@
flfgmc: formatSearchkey() flfgmc: formatSearchkey()
}).then((res) => { }).then((res) => {
if (res.success) { 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')] 'fabubumen', 'mingcheng')]
} }
loading = false loading = false
@ -188,6 +196,21 @@
list.value = [] list.value = []
getList(1) 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(() => { onReachBottom(() => {
if (loading) return if (loading) return
@ -198,9 +221,6 @@
onLoad((options) => { onLoad((options) => {
type.value = options.title type.value = options.title
getList(1) getList(1)
//#ifdef H5 || MP-WEIXIN
ifH5 = true;
//#endif
}); });
</script> </script>
@ -242,11 +262,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 12px; font-size: 12px;
color: #666;
.meta-text {
margin-left: 4px;
}
} }
} }

4
src/pages-operate/sc/index.vue
View File

@ -76,10 +76,10 @@
let insFlag = res.result.insFlag let insFlag = res.result.insFlag
if (url) { if (url) {
if (isH5()) { 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)) Base64.encode(baseUrl + url))
} else { } 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)) new base64().encode(baseUrl + url))
} }
} else if (/^-?\d+$/.test(quote) && !insFlag) { } else if (/^-?\d+$/.test(quote) && !insFlag) {

1
src/pages-work/components/common/echartUtil.ts
View File

@ -1063,7 +1063,6 @@ export function disposeGridLayout(compName, chartOption, config, chartData) {
chartOption.grid.bottom = 30; chartOption.grid.bottom = 30;
// #endif // #endif
} }
console.log('---chartOption--',chartOption);
return chartOption; return chartOption;
} }
/** /**

8
src/pages/index/index.vue
View File

@ -9,7 +9,7 @@
</route> </route>
<template> <template>
<PageLayout :navbarShow="false"> <PageLayout :navbarShow="false">
<view class="nav"> <view class="nav" >
<view class="nav_box"> <view class="nav_box">
<view class="weather_calender"> <view class="weather_calender">
<view class="position position-left"> <view class="position position-left">
@ -103,6 +103,8 @@
import { import {
taskListApi taskListApi
} from '@/api/process' } from '@/api/process'
import { isH5 } from '@/utils/platform'
defineOptions({ defineOptions({
name: 'index', name: 'index',
options: { options: {
@ -127,6 +129,7 @@
const res = wx.getSystemInfoSync(); const res = wx.getSystemInfoSync();
const statusHeight = res.statusBarHeight; //状态栏高度 const statusHeight = res.statusBarHeight; //状态栏高度
const cusnavbarheight = (statusHeight + 30) + "px"; const cusnavbarheight = (statusHeight + 30) + "px";
const goPage = (item) => { const goPage = (item) => {
uni.navigateTo({ uni.navigateTo({
url: `${item.path}?title=${item.text}` url: `${item.path}?title=${item.text}`
@ -138,7 +141,7 @@
url: '/pages-process/approvalTabbar' url: '/pages-process/approvalTabbar'
}) })
} }
const goToMyApplyProcess = () => { const goToMyApplyProcess = () => {
uni.navigateTo({ uni.navigateTo({
url: '/pages-process/myApplyProcess' url: '/pages-process/myApplyProcess'
@ -287,6 +290,7 @@
} }
.scrollView { .scrollView {
height: 110%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: 0; min-height: 0;

11
src/pages/login/login.vue
View File

@ -127,6 +127,17 @@
uni.setStorageSync('logintime', Date.now()) //缓存登录时间 uni.setStorageSync('logintime', Date.now()) //缓存登录时间
router.pushTab({ path: HOME_PAGE }) router.pushTab({ path: HOME_PAGE })
} else { } else {
res.message == '数据库中已存在该记录' ? res.message = '请使用统一身份账号登录' : res.message
if (!res.success) {
try {
// 尝试解析 JSON（仅当 message 可能是 JSON 时）
const response = JSON.parse(res.message);
if (response.error_description === '用户名或密码错误') {
res.message = '用户名或密码错误';
}
} catch (e) {
}
}
toast.warning(res.message) toast.warning(res.message)
} }
}) })

1
src/pages/more/more.vue
View File

@ -58,7 +58,6 @@ const init = () => {
} }
const goPage = (item) => { const goPage = (item) => {
let page = item.routeIndex let page = item.routeIndex
console.log('-----------page------------', page)
if (!page) { if (!page) {
toast.info('该功能暂未实现') toast.info('该功能暂未实现')
} else { } else {

2
src/pages/onlinePreview/onlinePreview.vue
View File

@ -27,7 +27,7 @@
onLoad((options) => { onLoad((options) => {
let Base64 = new base64(); let Base64 = new base64();
var url = baseUrl + JSON.parse(options.data); var url = baseUrl + JSON.parse(options.data);
fileUrl = 'https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent(Base64.encode(url)) fileUrl = 'https://szcx.zyyt.sinopec.com/preview/onlinePreview?url=' + encodeURIComponent(Base64.encode(url))
}) })
</script> </script>

2
src/pages/onlinePreview/onlinePreviewH5.vue
View File

@ -29,7 +29,7 @@
onLoad((options) => { onLoad((options) => {
let url = JSON.parse(options.data) let url = JSON.parse(options.data)
url = baseUrl + url; url = baseUrl + url;
fileUrl = 'https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent(Base64.encode(url)) fileUrl = 'https://szcx.zyyt.sinopec.com/preview/onlinePreview?url=' + encodeURIComponent(Base64.encode(url))
}) })
</script> </script>

4
src/pages/production/shishishuju/trqSssj.vue
View File

@ -90,8 +90,8 @@
const jlData = ref([]) const jlData = ref([])
const sssjUrl = ref('wss://36.112.48.190/Gyk/websocket/') const sssjUrl = ref('wss://szcx.zyyt.sinopec.com/Gyk/websocket/')
const jlByzc = ref('https://36.112.48.190/Gyk/sssj/GetJlByZc') const jlByzc = ref('https://szcx.zyyt.sinopec.com/Gyk/sssj/GetJlByZc')
//首先链接的地址要先拿在websocket在线调试去调试是否能连接通 不然下面的操作就不知道错误 //首先链接的地址要先拿在websocket在线调试去调试是否能连接通 不然下面的操作就不知道错误
// 建立websocket // 建立websocket

7
src/pages/user/people.vue
View File

@ -195,12 +195,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
// //
.avatar-area { .avatar-area {
/* #ifdef MP-WEIXIN */ background-image: url('@/static/backgroud.jpg');
background-image: url('https://static.jeecg.com/upload/test/blue_1595818030310.png');
/* #endif */
/* #ifndef MP-WEIXIN */
background-image: url('@/static/blue.png');
/* #endif */
background-size: cover; background-size: cover;
height: 400upx; height: 400upx;
display: flex; display: flex;

BIN
src/static/backgroud.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 MiB

BIN
src/static/blue.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

1
src/uni_modules/lime-echart/static/echarts.js
View File

@ -27909,7 +27909,6 @@ echartsProto._onframe = function () {
// frame is executed immedietely after task reset. // frame is executed immedietely after task reset.
// this._coordSysMgr.update(ecModel, api); // this._coordSysMgr.update(ecModel, api);
// console.log('--- ec frame visual ---', remainTime);
scheduler.performVisualTasks(ecModel); scheduler.performVisualTasks(ecModel);
renderSeries(this, this._model, api, 'remain'); renderSeries(this, this._model, api, 'remain');

6
src/utils/index.ts
View File

@ -323,7 +323,7 @@ export const getLocation = () => {
success: function (position) { success: function (position) {
// 成功获取位置后请求地理编码 // 成功获取位置后请求地理编码
uni.request({ uni.request({
url: 'http://api.tianditu.gov.cn/geocoder', url: 'https://api.tianditu.gov.cn/geocoder',
method: 'GET', method: 'GET',
data: { data: {
postStr: JSON.stringify({ postStr: JSON.stringify({
@ -394,7 +394,7 @@ function handleDefaultLocation() {
function weatherRequest(params : { lat ?: number; lon ?: number; q ?: string }) { function weatherRequest(params : { lat ?: number; lon ?: number; q ?: string }) {
const store = useAppStore() const store = useAppStore()
uni.request({ uni.request({
url: 'http://api.openweathermap.org/data/2.5/weather', url: 'https://api.openweathermap.org/data/2.5/weather',
method: 'GET', method: 'GET',
data: { data: {
...params, ...params,
@ -437,7 +437,7 @@ export const imgUrl = (url : string) => {
* @returns {*} * @returns {*}
*/ */
export function getFileAccessHttpUrl(avatar, subStr) { export function getFileAccessHttpUrl(avatar, subStr) {
if (!subStr) subStr = 'http' if (!subStr) subStr = 'https'
if (avatar && avatar.startsWith(subStr)) { if (avatar && avatar.startsWith(subStr)) {
return avatar; return avatar;
} else { } else {