Merge pull request 'projects/mes-test' (#133) from projects/mes-test into projects/mes

Reviewed-on: #133

.env.prod

@@ -15,14 +15,15 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = '/prod-api'
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
+VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://10.70.2.32'
+# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = 'http://192.168.0.33:8889/'
 
 # 二级部署路径
-# VUE_APP_APP_NAME ='yudao-admin'
+VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true

.env.stage

@@ -1,21 +1,16 @@
-# 生产环境配置
+NODE_ENV = production
-ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = MES系统
+VUE_APP_TITLE = 产线监控系统
 
-# 芋道管理系统/生产环境
+# 测试环境配置
-VUE_APP_BASE_API = '/prod-api'
+ENV = 'staging'
 
-# 积木报表指向地址
+# 芋道管理系统/测试环境
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
 
-
+# 静态资源地址
-# 根据服务器或域名修改
+PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
-PUBLIC_PATH = 'http://192.168.0.33:8889/'
-
-# 二级部署路径
-# VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
@@ -25,3 +20,4 @@ VUE_APP_DOC_ENABLE = false
 
 # 百度统计
 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
+

src/components/Verifition/Verify/VerifySlide.vue

@@ -360,7 +360,6 @@ export default {
         ts: Date.now(), // 现在的时间戳
       }
       reqGet(data).then(res => {
-        console.log(1)
         if (res.repCode === '0000') {
           this.backImgBase = res.repData.originalImageBase64
           this.blockBackImgBase = res.repData.jigsawImageBase64

src/router/index.js

@@ -104,7 +104,7 @@ export const constantRoutes = [
     // this generates a separate chunk (about.[hash].js) for this route
     // which is lazy-loaded when the route is visited.
     component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/coldBoard.vue')
-  }, 
+  },
      {
     path: '/processingBoard',
     name: 'processingBoard',

src/views/databoard/components/Container.vue

@@ -1,93 +0,0 @@
-<!-- 
-    filename: Container.vue
-    author: liubin
-    date: 2023-12-05 14:29:53
-    description: 窑炉容器
--->
-
-<template>
-	<div class="kiln-container" :class="['kiln-container__' + size]">
-		<div class="container-hd" style="display: flex; align-items: center">
-			<i
-				class=""
-				style="display: inline-block; margin-left: 12px; padding-top: 4px">
-				<img :src="imgSrc" width="18" height="16" alt="" />
-			</i>
-			<span
-				style="
-					color: #fff;
-					font-size: 20px;
-					line-height: 2;
-					margin-left: 6px;
-					display: inline-block;
-				">
-				{{ name }}
-			</span>
-		</div>
-		<div class="container-body">
-			<slot>
-				<div class="test-body">something test....</div>
-			</slot>
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'KilnContainer',
-	components: {},
-	props: ['name', 'width', 'size'],
-	data() {
-		return {};
-	},
-	computed: {
-		imgSrc() {
-			switch (this.name) {
-				case '原料用量统计':
-					return require('../assets/move.png');
-				case '风机运行频率':
-					return require('../assets/flow.png');
-				case 'ISRA缺陷检测':
-					return require('../assets/gas.png');
-				case '能耗':
-					return require('../assets/gas.png');
-				case '窑炉信息':
-					return require('../assets/gas.png');
-				case '烟气处理':
-					return require('../assets/gas.png');
-			}
-		},
-	},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss">
-.kiln-container {
-	display: inline-block;
-	width: 100%;
-	height: 100%;
-	padding: 8px;
-	display: flex;
-	flex-direction: column;
-	position: relative;
-
-	&__small {
-		background: url(../assets/short.png) no-repeat;
-		background-size: 100% 100%;
-		background-position: 0 0;
-	}
-
-	&__middle {
-		background: url(../assets/middle.png) no-repeat;
-		background-size: 100% 100%;
-		background-position: 0 0;
-	}
-
-	&__large {
-		background: url(../assets/high.png) no-repeat;
-		background-size: 100% 100%;
-		background-position: 0 0;
-	}
-}
-</style>

src/views/databoard/components/DateBtnGroup.vue

@@ -1,84 +0,0 @@
-<!-- 
-    filename: DateBtnGroup.vue
-    author: liubin
-    date: 2023-12-05 14:35:14
-    description: 日期按钮组
--->
-
-<template>
-	<div class="date-btn-group">
-		<button
-			class="btn"
-			:class="{ 'btn-active': active == '日' }"
-			@click="handleClick('日')">
-			日
-		</button>
-		<button
-			class="btn"
-			:class="{ 'btn-active': active == '周' }"
-			@click="handleClick('周')">
-			周
-		</button>
-		<button
-			class="btn"
-			:class="{ 'btn-active': active == '月' }"
-			@click="handleClick('月')">
-			月
-		</button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'DateBtnGroup',
-	data() {
-		return {
-			active: '日',
-		};
-	},
-	methods: {
-		handleClick(v) {
-			this.active = v;
-			this.$emit('change', v);
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-button {
-	appearance: none;
-	border: none;
-	outline: none;
-	background: none;
-	padding: 6px 8px;
-}
-.date-btn-group {
-	// position: absolute;
-	// top: 40px;
-	// right: 100px;
-	// border: 1px solid #ccc;
-	// padding: 12px;
-	display: flex;
-	align-items: center;
-	gap: 12px;
-}
-
-.btn {
-	cursor: pointer;
-	border: 1px solid #11e8e4;
-	border-radius: 4px;
-	color: #11e8e4;
-	transition: all 0.3s ease-in-out;
-
-	&:hover {
-		background: #11e8e4;
-		color: #013433;
-	}
-}
-
-.btn-active {
-	background: #11e8e4;
-	color: #013433;
-}
-</style>

src/views/databoard/components/Header.vue

@@ -1,75 +0,0 @@
-<!-- 
-    filename: Header.vue
-    author: liubin
-    date: 2023-12-05 14:30:46
-    description: 顶部标题
--->
-
-<template>
-	<header class="kiln-header">
-		<h1
-			style="
-				font-size: 32px;
-				margin-bottom: 36px;
-				color: #0ee8e4;
-				letter-spacing: 5px;
-			">
-			窑炉生产运行驾驶舱
-		</h1>
-		<!-- left: 312px; -->
-		<div
-			class="firm"
-			style="
-				position: absolute;
-				bottom: 24px;
-				left: 16.5vw;
-				color: #fff;
-				font-size: 16px;
-				letter-spacing: 1px;
-			">
-			单位: 河南汇融科技服务有限公司
-		</div>
-		<div
-			class="datetime"
-			style="
-				position: absolute;
-				bottom: 18px;
-				right: 15.5vw;
-				color: #fff;
-				font-size: 16px;
-				letter-spacing: 1px;
-                display: flex;
-                align-items: center;
-                gap: 16px;
-			">
-			<DateBtnGroup />
-			{{ new Date().toLocaleString() }}
-		</div>
-	</header>
-</template>
-
-<script>
-import DateBtnGroup from './DateBtnGroup.vue';
-export default {
-	name: 'KilnHeader',
-	components: { DateBtnGroup },
-	props: {},
-	data() {
-		return {};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss">
-.kiln-header {
-	background: url('../assets/head.png') no-repeat;
-	height: 88px;
-	background-size: 100%;
-	background-position: 0 0;
-	display: grid;
-	place-content: center;
-	position: relative;
-}
-</style>

src/views/databoard/components/SelectorBtnGroup.vue

@@ -1,69 +0,0 @@
-<!-- 
-    filename: SelectorBtnGroup.vue
-    author: liubin
-    date: 2023-12-05 14:28:24
-    description: 选项按钮组
--->
-
-<template>
-	<div class="selector-btn-group">
-		<button
-			class="btn"
-			v-for="opt in options"
-			:key="opt"
-			@click="active = opt"
-			:class="active == opt ? 'btn-active' : ''">
-			{{ opt }}
-		</button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'SelectorBtnGroup',
-	components: {},
-	props: ['options'],
-	data() {
-		return {
-			active: this.options[0] || 'default'
-		};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss">
-button {
-	border: none;
-	appearance: none;
-	outline: none;
-	color: red;
-	font-size: 14px;
-	padding: 8px 12px;
-}
-
-button:first-child {
-	border-top-left-radius: 8px;
-	border-bottom-left-radius: 8px;
-}
-
-button:last-child {
-	border-top-right-radius: 8px;
-	border-bottom-right-radius: 8px;
-}
-.selector-btn-group {
-}
-
-.btn {
-	background: #03233c;
-	color: #fff;
-	cursor: pointer;
-	transition: all 0.3s ease-out;
-
-	&.btn-active, 
-	&:hover {
-		background: #0f3d5c;
-	}
-}
-</style>

src/views/databoard/components/ShadowRect.vue

@@ -1,71 +0,0 @@
-<!-- 
-    filename: ShadowRect.vue
-    author: liubin
-    date: 2023-12-05 14:28:57
-    description: 阴影矩形   
--->
-
-<template>
-	<div class="shadow-rect" :style="{ borderRadius: rounded ? '8px' : '2px' }">
-		<slot>
-			<div
-				class="test-data"
-				style="flex: 1; display: flex; align-items: center">
-				<span
-					style="
-						flex: 7;
-						color: #fff;
-						text-align: right;
-						font-size: 18px;
-						line-height: 1.12;
-						letter-spacing: 1px;
-						padding-right: 12px;
-					">
-					窑炉压力碹顶加权
-				</span>
-				<span
-					style="
-						flex: 3;
-						color: #fff;
-						text-align: left;
-						font-size: 18px;
-						line-height: 1.12;
-						padding-right: 8px;
-					">
-					92Kpa
-				</span>
-			</div>
-		</slot>
-	</div>
-</template>
-
-<script>
-export default {
-	name: '',
-	components: {},
-	props: ['rounded'],
-	data() {
-		return {};
-	},
-	watch: {
-		rounded(val) {
-			if (val) {
-				console.log('val', val);
-			}
-		},
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss">
-.shadow-rect {
-	padding: 8px;
-	border-radius: 2px;
-	box-shadow: inset 0 0 8px 2px #ccc3;
-	color: white;
-	display: flex;
-	align-items: center;
-}
-</style>

src/views/databoard/components/Switcher.vue

@@ -1,57 +0,0 @@
-<!-- 
-    filename: Switcher.vue
-    author: liubin
-    date: 2023-12-05 14:29:29
-    description: 开关
--->
-
-<template>
-	<div class="switcher" style="display: flex; align-items: center; gap: 12px">
-		<el-switch v-model="value"></el-switch>
-		<span style="color: #fff; font-size: 16px">{{ mode }}</span>
-		;
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'Switcher',
-	components: {},
-	props: {},
-	data() {
-		return {
-			value: true,
-		};
-	},
-	computed: {
-		mode() {
-			return this.value ? '历史详情' : '实时数据';
-		},
-	},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss">
-.switcher {
-	:deep(.el-switch__core) {
-        border: none;
-        background-color: #213d566b;
-        
-		&::after {
-            background-color: #02457e;
-		}
-	}
-    
-	:deep(.is-checked) {
-        .el-switch__core {
-            border: none;
-            background-color: #b4fffc;
-
-			&::after {
-				background-color: #08d8cd;
-			}
-		}
-	}
-}
-</style>

src/views/databoard/components/line.js

@@ -1,16 +0,0 @@
-export default {
-	name: 'KilnLine',
-	props: ['horizontal'],
-	render: function (h) {
-		return (
-			<div
-				class="line"
-				style={{
-					width: this.horizontal ? '100%' : '4px',
-					height: this.horizontal ? '4px' : '100%',
-					background:
-						'radial-gradient(ellipse at center, #3CE7FF, #3CE7FF66, transparent, transparent)',
-				}}></div>
-		);
-	},
-};

src/views/databoard/kiln/EnergeCost.vue

@@ -1,58 +0,0 @@
-<!-- 
-    filename: MaterialCost.vue
-    author: liubin
-    date: 2023-12-06 09:09:27
-    description: 
--->
-
-<template>
-	<Container name="能耗" size="middle" style="">
-		<div
-			class="absolute"
-			style="
-				padding: 12px;
-				display: grid;
-				grid-template-columns: repeat(3, 1fr);
-				grid-auto-rows: auto;
-				gap: 8px;
-			">
-			<ShadowRect v-for="n in 9" :key="n" :rounded="false">
-				<div
-					class="material"
-					style="
-						flex: 1;
-						padding: 6px;
-						display: flex;
-						flex-direction: column;
-						gap: 4px;
-						align-items: center;
-						justify-content: center;
-					">
-					<span style="color: #0ee8e4; font-weight: 500; font-size: 32px">
-						234
-					</span>
-					<span style="color: #fff; font-size: 14px; letter-spacing: 1px">
-						- 原料1/吨 -
-					</span>
-				</div>
-			</ShadowRect>
-		</div>
-	</Container>
-</template>
-
-<script>
-import Container from '../components/Container.vue';
-import ShadowRect from '../components/ShadowRect.vue';
-export default {
-	name: 'MaterialCost',
-	components: { Container, ShadowRect },
-	props: {},
-	data() {
-		return {};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss"></style>

src/views/databoard/kiln/FanSequence.vue

@@ -1,54 +0,0 @@
-<!-- 
-    filename: FanSequence.vue
-    author: liubin
-    date: 2023-12-06 09:40:51
-    description: 
--->
-
-<template>
-	<Container name="风机运行频率" size="middle" style="">
-		<div
-			class="absolute"
-			style="
-				padding: 12px;
-				display: grid;
-				grid-template-columns: repeat(2, 1fr);
-				grid-auto-rows: auto;
-				gap: 8px;
-			">
-			<ShadowRect v-for="n in 14" :key="n" :rounded="false">
-				<span
-					style="
-						font-size: 16px;
-						line-height: 1.24;
-						flex: 1.2;
-						text-align: right;
-						padding-right: 8px;
-						letter-spacing: 1px;
-					">
-					{{ n }}#风机
-				</span>
-				<span style="font-size: 16px; line-height: 1.24; flex: 1">
-					{{ Math.floor(Math.random() * 100) }}Hz
-				</span>
-			</ShadowRect>
-		</div>
-	</Container>
-</template>
-
-<script>
-import Container from '../components/Container.vue';
-import ShadowRect from '../components/ShadowRect.vue';
-export default {
-	name: 'FanSequence',
-	components: { Container, ShadowRect },
-	props: {},
-	data() {
-		return {};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss"></style>

src/views/databoard/kiln/IsraCheck.vue

@@ -1,80 +0,0 @@
-<!-- 
-    filename: IsraCheck.vue
-    author: liubin
-    date: 2023-12-06 09:50:13
-    description: 
--->
-
-<template>
-	<Container name="ISRA缺陷检测" size="middle" style="">
-		<div style="padding: 12px; display: flex; flex-direction: column; gap: 8px">
-			<div class="f" style="flex: 9"></div>
-			<ul
-				class="legend"
-				style="
-					flex: 1;
-					padding: 8px;
-					display: flex;
-					justify-content: center;
-					gap: 20px;
-					color: #fff;
-					font-size: 14px;
-				">
-				<li class="fault-1">缺陷1</li>
-				<li class="fault-2">缺陷2</li>
-				<li class="fault-3">缺陷3</li>
-				<li class="fault-4">缺陷4</li>
-			</ul>
-		</div>
-	</Container>
-</template>
-
-<script>
-import Container from '../components/Container.vue';
-import ShadowRect from '../components/ShadowRect.vue';
-export default {
-	name: 'IsraCheck',
-	components: { Container, ShadowRect },
-	props: {},
-	data() {
-		return {};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss">
-ul,
-li {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-	position: relative;
-}
-
-li::before {
-	content: '';
-	display: inline-block;
-	width: 8px;
-	height: 8px;
-	border-radius: 50%;
-	background: #ccc;
-	position: absolute;
-	top: 30%;
-	left: -12px;
-}
-
-li.fault-1::before {
-	background: #2760ff;
-}
-li.fault-2::before {
-	background: #518eec;
-}
-li.fault-3::before {
-	background: #0ee8e4;
-}
-li.fault-4::before {
-	background: #ddb523;
-}
-</style>

src/views/databoard/kiln/LeftFour.vue

@@ -1,41 +0,0 @@
-<!-- 
-    filename: LeftFour.vue
-    author: liubin
-    date: 2023-12-06 09:35:30
-    description: 
--->
-
-<template>
-	<div
-		class="left-four"
-		style="
-			display: grid;
-			gap: 16px;
-			grid-template-columns: 1fr 1fr;
-			grid-template-rows: 1fr 1fr;
-		">
-		<MaterialCost />
-		<IsraCheck />
-		<EnergeCost />
-		<FanSequence />
-	</div>
-</template>
-
-<script>
-import MaterialCost from './MaterialCost.vue';
-import FanSequence from './FanSequence.vue';
-import IsraCheck from './IsraCheck.vue';
-import EnergeCost from './EnergeCost.vue';
-export default {
-	name: 'LeftFour',
-	components: { MaterialCost, EnergeCost, IsraCheck, FanSequence },
-	props: {},
-	data() {
-		return {};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss"></style>

src/views/databoard/kiln/MaterialCost.vue

@@ -1,58 +0,0 @@
-<!-- 
-    filename: MaterialCost.vue
-    author: liubin
-    date: 2023-12-06 09:09:27
-    description: 
--->
-
-<template>
-	<Container name="原料用量统计" size="middle" style="">
-		<div
-			class="absolute"
-			style="
-				padding: 12px;
-				display: grid;
-				grid-template-columns: repeat(3, 1fr);
-				grid-auto-rows: auto;
-				gap: 8px;
-			">
-			<ShadowRect v-for="n in 9" :key="n" :rounded="false">
-				<div
-					class="material"
-					style="
-						flex: 1;
-						padding: 6px;
-						display: flex;
-						flex-direction: column;
-						gap: 4px;
-						align-items: center;
-						justify-content: center;
-					">
-					<span style="color: #0ee8e4; font-weight: 500; font-size: 32px">
-						234
-					</span>
-					<span style="color: #fff; font-size: 14px; letter-spacing: 1px">
-						- 原料1/吨 -
-					</span>
-				</div>
-			</ShadowRect>
-		</div>
-	</Container>
-</template>
-
-<script>
-import Container from '../components/Container.vue';
-import ShadowRect from '../components/ShadowRect.vue';
-export default {
-	name: 'MaterialCost',
-	components: { Container, ShadowRect },
-	props: {},
-	data() {
-		return {};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss"></style>

src/views/databoard/kiln/RightTwo.vue

@@ -1,158 +0,0 @@
-<!-- 
-    filename: RightTwo.vue
-    author: liubin
-    date: 2023-12-06 10:19:00
-    description: 
--->
-
-<template>
-	<div
-		class="right-two"
-		style="display: flex; gap: 16px; flex-direction: column">
-		<div class="kiln-info" style="flex: 1">
-			<Container name="窑炉信息" size="small" style="">
-				<div
-					class="absolute"
-					style="
-						padding: 12px;
-						display: grid;
-						grid-template-columns: repeat(2, 1fr);
-						grid-auto-rows: auto;
-						gap: 8px;
-					">
-					<ShadowRect v-for="n in 8" :key="n" :rounded="false">
-						<span
-							style="
-								font-size: 16px;
-								line-height: 1.24;
-								flex: 1.2;
-								text-align: right;
-								padding-right: 8px;
-								letter-spacing: 1px;
-							">
-							{{ n }}#风机
-						</span>
-						<span style="font-size: 16px; line-height: 1.24; flex: 1">
-							{{ Math.floor(Math.random() * 100) }}Hz
-						</span>
-					</ShadowRect>
-				</div>
-			</Container>
-		</div>
-		<div class="gas-handle" style="flex: 2">
-			<Container name="烟气处理" size="large" style="">
-				<div
-					class=""
-					style="
-						flex: 1;
-						display: grid;
-						grid-template-columns: 1fr 1fr;
-						grid-template-rows: auto;
-						gap: 8px;
-						padding: 8px;
-					">
-					<ShadowRect>
-						<span
-							style="
-								font-size: 16px;
-								line-height: 1.24;
-								flex: 1.2;
-								text-align: right;
-								padding-right: 8px;
-								letter-spacing: 1px;
-							">
-							氧气含量
-						</span>
-						<span style="font-size: 16px; line-height: 1.24; flex: 1">82%</span>
-					</ShadowRect>
-					<ShadowRect>
-						<div
-							style="
-								font-size: 16px;
-								line-height: 1.5;
-								flex: 1.2;
-								text-align: right;
-								padding-right: 8px;
-								letter-spacing: 3px;
-							">
-							<p style="margin: 0; line-height: inherit">一氧化氮</p>
-							<p style="margin: 0; line-height: inherit">排放浓度</p>
-						</div>
-						<span style="font-size: 16px; line-height: 1.24; flex: 1">82%</span>
-					</ShadowRect>
-
-					<ShadowRect>
-						<div
-							style="
-								font-size: 16px;
-								line-height: 1.5;
-								flex: 1.2;
-								text-align: right;
-								padding-right: 8px;
-								letter-spacing: 3px;
-							">
-							<p style="margin: 0; line-height: inherit">二氧化硫</p>
-							<p style="margin: 0; line-height: inherit">排放浓度</p>
-						</div>
-						<span style="font-size: 16px; line-height: 1.24; flex: 1">82%</span>
-					</ShadowRect>
-
-					<ShadowRect>
-						<div
-							style="
-								font-size: 16px;
-								line-height: 1.5;
-								flex: 1.2;
-								text-align: right;
-								padding-right: 8px;
-								letter-spacing: 3px;
-							">
-							<p style="margin: 0; line-height: inherit">二氧化氮</p>
-							<p style="margin: 0; line-height: inherit">排放浓度</p>
-						</div>
-						<span style="font-size: 16px; line-height: 1.24; flex: 1">82%</span>
-					</ShadowRect>
-				</div>
-				<KilnLine :horizontal="true" />
-				<div class="" style="flex: 2; padding: 8px">
-					<div class="header-line" style="margin-bottom: 8px; display: flex; align-items: center">
-						<h2 class="" style="margin: 0; color: #0ee8fe; margin-right: 12px;">烟气趋势图</h2>
-						<Switcher />
-					</div>
-					<div
-						class="select-line"
-						style="
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-						">
-						<SelectorBtnGroup
-							:options="['氧气含量', '二氧化硫', '一氧化氢', '二氧化氢']" />
-						<SelectorBtnGroup :options="['日', '周', '月', '年']" />
-					</div>
-					<div class="chart" style="height: 220px"></div>
-				</div>
-			</Container>
-		</div>
-	</div>
-</template>
-
-<script>
-import Container from '../components/Container.vue';
-import ShadowRect from '../components/ShadowRect.vue';
-import KilnLine from '../components/line';
-import Switcher from '../components/Switcher.vue';
-import SelectorBtnGroup from '../components/SelectorBtnGroup.vue';
-export default {
-	name: 'RightTwo',
-	components: { Container, Switcher, SelectorBtnGroup, KilnLine, ShadowRect },
-	props: {},
-	data() {
-		return {};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss"></style>

src/views/databoard/kiln/index.vue

@@ -1,59 +0,0 @@
-<!-- 
-    filename: KilnDataBoard.vue
-    author: liubin
-    date: 2023-12-04 16:51:00
-    description: 
--->
-
-<template>
-	<div
-		class="KilnDataBoard"
-		style="
-			position: absolute;
-			top: -8px;
-			left: -16px;
-			width: calc(100% + 28px);
-			height: calc(100% + 38px);
-			display: flex;
-			flex-direction: column;
-			gap: 16px;
-		">
-		<KHeader />
-		<div
-			class="main-body"
-			style="flex: 1; display: flex; gap: 16px; padding: 8px 16px">
-			<div class="left-side" style="flex: 2">
-				<LeftFour />
-			</div>
-			<div class="right-side" style="flex: 1">
-				<RightTwo />
-			</div>
-		</div>
-	</div> 
-</template>
-
-<script>
-import KHeader from '../components/Header.vue';
-import LeftFour from './LeftFour.vue';
-import RightTwo from './RightTwo.vue';
-
-export default {
-	name: 'KilnDataBoard',
-	components: {
-		KHeader,
-		LeftFour,
-		RightTwo,
-	},
-	data() {
-		return {};
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.KilnDataBoard {
-	background: url(../assets/bg.png) no-repeat;
-	background-size: cover;
-	background-position: 0 0;
-}
-</style>

src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue

@@ -117,7 +117,7 @@
 							style="position: absolute; top: -40px; right: 0">
 							<el-button @click="handleAddAttr" type="text">
 								<i class="el-icon-plus"></i>
-								添加参数
+								添加属性
 							</el-button>
 						</div>
 						<base-table