new-LIMS-before.git

			@@ -4,7 +4,7 @@
			<div style="display: flex;justify-content: space-between;margin-top: 10px;">
			<div style="display: flex;">
			<div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
			<span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">状态</span>
			<span style="width: 48px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">状态</span>
			<el-select v-model="entity.deviceStatus" placeholder="全部"
			@change="currentPage = 1, keyMap = {}, list = [], finishLoding = false, refreshTable()"
			size="small" clearable>
			@@ -13,7 +13,7 @@
			</el-select>
			</div>
			<div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
			<span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">设备名称</span>
			<span style="width: 88px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">设备名称</span>
			<el-input size="small" placeholder="请输入" clearable v-model="entity.deviceName"
			@keyup.enter="currentPage = 1, keyMap = {}, list = [], finishLoding = false, refreshTable()"></el-input>
			</div>
			@@ -36,8 +36,8 @@
			display: flex;
			align-items: center;
			justify-content: center;
			border: 1px solid #EEEEEE;">
			<lims-icon name="el-icon-picture-outline" style="font-size:20px;color:#666666;"></lims-icon>
			border: 1px solid var(--lims-divider);">
			<lims-icon name="el-icon-picture-outline" style="font-size:20px;color:var(--lims-text-2);"></lims-icon>
			</div></template>
			</el-image>
			<div class="list-left">
			@@ -52,13 +52,13 @@
			</div>
			<div class="list-left-info">
			<span class="label">规格型号：</span>
			<span style="color:#333333;font-size: 16px;">{{ m.specificationModel ? m.specificationModel : '无'
			<span style="color:var(--lims-text);font-size: 16px;">{{ m.specificationModel ? m.specificationModel : '无'
			}}</span>
			</div>
			<div class="list-left-info">
			<span class="label">状态：</span>
			<el-tag :type="m.type" v-if="m.deviceStatusName">{{ m.deviceStatusName }}</el-tag>
			<span v-else style="color:#333333;font-size: 16px;">无</span>
			<span v-else style="color:var(--lims-text);font-size: 16px;">无</span>
			</div>
			</div>
			<div class="circles" :class="m.type">
			@@ -70,7 +70,7 @@
			</li>
			</ul>
			</scroll-pagination>
			<div v-if="list.length < 1 && !loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px">
			<div v-if="list.length < 1 && !loading" style="color:var(--lims-text-3);font-size:14px;text-align: center;margin-top:200px">
			暂无数据
			</div>
			</div>
			@@ -116,6 +116,7 @@
			entity: {
			deviceStatus: null,
			deviceName: null,
			largeCategory: null,
			},
			options: [],
			list: [],
			@@ -125,7 +126,6 @@
			loading: true, // 组件loading的展示,默认为true
			finishLoding: false, // 加载完成，显示已经没有更多了
			keyMap: {},
			laboratoryNameIsNull: false,
			importVisible: false,
			importing: false,
			importFiles: [],
			@@ -206,7 +206,6 @@
			this.finishLoding = false;
			}
			selectDeviceParameter({
			laboratoryNameIsNull: this.laboratoryNameIsNull,
			current: this.currentPage,
			size: this.pageSize,
			...this.entity
			@@ -263,6 +262,7 @@
			this.entity = {
			deviceStatus: null,
			deviceName: null,
			largeCategory: null,
			};
			this.refreshTable()
			},
			@@ -275,33 +275,14 @@
			},
			// 点击侧边栏刷新
			clickSidebar(clickNodeVal) {
			this.laboratoryNameIsNull = false
			// 是否存在value，存在value代表为三级
			// 存在value代表选中了设备，由设备详情展示处理
			if (!clickNodeVal.value) {
			this.finishLoding = false;
			this.keyMap = {};
			this.currentPage = 1;
			this.list = [];
			this.entity.laboratoryName = null
			this.entity.storagePoint = null
			// 等于1代表为树的一级，label为部门
			if (clickNodeVal.label == '其他') {
			this.laboratoryNameIsNull = true
			this.refreshTable();
			return
			}
			if (clickNodeVal.level == 1) {
			this.entity.laboratoryName = clickNodeVal.label
			// 等于二级。label为存储地点
			} else if (clickNodeVal.level == 2) {
			// 其他表示没有配置实验室，只配置了地点
			if (clickNodeVal.parent.label == '其他') {
			this.laboratoryNameIsNull = true
			} else {
			this.entity.laboratoryName = clickNodeVal.parent.label
			}
			this.entity.storagePoint = clickNodeVal.label
			}
			// 树的一级为分类：全部/设备/计量器具
			this.entity.largeCategory = clickNodeVal.label === '全部' ? null : clickNodeVal.label;
			this.refreshTable();
			}
			}
			@@ -336,14 +317,14 @@
			width: 330px;
			height: 165px;
			border-radius: 8px 8px 8px 8px;
			border: 1px solid #EEEEEE;
			border: 1px solid var(--lims-divider);
			margin: 0 !important;
			display: flex;
			align-items: center;
			box-sizing: border-box;
			padding: 16px;
			font-size: 14px;
			color: #666666;
			color: var(--lims-text-2);
			position: relative;
			overflow: hidden;
			}
			@@ -415,7 +396,7 @@
			}

			.success .circle {
			background: #34BD66;
			background: var(--el-color-success);
			}

			.danger .circle {
			@@ -427,7 +408,7 @@
			}

			.info .circle {
			background: #909399;
			background: var(--lims-text-3);
			}

			.el-form-item {