diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss
index a4a60c0..965414a 100644
--- a/src/assets/styles/lend-manage.scss
+++ b/src/assets/styles/lend-manage.scss
@@ -112,8 +112,9 @@
}
}
-::v-deep .el-table__header-wrapper {
- background: url('~@/assets/images/table_head_bg.png') no-repeat !important;
+.warehose-el-table ::v-deep .el-table__header-wrapper {
+ box-shadow: inset 0px 0px 6px 1px #339cff;
+ background: none !important;
}
::v-deep .warehose-el-table .el-table__header .el-table__cell {
diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
index 766c116..6c5f126 100644
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@@ -412,8 +412,11 @@ export default {
diff --git a/src/views/archivesManage/archivesList/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
index be9afb7..884f3d0 100644
--- a/src/views/archivesManage/archivesList/archivesJuannei/index.vue
+++ b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
@@ -267,8 +267,11 @@ export default {
diff --git a/src/views/archivesManage/archivesList/archivesProject/index.vue b/src/views/archivesManage/archivesList/archivesProject/index.vue
index 38428ca..dd1aa93 100644
--- a/src/views/archivesManage/archivesList/archivesProject/index.vue
+++ b/src/views/archivesManage/archivesList/archivesProject/index.vue
@@ -221,8 +221,11 @@ export default {
diff --git a/src/views/components/WarehouseWarning.vue b/src/views/components/WarehouseWarning.vue
new file mode 100644
index 0000000..154eb80
--- /dev/null
+++ b/src/views/components/WarehouseWarning.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+ 报警记录
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/components/data1.json b/src/views/components/data1.json
new file mode 100644
index 0000000..7eb567d
--- /dev/null
+++ b/src/views/components/data1.json
@@ -0,0 +1,100 @@
+{
+ "rows":[
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ },
+ {
+ "time":"2022-6-30 13:00",
+ "warehouse":"文书档案库房",
+ "warning":"温度温度温度温度温度温度"
+ }
+
+ ]
+}
\ No newline at end of file
diff --git a/src/views/home.vue b/src/views/home.vue
index 6df6865..ee716ad 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -120,20 +120,7 @@
-
-
-
-
-
- 报警记录
-
-
-
-
-
-
-
-
+
@@ -192,6 +179,7 @@ import lendAcross from '@/views/components/echarts/lendAcross.vue'
import catePie from '@/views/components/echarts/catePie.vue'
import typePie from '@/views/components/echarts/typePie.vue'
import data1 from './data1.json'
+import WarehouseWarning from '@/views/components/WarehouseWarning'
// const lineChartData = {
// newVisitis: {
@@ -216,6 +204,7 @@ export default {
name: 'Dashboard',
components: {
// GithubCorner,
+ WarehouseWarning,
PanelGroup,
// LineChart,
// RadarChart,
diff --git a/src/views/storeManage/deviceManage/module/deviceDetail.vue b/src/views/storeManage/deviceManage/module/deviceDetail.vue
index 231e5a0..57231e6 100644
--- a/src/views/storeManage/deviceManage/module/deviceDetail.vue
+++ b/src/views/storeManage/deviceManage/module/deviceDetail.vue
@@ -504,21 +504,21 @@ export default {
border-color: #fd8042;
background-color: #fd8042;
&.is-disabled {
- border-color: #666666;
- background-color: #666666;
+ border-color: #7E4021;
+ background-color: #7E4021;
}
}
&.binding-param-btn {
border-color: #1aae93;
background-color: #1aae93;
&.is-disabled {
- border-color: #666666;
- background-color: #666666;
+ border-color: #0D5649;
+ background-color: #0D5649;
}
}
- // &.is-disabled{
- // color: #666;
- // }
+ &.is-disabled{
+ color: #666;
+ }
}
.iconfont {
line-height: 28px;
diff --git a/src/views/storeManage/warehouse3D/collateRoom/index.vue b/src/views/storeManage/warehouse3D/collateRoom/index.vue
index 97d781c..78adfa8 100644
--- a/src/views/storeManage/warehouse3D/collateRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/collateRoom/index.vue
@@ -12,43 +12,20 @@
scrolling="no"
/>
-
-
-
-
-
-
-
报警记录
-
-
-
-
-
-
-
+
diff --git a/src/views/storeManage/warehouse3D/fullView/index.vue b/src/views/storeManage/warehouse3D/fullView/index.vue
index d6e125b..5fc66d8 100644
--- a/src/views/storeManage/warehouse3D/fullView/index.vue
+++ b/src/views/storeManage/warehouse3D/fullView/index.vue
@@ -14,43 +14,20 @@
/>
-
-
-
-
-
报警记录
-
-
-
-
-
-
-
-
+