diff --git a/package.json b/package.json
index d1c027875..a97e5d68f 100644
--- a/package.json
+++ b/package.json
@@ -9,36 +9,35 @@
"build": "vue-cli-service build"
},
"dependencies": {
- "axios": "^0.21.1",
+ "axios": "^0.24.0",
"clipboard": "^2.0.8",
- "core-js": "^3.15.1",
- "echarts": "^5.1.2",
+ "core-js": "^3.20.2",
+ "echarts": "^5.2.2",
"element-ui": "^2.15.2",
- "highlight.js": "^11.2.0",
- "insert-css": "^2.0.0",
- "js-base64": "^3.6.1",
+ "highlight.js": "^11.4.0",
+ "js-base64": "^3.7.2",
"js-cookie": "latest",
"js-md5": "^0.7.3",
"nprogress": "latest",
"vue": "^2.6.14",
- "vue-axios": "^3.2.4",
+ "vue-axios": "^3.4.0",
"vue-baidu-map": "^0.21.22",
"vue-gemini-scrollbar": "^2.0.1",
"vue-highlightjs": "^1.3.3",
- "vue-router": "^3.5.2",
+ "vue-router": "^3.5.3",
"vue-sparklines": "^0.2.1",
"vuex": "^3.6.2"
},
"devDependencies": {
- "@vue/cli-plugin-babel": "^4.5.13",
- "@vue/cli-plugin-router": "^4.5.13",
- "@vue/cli-plugin-vuex": "^4.5.13",
- "@vue/cli-service": "^4.5.13",
+ "@vue/cli-plugin-babel": "~4.5.15",
+ "@vue/cli-plugin-router": "~4.5.15",
+ "@vue/cli-plugin-vuex": "~4.5.15",
+ "@vue/cli-service": "~4.5.15",
"node-sass": "^4.14.1 ",
"sass-loader": "^8.0.2",
"vue-cli-plugin-element": "^1.0.1",
"vue-template-compiler": "^2.6.14",
- "webpack": "^4.36.0"
+ "webpack": "^5.0.0"
},
"browserslist": [
"> 1%",
diff --git a/src/components/card/skeleton-card.vue b/src/components/card/skeleton-card.vue
new file mode 100644
index 000000000..0f928b2e6
--- /dev/null
+++ b/src/components/card/skeleton-card.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/card/styles/things-card.scss b/src/components/card/styles/things-card.scss
index 8239c7943..efc00abf4 100644
--- a/src/components/card/styles/things-card.scss
+++ b/src/components/card/styles/things-card.scss
@@ -210,3 +210,8 @@
.header-disable {
border-bottom: 1px solid #fbc4c4;
}
+
+.el-popover.el-popper {
+ width: 300px;
+}
+
diff --git a/src/views/device/DeviceCard.vue b/src/views/device/DeviceCard.vue
index 261ab5a56..1f00cf862 100644
--- a/src/views/device/DeviceCard.vue
+++ b/src/views/device/DeviceCard.vue
@@ -37,7 +37,7 @@
启用
-
+
删除
编辑
diff --git a/src/views/device/DeviceDetail.vue b/src/views/device/DeviceDetail.vue
index 0fa313a48..eeb4866c3 100644
--- a/src/views/device/DeviceDetail.vue
+++ b/src/views/device/DeviceDetail.vue
@@ -16,6 +16,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -93,6 +108,7 @@