-
-
-
-
-
diff --git a/src/main.js b/src/main.js
index 01cba2f..e3c286e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,3 +1,10 @@
+/*
+ * @Date: 2021-11-30 15:35:16
+ * @LastEditors: JinxuChen
+ * @LastEditTime: 2021-11-30 17:51:56
+ * @FilePath: \GpsCardAdmin\src\main.js
+ * @description:
+ */
import Vue from 'vue'
import 'normalize.css/normalize.css' // A modern alternative to CSS resets
@@ -29,9 +36,9 @@ if (process.env.NODE_ENV === 'production') {
}
// set ElementUI lang to EN
-Vue.use(ElementUI, { locale })
+/* Vue.use(ElementUI, { locale }) */
// 如果想要中文版 element-ui,按如下方式声明
-// Vue.use(ElementUI)
+Vue.use(ElementUI)
Vue.config.productionTip = false
diff --git a/src/router/index.js b/src/router/index.js
index 14cf0f4..ecbc9d3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -103,7 +103,8 @@ export const constantRoutes = [{
icon: 'el-icon-user-solid'
}
},
- {
+ // todo 一期先不做这个功能 后面原型图确认了再做
+ /* {
path: 'related-setting',
name: 'related-setting',
component: () => import('@/views/off-limits-manage/related-setting/index'),
@@ -111,7 +112,7 @@ export const constantRoutes = [{
title: '相关设置',
icon: 'el-icon-s-tools'
}
- },
+ }, */
{
path: 'alarm-query',
name: 'alarm-query',
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 3b4da51..588523d 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -61,5 +61,5 @@ div:focus {
// main-container global css
.app-container {
- padding: 20px;
+ padding: 20px 10px;
}
diff --git a/src/utils/model.js b/src/utils/model.js
index 33669c0..9aaa3ae 100644
--- a/src/utils/model.js
+++ b/src/utils/model.js
@@ -1,8 +1,8 @@
/*
* @Date: 2021-11-30 15:09:25
* @LastEditors: JinxuChen
- * @LastEditTime: 2021-11-30 15:09:49
+ * @LastEditTime: 2021-12-01 18:17:55
* @FilePath: \GpsCardAdmin\src\utils\model.js
* @description: 版本号
*/
-export const VersionModel = '1.0.0';
\ No newline at end of file
+export const VersionModel = '1.0.1';
\ No newline at end of file
diff --git a/src/utils/scroll-to.js b/src/utils/scroll-to.js
new file mode 100644
index 0000000..c5d8e04
--- /dev/null
+++ b/src/utils/scroll-to.js
@@ -0,0 +1,58 @@
+Math.easeInOutQuad = function(t, b, c, d) {
+ t /= d / 2
+ if (t < 1) {
+ return c / 2 * t * t + b
+ }
+ t--
+ return -c / 2 * (t * (t - 2) - 1) + b
+}
+
+// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
+var requestAnimFrame = (function() {
+ return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
+})()
+
+/**
+ * Because it's so fucking difficult to detect the scrolling element, just move them all
+ * @param {number} amount
+ */
+function move(amount) {
+ document.documentElement.scrollTop = amount
+ document.body.parentNode.scrollTop = amount
+ document.body.scrollTop = amount
+}
+
+function position() {
+ return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop
+}
+
+/**
+ * @param {number} to
+ * @param {number} duration
+ * @param {Function} callback
+ */
+export function scrollTo(to, duration, callback) {
+ const start = position()
+ const change = to - start
+ const increment = 20
+ let currentTime = 0
+ duration = (typeof (duration) === 'undefined') ? 500 : duration
+ var animateScroll = function() {
+ // increment the time
+ currentTime += increment
+ // find the value with the quadratic in-out easing function
+ var val = Math.easeInOutQuad(currentTime, start, change, duration)
+ // move the document.body
+ move(val)
+ // do the animation unless its over
+ if (currentTime < duration) {
+ requestAnimFrame(animateScroll)
+ } else {
+ if (callback && typeof (callback) === 'function') {
+ // the animation is done so lets callback
+ callback()
+ }
+ }
+ }
+ animateScroll()
+}
diff --git a/src/views/off-limits-manage/alarm-query/index.vue b/src/views/off-limits-manage/alarm-query/index.vue
index 7f52e7b..7afad8b 100644
--- a/src/views/off-limits-manage/alarm-query/index.vue
+++ b/src/views/off-limits-manage/alarm-query/index.vue
@@ -1,27 +1,115 @@
-
- 告警查询
+
diff --git a/src/views/off-limits-manage/alarm-recognition/index.vue b/src/views/off-limits-manage/alarm-recognition/index.vue
index 353fd52..17c67e6 100644
--- a/src/views/off-limits-manage/alarm-recognition/index.vue
+++ b/src/views/off-limits-manage/alarm-recognition/index.vue
@@ -1,27 +1,298 @@
-
- 告警识别内容
+
+
+ 添加
+ 批量导入
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/off-limits-manage/common-exception/index.vue b/src/views/off-limits-manage/common-exception/index.vue
index 9d77fa5..284368e 100644
--- a/src/views/off-limits-manage/common-exception/index.vue
+++ b/src/views/off-limits-manage/common-exception/index.vue
@@ -1,27 +1,210 @@
-
- 通用例外
+
+
+ 添加
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue b/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue
index babc5cb..bf359fa 100644
--- a/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue
+++ b/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue
@@ -1,7 +1,7 @@
@@ -16,7 +16,7 @@ export default {
name:'',
data(){
return {
-
+ name: ''
}
}
}
diff --git a/src/views/off-limits-manage/user-exception/index.vue b/src/views/off-limits-manage/user-exception/index.vue
index d595800..d284e49 100644
--- a/src/views/off-limits-manage/user-exception/index.vue
+++ b/src/views/off-limits-manage/user-exception/index.vue
@@ -1,24 +1,177 @@
- 用户例外
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+