From c8315eb3969bd51bdd712d1b4d4d1cfc2bef243c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/images/screen/button.png | 0
src/views/screen/components/screen-map-three/experience/camera.js | 2
src/views/system/work-order/threshold/index.vue | 371 +--------------------
src/assets/icons/coordinate.png | 0
src/views/screen/components/screen-map/index.vue | 1
src/views/screen/index.vue | 2
src/assets/images/screen/pageBg2.png | 0
src/views/screen/components/screen-map-three/experience/world/map.js | 601 ++++++++++++++++++-----------------
src/views/screen/components/select-item/index.vue | 36 +
src/assets/images/screen/button1.png | 0
10 files changed, 359 insertions(+), 654 deletions(-)
diff --git a/src/assets/icons/coordinate.png b/src/assets/icons/coordinate.png
new file mode 100644
index 0000000..4a3964e
--- /dev/null
+++ b/src/assets/icons/coordinate.png
Binary files differ
diff --git a/src/assets/images/screen/button.png b/src/assets/images/screen/button.png
new file mode 100644
index 0000000..54e328e
--- /dev/null
+++ b/src/assets/images/screen/button.png
Binary files differ
diff --git a/src/assets/images/screen/button1.png b/src/assets/images/screen/button1.png
new file mode 100644
index 0000000..58ebd24
--- /dev/null
+++ b/src/assets/images/screen/button1.png
Binary files differ
diff --git a/src/assets/images/screen/pageBg2.png b/src/assets/images/screen/pageBg2.png
new file mode 100644
index 0000000..fbbcfb8
--- /dev/null
+++ b/src/assets/images/screen/pageBg2.png
Binary files differ
diff --git a/src/views/screen/components/screen-map-three/experience/camera.js b/src/views/screen/components/screen-map-three/experience/camera.js
index fdf3223..99dbf26 100644
--- a/src/views/screen/components/screen-map-three/experience/camera.js
+++ b/src/views/screen/components/screen-map-three/experience/camera.js
@@ -16,7 +16,7 @@
// 璁剧疆閫忚鐩告満
setInstance() {
this.instance = new PerspectiveCamera(45, this.sizes.width / this.sizes.height, 0.1, 200);
- this.instance.position.set(0, 45, 45);
+ this.instance.position.set(0, 37, 37);
this.scene.add(this.instance);
// const help = new CameraHelper(this.instance);
// this.scene.add(help);
diff --git a/src/views/screen/components/screen-map-three/experience/world/map.js b/src/views/screen/components/screen-map-three/experience/world/map.js
index 1dd127f..8a1b08b 100644
--- a/src/views/screen/components/screen-map-three/experience/world/map.js
+++ b/src/views/screen/components/screen-map-three/experience/world/map.js
@@ -1,315 +1,336 @@
-import * as THREE from 'three';
-import * as d3 from 'd3';
-import mapData from '@/assets/map/zigong2.json';
-import { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer';
+import * as THREE from "three";
+import * as d3 from "d3";
+import mapData from "@/assets/map/zigong2.json";
+import { CSS2DObject } from "three/examples/jsm/renderers/CSS2DRenderer";
-import textureMapImage from '@/assets/map/texture/gz-map.jpg';
-import textureMapFxImage from '@/assets/map/texture/gz-map-fx.jpg';
+import textureMapImage from "@/assets/map/texture/gz-map.jpg";
+import textureMapFxImage from "@/assets/map/texture/gz-map-fx.jpg";
-import gsap from 'gsap';
+import gsap from "gsap";
// 鍦板浘娣卞害
const MAP_DEPTH = 0.2;
-const projection = d3.geoMercator().center([104.779307, 29.33924]).translate([0, 0, 0]);
+const projection = d3
+ .geoMercator()
+ .center([104.779307, 29.33924])
+ .translate([0, 0, 0]);
const raycaster = new THREE.Raycaster();
export default class Map {
- constructor(experience) {
- this.experience = experience;
- this.scene = experience.scene;
- this.camera = experience.camera;
+ constructor(experience) {
+ this.experience = experience;
+ this.scene = experience.scene;
+ this.camera = experience.camera;
- this.provinceMeshList = [];
- this.labelList = [];
- this.textureLoader = new THREE.TextureLoader();
- this.setTexture();
- this.operationData(mapData);
- setTimeout(() => {
- this.enterAnimation();
- }, 500);
- }
- setTexture() {
- const textureMap = this.textureLoader.load(textureMapImage);
- const textureMapFx = this.textureLoader.load(textureMapFxImage);
- textureMap.wrapS = textureMapFx.wrapS = THREE.RepeatWrapping;
- textureMap.wrapT = textureMapFx.wrapT = THREE.RepeatWrapping;
- textureMap.flipY = textureMapFx.flipY = false;
- textureMap.rotation = textureMapFx.rotation = THREE.MathUtils.degToRad(45);
- const scale = 0.128;
- textureMap.repeat.set(scale, scale);
- textureMapFx.repeat.set(scale, scale);
- this.topFaceMaterial = new THREE.MeshPhongMaterial({
- map: textureMap,
- // color: 0xb4eeea,
- color: 0xb3fffa,
- combine: THREE.MultiplyOperation,
- transparent: true,
- opacity: 1,
+ this.provinceMeshList = [];
+ this.labelList = [];
+ this.textureLoader = new THREE.TextureLoader();
+ this.setTexture();
+ this.operationData(mapData);
+ setTimeout(() => {
+ this.enterAnimation();
+ }, 500);
+ }
+ setTexture() {
+ const textureMap = this.textureLoader.load(textureMapImage);
+ const textureMapFx = this.textureLoader.load(textureMapFxImage);
+ textureMap.wrapS = textureMapFx.wrapS = THREE.RepeatWrapping;
+ textureMap.wrapT = textureMapFx.wrapT = THREE.RepeatWrapping;
+ textureMap.flipY = textureMapFx.flipY = false;
+ textureMap.rotation = textureMapFx.rotation = THREE.MathUtils.degToRad(45);
+ const scale = 0.128;
+ textureMap.repeat.set(scale, scale);
+ textureMapFx.repeat.set(scale, scale);
+ this.topFaceMaterial = new THREE.MeshPhongMaterial({
+ map: textureMap,
+ // color: 0xb4eeea,
+ color: 0xb3fffa,
+ combine: THREE.MultiplyOperation,
+ transparent: true,
+ opacity: 1,
+ });
+ this.sideMaterial = new THREE.MeshLambertMaterial({
+ color: 0x123024,
+ transparent: true,
+ opacity: 0.9,
+ });
+ }
+
+ /**
+ * 瑙ｆ瀽json鏁版嵁锛屽苟缁樺埗鍦板浘澶氳竟褰�
+ * @param {*} jsondata 鍦板浘鏁版嵁
+ */
+ operationData(jsondata) {
+ this.map = new THREE.Group();
+
+ // geo淇℃伅
+ const features = jsondata.features;
+ features.forEach((feature) => {
+ // 鍗曚釜鐪佷唤 瀵硅薄
+ const province = new THREE.Object3D();
+ // 鍦板潃
+ province.properties = feature.properties.name;
+ province.isHover = false;
+ // 澶氫釜鎯呭喌
+ // console.log(feature.geometry.type);
+ if (feature.geometry.type === "MultiPolygon") {
+ feature.geometry.coordinates.forEach((coordinate) => {
+ coordinate.forEach((rows) => {
+ const line = this.drawBoundary(rows);
+ const mesh = this.drawExtrudeMesh(rows);
+ province.add(line);
+ province.add(mesh);
+ this.provinceMeshList.push(mesh);
+ });
});
- this.sideMaterial = new THREE.MeshLambertMaterial({
- color: 0x123024,
- transparent: true,
- opacity: 0.9,
+ }
+
+ // 鍗曚釜鎯呭喌
+ if (feature.geometry.type === "Polygon") {
+ feature.geometry.coordinates.forEach((coordinate) => {
+ const line = this.drawBoundary(coordinate);
+ const mesh = this.drawExtrudeMesh(coordinate);
+ province.add(line);
+ province.add(mesh);
+ this.provinceMeshList.push(mesh);
});
+ }
+ const label = this.drawLabelText(feature);
+ this.labelList.push({ name: feature.properties.name, label });
+ province.add(label);
+ this.map.add(province);
+ });
+ this.map.position.set(1, 1, -1.5);
+ this.map.scale.set(10, 10, 1);
+ this.map.rotation.set(
+ THREE.MathUtils.degToRad(-90),
+ 0,
+ THREE.MathUtils.degToRad(20)
+ );
+ this.scene.add(this.map);
+
+ this.setMouseEvent();
+ }
+
+ /**
+ * 鐢诲尯鍩熷垎鐣岀嚎
+ * @param {*} polygon 鍖哄煙鍧愭爣鐐规暟缁�
+ * @returns 鍖哄煙鍒嗙晫绾�
+ */
+ drawBoundary(polygon) {
+ const points = [];
+ for (let i = 0; i < polygon.length; i++) {
+ const [x, y] = projection(polygon[i]);
+ points.push(new THREE.Vector3(x, -y, 0));
}
-
- /**
- * 瑙ｆ瀽json鏁版嵁锛屽苟缁樺埗鍦板浘澶氳竟褰�
- * @param {*} jsondata 鍦板浘鏁版嵁
- */
- operationData(jsondata) {
- this.map = new THREE.Group();
-
- // geo淇℃伅
- const features = jsondata.features;
- features.forEach((feature) => {
- // 鍗曚釜鐪佷唤 瀵硅薄
- const province = new THREE.Object3D();
- // 鍦板潃
- province.properties = feature.properties.name;
- province.isHover = false;
- // 澶氫釜鎯呭喌
- // console.log(feature.geometry.type);
- if (feature.geometry.type === "MultiPolygon") {
- feature.geometry.coordinates.forEach((coordinate) => {
- coordinate.forEach((rows) => {
- const line = this.drawBoundary(rows);
- const mesh = this.drawExtrudeMesh(rows);
- province.add(line);
- province.add(mesh);
- this.provinceMeshList.push(mesh);
- });
- });
- }
-
- // 鍗曚釜鎯呭喌
- if (feature.geometry.type === "Polygon") {
- feature.geometry.coordinates.forEach((coordinate) => {
- const line = this.drawBoundary(coordinate);
- const mesh = this.drawExtrudeMesh(coordinate);
- province.add(line);
- province.add(mesh);
- this.provinceMeshList.push(mesh);
- });
- }
- const label = this.drawLabelText(feature);
- this.labelList.push({ name: feature.properties.name, label });
- province.add(label);
- this.map.add(province);
- });
- this.map.position.set(1, 1, -1.5);
- this.map.scale.set(10, 10, 1);
- this.map.rotation.set(THREE.MathUtils.degToRad(-90), 0, THREE.MathUtils.degToRad(20));
- this.scene.add(this.map);
-
- this.setMouseEvent();
+ const lineGeometry = new THREE.BufferGeometry().setFromPoints(points);
+ const lineMaterial = new THREE.LineBasicMaterial({
+ color: 0xffffff,
+ linewidth: 2,
+ transparent: true,
+ depthTest: false,
+ });
+ const line = new THREE.Line(lineGeometry, lineMaterial);
+ line.translateZ(MAP_DEPTH + 0.001);
+ return line;
+ }
+ /**
+ * 缁樺埗鍖哄煙澶氳竟褰�
+ * @param {*} polygon 鍖哄煙鍧愭爣鐐规暟缁�
+ * @returns 鍖哄煙澶氳竟褰�
+ */
+ drawExtrudeMesh(polygon) {
+ const shape = new THREE.Shape();
+ for (let i = 0; i < polygon.length; i++) {
+ const [x, y] = projection(polygon[i]);
+ if (i === 0) {
+ shape.moveTo(x, -y);
+ }
+ shape.lineTo(x, -y);
}
+ const geometry = new THREE.ExtrudeGeometry(shape, {
+ depth: MAP_DEPTH,
+ bevelEnabled: false,
+ bevelSegments: 1,
+ bevelThickness: 0.1,
+ });
+ return new THREE.Mesh(geometry, [this.topFaceMaterial, this.sideMaterial]);
+ }
- /**
- * 鐢诲尯鍩熷垎鐣岀嚎
- * @param {*} polygon 鍖哄煙鍧愭爣鐐规暟缁�
- * @returns 鍖哄煙鍒嗙晫绾�
- */
- drawBoundary(polygon) {
- const points = [];
- for (let i = 0; i < polygon.length; i++) {
- const [x, y] = projection(polygon[i]);
- points.push(new THREE.Vector3(x, -y, 0));
- }
- const lineGeometry = new THREE.BufferGeometry().setFromPoints(points);
- const lineMaterial = new THREE.LineBasicMaterial({
- color: 0xffffff,
- linewidth: 2,
- transparent: true,
- depthTest: false,
- });
- const line = new THREE.Line(lineGeometry, lineMaterial);
- line.translateZ(MAP_DEPTH + 0.001);
- return line;
+ drawLabelText(province) {
+ const [x, y] = projection(province.properties.center);
+ const div = document.createElement("div");
+ // const icon = document.createElement("div");
+ div.innerHTML = province.properties.name;
+ div.style.padding = "4px 10px";
+ div.style.color = "#fff";
+ div.style.fontSize = "18px";
+ div.style.position = "absolute";
+ // div.style.display = "flex";
+ // div.style.justifyContent = 'center'
+ // div.style.backgroundColor = 'rgba(25,25,25,0.5)';
+ // div.style.border = '5px';
+ // icon.style.borderRadius = '100%'
+ // icon.style.background = '#aaffa5'
+ // icon.style.width = '10px'
+ // icon.style.height = '10px'
+ // div.appendChild(icon);
+ const label = new CSS2DObject(div);
+ div.style.pointerEvents = "none";
+ label.position.set(x, y, MAP_DEPTH + 0.05);
+ return label;
+ }
+
+ setMouseEvent() {
+ this.mouseEvent = this.handleEvent.bind(this);
+ this.experience.canvas.addEventListener("mousemove", this.mouseEvent);
+ }
+
+ removeMouseEvent() {
+ this.experience.canvas.removeEventListener("mousemove", this.mouseEvent);
+ }
+
+ handleEvent(e) {
+ // console.log(this);
+ // return;
+ if (this.map) {
+ let mouse = new THREE.Vector2();
+ let getBoundingClientRect =
+ this.experience.canvas.getBoundingClientRect();
+ let x =
+ ((e.clientX - getBoundingClientRect.left) /
+ getBoundingClientRect.width) *
+ 2 -
+ 1;
+ let y =
+ -(
+ (e.clientY - getBoundingClientRect.top) /
+ getBoundingClientRect.height
+ ) *
+ 2 +
+ 1;
+ mouse.x = x;
+ mouse.y = y;
+
+ raycaster.setFromCamera(mouse, this.camera.instance);
+
+ let intersects = raycaster.intersectObjects(this.provinceMeshList, false);
+
+ if (intersects.length) {
+ let temp = intersects[0].object;
+ this.animation(temp.parent);
+ this.showLabel(temp.parent);
+ } else {
+ this.animation();
+ }
}
- /**
- * 缁樺埗鍖哄煙澶氳竟褰�
- * @param {*} polygon 鍖哄煙鍧愭爣鐐规暟缁�
- * @returns 鍖哄煙澶氳竟褰�
- */
- drawExtrudeMesh(polygon) {
- const shape = new THREE.Shape();
- for (let i = 0; i < polygon.length; i++) {
- const [x, y] = projection(polygon[i]);
- if (i === 0) {
- shape.moveTo(x, -y);
- }
- shape.lineTo(x, -y);
- }
- const geometry = new THREE.ExtrudeGeometry(shape, {
- depth: MAP_DEPTH,
- bevelEnabled: false,
- bevelSegments: 1,
- bevelThickness: 0.1,
- });
- return new THREE.Mesh(geometry, [
- this.topFaceMaterial,
- this.sideMaterial,
- ]);
- }
+ }
- drawLabelText(province) {
- const [x, y] = projection(province.properties.center);
- const div = document.createElement('div');
- div.innerHTML = province.properties.name;
- div.style.padding = '4px 10px';
- div.style.color = '#fff';
- div.style.fontSize = '16px';
- div.style.position = 'absolute';
- div.style.backgroundColor = 'rgba(25,25,25,0.5)';
- div.style.borderRadius = '5px';
- const label = new CSS2DObject(div);
- div.style.pointerEvents = 'none';
- label.position.set(x, y, MAP_DEPTH + 0.05);
- return label;
- }
+ throttle(callback, delay) {
+ let lastCall = 0;
+ return function () {
+ let now = new Date().getTime();
+ if (now - lastCall >= delay) {
+ lastCall = now;
+ callback.apply(null, arguments);
+ }
+ };
+ }
-
- setMouseEvent() {
- this.mouseEvent = this.handleEvent.bind(this);
- this.experience.canvas.addEventListener("mousemove", this.mouseEvent);
- }
-
- removeMouseEvent() {
- this.experience.canvas.removeEventListener("mousemove", this.mouseEvent);
- }
-
- handleEvent(e) {
- // console.log(this);
- // return;
- if (this.map) {
- let mouse = new THREE.Vector2();
- let getBoundingClientRect = this.experience.canvas.getBoundingClientRect();
- let x = ((e.clientX - getBoundingClientRect.left) / getBoundingClientRect.width) * 2 - 1;
- let y = -((e.clientY - getBoundingClientRect.top) / getBoundingClientRect.height) * 2 + 1;
- mouse.x = x;
- mouse.y = y;
-
- raycaster.setFromCamera(mouse, this.camera.instance);
-
- let intersects = raycaster.intersectObjects(this.provinceMeshList, false);
-
- if (intersects.length) {
- let temp = intersects[0].object;
- this.animation(temp.parent);
- this.showLabel(temp.parent);
- } else {
- this.animation();
- }
- }
- }
-
- throttle(callback, delay) {
- let lastCall = 0;
- return function () {
- let now = new Date().getTime();
- if (now - lastCall >= delay) {
- lastCall = now;
- callback.apply(null, arguments);
- }
- };
- }
-
- animation(province) {
- if (province) {
- if (!province.isHover) {
- province.isHover = true;
- this.map.children.forEach((item) => {
- if (item.properties === province.properties) {
- gsap.to(province.position, {
- z: 0.12,
- duration: 0.6
- })
- } else {
- this.resetAnimation(item);
- }
- })
- }
- } else {
- this.resetAllAnimation();
- }
-
- }
-
- resetAnimation(province) {
- gsap.to(province.position, {
- z: 0,
- duration: 0.6,
- onComplete: () => {
- province.isHover = false;
- }
- })
- }
-
- resetAllAnimation() {
+ animation(province) {
+ if (province) {
+ if (!province.isHover) {
+ province.isHover = true;
this.map.children.forEach((item) => {
+ if (item.properties === province.properties) {
+ gsap.to(province.position, {
+ z: 0.12,
+ duration: 0.6,
+ });
+ } else {
this.resetAnimation(item);
- })
- }
-
- showLabel(province) {
- this.labelList.forEach((item) => {
- // if (item.name === province.properties) {
- // item.label.element.style.visibility = 'visible';
- // } else {
- // item.label.element.style.visibility = 'hidden';
- // }
- })
- }
-
- enterAnimation() {
- gsap.to(this.map.scale, {
- z: 10,
- duration: 0.6,
- ease: 'power1.out'
- })
- }
-
- destroy() {
- this.removeMouseEvent();
- this.disposeObject();
- this.removeObject();
- this.resetObject();
- }
-
- disposeObject() {
- this.map.traverse((child) => {
- if (child.material) {
- // 鍙兘瀛樺湪鏉愯川涓烘暟缁勭殑鎯呭喌
- if (child.material instanceof Array) {
- child.material.forEach((item) => item.dispose());
- } else {
- child.material.dispose();
- if (child.material.map) {
- child.material.map.dispose();
- }
- }
- }
- if (child.geometry) {
- child.geometry.dispose();
- child.geometry.attributes = null; // 杩欎簺灞炴�у寘鎷琾osition, normal, uv绛夌瓑
- }
- child = null;
+ }
});
- this.topFaceMaterial.dispose();
- this.sideMaterial.dispose();
+ }
+ } else {
+ this.resetAllAnimation();
}
+ }
- removeObject() {
- this.scene.remove(this.map);
- }
+ resetAnimation(province) {
+ gsap.to(province.position, {
+ z: 0,
+ duration: 0.6,
+ onComplete: () => {
+ province.isHover = false;
+ },
+ });
+ }
- resetObject() {
- this.map = null;
- this.provinceMeshList = null;
- this.labelList = null;
- this.textureLoader = null;
- }
-}
\ No newline at end of file
+ resetAllAnimation() {
+ this.map.children.forEach((item) => {
+ this.resetAnimation(item);
+ });
+ }
+
+ showLabel(province) {
+ this.labelList.forEach((item) => {
+ // if (item.name === province.properties) {
+ // item.label.element.style.visibility = 'visible';
+ // } else {
+ // item.label.element.style.visibility = 'hidden';
+ // }
+ });
+ }
+
+ enterAnimation() {
+ gsap.to(this.map.scale, {
+ z: 10,
+ duration: 0.6,
+ ease: "power1.out",
+ });
+ }
+
+ destroy() {
+ this.removeMouseEvent();
+ this.disposeObject();
+ this.removeObject();
+ this.resetObject();
+ }
+
+ disposeObject() {
+ this.map.traverse((child) => {
+ if (child.material) {
+ // 鍙兘瀛樺湪鏉愯川涓烘暟缁勭殑鎯呭喌
+ if (child.material instanceof Array) {
+ child.material.forEach((item) => item.dispose());
+ } else {
+ child.material.dispose();
+ if (child.material.map) {
+ child.material.map.dispose();
+ }
+ }
+ }
+ if (child.geometry) {
+ child.geometry.dispose();
+ child.geometry.attributes = null; // 杩欎簺灞炴�у寘鎷琾osition, normal, uv绛夌瓑
+ }
+ child = null;
+ });
+ this.topFaceMaterial.dispose();
+ this.sideMaterial.dispose();
+ }
+
+ removeObject() {
+ this.scene.remove(this.map);
+ }
+
+ resetObject() {
+ this.map = null;
+ this.provinceMeshList = null;
+ this.labelList = null;
+ this.textureLoader = null;
+ }
+}
diff --git a/src/views/screen/components/screen-map/index.vue b/src/views/screen/components/screen-map/index.vue
index df27196..821c160 100644
--- a/src/views/screen/components/screen-map/index.vue
+++ b/src/views/screen/components/screen-map/index.vue
@@ -2,7 +2,6 @@
<div class="map-container">
<wrapper-title :title="'鍖哄煙鍦板浘'"></wrapper-title>
<div class="map-content">
-
<div ref="map" class="map-style"></div>
</div>
</div>
diff --git a/src/views/screen/components/select-item/index.vue b/src/views/screen/components/select-item/index.vue
index 9a6d6bf..6144a10 100644
--- a/src/views/screen/components/select-item/index.vue
+++ b/src/views/screen/components/select-item/index.vue
@@ -1,14 +1,14 @@
<template>
<div class="select-container">
<div class="tabs-box">
- <el-button v-for="item in testData1" class="transparent-button">{{ item.name }} </el-button>
- <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
+ <!-- <el-button v-for="item in testData1" class="transparent-button">{{ item.name }} </el-button> -->
+ <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane
v-for="item in testData1"
:label="item.name"
:name="item.value"
></el-tab-pane>
- </el-tabs> -->
+ </el-tabs>
<!-- <div>
<el-button>
@@ -127,7 +127,7 @@
<style lang="scss" scoped>
.select-container {
position: absolute;
- top: 10px;
+ top: 0px;
left: 20px;
display: flex;
align-items: center;
@@ -165,15 +165,18 @@
display: flex;
align-items: center;
width: 320px;
+ margin-top: -15px
}
}
::v-deep .tabs-box {
+ margin-top: 5px;
width: 40%;
.el-tabs__item {
color: #ffffff !important;
}
.is-active {
- color: #4481dd !important;
+ color: #61aef7 !important;
+ background: url('../../../../assets/images/screen/button1.png');;
}
}
::v-deep .el-input__inner {
@@ -189,10 +192,25 @@
::v-deep .date-select .el-date-editor .el-range-separator {
color: #4481dd !important;
}
-.transparent-button {
- background-color: transparent;
- border-color: #23f0ed;
- color: #0d6adb; /* 杩欓噷璁剧疆鎸夐挳鏂囧瓧棰滆壊 */
+// .transparent-button {
+// background-color: transparent;
+// border-color: #23f0ed;
+// color: #b944dd; /* 杩欓噷璁剧疆鎸夐挳鏂囧瓧棰滆壊 */
+// }
+/* 鍘绘帀tabs鏍囩鏍忎笅鐨勪笅鍒掔嚎 */
+::v-deep .el-tabs__nav-wrap::after {
+ position: static !important;
+ /* background-color: #fff; */
+}
+/* 涓嬪垝绾垮垏鎹㈤珮浜� */
+::v-deep .el-tabs__active-bar {
+ background-color: #4481DD;
+}
+::v-deep .el-tabs__item{
+ margin: 5px 30px;
+ padding: 0px 25px !important;
+ border-radius: 5px;
+ background: url('../../../../assets/images/screen/button.png');
}
</style>
diff --git a/src/views/screen/index.vue b/src/views/screen/index.vue
index 4de83dc..26ed82b 100644
--- a/src/views/screen/index.vue
+++ b/src/views/screen/index.vue
@@ -35,7 +35,7 @@
-webkit-user-select: none;
}
.screen {
- //background: url('../../assets/images/screen/pageBg1.jpg') !important;
+ background: url('../../assets/images/screen/pageBg1.jpg') !important;
background-size: cover !important;
background-repeat: no-repeat !important;
background-position: center center !important;
diff --git a/src/views/system/work-order/threshold/index.vue b/src/views/system/work-order/threshold/index.vue
index 345e441..848a2b4 100644
--- a/src/views/system/work-order/threshold/index.vue
+++ b/src/views/system/work-order/threshold/index.vue
@@ -283,339 +283,6 @@
</el-card></el-col
>
</el-row>
-
- <!-- 浜鸿劯闃堝�� -->
- <el-dialog
- title="淇敼浜鸿劯宸ュ崟闃堝��"
- :visible.sync="faceOpen"
- width="700px"
- append-to-body
- >
- <el-form
- ref="faceForm"
- :model="faceForm"
- label-width="150px"
- :inline="true"
- >
- <el-form-item class="fixedWidth" label="鎶撴媿閲�" prop="captureNum">
- <el-input
- clearable
- size="small"
- v-model="faceForm.captureNum"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="faceForm.captureNumAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item class="fixedWidth" label="杩囪溅缂哄け鐜�" prop="timelyRate">
- <el-input
- clearable
- size="small"
- v-model="faceForm.timelyRate"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="faceForm.timelyRateAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item class="fixedWidth" label="寤惰繜閲�" prop="delayAmount">
- <el-input
- clearable
- size="small"
- v-model="faceForm.delayAmount"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="faceForm.delayAmountAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="璁惧娲昏穬鐜�"
- prop="deviceActiveRate"
- >
- <el-input
- clearable
- size="small"
- v-model="faceForm.deviceActiveRate"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="faceForm.deviceActiveRateAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="鎶撴媿鍙婃椂鐜�"
- prop="timelyCapture"
- >
- <el-input
- clearable
- size="small"
- v-model="faceForm.timelyCapture"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="faceForm.timelyCaptureAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="鏃堕挓鍑嗙‘鐜�"
- prop="deviceActiveRate"
- >
- <el-input
- clearable
- size="small"
- v-model="faceForm.timeAccuracy"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="faceForm.timeAccuracyAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="editFace">纭� 瀹�</el-button>
- <el-button @click="cancelFace">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <!-- 杞﹁締闃堝�� -->
- <el-dialog
- title="淇敼杞﹁締宸ュ崟闃堝��"
- :visible.sync="carOpen"
- width="700px"
- append-to-body
- >
- <el-form
- ref="faceForm"
- :model="faceForm"
- label-width="150px"
- :inline="true"
- >
- <el-form-item class="fixedWidth" label="杩囪溅鏁版嵁閲�" prop="passCarNum">
- <el-input
- clearable
- size="small"
- v-model="carForm.passCarNum"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="carForm.passCarNumAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="杩囪溅缂哄け鐜�"
- prop="passCarMissRate"
- >
- <el-input
- clearable
- size="small"
- v-model="carForm.passCarMissRate"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="carForm.passCarMissRateAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="鏈夋晥杩囪溅鏁版嵁閲�"
- prop="passCarEffectiveNum"
- >
- <el-input
- clearable
- size="small"
- v-model="carForm.passCarEffectiveNum"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="carForm.passCarEffectiveNumAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="璁惧娲昏穬鐜�"
- prop="deviceActiveRate"
- >
- <el-input
- clearable
- size="small"
- v-model="carForm.deviceActiveRate"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="carForm.deviceActiveRateAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="鎶撴媿鍙婃椂鐜�"
- prop="timelyCapture"
- >
- <el-input
- clearable
- size="small"
- v-model="carForm.timelyCapture"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="carForm.timelyCaptureAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- <el-form-item class="fixedWidth" label="鏃堕挓鍑嗙‘鐜�" prop="timeAccuracy">
- <el-input
- clearable
- size="small"
- v-model="carForm.timeAccuracy"
- placeholder="宸ュ崟闃堝��"
- />
- <el-input
- clearable
- size="small"
- v-model="carForm.timeAccuracyAuto"
- placeholder="涓嬪彂闃堝��"
- />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="editCar">纭� 瀹�</el-button>
- <el-button @click="cancelCar">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <!-- 瑙嗛闃堝�� -->
- <el-dialog
- title="淇敼瑙嗛宸ュ崟闃堝��"
- :visible.sync="videoOpen"
- width="700px"
- append-to-body
- >
- <el-form
- ref="videoForm"
- :model="videoForm"
- label-width="100px"
- :inline="true"
- >
- <el-form-item
- class="fixedWidth"
- label="鍥惧儚璐ㄩ噺"
- prop="imageQuality"
- label-width="100px"
- >
- <el-select
- v-model="videoForm.imageQuality"
- placeholder="宸ュ崟闃堝��"
- @change="handleModeNameChange"
- >
- <el-option
- :key="dict.value"
- :label="dict.value"
- v-for="dict in dict.type.image_qualify"
- />
- </el-select>
- <el-select
- v-model="videoForm.imageQualityAuto"
- placeholder="涓嬪彂闃堝��"
- @change="handleModeNameChange"
- >
- <el-option
- :key="dict.value"
- :label="dict.value"
- v-for="dict in dict.type.image_qualify"
- />
- </el-select>
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="瑙嗛璐ㄩ噺"
- prop="videoQuality"
- label-width="100px"
- >
- <el-select
- v-model="videoForm.videoQuality"
- placeholder="宸ュ崟闃堝��"
- @change="handleModeNameChange"
- >
- <el-option
- :key="dict.value"
- :label="dict.value"
- v-for="dict in dict.type.video_qualify"
- />
- </el-select>
- <el-select
- v-model="videoForm.videoQualityAuto"
- placeholder="涓嬪彂闃堝��"
- @change="handleModeNameChange"
- >
- <el-option
- :key="dict.value"
- :label="dict.value"
- v-for="dict in dict.type.video_qualify"
- />
- </el-select>
- </el-form-item>
- <el-form-item
- class="fixedWidth"
- label="鏍囨敞鍑嗙‘鐜�"
- prop="annotationAccuracy"
- label-width="100px"
- >
- <el-input
- v-model="videoForm.annotationAccuracy"
- type="number"
- size="small"
- placeholder="宸ュ崟闃堝��"
- ></el-input>
- <el-input
- v-model="videoForm.annotationAccuracy"
- type="number"
- size="small"
- placeholder="涓嬪彂闃堝��"
- ></el-input>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="editVideo">纭� 瀹�</el-button>
- <el-button @click="cancelVideo">鍙� 娑�</el-button>
- </div>
- </el-dialog>
</div>
</template>
@@ -906,28 +573,28 @@
this.resetForm("carForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
+ // handleQuery() {
+ // this.queryParams.pageNum = 1;
+ // this.getList();
+ // },
/** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
+ // resetQuery() {
+ // this.resetForm("queryForm");
+ // this.handleQuery();
+ // },
// 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.id);
- this.single = selection.length !== 1;
- this.multiple = !selection.length;
- },
+ // handleSelectionChange(selection) {
+ // this.ids = selection.map((item) => item.id);
+ // this.single = selection.length !== 1;
+ // this.multiple = !selection.length;
+ // },
/** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞杩愮淮闃堝��";
- this.handleModeNameChange();
- },
+ // handleAdd() {
+ // this.reset();
+ // this.open = true;
+ // this.title = "娣诲姞杩愮淮闃堝��";
+ // this.handleModeNameChange();
+ // },
/** 淇敼鎸夐挳鎿嶄綔 */
updateWho(row) {
if (row.monitorType === "face") {
--
Gitblit v1.8.0