diff --git a/dc3/nginx/conf.d/default.conf b/dc3/nginx/conf.d/default.conf
index c171bfc..d67e112 100644
--- a/dc3/nginx/conf.d/default.conf
+++ b/dc3/nginx/conf.d/default.conf
@@ -40,7 +40,7 @@ server {
         proxy_pass             http://dc3-auth:8300/;
     }
 
-    location ^~/device_api/ {
+    location ^~/manager_api/ {
         proxy_pass             http://dc3-manager:8400/;
     }
 
diff --git a/package.json b/package.json
index 11e256e..08ac9c9 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "@antv/g2": "^3.5.11",
     "@antv/l7": "latest",
     "@antv/l7-maps": "latest",
-    "@smallwei/avue": "^2.3.9",
+    "@smallwei/avue": "^2.4.0",
     "axios": "^0.19.2",
     "core-js": "^3.6.4",
     "echarts": "^4.6.0",
diff --git a/src/api/data.js b/src/api/data.js
new file mode 100644
index 0000000..f00e9a2
--- /dev/null
+++ b/src/api/data.js
@@ -0,0 +1,9 @@
+import request from '@/config/axios'
+
+export const pointValueApi = {
+    list: (pointValue) => request({
+        url: '/data_api/data/list',
+        method: 'post',
+        data: pointValue
+    })
+};
diff --git a/src/api/manager.js b/src/api/manager.js
index 7c7740a..583cb96 100644
--- a/src/api/manager.js
+++ b/src/api/manager.js
@@ -2,11 +2,11 @@ import request from '@/config/axios'
 
 export const driverApi = {
     delete: (id) => request({
-        url: '/device_api/manager/driver/delete/' + id,
+        url: '/manager_api/manager/driver/delete/' + id,
         method: 'post'
     }),
     list: (driver) => request({
-        url: '/device_api/manager/driver/list',
+        url: '/manager_api/manager/driver/list',
         method: 'post',
         data: driver
     })
@@ -14,21 +14,21 @@ export const driverApi = {
 
 export const driverAttributeApi = {
     add: (driverAttribute) => request({
-        url: '/device_api/manager/driverAttribute/add',
+        url: '/manager_api/manager/driverAttribute/add',
         method: 'post',
         data: driverAttribute
     }),
     delete: (id) => request({
-        url: '/device_api/manager/driverAttribute/delete/' + id,
+        url: '/manager_api/manager/driverAttribute/delete/' + id,
         method: 'post'
     }),
     update: (driverAttribute) => request({
-        url: '/device_api/manager/driverAttribute/update',
+        url: '/manager_api/manager/driverAttribute/update',
         method: 'post',
         data: driverAttribute
     }),
     list: (driverAttribute) => request({
-        url: '/device_api/manager/driverAttribute/list',
+        url: '/manager_api/manager/driverAttribute/list',
         method: 'post',
         data: driverAttribute
     })
@@ -36,21 +36,21 @@ export const driverAttributeApi = {
 
 export const driverInfoApi = {
     add: (driverInfo) => request({
-        url: '/device_api/manager/driverInfo/add',
+        url: '/manager_api/manager/driverInfo/add',
         method: 'post',
         data: driverInfo
     }),
     delete: (id) => request({
-        url: '/device_api/manager/driverInfo/delete/' + id,
+        url: '/manager_api/manager/driverInfo/delete/' + id,
         method: 'post'
     }),
     update: (driverInfo) => request({
-        url: '/device_api/manager/driverInfo/update',
+        url: '/manager_api/manager/driverInfo/update',
         method: 'post',
         data: driverInfo
     }),
     list: (driverInfo) => request({
-        url: '/device_api/manager/driverInfo/list',
+        url: '/manager_api/manager/driverInfo/list',
         method: 'post',
         data: driverInfo
     })
@@ -58,21 +58,21 @@ export const driverInfoApi = {
 
 export const pointAttributeApi = {
     add: (pointAttribute) => request({
-        url: '/device_api/manager/pointAttribute/add',
+        url: '/manager_api/manager/pointAttribute/add',
         method: 'post',
         data: pointAttribute
     }),
     delete: (id) => request({
-        url: '/device_api/manager/pointAttribute/delete/' + id,
+        url: '/manager_api/manager/pointAttribute/delete/' + id,
         method: 'post'
     }),
     update: (pointAttribute) => request({
-        url: '/device_api/manager/pointAttribute/update',
+        url: '/manager_api/manager/pointAttribute/update',
         method: 'post',
         data: pointAttribute
     }),
     list: (pointAttribute) => request({
-        url: '/device_api/manager/pointAttribute/list',
+        url: '/manager_api/manager/pointAttribute/list',
         method: 'post',
         data: pointAttribute
     })
@@ -80,21 +80,21 @@ export const pointAttributeApi = {
 
 export const pointInfoApi = {
     add: (pointInfo) => request({
-        url: '/device_api/manager/pointInfo/add',
+        url: '/manager_api/manager/pointInfo/add',
         method: 'post',
         data: pointInfo
     }),
     delete: (id) => request({
-        url: '/device_api/manager/pointInfo/delete/' + id,
+        url: '/manager_api/manager/pointInfo/delete/' + id,
         method: 'post'
     }),
     update: (pointInfo) => request({
-        url: '/device_api/manager/pointInfo/update',
+        url: '/manager_api/manager/pointInfo/update',
         method: 'post',
         data: pointInfo
     }),
     list: (pointInfo) => request({
-        url: '/device_api/manager/pointInfo/list',
+        url: '/manager_api/manager/pointInfo/list',
         method: 'post',
         data: pointInfo
     })
@@ -102,21 +102,21 @@ export const pointInfoApi = {
 
 export const profileApi = {
     add: (profile) => request({
-        url: '/device_api/manager/profile/add',
+        url: '/manager_api/manager/profile/add',
         method: 'post',
         data: profile
     }),
     delete: (id) => request({
-        url: '/device_api/manager/profile/delete/' + id,
+        url: '/manager_api/manager/profile/delete/' + id,
         method: 'post'
     }),
     update: (profile) => request({
-        url: '/device_api/manager/profile/update',
+        url: '/manager_api/manager/profile/update',
         method: 'post',
         data: profile
     }),
     list: (profile) => request({
-        url: '/device_api/manager/profile/list',
+        url: '/manager_api/manager/profile/list',
         method: 'post',
         data: profile
     })
@@ -124,21 +124,21 @@ export const profileApi = {
 
 export const groupApi = {
     add: (group) => request({
-        url: '/device_api/manager/group/add',
+        url: '/manager_api/manager/group/add',
         method: 'post',
         data: group
     }),
     delete: (id) => request({
-        url: '/device_api/manager/group/delete/' + id,
+        url: '/manager_api/manager/group/delete/' + id,
         method: 'post'
     }),
     update: (group) => request({
-        url: '/device_api/manager/group/update',
+        url: '/manager_api/manager/group/update',
         method: 'post',
         data: group
     }),
     list: (group) => request({
-        url: '/device_api/manager/group/list',
+        url: '/manager_api/manager/group/list',
         method: 'post',
         data: group
     })
@@ -146,21 +146,21 @@ export const groupApi = {
 
 export const deviceApi = {
     add: (device) => request({
-        url: '/device_api/manager/device/add',
+        url: '/manager_api/manager/device/add',
         method: 'post',
         data: device
     }),
     delete: (id) => request({
-        url: '/device_api/manager/device/delete/' + id,
+        url: '/manager_api/manager/device/delete/' + id,
         method: 'post'
     }),
     update: (device) => request({
-        url: '/device_api/manager/device/update',
+        url: '/manager_api/manager/device/update',
         method: 'post',
         data: device
     }),
     list: (device) => request({
-        url: '/device_api/manager/device/list',
+        url: '/manager_api/manager/device/list',
         method: 'post',
         data: device
     })
@@ -168,21 +168,21 @@ export const deviceApi = {
 
 export const pointApi = {
     add: (point) => request({
-        url: '/device_api/manager/point/add',
+        url: '/manager_api/manager/point/add',
         method: 'post',
         data: point
     }),
     delete: (id) => request({
-        url: '/device_api/manager/point/delete/' + id,
+        url: '/manager_api/manager/point/delete/' + id,
         method: 'post'
     }),
     update: (point) => request({
-        url: '/device_api/manager/point/update',
+        url: '/manager_api/manager/point/update',
         method: 'post',
         data: point
     }),
     list: (point) => request({
-        url: '/device_api/manager/point/list',
+        url: '/manager_api/manager/point/list',
         method: 'post',
         data: point
     })
@@ -190,31 +190,31 @@ export const pointApi = {
 
 export const dictionaryApi = {
     driverDictionary: () => request({
-        url: '/device_api/manager/dictionary/driver',
+        url: '/manager_api/manager/dictionary/driver',
         method: 'get'
     }),
     profileDictionary: () => request({
-        url: '/device_api/manager/dictionary/profile',
+        url: '/manager_api/manager/dictionary/profile',
         method: 'get'
     }),
     driverAttributeDictionary: () => request({
-        url: '/device_api/manager/dictionary/driverAttribute',
+        url: '/manager_api/manager/dictionary/driverAttribute',
         method: 'get'
     }),
     pointAttributeDictionary: () => request({
-        url: '/device_api/manager/dictionary/pointAttribute',
+        url: '/manager_api/manager/dictionary/pointAttribute',
         method: 'get'
     }),
     groupDictionary: () => request({
-        url: '/device_api/manager/dictionary/group',
+        url: '/manager_api/manager/dictionary/group',
         method: 'get'
     }),
     deviceDictionary: (parent) => request({
-        url: '/device_api/manager/dictionary/device/' + parent,
+        url: '/manager_api/manager/dictionary/device/' + parent,
         method: 'get'
     }),
     pointDictionary: (parent) => request({
-        url: '/device_api/manager/dictionary/point/' + parent,
+        url: '/manager_api/manager/dictionary/point/' + parent,
         method: 'get'
     })
 };
diff --git a/src/router/views/index.js b/src/router/views/index.js
index fcd38e2..162ffaf 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -77,19 +77,12 @@ export default [
                 },
                 component: () => import('@/views/point/PointInfo')
             }, {
-                name: 'now',
-                path: '/now',
+                name: 'pointValue',
+                path: '/pointValue',
                 meta: {
                     isAuth: true
                 },
-                component: () => import('@/views/Now')
-            }, {
-                name: 'history',
-                path: '/history',
-                meta: {
-                    isAuth: true
-                },
-                component: () => import('@/views/History')
+                component: () => import('@/views/point/PointValue')
             }, {
                 name: 'alarm',
                 path: '/alarm',
diff --git a/src/views/History.vue b/src/views/History.vue
deleted file mode 100644
index 3fa2807..0000000
--- a/src/views/History.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <div class="about">
-    <h1>This is an about page</h1>
-  </div>
-</template>
diff --git a/src/views/Now.vue b/src/views/Now.vue
deleted file mode 100644
index e8869ec..0000000
--- a/src/views/Now.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-    <base-card>
-        <avue-crud :option="option"
-                   :data="data"
-                   ref="crud"
-                   v-model="form"
-                   @row-del="rowDel"
-                   @row-update="handleRowUpdate"
-                   @row-save="handleRowSave"
-                   @search-change="searchChange"
-                   @search-reset="searchReset">
-            <template slot="menuLeft">
-                <el-button type="danger"
-                           size="small"
-                           icon="el-icon-delete"
-                           plain>删 除
-                </el-button>
-            </template>
-        </avue-crud>
-    </base-card>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                form: {},
-                query: {},
-                page: {
-                    pageSize: 10,
-                    currentPage: 1,
-                    total: 0
-                },
-                data: [{
-                    name: '张三',
-                    sex: '男',
-                    date: '1994-02-23 00:00:00'
-                }, {
-                    name: '李四',
-                    sex: '女',
-                    date: '1994-02-23 00:00:00'
-                }, {
-                    name: '王五',
-                    sex: '女',
-                    date: '1994-02-23 00:00:00'
-                }, {
-                    name: '赵六',
-                    sex: '男',
-                    date: '1994-02-23 00:00:00'
-                }],
-                option: {
-                    tip: false,
-                    tree: true,
-                    border: true,
-                    index: true,
-                    viewBtn: true,
-                    column: [
-                        {
-                            label: '姓名',
-                            prop: 'name',
-                            search: true,
-                            rules: [
-                                {
-                                    required: true,
-                                    message: "请输入部门名称",
-                                    trigger: "blur"
-                                }
-                            ]
-                        },
-                        {
-                            label: '性别',
-                            prop: 'sex'
-                        }, {
-                            label: "日期",
-                            prop: "date",
-                            type: "date",
-                            format: "yyyy-MM-dd hh:mm:ss",
-                            valueFormat: "yyyy-MM-dd hh:mm:ss",
-                        }
-                    ]
-                }
-            }
-        },
-        methods: {
-            // 增加按钮
-            handleRowSave(row, done, loading) {
-                this.data.splice(0, 0, row);
-                done();  // 关闭表单
-                loading(); // 按钮停止加载
-            },
-            // 修改按钮
-            handleRowUpdate(row, index, done, loading) {
-                this.data.splice(index, 1, row);
-                done();  // 关闭表单
-                loading(); // 按钮停止加载
-            },
-            // 删除按钮
-            rowDel(row, index) {
-                this.$confirm('是否删除该条信息？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    this.data.splice(index, 1);
-                });
-            },
-        },
-    }
-</script>
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
index 22849c0..1ade20b 100644
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -19,6 +19,7 @@
                     <el-menu-item index="/group">分组</el-menu-item>
                     <el-menu-item index="/device">设备</el-menu-item>
                     <el-menu-item index="/pointInfo">位号配置</el-menu-item>
+                    <el-menu-item index="/pointValue">历史值</el-menu-item>
                     <!--<el-menu-item index="/now">实时</el-menu-item>
                     <el-menu-item index="/history">历史</el-menu-item>
                     <el-menu-item index="/video">视频</el-menu-item>
diff --git a/src/views/point/PointValue.vue b/src/views/point/PointValue.vue
new file mode 100644
index 0000000..99b7c78
--- /dev/null
+++ b/src/views/point/PointValue.vue
@@ -0,0 +1,186 @@
+<template>
+    <el-col :span="24">
+        <base-card>
+            <avue-crud :option="listOption"
+                       :data="listData"
+                       :page="page"
+                       :table-loading="loading"
+                       ref="crud"
+                       v-model="listForm"
+                       @on-load="list"
+                       @search-reset="searchReset"
+                       @date-change="dateChange"
+                       @search-change="searchChange"
+                       @refresh-change="refreshChange"
+                       @size-change="sizeChange"
+                       @current-change="currentChange"
+            >
+            </avue-crud>
+        </base-card>
+    </el-col>
+</template>
+
+<script>
+    import {dictionaryApi} from '@/api/manager'
+    import {pointValueApi} from '@/api/data'
+
+    export default {
+        data() {
+            return {
+                query: {},
+                listForm: {},
+                listData: [],
+                listOption: {
+                    tip: false,
+                    index: true,
+                    stripe: true,
+                    border: true,
+                    dateBtn: true,
+                    addBtn: false,
+                    viewBtn: true,
+                    editBtn: false,
+                    delBtn: false,
+                    height: 664,
+                    align: 'center',
+                    column: [
+                        {
+                            label: '所属设备',
+                            prop: 'deviceId',
+                            span: 12,
+                            search: true,
+                            searchSpan: 12,
+                            type: 'tree',
+                            dicData: [],
+                            defaultExpandAll: true,
+                            rules: [
+                                {
+                                    required: true,
+                                    message: '请选择所属设备',
+                                    trigger: 'click'
+                                }
+                            ]
+                        }, {
+                            label: '所属位号',
+                            prop: 'pointId',
+                            span: 12,
+                            search: true,
+                            searchSpan: 12,
+                            type: 'tree',
+                            dicData: [],
+                            defaultExpandAll: true,
+                            rules: [
+                                {
+                                    required: true,
+                                    message: '请选择所属位号',
+                                    trigger: 'click'
+                                }
+                            ]
+                        }, {
+                            label: '原始值',
+                            prop: 'rawValue',
+                            span: 12
+                        }, {
+                            label: '处理值',
+                            prop: 'value',
+                            span: 12
+                        }, {
+                            label: '采集日期',
+                            prop: 'originTime',
+                            width: 180,
+                            span: 12,
+                            disabled: true,
+                            type: 'date',
+                            format: 'yyyy-MM-dd HH:mm:ss.SSS'
+                        }, {
+                            label: '保存日期',
+                            prop: 'createTime',
+                            width: 180,
+                            span: 12,
+                            disabled: true,
+                            type: 'date',
+                            format: 'yyyy-MM-dd HH:mm:ss.SSS'
+                        }, {
+                            label: '延时(毫秒)',
+                            width: 90,
+                            prop: 'interval'
+                        }
+                    ]
+                },
+                loading: true,
+                page: {
+                    total: 0,
+                    pageSize: 20,
+                    currentPage: 1,
+                    startTime: 0,
+                    endTime: 0
+                }
+            }
+        },
+        created() {
+            this.device();
+            this.point();
+        },
+        methods:
+            {
+                list(page) {
+                    this.loading = true;
+                    pointValueApi.list(Object.assign({
+                        page: {
+                            current: page.currentPage,
+                            size: page.pageSize,
+                            startTime: page.startTime,
+                            endTime: page.endTime
+                        }
+                    }, this.query)).then(res => {
+                        const data = res.data;
+                        this.page.total = data.total;
+                        this.listData = data.records;
+                    }).finally(() => {
+                        this.loading = false;
+                    });
+                },
+                device() {
+                    dictionaryApi.deviceDictionary('group').then(res => {
+                        this.listOption.column[this.$refs.crud.findColumnIndex('deviceId')].dicData = res.data;
+                    }).catch((e) => {
+                        console.log(e);
+                    });
+                },
+                point() {
+                    dictionaryApi.pointDictionary('profile').then(res => {
+                        this.listOption.column[this.$refs.crud.findColumnIndex('pointId')].dicData = res.data;
+                    }).catch((e) => {
+                        console.log(e);
+                    });
+                },
+                dateChange(date) {
+                    if (date != null && date.length === 2) {
+                        this.page.startTime = new Date(date[0]).getTime();
+                        this.page.endTime = new Date(date[1]).getTime();
+                    }
+                    this.list(this.page);
+                },
+                refreshChange() {
+                    this.list(this.page);
+                },
+                currentChange(page) {
+                    this.page.currentPage = page;
+                },
+                sizeChange(pageSize) {
+                    this.page.pageSize = pageSize;
+                },
+                searchChange(params, done) {
+                    this.query = params;
+                    this.list(this.page);
+                    done();
+                },
+                searchReset() {
+                    this.query = {};
+                    this.list(this.page);
+                }
+            }
+    }
+</script>
+
+<style lang="scss">
+</style>
diff --git a/vue.config.js b/vue.config.js
index 3e642e8..3f092de 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -20,12 +20,20 @@ module.exports = {
                     '^/user_api': ''
                 }
             },
-            '/device_api': {
+            '/manager_api': {
                 target: 'http://dc3-manager:8400',
                 changeOrigin: true,
                 ws: true,
                 pathRewrite: {
-                    '^/device_api': ''
+                    '^/manager_api': ''
+                }
+            },
+            '/data_api': {
+                target: 'http://dc3-data:8500',
+                changeOrigin: true,
+                ws: true,
+                pathRewrite: {
+                    '^/data_api': ''
                 }
             }
         }
diff --git a/yarn.lock b/yarn.lock
index 5bbd8b6..cbf8b9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1130,10 +1130,10 @@
   dependencies:
     "@babel/runtime" "^7.0.0"
 
-"@smallwei/avue@^2.3.9":
-  version "2.3.9"
-  resolved "https://registry.yarnpkg.com/@smallwei/avue/-/avue-2.3.9.tgz#a67552489b404878c890f81619637d29fc7b4fa4"
-  integrity sha512-AxvWHDpaOwLt+opEClTSaJ3cGcXadnV3ewucGjXfCMe/tdJO01KEgrqOxtQW+nJXgYEa69zbV1dWNMyPkgIamg==
+"@smallwei/avue@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@smallwei/avue/-/avue-2.4.0.tgz#db5e8d820bc6a35e34346ff5700baebc15a5cfd5"
+  integrity sha512-U5Ft+BKO9OrUGYamtzehEJwMOGnVs/RlQFhDQ5q2yH7JF2MpotczYJrP0PJHlOjkw6FAodT7OpvRTrs6YLSHdA==
   dependencies:
     ant-design-vue "^1.3.14"
     async-validator "^1.10.0"
@@ -3374,7 +3374,7 @@ debug@=3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3410,11 +3410,6 @@ deep-equal@^1.0.1, deep-equal@~1.1.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3527,11 +3522,6 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-node@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
@@ -4447,13 +4437,6 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -5000,7 +4983,7 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5024,13 +5007,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -5134,11 +5110,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
 inquirer@^7.0.0:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703"
@@ -6245,14 +6216,6 @@ minipass-pipeline@^1.2.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
 minipass@^3.0.0, minipass@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
@@ -6260,13 +6223,6 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -6394,15 +6350,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-needle@^2.2.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
-  integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -6493,22 +6440,6 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.47:
   version "1.1.47"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4"
@@ -6546,14 +6477,6 @@ node-sass@^4.13.1:
   dependencies:
     abbrev "1"
 
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6606,27 +6529,6 @@ normalize-wheel@^1.0.1:
   resolved "https://registry.yarnpkg.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz#aec886affdb045070d856447df62ecf86146ec45"
   integrity sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6641,7 +6543,7 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -6880,7 +6782,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4:
+osenv@0:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -7765,16 +7667,6 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -8230,7 +8122,7 @@ sass-loader@^8.0.2:
     schema-utils "^2.6.1"
     semver "^6.3.0"
 
-sax@^1.2.4, sax@~1.2.4:
+sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -8272,7 +8164,7 @@ selfsigned@^1.10.7:
   dependencies:
     node-forge "0.9.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -8896,11 +8788,6 @@ strip-json-comments@^3.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
   integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
 stylehacks@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -9024,19 +8911,6 @@ tar@^2.0.0:
     fstream "^1.0.12"
     inherits "2"
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -9965,7 +9839,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==