~zhoushihao/YiWuProject.git

			@@ -496,16 +496,20 @@
			return '#911005';
			case 9:
			return '#4682B4';
			default:
			return '#CDAF95';
			}
			}
			function getRectColor2(state) {
			switch (state) {
			case 2:
			case 2:
			return 'lightblue';
			case 8:
			return '#911005';
			case 9:
			return '#4682B4';
			default:
			return '#CDAF95';
			}
			}
			function getRectColora(state) {
			@@ -515,11 +519,13 @@
			case 1:
			return '#95d475';
			case -1:
			return '#CDAF95';
			return '#99BBFF';
			case 8:
			return '#911005';
			case 9:
			return '#4682B4';
			default:
			return '#CDAF95';
			}
			}
			function getRectColorb(state) {
			@@ -532,6 +538,8 @@
			return '#911005';
			case 9:
			return '#4682B4';
			default:
			return '#CDAF95';
			}
			}
			function showDialog1(rect) {
			@@ -896,8 +904,8 @@
			:style="{ position: 'absolute',
			top: `${rect.y}px`,
			left: `${rect.x}px`,
			width: `${rect.widtha}px`,
			height: `${rect.heighta}px`,
			width: `${rect.width}px`,
			height: `${rect.height}px`,
			backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor1(rect.state) }">
			<div class="centered-text">
			<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
			@@ -924,8 +932,8 @@
			:style="{ position: 'absolute',
			top: `${rect.y}px`,
			left: `${rect.x}px`,
			width: `${rect.widtha}px`,
			height: `${rect.heighta}px`,
			width: `${rect.width}px`,
			height: `${rect.height}px`,
			backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor2(rect.state) }">
			<div class="centered-text">
			<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
			@@ -962,7 +970,7 @@
			@click="showDialoga(rect)"
			class="rect"
			:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
			width: `${rect.widtha}px`, height: `${rect.heighta}px`,
			width: `${rect.width}px`, height: `${rect.height}px`,
			backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state) }">
			<div class="centered-text">
			<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
			@@ -989,7 +997,7 @@
			@click="showDialogb(rect)"
			class="rect"
			:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
			width: `${rect.widtha}px`, height: `${rect.heighta}px`,
			width: `${rect.width}px`, height: `${rect.height}px`,
			backgroundColor: rect.isActive ? '#ADFF2F' : getRectColorb(rect.state) }">
			<!-- backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }"> -->
			<div class="centered-text">