Merge branch 'ft-dev' into 'main'

feat：新增组态功能

See merge request huang/thingskit-app!67

 .project
 .project
+.history
 unpackage/
 unpackage/
 .DS_Store
 .DS_Store
 dist/
 dist/

@@ -2,15 +2,17 @@ import {
 	getTabbarHeight
 	getTabbarHeight
 } from '@/plugins/utils';
 } from '@/plugins/utils';
 let baseUrl = "";
 let baseUrl = "";
+let baseDrawioUrl = ""
 if (process.env.NODE_ENV === 'development') {
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	// 开发环境
 	// baseUrl = 'http://192.168.10.115:8080/api'
 	// baseUrl = 'http://192.168.10.115:8080/api'
 	baseUrl = 'https://dev.thingskit.com/api'
 	baseUrl = 'https://dev.thingskit.com/api'
-
+	baseDrawioUrl = 'https://dev.thingskit.com/thingskit-drawio'
 } else if (process.env.NODE_ENV === 'production') {
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
 	// 生产环境
 	// baseUrl = 'http://47.99.141.212:8080/api'
 	// baseUrl = 'http://47.99.141.212:8080/api'
 	baseUrl = 'https://dev.thingskit.com/api'
 	baseUrl = 'https://dev.thingskit.com/api'
+	baseDrawioUrl = 'https://dev.thingskit.com/thingskit-drawio'
 }
 }
 
 
 let systemInfo = {
 let systemInfo = {
@@ -41,6 +43,7 @@ console.log(systemInfo, 'systemInfo')
 const courtConfig = {
 const courtConfig = {
 	publicAppId: '', //公众号appId
 	publicAppId: '', //公众号appId
 	baseUrl: baseUrl, //域名
 	baseUrl: baseUrl, //域名
+	baseDrawioUrl: baseDrawioUrl,
 	systemInfo: systemInfo, //系统信息
 	systemInfo: systemInfo, //系统信息
 	mapData: {
 	mapData: {
 		key: '', //地图key
 		key: '', //地图key

@@ -14,7 +14,10 @@ uni.$u.http.setConfig((config) => {
 	window.sessionStorage.getItem("userInfo").isToken;
 	window.sessionStorage.getItem("userInfo").isToken;
 	// #endif
 	// #endif
 	/* config 为默认全局配置*/
 	/* config 为默认全局配置*/
-	config.baseURL = base.baseUrl; /* 根域名 */
+	// const getConfiguration = uni.getStorageSync('getConfiguration').isConfiguration
+	// console.log('getConfiguration', getConfiguration);
+	// config.baseURL = getConfiguration == true ? base.baseDrawioUrl : base.baseUrl /* 根域名 */
+	config.baseURL = base.baseUrl /* 根域名 */
 	config.header = {
 	config.header = {
 		"Content-Type": "application/json",
 		"Content-Type": "application/json",
 		'X-Authorization': "Bearer " + token,
 		'X-Authorization': "Bearer " + token,
@@ -39,17 +42,23 @@ uni.$u.http.interceptors.request.use(
 		// 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
 		// 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
 		config.data = config.data || {};
 		config.data = config.data || {};
 		// 根据custom参数中配置的是否需要token，添加对应的请求头
 		// 根据custom参数中配置的是否需要token，添加对应的请求头
+		const getConfiguration = uni.getStorageSync('getConfiguration').isConfiguration
 		if (config?.custom?.auth) {
 		if (config?.custom?.auth) {
 			config.header['X-Authorization'] =
 			config.header['X-Authorization'] =
 				"Bearer " + store.state.userInfo.isToken ||
 				"Bearer " + store.state.userInfo.isToken ||
 				uni.getStorageSync("userInfo").isToken ||
 				uni.getStorageSync("userInfo").isToken ||
 				undefined;
 				undefined;
+			config.baseURL = getConfiguration == true ? base.baseDrawioUrl : base.baseUrl
 		}
 		}
 		if (config?.custom?.load) {
 		if (config?.custom?.load) {
 			//打开加载动画
 			//打开加载动画
 			store.commit("setLoadingShow", true);
 			store.commit("setLoadingShow", true);
 		}
 		}
-
+		if (getConfiguration) {
+			uni.setStorageSync('config', config)
+		} else {
+			uni.removeStorageSync('config')
+		}
 		return config;
 		return config;
 	},
 	},
 	(config) => {
 	(config) => {

@@ -2,60 +2,112 @@
 	<view class="status-page">
 	<view class="status-page">
 		<f-navbar navbarType="2" @leftClick="leftClick">
 		<f-navbar navbarType="2" @leftClick="leftClick">
 			<view class="u-flex search-top" slot="left">
 			<view class="u-flex search-top" slot="left">
-				<view class="search-main"><u--input prefixIcon="search" placeholder="请输入组态名称" border="surround" shape="circle"></u--input></view>
+				<view class="search-main"><u--input @change="inputChanged" prefixIcon="search" placeholder="请输入组态名称" border="surround" shape="circle"></u--input></view>
 			</view>
 			</view>
 		</f-navbar>
 		</f-navbar>
 		<!-- 公共组件-每个页面必须引入 -->
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<public-module></public-module>
-		<view class="status-container">
-			<view @click="openStatusDetail(item.id)" v-for="(item, index) in list" :key="index" class="status-item u-flex">
-				<view class="item-image"><image class="image" :src="item.icon"></image></view>
-				<view class="item-text">
-					<text class="text">{{ item.name }}</text>
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+			<view class="status-container">
+				<view @click="openConfigDetail(item.id)" v-for="(item, index) in list" :key="index" class="status-item u-flex">
+					<view style="cursor: pointer;" class="item-image"><image class="image" :src="item.icon || defaultConfigImage"></image></view>
+					<view class="item-text">
+						<text class="text">{{ item.name }}</text>
+					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-		</view>
-		<f-tabbar></f-tabbar>
+		</mescroll-body>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import fNavbar from '@/components/module/f-navbar/f-navbar';
 import fNavbar from '@/components/module/f-navbar/f-navbar';
+import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 
 
 export default {
 export default {
 	components: {
 	components: {
-		fTabbar,
 		fNavbar
 		fNavbar
 	},
 	},
+	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 	data() {
 	data() {
 		return {
 		return {
-			list: [
-				{
-					id: 1,
-					name: '智慧办公室1',
-					icon: '../../../static/test.png'
-				},
-				{
-					id: 2,
-					name: '智慧办公室2',
-					icon: '../../../static/test.png'
-				}
-			]
+			page: {
+				num: 0,
+				size: 10
+			},
+			downOption: {
+				auto: true //是否在初始化后,自动执行downCallback; 默认true
+			},
+			upOption: {
+				auto: false // 不自动加载
+			},
+			defaultConfigImage: '../../../static/test.png',
+			list: []
 		};
 		};
 	},
 	},
 	onLoad() {
 	onLoad() {
 		// 隐藏原生的tabbar
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 		uni.hideTabBar();
+		uni.setStorageSync('getConfiguration', {
+			isConfiguration: false
+		});
+	},
+	onUnload() {
+		uni.setStorageSync('getConfiguration', {
+			isConfiguration: false
+		});
+		uni.removeStorageSync('getConfiguration');
 	},
 	},
 	methods: {
 	methods: {
+		inputChanged(e) {
+			this.page.num = 1;
+			this.loadData(1, e);
+		},
 		leftClick() {
 		leftClick() {
 			return false;
 			return false;
 		},
 		},
-		openStatusDetail(e) {
+		onBackPress() {
+			console.log('返回');
+			return true; // 阻止返回 不阻止就不写或者用uni.navigateBack({ delta: 1 })返回
+		},
+		openConfigDetail(e) {
 			uni.navigateTo({
 			uni.navigateTo({
-				url: 'configurationDetail'
+				url: 'configurationDetail?configId=' + e
 			});
 			});
+		},
+		/*下拉刷新的回调 */
+		downCallback() {
+			//联网加载数据
+			this.page.num = 1;
+			this.loadData(1);
+		},
+		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+		upCallback() {
+			//联网加载数据
+			this.page.num += 1;
+			this.loadData(this.page.num);
+		},
+		loadData(pageNo, T) {
+			let httpData = {
+				page: pageNo,
+				pageSize: 10,
+				name: T
+			};
+			uni.$u.http
+				.get('/yt/configuration/center', { params: httpData, custom: { load: false } })
+				.then(res => {
+					uni.stopPullDownRefresh();
+					this.mescroll.endByPage(res.items.length, res.total);
+					if (pageNo == 1) {
+						this.list = res.items;
+					} else {
+						this.list = this.list.concat(res.items);
+					}
+				})
+				.catch(e => {
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				});
 		}
 		}
 	}
 	}
 };
 };

@@ -2,24 +2,66 @@
 	<view class="content">
 	<view class="content">
 		<!-- 公共组件-每个页面必须引入 -->
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<public-module></public-module>
-		<f-tabbar :isFillHeight="false"></f-tabbar>
+		<web-view :src="showConfiguration" bindload="bindload" binderror="binderror"></web-view>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 export default {
 export default {
-	components: {
-		fTabbar
-	},
 	data() {
 	data() {
-		return {};
+		return {
+			showConfiguration: '',
+			defauleConfigImage: 'https://dev.thingskit.com',
+			params: ''
+		};
 	},
 	},
 	onLoad(e) {
 	onLoad(e) {
+		uni.setStorageSync('getConfiguration', {
+			isConfiguration: true
+		});
+		if (e.configId !== null) {
+			this.params = e.configId;
+			this.requestUrl(this.params);
+		}
 		// 隐藏原生的tabbar
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 		uni.hideTabBar();
+	},
+	onShow() {
+		uni.setStorageSync('getConfiguration', {
+			isConfiguration: true
+		});
+	},
+	onUnload() {
+		uni.setStorageSync('getConfiguration', {
+			isConfiguration: false
+		});
+		uni.removeStorageSync('config');
+	},
+	methods: {
+		// 网页加载成功时候触发此事件
+		bindload(res) {
+			console.log(res, res.detail);
+		},
+		// 网页加载失败的时候触发此事件
+		binderror(err) {
+			console.log(err, err.detail);
+		},
+		async requestUrl(e) {
+			const httpData = {
+				configurationId: e,
+				lightbox: 1
+			};
+			const getUrl = await uni.$u.http.get('/', { params: httpData, custom: { load: false } });
+			const pathUrl = uni.getStorageSync('config');
+			this.showConfiguration = pathUrl.baseURL + '/' + '?' + 'configurationId=' + e + '&' + 'lightbox=' + 1;
+		}
 	}
 	}
 };
 };
 </script>
 </script>
 
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.content {
+	background: #f8f9fa;
+	min-height: 100vh;
+}
+</style>

@@ -121,6 +121,10 @@ export default {
 		// 隐藏原生的tabbar
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 		uni.hideTabBar();
 		this.getDeviceTotalData();
 		this.getDeviceTotalData();
+		uni.setStorageSync('getConfiguration', {
+			isConfiguration: false
+		});
+		uni.removeStorageSync('getConfiguration');
 	},
 	},
 	methods: {
 	methods: {
 		...mapActions(['updateBadgeTotal']),
 		...mapActions(['updateBadgeTotal']),
@@ -145,13 +149,11 @@ export default {
 			uni.navigateTo({
 			uni.navigateTo({
 				url: 'camera/camera'
 				url: 'camera/camera'
 			});
 			});
-			// this.showToastWip()
 		},
 		},
 		openOrgStatus() {
 		openOrgStatus() {
-			// uni.navigateTo({
-			// 	url: 'configuration/configuration'
-			// });
-			this.showToastWip();
+			uni.navigateTo({
+				url: 'configuration/configuration'
+			});
 		},
 		},
 		//告警状态查询
 		//告警状态查询
 		navigatorAlarmStatus(e) {
 		navigatorAlarmStatus(e) {

 .status-page {
 .status-page {
+	background: #f8f9fa;
 	padding: 15rpx 15rpx;
 	padding: 15rpx 15rpx;
+	min-height: 100vh;
 	.search-top {
 	.search-top {
 		justify-content: space-between;
 		justify-content: space-between;
 		flex-direction: row;
 		flex-direction: row;
 		.search-main {
 		.search-main {
 			width: 700rpx;
 			width: 700rpx;
+			margin-top: -34rpx;
 		}
 		}
 	}
 	}
 }
 }

@@ -174,7 +174,7 @@ export default {
 						icon: 'none'
 						icon: 'none'
 					}).then(res => {
 					}).then(res => {
 						uni.reLaunch({
 						uni.reLaunch({
-							url: '/pages/personal/personal'
+							url: '/publicLoginSubPage/public/login'
 						});
 						});
 					});
 					});
 				})
 				})
@@ -183,7 +183,6 @@ export default {
 						title: err.data.msg,
 						title: err.data.msg,
 						icon: 'none'
 						icon: 'none'
 					});
 					});
-					console.log(err.data.msg);
 				});
 				});
 		},
 		},
 		showPasswordModeF() {
 		showPasswordModeF() {