Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-app!169

@@ -44,7 +44,8 @@
 		<!-- #endif -->
 		<view class="bottom-button">
 			<view v-if="handleText.includes(alarmDetail[8].value)" class="u-flex button-item">
-				<u-button @click="handleSubmit" type="primary" shape="circle" :text="$t('alarm.handle')"></u-button>
+				<u-button @click="handleSubmit
+				" type="primary" shape="circle" :text="$t('alarm.handle')"></u-button>
 			</view>
 			<view v-if="clearText.includes(alarmDetail[8].value)" class="u-flex button-item">
 				<u-button @click="handleRemove" type="error" shape="circle" :text="$t('alarm.cleanUp')"></u-button>
@@ -146,16 +147,16 @@ export default {
 		async handleSubmit() {
 			if (this.formModel.result == '') return uni.$u.toast(this.$t('alarm.pleaseResult'));
 			const res = await api.alarmApi.postAlarmAckApi(this.detailId)
-			if (res == '') {
+			// if (res == '') {
 				this.returnPrevPage(this.$t('common.processSuccess'))
 				setTimeout(() => {
 					useNavigateBack(1)
 				}, 500);
-			}
+			// }
 		},
 		async handleRemove() {
 			const res = await api.alarmApi.postAlarmClearApi(this.detailId)
-			if (res == '') {
+			// if (res == '') {
 				this.returnPrevPage(this.$t('common.clearSuccess'))
 				setTimeout(async () => {
 					useNavigateBack(1)
@@ -165,7 +166,7 @@ export default {
 						await this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
 					}
 				}, 500);
-			}
+			// }
 		},
 		//触发值处理
 		formatAlarmValue(e, dataFormat) {

@@ -27,6 +27,14 @@ const getVisualBoardApi = (params) => {
   return uni.$u.http.get('yt/data_board', params)
 }
 
+/**
+ * 
+ * @description 查询大屏分页
+ */
+const getLargeScreen = (params) => {
+  return uni.$u.http.get('yt/data_view', params)
+}
+
 //获取组织列表
 const getMeOrgListApi = () => {
   return uni.$u.http.get('/yt/organization/me/list')
@@ -38,6 +46,6 @@ export default {
   byCameraIdGetDetailApi,
   getConfigurationApi,
   getMeOrgListApi,
-  getVisualBoardApi,
+  getVisualBoardApi, getLargeScreen,
   getCameraGBTUrl,
 }

@@ -3,16 +3,24 @@ import { getTabbarHeight } from '@/plugins/utils'
  * 服务端配置项
  * baseUrl 服务端 api地址
  * baseDrawioUrl 组态地址 注意端口
- * baseVisualUrl 看板地址
+ * baseLargeDesigner 新版看板 注意端口
+ * baseVisualUrl 旧版看板地址
  * baseWebSocketUrl 服务端 websocket地址
  * socketPrefix websocket前缀 ((https, wss),( http, ws))
  */
-const baseUrl = 'http://localhost:8080/api'
-// const baseUrl = 'http://192.168.1.9:8080/api'
-const baseVisualUrl = 'http://localhost:9527'
-// const baseVisualUrl = "http://192.168.1.4:8083"
-const baseDrawioUrl = 'http://localhost:9527/thingskit-scada'
-const baseWebSocketUrl = 'localhost:8080'
+// const baseUrl = 'http://222.180.200.114:30427/api'
+const baseUrl = 'http://192.168.1.235:9527/api'
+
+//
+// const baseVisualUrl = 'http://222.180.200.114:30427'
+const baseVisualUrl = 'http://192.168.1.235:9527'
+
+// const baseDrawioUrl = 'http://222.180.200.114:30427/thingskit-scada'
+const baseDrawioUrl = 'http://192.168.1.235:9527/thingskit-scada'
+
+const baseLargeDesigner = 'http://192.168.1.235:9527/large-designer'
+
+const baseWebSocketUrl = '192.168.1.235:9527'
 const socketPrefix = 'ws'
 
 let systemInfo = {
@@ -44,6 +52,7 @@ const courtConfig = {
   baseUrl, //服务端地址
   baseVisualUrl, //服务端看板地址
   baseDrawioUrl, //服务端组态地址
+  baseLargeDesigner,//服务端大屏地址
   baseWebSocketUrl, //服务端websocket地址
   socketPrefix, //websocket前缀
   systemInfo: systemInfo, //系统信息

@@ -134,7 +134,7 @@
 				return this.deviceDetail.alarmStatus === '0' ? this.$t('common.noText') : this.$t('common.yesText');
 			},
 			formatLastOnlineTime() {
-				return formatToDate(Number(this.deviceDetail.lastOnlineTime), 'YYYY-MM-DD HH:mm:ss');
+				return this.deviceDetail?.lastOnlineTime && Number(this.deviceDetail?.lastOnlineTime)?formatToDate(Number(this.deviceDetail.lastOnlineTime), 'YYYY-MM-DD HH:mm:ss'):' ';
 			}
 		},
 		beforeCreate() {

@@ -14,10 +14,13 @@ export default {
   },
   cameraManagement: 'Camera management',
   configuration: 'Configuration',
-  bulletinBoard: 'Bulletin board',
+  bulletinBoard: 'Old notice board',
+  largeScreen: 'New notice board',
   cameraNum: 'Number of cameras:',
   configurationNum: 'Number of configurations:',
   pleaseConfigurationname: 'Please enter the configuration name',
   bulletionBoard: "Number of bulletin boards:",
-  pleaseVisualBoard: 'Please enter the name of the board'
+  largeScreenCount: "Large screen count:",
+  pleaseVisualBoard: 'Please enter the name of the board',
+  pleaselargeScreen: 'Please enter the name of the large screen',
 }

@@ -8,6 +8,7 @@ export default {
   configurationDetail: 'Configuration details',
   organizationScreening: 'Organizational screening',
   viewBoard: 'View bulletin board',
+  viewLargeScreen: 'View large screen',
   boardDetail: 'Bulletin board detail',
   languageSettings: 'Language settings',
   alarmDetail: 'Alarm details',

@@ -14,10 +14,13 @@ export default {
   },
   cameraManagement: '摄像头管理',
   configuration: '组态',
-  bulletinBoard: '看板',
+  bulletinBoard: '旧版看板',
+  largeScreen: '新版看板 ',
   cameraNum: '摄像头数：',
   configurationNum: '组态数：',
   pleaseConfigurationname: '请输入组态名称',
   bulletionBoard: '看板数：',
+  largeScreenCount: '大屏数',
   pleaseVisualBoard: '请输入看板名称',
+  pleaselargeScreen: '请输入大屏名称',
 }

@@ -8,6 +8,7 @@ export default {
   configurationDetail: "组态详情",
   organizationScreening: '组织筛选',
   viewBoard: '查看看板',
+  viewLargeScreen: '查看大屏',
   boardDetail: '看板详情',
   languageSettings: '语言设置',
   alarmDetail: '告警详情',

@@ -75,6 +75,18 @@
 			}
 		},
 		{
+			"path": "pages/index/components/largeScreen/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/index/components/largeScreen/detail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
 			"path": "pages/personal/components/switchLocales",
 			"style": {
 				"navigationBarTitleText": ""

@@ -48,4 +48,17 @@ export const createScadaPageLink = (
 	const href = `${config.baseDrawioUrl}#${hash}`
 
 	return href
-};
\ No newline at end of file
+};
+
+export const createLargeScreenPageLink = (record) => {
+	const userInfo = uni.getStorageSync('userInfo')
+	const BackEndLocaleMapping = {
+		'en': 'en_US ',
+		'zhCN': 'zh_CN',
+		'zh-Hans': 'zh_CN'
+	};
+	const locale = BackEndLocaleMapping[uni.getLocale()] || 'zh_CN'
+
+	const href = `${config.baseLargeDesigner}/#/chart/preview/${record?.id}?organizationId=${record.organizationId}&locale=${locale}&userId=${userInfo.userId}&isPhone=Phone`
+	return href
+}

+<template>
+	<view class="configuation-detail-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<web-view :src="largeScreenUrl"></web-view>
+	</view>
+</template>
+
+<script>
+import {
+	createLargeScreenPageLink
+} from '../config/help.js';
+	export default {
+		data(){
+			return {
+				largeScreenUrl:'',
+			}
+		},
+		async onLoad(e){
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			this.createShareUrl(e)
+		},
+		onShow(){
+			// this.$nextTick(()=>{
+			// 	uni.setNavigationBarTitle({
+			// 		title:this.$t('menu.boardDetail')
+			// 	})
+			// })
+		},
+		methods:{
+			async createShareUrl(record){
+				const href = createLargeScreenPageLink(record)
+				console.log(href,'url')
+				this.largeScreenUrl = href
+			}
+		}
+	}
+</script>
+
+<!-- <style lang="scss" scoped>
+	@import '../../static/configuration.scss';
+</style> -->

+<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="$t('homePage.pleaseVisualBoard')" border="surround"
+						shape="circle"></u--input>
+				</view>
+			</view>
+			<header-org @openOrg="openOrg" :total="total" :title="$t('homePage.bulletionBoard')" :imageSrc="imageSrc"></header-org>
+		</view>
+		<view style="height:128rpx"></view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<!-- 自带分页组件 -->
+		<mescroll-body height="80%" 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 headerOrg from '@/components/common/header-org.vue'
+	import {
+		useNavigateTo
+	} from '@/plugins/utils.js'
+	import {
+		createLargeScreenPageLink
+	} from '../config/help.js';
+
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components:{
+			headerOrg
+		},
+		data() {
+			return {
+				defaultConfigImage: '../../../../static/test.png',
+				imageSrc:'/static/visual-board.png',
+				page: {
+					num: 0,
+					size: 10
+				},
+				downOption: {
+					auto: true //是否在初始化后,自动执行downCallback; 默认true
+				},
+				upOption: {
+					auto: false // 不自动加载
+				},
+				list: [],
+				total:0,
+				ordId:''
+			};
+		},
+		onLoad() {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
+		},
+		onShow(){
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.viewBoard')
+			})
+			if (this.ordId) {
+				this.loadData(1,null, this.ordId);
+			}
+		},
+		onHide() {
+			this.ordId = '';
+		},
+		onUnload() {
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
+			uni.removeStorageSync('getConfiguration');
+		},
+		methods: {
+			inputChanged(e) {
+				this.page.num = 1;
+				this.loadData(1, e);
+			},
+		
+			async openConfigDetail(record) {
+				const {id,organizationId} = record || {}
+				uni.navigateTo({
+					url: `detail?id=${id}&organizationId=${organizationId}`
+				});
+			},
+			/*下拉刷新的回调 */
+			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,organizationId) {
+				let httpData = {
+					page: pageNo,
+					pageSize: 10,
+					name,
+					organizationId, 
+					template:false,
+					visualization: 'DATA_BOARD'
+					// platform: 'phone'
+				};
+				const res = await api.homeApi.getLargeScreen({
+					params: httpData,
+					custom: {
+						load: false
+					}
+				})
+				if (res) {
+					uni.stopPullDownRefresh();
+					this.mescroll.endBySize(res.items.length, res.total);
+					this.total = res.total;
+					if(!res.items.length && res.total==0){
+						this.mescroll.showEmpty()
+					}else{
+						this.mescroll.removeEmpty()
+					}
+					if (pageNo == 1) {
+						this.list = res.items;
+					} else {
+						this.list = this.list.concat(res.items);
+					}
+				}
+			},
+			openOrg() {
+				useNavigateTo('/pages/organization/organization')
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import '../../static/configuration.scss';
+</style>

@@ -13,6 +13,11 @@ const basicGridList = [{
 	icon: '/static/visual-board.png',
 	text: 'homePage.bulletinBoard'
 },
+{
+	event: 'largeScreen',
+	icon: '/static/visual-newBoard.png',
+	text: 'homePage.largeScreen'
+}
 ]
 
 const basicStatistics = [{

@@ -155,6 +155,9 @@ export default {
 		openVisualBoard() {
 			useNavigateTo('components/visualBoard/index')
 		},
+		openLargeScreen(){
+			useNavigateTo('components/largeScreen/index')
+		},
 		handleEvent(event) {
 			if (getApp().getBindNot()) {
 				uni.$u.toast(this.$t('common.pleaseBindAccount'))
@@ -162,7 +165,8 @@ export default {
 			}
 			if (event === 'visualBoard') {
 				this.openVisualBoard()
-			} else if (event === 'openCamera') this.openCamera()
+			}else if(event==='largeScreen') this.openLargeScreen()
+			 else if (event === 'openCamera') this.openCamera()
 			else {
 				this.openConfiguration()
 			}