heayng

pages/views/dataBoard/daYiReservation.vue

@@ -104,7 +104,7 @@
 					rotate: false,
 					rotateLock: false,
 					color: ["#10C139", "#FF8400", "#0183FA", "#EE6666", "#73C0DE", "#3CA272", ],
-					padding: [5, 5, 5, 5],
+					padding: [5, 65, 5, 5],
 					dataLabel: true,
 					enableScroll: false,
 					legend: {
@@ -120,7 +120,7 @@
 					},
 					extra: {
 						ring: {
-							ringWidth: 10,
+							ringWidth: 15,
 							centerColor: '#3E414F',
 							activeOpacity: 0.5,
 							activeRadius: 20,

pages/views/dataBoard/equipmentControl.vue

@@ -90,16 +90,18 @@
 						disabled: true,
 						disableGrid: true,
 						axisLine: false,
-						fontColor: '#fff',
+						fontColor:'#fff',
 					},
 					yAxis: {
 						disabled: false,
 						disableGrid: true,
 
-						data: [{
-							type: 'categories',
-							fontColor: '#fff',
-						}],
+						data: [
+							{
+								type:'categories',
+							fontColor:'#fff',
+						}
+						],
 					},
 					extra: {
 						bar: {
@@ -134,7 +136,7 @@
 				},
 				chartDataTow: {},
 				optsThree: {
-					color: ["#10C139", "#FF8400", "#00FFE6", "#0183FA", "#73C0DE", "#3CA272", ],
+					color: ["#10C139", "#FF8400", "#00FFE6", "#0183FA", "#73C0DE", "#3CA272",],
 					legend: {
 						show: false,
 					},
@@ -219,28 +221,28 @@
 							data: [{
 								"name": "5年内",
 								"value": 147,
-								"labelText": "5年内 147台 26%",
-								"textColor": "#fff",
+								"labelText":"5年内 147台 26%",
+								"textColor":"#fff",
 							}, {
 								"name": "10年内",
 								"value": 136,
-								"labelText": "10年内 136台 24%",
-								"textColor": "#fff",
+								"labelText":"10年内 136台 24%",
+								"textColor":"#fff",
 							}, {
 								"name": "12年内",
 								"value": 124,
-								"labelText": "12年内 124台 22%",
-								"textColor": "#fff",
+								"labelText":"12年内 124台 22%",
+								"textColor":"#fff",
 							}, {
 								"name": "20年内",
 								"value": 96,
-								"labelText": "20年内 96台 17%",
-								"textColor": "#fff",
+								"labelText":"20年内 96台 17%",
+								"textColor":"#fff",
 							}, {
 								"name": "超期服役",
 								"value": 67,
-								"labelText": "超期服役 67台 11%",
-								"textColor": "#fff",
+								"labelText":"超期服役 67台 11%",
+								"textColor":"#fff",
 							}]
 						}]
 					};
@@ -256,19 +258,19 @@
 							data: [{
 								"name": "13.2压力容器30%",
 								"value": 50,
-								"textColor": "#fff",
+								"textColor":"#fff",
 							}, {
 								"name": "13.1起重类设备10%",
 								"value": 30,
-								"textColor": "#fff",
+								"textColor":"#fff",
 							}, {
 								"name": "13.4加热及制冷装置管理40%",
 								"value": 20,
-								"textColor": "#fff",
+								"textColor":"#fff",
 							}, {
 								"name": "13.3场（厂）内专用机动车辆20%",
 								"value": 18,
-								"textColor": "#fff",
+								"textColor":"#fff",
 							}]
 						}]
 					};

pages/views/dataBoard/hazardSources.vue

@@ -35,7 +35,8 @@
 		<view class="table">
 			<uni-card>
 				<view style="height: 200px">
-					<zb-table :columns="column"  :stripe="false" :border="false" :data="dataList"></zb-table>
+					<zb-table :columns="column"  :stripe="false" :border="false"
+						:data="dataList"></zb-table>
 				</view>
 			</uni-card>
 
@@ -75,7 +76,7 @@
 					yAxis: {
 						disabled: false,
 						disableGrid: true,
-						
+
 						data: [{
 							type: 'categories',
 							fontColor: '#fff',
@@ -84,7 +85,7 @@
 					extra: {
 						bar: {
 							type: "stack",
-							width: 30,
+							width: 20,
 							meterBorde: 1,
 							meterFillColor: "#FFFFFF",
 							activeBgColor: "#000000",
@@ -181,7 +182,7 @@
 			dateClick(index) {
 				this.dateIndex = index;
 			},
-			
+
 			getServerData() {
 				//模拟从服务器获取数据时的延时
 				setTimeout(() => {
@@ -191,12 +192,12 @@
 						series: [{
 								name: "危险品",
 								textColor: "#FFFFFF",
-								data: [54, 41, 36, 33, 21]
+								data: [54, 41, 36, 23, 21]
 							},
 							{
 								name: "冷热设备与特种设备",
 								textColor: "#FFFFFF",
-								data: [43, 36, 26, 31, 6]
+								data: [43, 36, 26, 11, 6]
 							}
 						]
 					};

pages/views/dataBoard/securityHidden.vue

@@ -19,14 +19,14 @@
 						<text>1</text>
 						<text>农学院</text>
 					</view>
-					<view class="chart-b2-li-b">61</view>
+					<view class="chart-b2-li-b">70</view>
 				</view>
 				<view class="chart-b2-li">
 					<view class="chart-b2-li-t">
 						<text>2</text>
 						<text>理学院</text>
 					</view>
-					<view class="chart-b2-li-b">70</view>
+					<view class="chart-b2-li-b">61</view>
 				</view>
 				<view class="chart-b2-li">
 					<view class="chart-b2-li-t">
@@ -357,12 +357,13 @@
 						series: [{
 								name: "已整改",
 								textColor: '#fff',
-								data: [35, 36, 31, ]
+								data: [18, 27, 21, ]
+
 							},
 							{
 								name: "未整改",
 								textColor: '#fff',
-								data: [18, 27, 21, ]
+								data: [35, 36, 31, ]
 							},
 							{
 								name: "暂无法整改",

pages/views/dataBoard/warningDispose.vue

@@ -266,9 +266,11 @@
 				z-index: 200;
 
 				.chart-t {
+
 					display: flex;
 					justify-content: space-between;
-					margin: 0 30rpx;
+					margin: 0 50rpx;
+					width: 650rpx;
 
 					.chart-t-li {
 						width: 76rpx;

pages_manage/views/laboratory/iotControl.vue

@@ -14,9 +14,7 @@
 		</view>
 		<view class="sensor">
 			<view v-for="(item,index) in sensorData" :key="index">
-				<!-- <img class="sensor-l" :src="baseUrl+item.icon"/> -->
-				<svg :xmlns="baseUrl+item.icon" width="50" height="50"/>
-				<view class="sensor-l" style=""></view>
+				<img class="sensor-l" :src="baseUrl+item.icon"/>
 				<view class="sensor-r">{{item.deviceName}}:
 					{{item.deviceValue?item.deviceValue:''}}{{item.unit?item.unit:''}}</view>
 			</view>
@@ -93,7 +91,7 @@
 			}
 		},
 		created() {
-          
+
 		},
 		mounted() {
 			this.$set(this, 'newData', this.subjectData);
@@ -106,11 +104,7 @@
 		methods: {
 			//物联控制设备
 			deviceTypeFun(item) {
-				
 				if (item.type == 'video') {
-					uni.navigateTo({
-						url: '/pages_manage/views/laboratory/monitor'
-					});
 					if (!controlsRestrictVerify('subVideo')) {
 						uni.showToast({
 							title: '没有相关操作权限,请联系管理员',
@@ -120,7 +114,6 @@
 						});
 						return
 					}
-				
 				} else {
 					if (!controlsRestrictVerify('subHardwareControl')) {
 						uni.showToast({

uni_modules/zb-table/components/zb-table/zb-table.vue

@@ -102,9 +102,9 @@
 												:cellData="item" :checked="item.checked" />
 										</view>
 									</template>
-									<template v-else-if="ite.type==='index'">
+									<!-- <template v-else-if="ite.type==='index'">
 										{{index+1}}
-									</template>
+									</template> -->
 									<template v-else-if="ite.type==='img'">
 										<view class="checkbox-item">
 											<template v-if="item[ite.name]">
@@ -185,9 +185,9 @@
 												:cellData="ite" :checked="ite.checked" />
 										</view>
 									</template>
-									<template v-else-if="item.type==='index'">
+									<!-- <template v-else-if="item.type==='index'">
 										{{i+1}}
-									</template>
+									</template> -->
 									<template v-else>
 										{{ite[item.name]||item.emptyString}}
 									</template>
@@ -315,7 +315,7 @@
 										<text v-else>{{ite.emptyString}}</text>
 									</template>
 									<template v-else-if="ite.type==='index'">
-										{{index+1}}
+										<view :class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</view>
 									</template>
 									<template v-else>
 										<!--                    {{ ite.filters?itemFilter(item,ite):(item[ite.name]==null||item[ite.name]==='')?ite.emptyString:item[ite.name] }}-->
@@ -998,6 +998,66 @@
 			background: transparent;
 		}
 	}
+
+	.sortOne {
+		display: inline-block;
+		width: 40rpx;
+		height: 40rpx;
+		padding: 4rpx;
+		box-sizing: border-box;
+		background: rgba(255, 0, 0, 0.2);
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FF0000;
+		line-height: 40rpx;
+		text-align: center;
+		border-radius: 20rpx;
+	}
+
+	.sortTow {
+		display: inline-block;
+		width: 40rpx;
+		height: 40rpx;
+		padding: 4rpx;
+		box-sizing: border-box;
+		background: rgba(255, 153, 0, 0.2);
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FF9900;
+		line-height: 40rpx;
+		text-align: center;
+		border-radius: 20rpx;
+	}
+
+	.sortThree {
+		display: inline-block;
+		width: 40rpx;
+		height: 40rpx;
+		padding: 4rpx;
+		box-sizing: border-box;
+		background: rgba(255, 242, 0, 0.2);
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FFF200;
+		line-height: 40rpx;
+		text-align: center;
+		border-radius: 20rpx;
+	}
+
+	.sortFive {
+		display: inline-block;
+		width: 40rpx;
+		height: 40rpx;
+		padding: 4rpx;
+		box-sizing: border-box;
+		background: rgba(1, 131, 250, 0.2);
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #0183FA;
+		line-height: 40rpx;
+		text-align: center;
+		border-radius: 20rpx;
+	}
 </style>
 <style lang="scss" scoped>
 	.sorter-table {
@@ -1120,7 +1180,7 @@
 			border-bottom: 1px solid #e8e8e8;
 			//transition: background 0.3s;
 		}
-		
+
 
 		.zb-table-fixed-left .zb-table-header {
 			overflow-y: hidden;
@@ -1235,7 +1295,7 @@
 			text-overflow: ellipsis;
 			/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/
 			overflow-wrap: break-word;
-			border-bottom: 1px dashed rgba(216,216,216,0.2);
+			border-bottom: 1px dashed rgba(216, 216, 216, 0.2);
 			//transition: background 0.3s;
 		}