diff --git a/src/assets/images/M528.png b/src/assets/images/SR100.png similarity index 100% rename from src/assets/images/M528.png rename to src/assets/images/SR100.png diff --git a/src/assets/images/ch4.png b/src/assets/images/ch4.png new file mode 100644 index 0000000..f3f2ec0 Binary files /dev/null and b/src/assets/images/ch4.png differ diff --git a/src/assets/images/chemical.png b/src/assets/images/chemical.png new file mode 100644 index 0000000..b5f6f66 Binary files /dev/null and b/src/assets/images/chemical.png differ diff --git a/src/assets/images/glass.png b/src/assets/images/glass.png new file mode 100644 index 0000000..7149dcc Binary files /dev/null and b/src/assets/images/glass.png differ diff --git a/src/assets/images/leaf.png b/src/assets/images/leaf.png new file mode 100644 index 0000000..72358d1 Binary files /dev/null and b/src/assets/images/leaf.png differ diff --git a/src/assets/images/line.png b/src/assets/images/line.png new file mode 100644 index 0000000..8d4c2a0 Binary files /dev/null and b/src/assets/images/line.png differ diff --git a/src/assets/images/noise.png b/src/assets/images/noise.png new file mode 100644 index 0000000..1fdddd9 Binary files /dev/null and b/src/assets/images/noise.png differ diff --git a/src/assets/images/wind.png b/src/assets/images/wind.png new file mode 100644 index 0000000..929c21b Binary files /dev/null and b/src/assets/images/wind.png differ diff --git a/src/layout/index.vue b/src/layout/index.vue index 0ac2b7d..ed7ae0d 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -48,7 +48,7 @@ export default { } }, showBreadcrumb() { - const whiteList = ['overview', 'terminal/add'] + const whiteList = ['overview', 'terminal/add', 'data/value'] return whiteList.every((item) => this.$route.path.indexOf(item) === -1) } }, diff --git a/src/router/index.js b/src/router/index.js index 04511e6..5678787 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -228,7 +228,7 @@ export const constantRoutes = [ path: 'value', name: 'Value', component: () => import('@/views/data/value/index'), - meta: { title: '数据价值', disabled: true } + meta: { title: '数据价值' } } ] }, diff --git a/src/utils/request.js b/src/utils/request.js index 8de27db..e07e91e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -2,7 +2,7 @@ * @Author: 龚祖望 573413756@qq.com * @Date: 2022-05-16 09:16:41 * @LastEditors: 龚祖望 573413756@qq.com - * @LastEditTime: 2022-09-01 09:34:55 + * @LastEditTime: 2022-09-01 20:13:59 * @FilePath: \dashengda\src\utils\request.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -27,8 +27,6 @@ service.interceptors.request.use( config => { // do something before request is sent config.data = JSON.stringify(config.data) - console.log('data', config.data) - console.log('config', config) if (store.getters.token) { // let each request carry token // ['X-Token'] is a custom headers key @@ -67,7 +65,9 @@ service.interceptors.response.use( duration: 5 * 1000 }) } + if (res.code === '200300') { + } // // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; // if (res.code === 50008 || res.code === 50012 || res.code === 50014) { // // to re-login @@ -87,7 +87,6 @@ service.interceptors.response.use( // } }, error => { - console.log('err' + error) // for debug Message({ message: error.message, type: 'error', diff --git a/src/views/data/value/index.vue b/src/views/data/value/index.vue index e69de29..1f32356 100644 --- a/src/views/data/value/index.vue +++ b/src/views/data/value/index.vue @@ -0,0 +1,878 @@ + + + + + diff --git a/src/views/product/M528/index.vue b/src/views/product/M528/index.vue index 5ff3dc5..b5c6956 100644 --- a/src/views/product/M528/index.vue +++ b/src/views/product/M528/index.vue @@ -6,7 +6,7 @@

产品介绍

- +

矽璓智能终端M528-A800-5G-HM100采用多核异构设计,由一个主控CPU和通信CPU构成。 主控CPU基于NXP 公司 i.MXRT1052 跨界处理器设计,搭载ARM Cortex -M7内核,集微控制器的低功耗、易用性与应用处理器的高性能、高扩展性于一体。 主频528MHz,SDRAM 16MB, QSPI -Nor Flash 4MB 。 diff --git a/src/views/product/RV400-SR100/index.vue b/src/views/product/RV400-SR100/index.vue index 39785a4..c1bf07f 100644 --- a/src/views/product/RV400-SR100/index.vue +++ b/src/views/product/RV400-SR100/index.vue @@ -6,7 +6,7 @@

产品介绍

- +

矽璓智能终端RV400-NPU4T-5G-SR100采用多核异构设计,集成了一个Hi3559A主核和RISCV架构从核,其中Hi3559AV100 包含了丰富的计算资源,包括单核的 A53、 双核 A73 和双核 A53 组成的 big.LITTLE 系统。 一个 M7、 一个 GPU、 两个 DSP 和 NNIE 加速引擎,功能齐全,技术指标高,工艺先进且整体性能相当均衡,可以满足多个行业的需求。 diff --git a/src/views/terminal/add/index.vue b/src/views/terminal/add/index.vue index 55b9536..2652d13 100644 --- a/src/views/terminal/add/index.vue +++ b/src/views/terminal/add/index.vue @@ -176,7 +176,6 @@ export default { this.date = new Date().toLocaleDateString() this.getList(0) this.getList(1) - console.log('区域', 3.3 % 2) }, methods: { selectCompany() { diff --git a/src/views/terminal/center/index.vue b/src/views/terminal/center/index.vue index 0f607b0..aeb3dea 100644 --- a/src/views/terminal/center/index.vue +++ b/src/views/terminal/center/index.vue @@ -139,7 +139,118 @@ import { getList } from '@/api/terminal/center' export default { data() { return { - deviceList: [], + deviceList: [ + { + productname: '彩印车间', + status: 1, + statusdesc: '运行', + type: 'M-168-Lora-FM100', + kernel: 'rt-thread kenel', + webversion: '1.0', + no: 'A000001', + ipaddr: '192.168.131.29', + netmask: '255.255.254.0', + gateway: '192.168.130.1', + dnsserver0: '10.0.110.21', + dnsserver1: '10.0.110.20', + topic: '/broadcast/hf6mzwdVnJg/989898', + serveraddr: 'zwdVnJg.iot-as-mqtt.cn-shanghai.aliyuncs.com', + serverport: '1883', + username: 'test1&hf6mzwdVnJg', + clientid: '123|securemode=3,signmethod=hmacsha1|', + privateserveraddr: '192.168.131.30', + privateserverport: '9898', + privateserverusername: 'admin' + }, + { + productname: '生产车间', + status: 0, + statusdesc: '待机', + type: 'M528-A800-5G-HM100', + kernel: 'rt-thread kenel', + webversion: '1.0', + no: 'A000002', + ipaddr: '192.168.131.29', + netmask: '255.255.254.0', + gateway: '192.168.130.1', + dnsserver0: '10.0.110.21', + dnsserver1: '10.0.110.20', + topic: '/broadcast/hf6mzwdVnJg/989898', + serveraddr: 'zwdVnJg.iot-as-mqtt.cn-shanghai.aliyuncs.com', + serverport: '1883', + username: 'test1&hf6mzwdVnJg', + clientid: '123|securemode=3,signmethod=hmacsha1|', + privateserveraddr: '192.168.131.30', + privateserverport: '9898', + privateserverusername: 'admin' + }, + { + productname: '成型车间', + status: 1, + statusdesc: '运行', + type: 'RV400-NPU4T-5G-SR100', + kernel: 'rt-thread kenel', + webversion: '1.0', + no: 'A000003', + ipaddr: '192.168.131.29', + netmask: '255.255.254.0', + gateway: '192.168.130.1', + dnsserver0: '10.0.110.21', + dnsserver1: '10.0.110.20', + topic: '/broadcast/hf6mzwdVnJg/989898', + serveraddr: 'zwdVnJg.iot-as-mqtt.cn-shanghai.aliyuncs.com', + serverport: '1883', + username: 'test1&hf6mzwdVnJg', + clientid: '123|securemode=3,signmethod=hmacsha1|', + privateserveraddr: '192.168.131.30', + privateserverport: '9898', + privateserverusername: 'admin' + }, + { + productname: '打包车间', + status: 2, + statusdesc: '警告', + type: 'RV400-NPU16T-5G-AR100', + kernel: 'rt-thread kenel', + webversion: '1.0', + no: 'A000004', + ipaddr: '192.168.131.29', + netmask: '255.255.254.0', + gateway: '192.168.130.1', + dnsserver0: '10.0.110.21', + dnsserver1: '10.0.110.20', + topic: '/broadcast/hf6mzwdVnJg/989898', + serveraddr: 'zwdVnJg.iot-as-mqtt.cn-shanghai.aliyuncs.com', + serverport: '1883', + username: 'test1&hf6mzwdVnJg', + clientid: '123|securemode=3,signmethod=hmacsha1|', + privateserveraddr: '192.168.131.30', + privateserverport: '9898', + privateserverusername: 'admin' + }, + { + productname: '打包车间', + status: 1, + statusdesc: '运行', + type: 'RV400-NPU16T-5G-AR100', + kernel: 'rt-thread kenel', + webversion: '1.0', + no: 'A000005', + ipaddr: '192.168.131.29', + netmask: '255.255.254.0', + gateway: '192.168.130.1', + dnsserver0: '10.0.110.21', + dnsserver1: '10.0.110.20', + topic: '/broadcast/hf6mzwdVnJg/989898', + serveraddr: 'zwdVnJg.iot-as-mqtt.cn-shanghai.aliyuncs.com', + serverport: '1883', + username: 'test1&hf6mzwdVnJg', + clientid: '123|securemode=3,signmethod=hmacsha1|', + privateserveraddr: '192.168.131.30', + privateserverport: '9898', + privateserverusername: 'admin' + } + ], visible: false, current: {}, protocol: 'TCP/IP' @@ -232,6 +343,7 @@ export default { getList() { getList({ activestatus: 1 }).then(res => { if (res.code === '200000') { + this.deviceList = [] res.data.forEach(item => { this.deviceList.push({ ...item, status: item.runstatus }) }) diff --git a/vue.config.js b/vue.config.js index 2be0bf7..11c5167 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,7 +24,7 @@ module.exports = { publicPath: '/', outputDir: 'dist', assetsDir: 'static', - lintOnSave: process.env.NODE_ENV === 'development', + lintOnSave: false, productionSourceMap: false, devServer: { port: port,