修改生产模块页面，增加顶部标签，新建分包pages-production，将生产页面移动至分包下面。

下一步制作曲线页面，统计页面，继续做好设备，安防等页面。
Merge branch 'minJeecg' into 'master'
2025-09-11 17:58:34 +08:00 · 2025-09-11 07:27:26 +00:00 · 2025-09-11 15:26:23 +08:00 · 2025-09-09 10:11:58 +08:00 · 2025-09-09 10:11:09 +08:00 · 2025-09-08 13:28:01 +08:00
13 changed files with 184 additions and 185 deletions
--- a/env/.env.development
+++ b/env/.env.development
@ -7,7 +7,10 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
+#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot'
+#VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot'
+#VITE_SERVER_BASEURL = 'https://10.75.166.6/test'

 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
--- a/env/.env.production
+++ b/env/.env.production
@ -8,7 +8,7 @@ VITE_SHOW_SOURCEMAP = false
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''

-
-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'
--- 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: '2.1.0',
-  versionCode: '20250808',
+  versionName: '2.2.0',
+  versionCode: '20250903',
  transformPx: false,
  locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
  /* 5+App特有相关 */
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@ -9,9 +9,7 @@ export function queryPostByUserIdApi(userid : string) {
 	return http({
 		url: '/sys/user/queryPostByUserId',
 		method: 'GET',
-		data: {
-			userid
-		}
+		data: { userid }
 	});
 }

@ -36,3 +34,12 @@ export function queryUserByOrgRoleApi(config : object) {
 		data: config
 	})
 }
+
+/*根据劳动合同号查询用户信息*/
+export function queryUsernameByLdhth(ldhth : string) {
+	return http({
+		url: '/sys/user/queryUsernameByLdhth',
+		method: 'GET',
+		data: { ldhth }
+	})
+}
--- a/src/components/Esign/SinopecEsignPageH5.vue
+++ b/src/components/Esign/SinopecEsignPageH5.vue
@ -80,6 +80,7 @@
 		iframeWin.value = iframe.value.contentWindow
 		console.log(iframe.value)
 		console.log(iframe.value.contentWindow)
+		console.log(props.fileName)
 		try {
 			iframeWin.value.postMessage({
 				filename: props.fileName,
@ -138,7 +139,7 @@
 			if(props.taskDefKey=='task1715564108096'){ //如果是综合办审核，不需要该区
 				return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证
 			}
-			return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证
+			// return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证
 			if (sign.value) {
 				return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证
 			} else {
--- a/src/manifest.json
+++ b/src/manifest.json
@ -2,8 +2,8 @@
  "name": "数智产销",
  "appid": "__UNI__9F097F0",
  "description": "",
-  "versionName": "2.1.0",
-  "versionCode": "20250808",
+  "versionName": "2.2.0",
+  "versionCode": "20250903",
  "transformPx": false,
  "app-plus": {
    "usingComponents": true,
--- a/src/pages-bpm/officialReceptions/index.vue
+++ b/src/pages-bpm/officialReceptions/index.vue
@ -75,6 +75,7 @@
 				if(info.value.jdsqwj){
 					info.value.jdsqwj = info.value.jdsqwj.replace("PdfFiles/PdfFile/",'')
 				}
+				console.log(info.value.jdsqwj)
 			}else{
 				toast.error(res.message)
 			}
--- a/src/pages-user/userEdit/userEdit.vue
+++ b/src/pages-user/userEdit/userEdit.vue
@ -27,6 +27,8 @@
 					placeholder="请输入手机号" :rules="[{ validator: rules.phone }]" />
 				<wd-input label="邮箱" prop="email" clearable label-width="100px" v-model="model.email"
 					placeholder="请输入邮箱" :rules="[{ validator: rules.email }]" />
+				<wd-input label="密码" prop="clock" clearable label-width="100px" v-model="model.password"
+					placeholder="修改密码,不修改密码无需输入" v-if="userStore.userInfo.userIdentity == 3"/>
 			</wd-cell-group>
 			<view class="footer p5">
 				<wd-button type="primary" size="large" @click="handleSubmit" block>提交</wd-button>
@ -65,6 +67,7 @@
 		// sex: userStore.userInfo.sex ?? 1,
 		phone: userStore.userInfo.phone,
 		email: userStore.userInfo.email,
+		password: ''
 	})
 	const rules = {
 		phone: (value : string) => {
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@ -17,13 +17,13 @@
 					<view class="account-login-area">
 						<view class="box account">
 							<wd-icon name="user" size="15px"></wd-icon>
-							<wd-text text="账号："></wd-text>
-							<wd-input class="uni-input" placeholder="请输入统一身份认证" v-model.trim="userName"></wd-input>
+							<wd-text text=""></wd-text>
+							<wd-input class="uni-input" placeholder="统一身份/劳动合同号" v-model.trim="userName"></wd-input>
 						</view>
 						<view class="box password">
 							<wd-icon name="lock-on" size="15px"></wd-icon>
-							<wd-text text="密码："></wd-text>
-							<input class="uni-input" placeholder="请输入密码" :password="showPassword"
+							<wd-text text=""></wd-text>
+							<input class="uni-input" placeholder="密码" :password="showPassword"
 								v-model.trim="password" />
 							<wd-icon v-if="showPassword" name="eye-close" size="18px"
 								@click="handleChangePassword"></wd-icon>
@ -52,15 +52,32 @@
 	</PageLayout>
 </template>

-<script lang="ts" setup>
-	import { useToast } from 'wot-design-uni'
-	import { ref } from 'vue'
-	import { useUserStore } from '@/store/user'
-	import { http } from '@/utils/http'
-	import { HOME_PAGE } from '@/common/constants'
-	import { useRouter } from '@/plugin/uni-mini-router'
+<script setup>
+	import {
+		useToast
+	} from 'wot-design-uni'
+	import {
+		ref
+	} from 'vue'
+	import {
+		useUserStore
+	} from '@/store/user'
+	import {
+		http
+	} from '@/utils/http'
+	import {
+		HOME_PAGE
+	} from '@/common/constants'
+	import {
+		useRouter
+	} from '@/plugin/uni-mini-router'
 	import Base64 from 'base-64';
-	import { loginApi } from '@/api/system';
+	import {
+		loginApi
+	} from '@/api/system';
+	import {
+		queryUsernameByLdhth
+	} from '@/api/system/user';

 	defineOptions({
 		name: 'login',
@ -75,7 +92,8 @@
 	const showPassword = ref(true) //是否显示明文
 	const remPW = ref(false) //是否记住密码
 	/**h5系统信息中没有appWgtVersion值*/
-	const version = uni.getSystemInfoSync().appWgtVersion ? uni.getSystemInfoSync().appWgtVersion : uni.getSystemInfoSync().appVersion
+	const version = uni.getSystemInfoSync().appWgtVersion ? uni.getSystemInfoSync().appWgtVersion : uni.getSystemInfoSync()
+		.appVersion
 	const toast = useToast()
 	const userStore = useUserStore()
 	const handleChangePassword = () => {
@ -92,58 +110,85 @@
 		uni.setStorageSync('accountpassword', JSON.stringify(localObj))
 		uni.setStorageSync('savePwd', remPW.value)
 	}
-	const handleLogin = () => {
+	const handleLogin = async () => {
 		if (userName.value.length === 0) {
-			toast.warning('请输入统一身份认证')
+			toast.warning('请输入统一身份/劳动合同号')
 			return
 		}
 		if (password.value.length === 0) {
 			toast.warning('请输入密码')
 			return
 		}
-		let un = Base64.encode(encodeURIComponent(userName.value))
-		let pw = Base64.encode(encodeURIComponent(password.value))
-		loading.value = true
-		/*生产环境 begin */
-		// loginApi({ username: un, password: pw })
-		/*开发环境 begin */
-		loginApi({ username: userName.value, password: password.value, captcha: 'app' })
-			.then((res : any) => {
-				if (res.success) {
-					const { result } = res
-					const userInfo = result.userInfo
-					userStore.setUserInfo({
-						...userInfo,
-						token: result.token,
-						userid: userInfo.id,
-						username: userInfo.username,
-						realname: userInfo.realname,
-						avatar: userInfo.avatar,
-						post: userInfo.post,
-						tenantId: userInfo.loginTenantId,
-						localStorageTime: +new Date(),
-					})
-					savePwd()  //记住账号密码
-					uni.setStorageSync('logintime', Date.now()) //缓存登录时间
-					router.pushTab({ path: HOME_PAGE })
+		let params = {
+			username: userName.value,
+			password: password.value,
+		};
+		/*判断是否是六位纯数字*/
+		if (userName.value.match(/^\d{6}$/)) {
+			await queryUsernameByLdhth(userName.value).then(res => {
+				if (res) {
+					params = {
+						username: Base64.encode(encodeURIComponent(res)),
+						password: Base64.encode(encodeURIComponent(password.value)),
+					};
 				} 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)
+					params.captcha = 'app';
 				}
 			})
-			.finally(() => {
-				loading.value = false
-			})
+		} else {
+			/*开发环境 */
+			params.captcha = 'app';
+			/*生产环境 */
+			// params = {
+			// 	username: Base64.encode(encodeURIComponent(userName.value)),
+			// 	password: Base64.encode(encodeURIComponent(password.value)),
+			// };
+		}
+		login(params)
+	}
+
+	const login = async (params) => {
+		loading.value = true
+		try {
+			// 调用API
+			const res = await loginApi(params);
+			if (res.success) {
+				const {
+					result
+				} = res
+				const userInfo = result.userInfo
+				userStore.setUserInfo({
+					...userInfo,
+					token: result.token,
+					userid: userInfo.id,
+					username: userInfo.username,
+					realname: userInfo.realname,
+					avatar: userInfo.avatar,
+					post: userInfo.post,
+					tenantId: userInfo.loginTenantId,
+					localStorageTime: +new Date(),
+				})
+				savePwd() //记住账号密码
+				uni.setStorageSync('logintime', Date.now()) //缓存登录时间
+				router.pushTab({
+					path: HOME_PAGE
+				})
+			} 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)
+			}
+		} finally {
+			loading.value = false;
+		}
 	}

 	onLoad(() => {
--- a/src/pages/production/index.vue
+++ b/src/pages/production/index.vue
@ -9,51 +9,35 @@
 </route>
 <template>
 	<PageLayout :navbarShow="false">
-		<view>
-			<view class="placeholder"></view>
-			<view style="width: 100%; display: grid; place-items: center">
-				<uni-title :title="dateDate + '：生产情况'" type="h1" color="blue" />
-			</view>
-			<view style="margin: 0 10px;">
-				<uni-segmented-control style="margin-top: 10px;margin-bottom: 10px" :current="current" :values="items"
-					@clickItem="onClickItem" styleType="button" activeColor="#0055ff"></uni-segmented-control>
-			</view>
-			<view class="content">
-				<view v-if="current === 0">
-					<view style="padding: 0 10px">
-						<view class="progress-bartime">
-							<!-- 动态设置宽度和颜色 -->
-							<view class="progressTime"
-								:style="{ width: `${timePercent}%`, 'background-color': '#0055ff' }">
-							</view>
-							<!-- 显示带符号的百分比 -->
-							<text class="progress-text">全年时间进度:{{ timePercent }}%</text>
-						</view>
-					</view>
-					<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
-						<trq-data></trq-data>
-						<yy-data></yy-data>
-					</scroll-view>
-				</view>
-				<view v-if="current === 1">
-					<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
-						<sssjForm></sssjForm>
-					</scroll-view>
-				</view>
+		<view class="nav">
+			<view class="nav_box">
+				<scroll-view direction="horizontal">
+					<uni-segmented-control :current="current" :values="items" styleType="string" mode="segmented"
+						@clickItem="onClickItem"></uni-segmented-control>
+				</scroll-view>
 			</view>
 		</view>
+		<view class="content">
+
+			<view v-if="current === 0">
+				<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
+					<sssjData></sssjData>
+				</scroll-view>
+			</view>
+			<view v-if="current === 1">
+				<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
+					<trq-data></trq-data>
+					<yy-data></yy-data>
+				</scroll-view>
+			</view>
+		</view>
+
+
+
 	</PageLayout>
 </template>

 <script setup>
-	import trqData from './ribaoshuju/trqRbsj';
-	import yyData from './ribaoshuju/yyRbsj';
-	import sssjForm from './shishishuju/index';
-	import {
-		formatDate,
-		getDateAfterDays,
-		getYearProgress
-	} from '@/utils/dateTime';
 	import {
 		ref,
 		onMounted,
@ -62,14 +46,19 @@
 		watchEffect,
 		onUnmounted
 	} from 'vue';
-	const items = ref(['日报数据', '实时数据'])
+	//、、东风风光的
+	import trqData from '@/pages-production/ribaoshuju/trqRbsj';
+	import yyData from '@/pages-production/ribaoshuju/yyRbsj';
+	import sssjData from '@/pages-production/shishishuju/trqSssj';
+	const items = ref(['油气实时', '油气历史', '管线运行', '安防监控', '设备运行'])
 	const current = ref(0)
 	const res = wx.getSystemInfoSync();
 	const statusHeight = res.statusBarHeight; //状态栏高度
-	const cusnavbarheight = statusHeight + 44 + 'px';
-	const scrollViewHeight = ref(0); //状态栏高度
-	const timePercent = ref(0);
-	const dateDate = ref('');
+	const cusnavbarheight = (statusHeight + 50) + "px";
+	const scrollViewHeight = ref(0); //滚动控件的高度
+
+	const activeColor = ref("#0000ff")
+	const inActiveColor = ref("#000000")

 	function onClickItem(e) {
 		if (current.value != e.currentIndex) {
@ -77,31 +66,16 @@
 		}
 	}

-	const strDate = () => {
-		const now = new Date();
-		if (now.getHours() < 11) {
-			return formatDate(getDateAfterDays(now, -1)); //11点之前  头一天的数据
-		} else {
-			return formatDate(now);
-		}
-	};
 	onMounted(() => {
-		dateDate.value = strDate();
-		timePercent.value = getYearProgress();
 		calculateScrollViewHeight();
-		// 监听窗口大小变化事件，当窗口大小改变时重新计算高度
-		window.addEventListener('resize', calculateScrollViewHeight);
+		// 使用 Uniapp 提供的窗口大小变化监听方法
+		uni.onWindowResize(calculateScrollViewHeight);
 	});

 	onUnmounted(() => {
-		// 移除窗口大小变化事件监听器
-		window.removeEventListener('resize', calculateScrollViewHeight);
+		// 移除 Uniapp 窗口大小变化监听
+		uni.offWindowResize(calculateScrollViewHeight);
 	});
-
-	onHide(()=>{ //切换首页后，将生产切换为日本数据以清楚定时 by闵
-		current.value = 0;
-	}) 
-
 	const calculateScrollViewHeight = () => {
 		// 获取屏幕的总高度
 		const screenHeight = uni.getSystemInfoSync().windowHeight;
@ -111,18 +85,7 @@
 		query
 			.select('.nav')
 			.boundingClientRect();
-		query
-			.select('.placeholder')
-			.boundingClientRect();
-		query
-			.select('.uni-title')
-			.boundingClientRect();
-		query
-			.select('.uni-segmented-control')
-			.boundingClientRect();
-		query
-			.select('.progress-bartime')
-			.boundingClientRect();
+
 		// 执行查询操作
 		query.exec((res) => {
 			let totalHeight = 0;
@ -132,62 +95,38 @@
 				}
 			});
 			// 计算 scroll-view 的高度
-			scrollViewHeight.value = screenHeight - totalHeight - 80;
+			scrollViewHeight.value = screenHeight - totalHeight;
 		});
 	};
 </script>

 <style lang="scss" scoped>
 	.nav {
-		width: calc(100% - 60rpx);
-		padding: 0 30rpx;
+		width: calc(100%);
 		height: v-bind(cusnavbarheight);
-
 		font-size: 24rpx;
-		color: #ffffff;
+		//color: #333333;
 		position: fixed;
-		top: 0;
-		left: 0;
 		z-index: 99;
-		background-image: url('../../static/my/navbg.png');
+		background-image: url('@/static/navbg.png');
 		background-repeat: no-repeat;
 		background-size: 750rpx 458rpx;
 	}

-	.placeholder {
-		height: v-bind(cusnavbarheight);
-	}
+	.nav_box {
+		font-size: 18;

-	.progress-bartime {
-		position: relative;
-		height: 25px;
-		background: #f0f0f0;
-		border-radius: 10px;
-		overflow: hidden;
-		margin-bottom: 20rpx;
-	}
-
-	.progress {
-		height: 100%;
-		transition: all 0.3s;
-	}
-
-	.progressTime {
-		height: 100%;
-		transition: all 0.3s;
-		padding: 0 20px;
-	}
-
-	.progress-text {
 		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		color: red;
-		/* 保持红色 */
-		font-size: 16px;
-		font-weight: bold;
-		text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-		/* 提升可读性 */
+		bottom: 6rpx;
+		width: calc(100% - 60rpx);
+		left: 30rpx;
+		right: 30rpx;
+	}
+
+	.content {
+		position: absolute;
+		top: v-bind(cusnavbarheight);
+		width: 100%;
+		min-height: calc(100vh - v-bind(cusnavbarheight));
 	}
 </style>
--- a/src/store/user.ts
+++ b/src/store/user.ts
@ -15,6 +15,7 @@ const initState = {
 	post: '',
 	orgCode: '',
 	workNo: '',
+	userIdentity: '',
 	// 本地存储时间
 	localStorageTime: 0,
 }
--- a/src/typings.d.ts
+++ b/src/typings.d.ts
@ -28,6 +28,7 @@ declare global {
 		tenantId ?: string | number
 		// sex ?: number
 		phone ?: string
+		userIdentity ?: string | number
 		post ?: string
 		email ?: string
 		/** 微信的 openid，非微信没有这个字段 */
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@ -235,9 +235,7 @@ export const useUpdateApp = defineStore('updateApp', () => {
 			if (webApp) {//如果是测试环境 ，upDateAppApi 传递参数 by min
 				path = webApp
 			}
-			console.log(22222222222222222)
 			upDateAppApi(path).then(async (res : any) => {
-				console.log(3333333333)
 				let {
 					result
 				} = res
Author	SHA1	Message	Date
liaodeyun	5a6d68bd19	修改生产模块页面，增加顶部标签，新建分包pages-production，将生产页面移动至分包下面。下一步制作曲线页面，统计页面，继续做好设备，安防等页面。	2025-09-11 17:58:34 +08:00
年泽闵	adcdb86db7	Merge branch 'minJeecg' into 'master' Min jeecg See merge request cxc/jeecguniapp!37	2025-09-11 07:27:26 +00:00
lagos	5477eaebe9	1	2025-09-11 15:26:23 +08:00
lagos	dd7d3bb64b	Merge remote-tracking branch 'remotes/origin/master' into minJeecg	2025-09-09 10:11:58 +08:00
lagos	01292d1f50	1	2025-09-09 10:11:09 +08:00
yangzhq68909	3e75a37937	Merge remote-tracking branch 'remotes/origin/master'	2025-09-08 13:28:01 +08:00
yangzhq68909	cf7c21a160	增加临时劳务登录	2025-09-08 13:27:49 +08:00
年泽闵	ea59b7b564	Merge branch 'minJeecg' into 'master' Min jeecg See merge request cxc/jeecguniapp!36	2025-09-05 00:14:15 +00:00
lagos	4b526dd5b4	Merge remote-tracking branch 'remotes/origin/master' into minJeecg # Conflicts: # env/.env.development	2025-09-05 08:13:31 +08:00
lagos	2215b058ab	1	2025-09-05 08:12:18 +08:00
yangzhq68909	c97b130da9	app登录方式修改增加劳动合同号	2025-09-03 15:17:38 +08:00
闵年泽	8acb78320c	Merge branch 'minJeecg' into 'master' Min jeecg See merge request cxcxt/jeecguniapp!35	2025-08-13 09:37:53 +08:00
闵年泽	5e7843d456	Merge branch 'minJeecg' into 'master' 1.修改app See merge request cxcxt/jeecguniapp!34	2025-08-09 11:27:18 +08:00