Browse Source

更新代码

master
song 4 years ago
parent
commit
1602d7a1f5
  1. 2
      .eslintignore
  2. 18
      package-lock.json
  3. 1
      package.json
  4. 24
      src/App.vue
  5. 20
      src/routers/index.js
  6. 15
      vite.config.js

2
.eslintignore

@ -6,4 +6,4 @@ babel.config.js
package.json package.json
postcss.config.js postcss.config.js
.eslintrc.js .eslintrc.js
vue.config.js vite.config.js

18
package-lock.json

@ -2670,7 +2670,6 @@
"version": "10.0.0", "version": "10.0.0",
"resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-10.0.0.tgz", "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-10.0.0.tgz",
"integrity": "sha1-n/YbZV3eU/s0qC34S7IUzoAuF8E=", "integrity": "sha1-n/YbZV3eU/s0qC34S7IUzoAuF8E=",
"dev": true,
"requires": { "requires": {
"graceful-fs": "^4.2.0", "graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1", "jsonfile": "^6.0.1",
@ -2832,8 +2831,7 @@
"graceful-fs": { "graceful-fs": {
"version": "4.2.8", "version": "4.2.8",
"resolved": "https://registry.nlark.com/graceful-fs/download/graceful-fs-4.2.8.tgz", "resolved": "https://registry.nlark.com/graceful-fs/download/graceful-fs-4.2.8.tgz",
"integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo=", "integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo="
"dev": true
}, },
"hard-rejection": { "hard-rejection": {
"version": "2.1.0", "version": "2.1.0",
@ -3427,7 +3425,6 @@
"version": "6.1.0", "version": "6.1.0",
"resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161822397&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz", "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161822397&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz",
"integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=", "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=",
"dev": true,
"requires": { "requires": {
"graceful-fs": "^4.1.6", "graceful-fs": "^4.1.6",
"universalify": "^2.0.0" "universalify": "^2.0.0"
@ -4834,8 +4831,7 @@
"universalify": { "universalify": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz",
"integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=", "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc="
"dev": true
}, },
"unplugin": { "unplugin": {
"version": "0.2.16", "version": "0.2.16",
@ -4907,6 +4903,16 @@
"rollup": "^2.57.0" "rollup": "^2.57.0"
} }
}, },
"vite-plugin-compression": {
"version": "0.3.5",
"resolved": "https://registry.nlark.com/vite-plugin-compression/download/vite-plugin-compression-0.3.5.tgz",
"integrity": "sha1-HlM460PmASjebW8isqq/Dj3AwX8=",
"requires": {
"chalk": "^4.1.2",
"debug": "^4.3.2",
"fs-extra": "^10.0.0"
}
},
"vite-plugin-linter": { "vite-plugin-linter": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmmirror.com/vite-plugin-linter/download/vite-plugin-linter-1.0.1.tgz", "resolved": "https://registry.npmmirror.com/vite-plugin-linter/download/vite-plugin-linter-1.0.1.tgz",

1
package.json

@ -18,6 +18,7 @@
"element-plus": "^1.1.0-beta.24", "element-plus": "^1.1.0-beta.24",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"vite": "^2.6.4", "vite": "^2.6.4",
"vite-plugin-compression": "^0.3.5",
"vite-plugin-windicss": "^1.4.11", "vite-plugin-windicss": "^1.4.11",
"vue": "^3.2.16", "vue": "^3.2.16",
"vue-router": "^4.0.12", "vue-router": "^4.0.12",

24
src/App.vue

@ -1,7 +1,7 @@
<script setup> <script setup>
import { computed, ref } from 'vue'; import { computed, ref } from 'vue';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
import { useRoute } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import Navbar from 'components/navbar.vue'; import Navbar from 'components/navbar.vue';
import zhCn from 'element-plus/lib/locale/lang/zh-cn'; import zhCn from 'element-plus/lib/locale/lang/zh-cn';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
@ -16,16 +16,20 @@ const routeList = ref(routes);
const menu = computed(() => store.state.menu); const menu = computed(() => store.state.menu);
// queryu token // queryu token
const validateQuery = async () => { const validateQuery = () => {
const route = useRoute(); const route = useRoute();
const u = computed(() => route.query.u); useRouter()
if (!u) { .isReady()
// urlu, .then(async () => {
ElMessage.error('缺少用户信息参数'); const u = computed(() => route.query.u);
} else { if (!u) {
// userId token // urlu,
await store.dispatch('user/getTokenByUserId', u); ElMessage.error('缺少用户信息参数');
} } else {
// userId token
await store.dispatch('user/getTokenByUserId', u.value);
}
});
}; };
validateQuery(); validateQuery();

20
src/routers/index.js

@ -3,61 +3,61 @@ import { createRouter, createWebHistory } from 'vue-router';
export const routes = [ export const routes = [
{ {
path: '/network-config', path: '/corrosion/network-config',
name: 'network-config', name: 'network-config',
meta: { title: '网络参数配置', icon: 'el-icon-setting' }, meta: { title: '网络参数配置', icon: 'el-icon-setting' },
component: () => import('@/views/network-config.vue'), component: () => import('@/views/network-config.vue'),
}, },
{ {
path: '/function-config', path: '/corrosion/function-config',
name: 'function-config', name: 'function-config',
meta: { title: '功能参数配置', icon: 'el-icon-set-up' }, meta: { title: '功能参数配置', icon: 'el-icon-set-up' },
component: () => import('@/views/function-config.vue'), component: () => import('@/views/function-config.vue'),
}, },
{ {
path: '/device-create', path: '/corrosion/device-create',
name: 'device-create', name: 'device-create',
meta: { title: '设备添加', icon: 'el-icon-plus' }, meta: { title: '设备添加', icon: 'el-icon-plus' },
component: () => import('@/views/device-create.vue'), component: () => import('@/views/device-create.vue'),
}, },
{ {
path: '/devices', path: '/corrosion/devices',
name: 'devices', name: 'devices',
meta: { title: '设备管理', icon: 'el-icon-box' }, meta: { title: '设备管理', icon: 'el-icon-box' },
component: () => import('@/views/device-list.vue'), component: () => import('@/views/device-list.vue'),
}, },
{ {
path: '/data-history', path: '/corrosion/data-history',
name: 'data-history', name: 'data-history',
meta: { title: '历史数据查看', icon: 'el-icon-document-copy' }, meta: { title: '历史数据查看', icon: 'el-icon-document-copy' },
component: () => import('@/views/data-history.vue'), component: () => import('@/views/data-history.vue'),
}, },
{ {
path: '/statistical-history', path: '/corrosion/statistical-history',
name: 'statistical-history', name: 'statistical-history',
meta: { title: '历史数据统计', icon: 'el-icon-data-line' }, meta: { title: '历史数据统计', icon: 'el-icon-data-line' },
component: () => import('@/views/statistical-history.vue'), component: () => import('@/views/statistical-history.vue'),
}, },
{ {
path: '/statistical-realtime', path: '/corrosion/statistical-realtime',
name: 'statistical-realtime', name: 'statistical-realtime',
meta: { title: '实时数据统计', icon: 'el-icon-time' }, meta: { title: '实时数据统计', icon: 'el-icon-time' },
component: () => import('@/views/statistical-realtime.vue'), component: () => import('@/views/statistical-realtime.vue'),
}, },
{ {
path: '/months', path: '/corrosion/months',
name: 'months', name: 'months',
meta: { title: '月累计数据分析', icon: 'el-icon-data-analysis' }, meta: { title: '月累计数据分析', icon: 'el-icon-data-analysis' },
component: () => import('@/views/month-data.vue'), component: () => import('@/views/month-data.vue'),
}, },
{ {
path: '/communication-log', path: '/corrosion/communication-log',
name: 'communication-log', name: 'communication-log',
meta: { title: '通讯日志', icon: 'el-icon-phone-outline' }, meta: { title: '通讯日志', icon: 'el-icon-phone-outline' },
component: () => import('@/views/communication-log.vue'), component: () => import('@/views/communication-log.vue'),
}, },
{ {
path: '/access-log', path: '/corrosion/access-log',
name: 'access-log', name: 'access-log',
meta: { title: '访问日志', icon: 'el-icon-message' }, meta: { title: '访问日志', icon: 'el-icon-message' },
component: () => import('@/views/access-log.vue'), component: () => import('@/views/access-log.vue'),

15
vite.config.js

@ -4,12 +4,14 @@ import WindiCSS from 'vite-plugin-windicss';
import { defineConfig } from 'vite'; import { defineConfig } from 'vite';
import path from 'path'; import path from 'path';
import vue from '@vitejs/plugin-vue'; import vue from '@vitejs/plugin-vue';
import viteCompression from 'vite-plugin-compression';
const resolve = dir => path.join(__dirname, dir); const resolve = dir => path.join(__dirname, dir);
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default defineConfig({
plugins: [vue(), WindiCSS(), Components({ resolvers: [ElementPlusResolver()] })], base: '/corrosion/',
plugins: [vue(), WindiCSS(), Components({ resolvers: [ElementPlusResolver()] }), viteCompression()],
resolve: { resolve: {
alias: { alias: {
'~': __dirname, '~': __dirname,
@ -22,4 +24,15 @@ export default defineConfig({
apis: resolve('src/apis'), apis: resolve('src/apis'),
}, },
}, },
build: {
rollupOptions: {
output: {
manualChunks(id) {
if (id.includes('node_modules')) {
return id.toString().split('node_modules/')[1].split('/')[0].toString();
}
},
},
},
},
}); });

Loading…
Cancel
Save