Merge branch 'perf/add-visual-board' into 'main_dev'

perf:首页添加看板展示

See merge request yunteng/thingskit-app!122

@@ -20,6 +20,11 @@ const getConfigurationApi = (params = {}) => {
 		.get('/yt/configuration/center', params)
 }
 
+// 获取看板分页API
+const getVisualBoardApi = (params) => {
+	return uni.$u.http.get('yt/data_board',params)
+}
+
 //获取组织列表
 const getMeOrgListApi = () => {
 	return uni.$u.http
@@ -31,5 +36,6 @@ export default {
 	getCameraApi,
 	byCameraIdGetDetailApi,
 	getConfigurationApi,
-	getMeOrgListApi
+	getMeOrgListApi,
+	getVisualBoardApi
 }

@@ -8,8 +8,8 @@ import {
  * baseWebSocketUrl 服务端 websocket地址
  * socketPrefix websocket前缀 ((https, wss),( http, ws))
  */
-
 const baseUrl = "http://222.180.200.114:48080/api";
+const baseVisualUrl = "http://192.168.1.10:8083"
 const baseDrawioUrl = "http://222.180.200.114:9527/thingskit-scada";
 const baseWebSocketUrl = "222.180.200.114:48080";
 const socketPrefix = "ws";
@@ -42,6 +42,7 @@ systemInfo.platform = "plus";
 const courtConfig = {
 	publicAppId: "", //公众号appId
 	baseUrl, //服务端地址
+	baseVisualUrl,//服务端看板地址
 	baseDrawioUrl, //服务端组态地址
 	baseWebSocketUrl, //服务端websocket地址
 	socketPrefix, //websocket前缀

@@ -403,4 +403,4 @@
 			width: 663rpx !important;
 		}
 	}
-</style>
\ No newline at end of file
+</style>

 {
     "name" : "ThingsKit",
-    "appid" : "__UNI__AD0D64F",
+    "appid" : "__UNI__E8FFC75",
     "description" : "thingskit",
     "versionName" : "1.0.0",
     "versionCode" : 100,
@@ -105,7 +105,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wxd5d018355f38262b",
+        "appid" : "wx3a36e5189b607150",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

@@ -61,6 +61,18 @@
 			"style": {
 				"navigationBarTitleText": "组织筛选"
 			}
+		},
+		{
+			"path": "pages/index/components/visualBoard/index",
+			"style": {
+				"navigationBarTitleText": "查看看板"
+			}
+		},
+		{
+			"path": "pages/index/components/visualBoard/detail",
+			"style": {
+				"navigationBarTitleText": "看板详情"
+			}
 		}
 	],
 	"subPackages": [{
@@ -194,4 +206,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}

@@ -59,4 +59,4 @@
 
 <style lang="scss" scoped>
 	@import '../../static/configuration.scss';
-</style>
\ No newline at end of file
+</style>

+<template>
+	<view>
+		<web-view :src="visualBoardUrl"></web-view>
+	</view>
+
+</template>
+
+<script>
+	import config from '../../../../config/baseUrl.js'
+	export default {
+		data(){
+			return {
+				visualBoardUrl:'',
+			}
+		},
+		async onLoad(e){
+			const url = await this.createShareUrl({id:e.id})
+			console.log(url,'url')
+			this.visualBoardUrl = url
+		},
+		methods:{
+			getUrl(id,userId){
+				return `/appPage/${id}/${userId}`
+			},
+
+			async createShareUrl(record){
+				const userInfo = uni.getStorageSync('userInfo')
+				const { id } = record;
+				// http://192.168.10.131:8083
+				return `${config.baseVisualUrl}${this.getUrl(id,userInfo.userId)}`;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+import config from '../../../../config/baseUrl.js'
+import {
+	atob,
+	btoa
+} from './weapp.atob.js'
+const getRandomString = () => Number(Math.random().toString().substring(2)).toString(36);
+
+export const ScadaModeEnum = {
+	PRIVATE_VIEW: 'PRIVATE_VIEW',
+	PUBLIC_VIEW: 'PUBLIC_VIEW',
+}
+
+export const encode = (record) => {
+	let hash = JSON.stringify(record);
+	const mixinString = getRandomString()
+		.slice(0, 10)
+		.padEnd(10, getRandomString())
+		.split('')
+		.map((item) => (Math.random() > 0.5 ? item.toUpperCase() : item))
+		.join('');
+	hash = btoa(hash);
+	hash = hash.substring(0, 6) + mixinString + hash.substring(6);
+	hash = btoa(hash);
+	return hash;
+};
+
+
+export const createScadaPageLink = (
+	record,
+	mode = ScadaModeEnum.PRIVATE_VIEW,
+	open = false
+) => {
+	const userInfo = uni.getStorageSync('userInfo')
+	const params = {
+		configurationId: record?.id,
+		organizationId: record?.organizationId,
+		mode: record?.viewType === ScadaModeEnum.PRIVATE_VIEW ? 'lightbox' : 'share',
+		platform: record?.platform,
+		userId: userInfo.userId
+	};
+
+	if (record?.viewType === ScadaModeEnum.PUBLIC_VIEW) {
+		params.publicId = record.publicId;
+	}
+
+	const hash = encode(params);
+
+	const href = `${config.baseDrawioUrl}#${hash}`
+
+	return href
+};
\ No newline at end of file

+<template>
+	<view class="configuation-page">
+		<view class="configuation-header">
+			<view class="header-gap"></view>
+			<view class="search-top">
+				<view class="search-main">
+					<u--input @change="inputChanged" prefixIcon="search" placeholder="请输入看板名称" border="surround"
+						shape="circle"></u--input>
+				</view>
+			</view>
+		</view>
+		<view style="height:35rpx"></view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<!-- 自带分页组件 -->
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
+			@up="upCallback">
+			<view class="configuation-container">
+				<view class="configuation-item">
+					<view @click="openConfigDetail(item)" v-for="(item, index) in list" :key="index" class="item">
+						<image class="image" :src="item.icon || defaultConfigImage"></image>
+						<text class="name">{{ item.name }}</text>
+					</view>
+				</view>
+			</view>
+			<mescroll-empty v-if="!list.length" />
+		</mescroll-body>
+		<!-- 自带分页组件 -->
+		<view style="height: 60rpx;"></view>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import api from '@/api/index.js'
+	import {
+		createScadaPageLink
+	} from './help';
+
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		data() {
+			return {
+				defaultConfigImage: '../../../../static/test.png',
+				page: {
+					num: 0,
+					size: 10
+				},
+				downOption: {
+					auto: true //是否在初始化后,自动执行downCallback; 默认true
+				},
+				upOption: {
+					auto: false // 不自动加载
+				},
+				list: []
+			};
+		},
+		onLoad() {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
+		},
+		onUnload() {
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
+			uni.removeStorageSync('getConfiguration');
+		},
+		methods: {
+			inputChanged(e) {
+				this.page.num = 1;
+				this.loadData(1, e);
+			},
+			openConfigDetail(e) {
+				console.log(e,'e')
+				uni.navigateTo({
+					url: 'detail?id=' + e.id
+				});
+			},
+			/*下拉刷新的回调 */
+			downCallback() {
+				//联网加载数据
+				this.page.num = 1;
+				this.loadData(1);
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback() {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num);
+			},
+			async loadData(pageNo, name) {
+				let httpData = {
+					page: pageNo,
+					pageSize: 10,
+					name,
+					platform: 'phone'
+				};
+				const res = await api.homeApi.getVisualBoardApi({
+					params: httpData,
+					custom: {
+						load: false
+					}
+				})
+				if (res) {
+					uni.stopPullDownRefresh();
+					this.mescroll.endByPage(res.items.length, res.total);
+					this.cameraTotal = res.total;
+					if (pageNo == 1) {
+						this.list = res.items;
+					} else {
+						this.list = this.list.concat(res.items);
+					}
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import '../../static/configuration.scss';
+</style>

+var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+var b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/;
+export const btoa = function(string) {
+	string = String(string);
+	var bitmap, a, b, c, result = "",
+		i = 0,
+		rest = string.length % 3;
+	for (; i < string.length;) {
+		if ((a = string.charCodeAt(i++)) > 255 ||
+			(b = string.charCodeAt(i++)) > 255 ||
+			(c = string.charCodeAt(i++)) > 255)
+			throw new TypeError(
+				"Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range."
+			);
+		bitmap = (a << 16) | (b << 8) | c;
+		result += b64.charAt(bitmap >> 18 & 63) + b64.charAt(bitmap >> 12 & 63) +
+			b64.charAt(bitmap >> 6 & 63) + b64.charAt(bitmap & 63);
+	}
+	return rest ? result.slice(0, rest - 3) + "===".substring(rest) : result;
+};
+
+export const atob = function(string) {
+	string = String(string).replace(/[\t\n\f\r ]+/g, "");
+	if (!b64re.test(string))
+		throw new TypeError(
+			"Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");
+	string += "==".slice(2 - (string.length & 3));
+	var bitmap, result = "",
+		r1, r2, i = 0;
+	for (; i < string.length;) {
+		bitmap = b64.indexOf(string.charAt(i++)) << 18 | b64.indexOf(string.charAt(i++)) << 12 |
+			(r1 = b64.indexOf(string.charAt(i++))) << 6 | (r2 = b64.indexOf(string.charAt(i++)));
+		result += r1 === 64 ? String.fromCharCode(bitmap >> 16 & 255) :
+			r2 === 64 ? String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255) :
+			String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255, bitmap & 255);
+	}
+	return result;
+};
+
+function b64DecodeUnicode(str) {
+	return decodeURIComponent(exports.weAtob(str).replace(/(.)/g, function(p) {
+		var code = p.charCodeAt(0).toString(16).toUpperCase();
+		if (code.length < 2) {
+			code = "0" + code;
+		}
+		return "%" + code;
+	}));
+}
+
+function base64_url_decode(str) {
+	var output = str.replace(/-/g, "+").replace(/_/g, "/");
+	switch (output.length % 4) {
+		case 0:
+			break;
+		case 2:
+			output += "==";
+			break;
+		case 3:
+			output += "=";
+			break;
+		default:
+			throw "Illegal base64url string!";
+	}
+	try {
+		return b64DecodeUnicode(output);
+	} catch (err) {
+		return exports.weAtob(output);
+	}
+}
+
+function weappJwtDecode(token, options) {
+	if (typeof token !== "string") {
+		throw ("Invalid token specified");
+	}
+	options = options || {};
+	var pos = options.header === true ? 0 : 1;
+	try {
+		return JSON.parse(base64_url_decode(token.split(".")[pos]));
+	} catch (e) {
+		throw ("Invalid token specified: " + e.message);
+	}
+}
\ No newline at end of file

@@ -8,6 +8,11 @@ const basicGridList = [{
 		icon: '/static/status.png',
 		text: '组态'
 	},
+	{
+		event: 'visualBoard',
+		icon: '/static/visual-board.png',
+		text: '看板'
+	},
 ]
 
 const basicStatistics = [{
@@ -51,4 +56,4 @@ const basicStatistics = [{
 export {
 	basicGridList,
 	basicStatistics
-}
\ No newline at end of file
+}

@@ -127,8 +127,13 @@
 			openConfiguration() {
 				useNavigateTo('components/configuration/configuration')
 			},
+			openVisualBoard() {
+				useNavigateTo('components/visualBoard/index')
+			},
 			handleEvent(event) {
-				if (event === 'openCamera') this.openCamera()
+				if(event==='visualBoard') {
+					this.openVisualBoard()
+				}else if (event === 'openCamera') this.openCamera()
 				else {
 					this.openConfiguration()
 				}
@@ -160,4 +165,4 @@
 
 <style lang="scss" scoped>
 	@import './static/index.scss';
-</style>
\ No newline at end of file
+</style>

@@ -36,6 +36,7 @@
 				width: 100rpx;
 				height: 100rpx;
 				margin-top: 20rpx;
+				border-radius: 32rpx;
 			}
 		}
 		.center-text {