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

2.3.1

Browse Source
This commit is contained in:
yangzhq68909 2025-10-10 10:01:51 +08:00
parent c705efe142
commit 2dacbe6c08
14 changed files with 99 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
env/.env.production vendored
View File

@ -8,7 +8,7 @@ VITE_SHOW_SOURCEMAP = false
#VITE_WEBAPP = 'D://opt//AppUpdateTest'
VITE_WEBAPP = ''
VITE_SERVER_BASEURL = 'https://10.75.166.6/test'
#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
#VITE_SERVER_BASEURL = 'https://10.75.166.6/test'
VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi'
#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi'

4
manifest.config.ts
View File

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

4
src/manifest.json
View File

@ -2,8 +2,8 @@
"name": "数智产销",
"appid": "__UNI__9F097F0",
"description": "",
"versionName": "2.3.0",
"versionCode": "202509011",
"versionName": "2.3.1",
"versionCode": "20251010",
"transformPx": false,
"app-plus": {
"usingComponents": true,

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

@ -9,9 +9,7 @@
</route>
<template>
<PageLayout :navbarShow="false">
<view>
财务管理
</view>
<wd-text text="功能正在开发..." bold style="margin: 20px;"></wd-text>
</PageLayout>
</template>

6
src/pages-operate/jingying/index.vue
View File

@ -3,15 +3,13 @@
layout: 'default',
style: {
navigationStyle: 'custom',
navigationBarTitleText: '经营考核 ',
navigationBarTitleText: '外部市场',
},
}
</route>
<template>
<PageLayout :navbarShow="false">
<view>
经营管理
</view>
<wd-text text="功能正在开发..." bold style="margin: 20px;"></wd-text>
</PageLayout>
</template>

20
src/pages-operate/wbsc/index.vue Normal file
View File

@ -0,0 +1,20 @@
<route lang="json5" type="page">
{
layout: 'default',
style: {
navigationStyle: 'custom',
navigationBarTitleText: '外部市场 ',
},
}
</route>
<template>
<PageLayout :navbarShow="false">
<wd-text text="功能正在开发..." bold style="margin: 20px;"></wd-text>
</PageLayout>
</template>
<script>
</script>
<style>
</style>

20
src/pages-production/anquanguanli/index.vue Normal file
View File

@ -0,0 +1,20 @@
<route lang="json5" type="page">
{
layout: 'default',
style: {
navigationStyle: 'custom',
navigationBarTitleText: '安全管理',
},
}
</route>
<template>
<PageLayout :navbarShow="false">
<wd-text text="功能正在开发..." bold style="margin: 20px;"></wd-text>
</PageLayout>
</template>
<script>
</script>
<style>
</style>

20
src/pages.json
View File

@ -376,7 +376,7 @@
"layout": "default",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "经营考核 "
"navigationBarTitleText": "外部市场"
}
},
{
@ -387,6 +387,15 @@
"navigationStyle": "custom",
"navigationBarTitleText": "三册"
}
},
{
"path": "wbsc/index",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "外部市场 "
}
}
]
},
@ -611,6 +620,15 @@
{
"root": "pages-production",
"pages": [
{
"path": "anquanguanli/index",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "安全管理"
}
},
{
"path": "ribaoshuju/index",
"type": "page",

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

@ -137,12 +137,12 @@
})
} else {
/*开发环境 */
params.captcha = 'app';
// params.captcha = 'app';
/*生产环境 */
// params = {
// username: Base64.encode(encodeURIComponent(userName.value)),
// password: Base64.encode(encodeURIComponent(password.value)),
// };
params = {
username: Base64.encode(encodeURIComponent(userName.value)),
password: Base64.encode(encodeURIComponent(password.value)),
};
}
login(params)
}

6
src/pages/operation/index.vue
View File

@ -29,6 +29,11 @@
<jingying-guanli></jingying-guanli>
</scroll-view>
</view>
<view v-if="current === 2">
<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
<waibu-guanli></waibu-guanli>
</scroll-view>
</view>
</view>
</PageLayout>
</template>
@ -44,6 +49,7 @@
} from 'vue';
import caiwuGuanli from '@/pages-operate/caiwu/index'
import jingyingGuanli from '@/pages-operate/jingying/index'
import waibuGuanli from '@/pages-operate/wbsc/index'
const items = ref(['计划财务', '经营考核', '外部市场'])
const current = ref(0)
const res = wx.getSystemInfoSync();

18
src/pages/production/index.vue
View File

@ -29,9 +29,22 @@
<rb-data></rb-data>
</scroll-view>
</view>
<view v-if="current === 2">
<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
<anquan-data></anquan-data>
</scroll-view>
</view>
<view v-if="current === 3">
<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
<anquan-data></anquan-data>
</scroll-view>
</view>
<view v-if="current === 4">
<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
<anquan-data></anquan-data>
</scroll-view>
</view>
</view>
</PageLayout>
</template>
@ -49,6 +62,7 @@
import rbData from '@/pages-production/ribaoshuju/index';
import sssjData from '@/pages-production/shishishuju/index';
import anquanData from '@/pages-production/anquanguanli/index';
const items = ref(['实时数据', '日报数据', '安全管理', '工程技术', '仪控设备'])
const current = ref(0)
const res = wx.getSystemInfoSync();

2
src/types/uni-pages.d.ts vendored
View File

@ -40,6 +40,7 @@ interface NavigateToOptions {
"/pages-operate/file/index" |
"/pages-operate/jingying/index" |
"/pages-operate/sc/index" |
"/pages-operate/wbsc/index" |
"/pages-humanResource/absence/add" |
"/pages-humanResource/absence/detail" |
"/pages-humanResource/absence/index" |
@ -72,6 +73,7 @@ interface NavigateToOptions {
"/pages-bpm/unconventional/index" |
"/pages-bpm/unconventional/stamp" |
"/pages-bpm/zbkh/index" |
"/pages-production/anquanguanli/index" |
"/pages-production/ribaoshuju/index" |
"/pages-production/ribaoshuju/rbsjLsxq" |
"/pages-production/ribaoshuju/trqRbsj" |

2
src/utils/http.ts
View File

@ -51,7 +51,7 @@ export const http = <T>(options: CustomRequestOptions) => {
!options.hideErrorToast &&
uni.showToast({
icon: 'none',
title: (res.data as IResData<T>).msg || '请求错误',
title: (res.data as IResData<T>).msg,
})
}
// 使用z-paging，在底层的网络请求抛出异常时uni.$emit('z-paging-error-emit')，业务中可不写

2
src/utils/request.ts
View File

@ -30,7 +30,7 @@ const http = <T>(options: CustomRequestOptions) => {
!options.hideErrorToast &&
uni.showToast({
icon: 'none',
title: (res.data as T & { msg?: string })?.msg || '请求错误',
title: (res.data as T & { msg?: string })?.msg,
})
reject(res)
}