diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue new file mode 100644 index 0000000..cea2495 --- /dev/null +++ b/src/views/home/alarm/count/components/trendAnalysis.vue @@ -0,0 +1,138 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue new file mode 100644 index 0000000..cea2495 --- /dev/null +++ b/src/views/home/alarm/count/components/trendAnalysis.vue @@ -0,0 +1,138 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue index 37bd226..1317575 100644 --- a/src/views/home/alarm/count/index.vue +++ b/src/views/home/alarm/count/index.vue @@ -1,9 +1,28 @@ + - 报警统计 + + + + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue new file mode 100644 index 0000000..cea2495 --- /dev/null +++ b/src/views/home/alarm/count/components/trendAnalysis.vue @@ -0,0 +1,138 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue index 37bd226..1317575 100644 --- a/src/views/home/alarm/count/index.vue +++ b/src/views/home/alarm/count/index.vue @@ -1,9 +1,28 @@ + - 报警统计 + + + + + + + + + + + + + diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue new file mode 100644 index 0000000..d8f0859 --- /dev/null +++ b/src/views/home/alarm/current/components/map.vue @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue new file mode 100644 index 0000000..cea2495 --- /dev/null +++ b/src/views/home/alarm/count/components/trendAnalysis.vue @@ -0,0 +1,138 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue index 37bd226..1317575 100644 --- a/src/views/home/alarm/count/index.vue +++ b/src/views/home/alarm/count/index.vue @@ -1,9 +1,28 @@ + - 报警统计 + + + + + + + + + + + + + diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue new file mode 100644 index 0000000..d8f0859 --- /dev/null +++ b/src/views/home/alarm/current/components/map.vue @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue index 707b8dc..743e384 100644 --- a/src/views/home/alarm/current/index.vue +++ b/src/views/home/alarm/current/index.vue @@ -4,20 +4,24 @@ Date: 2023-06-28 --> @@ -106,43 +219,114 @@ /> - - - - - - - 导出 - - - - - + + - - - - - {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} - - - - - - - - 查看 {{ scope }} + + + + + + 导出 + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + - - - - + + + + + 查看 {{ scope.$index }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue new file mode 100644 index 0000000..cea2495 --- /dev/null +++ b/src/views/home/alarm/count/components/trendAnalysis.vue @@ -0,0 +1,138 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue index 37bd226..1317575 100644 --- a/src/views/home/alarm/count/index.vue +++ b/src/views/home/alarm/count/index.vue @@ -1,9 +1,28 @@ + - 报警统计 + + + + + + + + + + + + + diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue new file mode 100644 index 0000000..d8f0859 --- /dev/null +++ b/src/views/home/alarm/current/components/map.vue @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue index 707b8dc..743e384 100644 --- a/src/views/home/alarm/current/index.vue +++ b/src/views/home/alarm/current/index.vue @@ -4,20 +4,24 @@ Date: 2023-06-28 --> @@ -106,43 +219,114 @@ /> - - - - - - - 导出 - - - - - + + - - - - - {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} - - - - - - - - 查看 {{ scope }} + + + + + + 导出 + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + - - - - + + + + + 查看 {{ scope.$index }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue index 94ef71e..37566c7 100644 --- a/src/views/home/alarm/history/index.vue +++ b/src/views/home/alarm/history/index.vue @@ -1,3 +1,240 @@ + + + - 历史报警 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 导出 + + + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + + + + + + + 查看 {{ scope.$index }} + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue new file mode 100644 index 0000000..cea2495 --- /dev/null +++ b/src/views/home/alarm/count/components/trendAnalysis.vue @@ -0,0 +1,138 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue index 37bd226..1317575 100644 --- a/src/views/home/alarm/count/index.vue +++ b/src/views/home/alarm/count/index.vue @@ -1,9 +1,28 @@ + - 报警统计 + + + + + + + + + + + + + diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue new file mode 100644 index 0000000..d8f0859 --- /dev/null +++ b/src/views/home/alarm/current/components/map.vue @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue index 707b8dc..743e384 100644 --- a/src/views/home/alarm/current/index.vue +++ b/src/views/home/alarm/current/index.vue @@ -4,20 +4,24 @@ Date: 2023-06-28 --> @@ -106,43 +219,114 @@ /> - - - - - - - 导出 - - - - - + + - - - - - {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} - - - - - - - - 查看 {{ scope }} + + + + + + 导出 + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + - - - - + + + + + 查看 {{ scope.$index }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue index 94ef71e..37566c7 100644 --- a/src/views/home/alarm/history/index.vue +++ b/src/views/home/alarm/history/index.vue @@ -1,3 +1,240 @@ + + + - 历史报警 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 导出 + + + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + + + + + + + 查看 {{ scope.$index }} + + + + + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts new file mode 100644 index 0000000..ac7db9f --- /dev/null +++ b/src/views/home/dashboard/components/imgData.ts @@ -0,0 +1,14 @@ +export const img = { + bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url), + czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url), + dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url), + guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url), + gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url), + lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url), + ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url), + tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url), + tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url), + well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url), + zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url), + zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url), +} diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue new file mode 100644 index 0000000..cea2495 --- /dev/null +++ b/src/views/home/alarm/count/components/trendAnalysis.vue @@ -0,0 +1,138 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue index 37bd226..1317575 100644 --- a/src/views/home/alarm/count/index.vue +++ b/src/views/home/alarm/count/index.vue @@ -1,9 +1,28 @@ + - 报警统计 + + + + + + + + + + + + + diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue new file mode 100644 index 0000000..d8f0859 --- /dev/null +++ b/src/views/home/alarm/current/components/map.vue @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue index 707b8dc..743e384 100644 --- a/src/views/home/alarm/current/index.vue +++ b/src/views/home/alarm/current/index.vue @@ -4,20 +4,24 @@ Date: 2023-06-28 --> @@ -106,43 +219,114 @@ /> - - - - - - - 导出 - - - - - + + - - - - - {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} - - - - - - - - 查看 {{ scope }} + + + + + + 导出 + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + - - - - + + + + + 查看 {{ scope.$index }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue index 94ef71e..37566c7 100644 --- a/src/views/home/alarm/history/index.vue +++ b/src/views/home/alarm/history/index.vue @@ -1,3 +1,240 @@ + + + - 历史报警 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 导出 + + + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + + + + + + + 查看 {{ scope.$index }} + + + + + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts new file mode 100644 index 0000000..ac7db9f --- /dev/null +++ b/src/views/home/dashboard/components/imgData.ts @@ -0,0 +1,14 @@ +export const img = { + bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url), + czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url), + dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url), + guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url), + gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url), + lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url), + ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url), + tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url), + tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url), + well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url), + zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url), + zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url), +} diff --git a/src/views/home/dashboard/components/showCard.vue b/src/views/home/dashboard/components/showCard.vue new file mode 100644 index 0000000..8650062 --- /dev/null +++ b/src/views/home/dashboard/components/showCard.vue @@ -0,0 +1,63 @@ + + + + + + + + {{ title }} + >>更多 + + + + + + + + + + diff --git a/package.json b/package.json index 09787a0..08b7990 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "circular-json": "^0.5.9", "dayjs": "^1.11.6", "echarts": "^5.4.1", - "element-plus": "^2.2.26", + "element-plus": "^2.7.6", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/public/config/config.json b/public/config/config.json index 4acfa58..8e6cc74 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:11640" + "baseUrl": "http://111.198.10.15:22006" } diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png new file mode 100644 index 0000000..f14ab85 --- /dev/null +++ b/src/assets/images/dashboard/bjtj.png Binary files differ diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png new file mode 100644 index 0000000..62d6842 --- /dev/null +++ b/src/assets/images/dashboard/czjc.png Binary files differ diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png new file mode 100644 index 0000000..2848938 --- /dev/null +++ b/src/assets/images/dashboard/dqbj.png Binary files differ diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg new file mode 100644 index 0000000..07a17f7 --- /dev/null +++ b/src/assets/images/dashboard/guanxian.jpg Binary files differ diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png new file mode 100644 index 0000000..64fbb0f --- /dev/null +++ b/src/assets/images/dashboard/gxjc.png Binary files differ diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png new file mode 100644 index 0000000..a5a1914 --- /dev/null +++ b/src/assets/images/dashboard/lixian.png Binary files differ diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png new file mode 100644 index 0000000..debf49b --- /dev/null +++ b/src/assets/images/dashboard/ssgl.png Binary files differ diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg new file mode 100644 index 0000000..7c67734 --- /dev/null +++ b/src/assets/images/dashboard/tiaoya.jpg Binary files differ diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png new file mode 100644 index 0000000..ca9e409 --- /dev/null +++ b/src/assets/images/dashboard/tingyong.png Binary files differ diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg new file mode 100644 index 0000000..9776ec0 --- /dev/null +++ b/src/assets/images/dashboard/well.jpg Binary files differ diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png new file mode 100644 index 0000000..2cfaeee --- /dev/null +++ b/src/assets/images/dashboard/zaixian.png Binary files differ diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png new file mode 100644 index 0000000..eb3d146 --- /dev/null +++ b/src/assets/images/dashboard/zjjc.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index 9801c1b..7a95e43 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,6 +18,7 @@ ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] + BarChartDouble: typeof import('./components/Echart/BarChartDouble.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue new file mode 100644 index 0000000..8a54ec3 --- /dev/null +++ b/src/components/Echart/BarChartDouble.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..89fcd01 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -288,7 +288,7 @@ const series: lineSeriesOption = { name: item.name, // 线系列名 type: 'line', - symbol: 'none', // 去掉折线节点 + symbol: item.symbol || 'none', // 去掉折线节点 smooth: props.smooth, // 曲线平滑设置 lineStyle: { width: 2, diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 4d8cae8..e247e28 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -96,24 +96,24 @@ const table = ref>() const singleChecked = ref(' ') // 单选选中id // 初始化列显示状态 -function initColumnsState() { - columnsChecked.value = [] - for (const column of props.columns) { - columnsChecked.value.push({ text: column.text, show: !!column.show }) - } -} +// function initColumnsState() { +// columnsChecked.value = [] +// for (const column of props.columns) { +// columnsChecked.value.push({ text: column.text, show: !!column.show }) +// } +// } // 最终展示列 -const columnsFiltered: Ref = ref([]) +// const columnsFiltered: Ref = ref([]) // 切换列 -function changeColumns() { - columnsFiltered.value = [] - for (const i in props.columns) { - if (columnsChecked.value[i].show === true) { - columnsFiltered.value.push(props.columns[i]) - } - } -} +// function changeColumns() { +// columnsFiltered.value = [] +// for (const i in props.columns) { +// if (columnsChecked.value[i].show === true) { +// columnsFiltered.value.push(props.columns[i]) +// } +// } +// } // 计算索引值方法 function indexMethod(index: number) { return props.query.limit * (props.query.offset - 1) + index + 1 @@ -143,10 +143,10 @@ emit('rowDbClick', row) } // 监听columns -watch(props.columns, (val) => { - initColumnsState() - changeColumns() -}) +// watch(props.columns, (val) => { +// initColumnsState() +// changeColumns() +// }) // 多选 const handleSelectionChange = (val: any) => { // console.log(val) @@ -172,12 +172,14 @@ } } defineExpose({ - clearMulti, initColumnsState, table, + clearMulti, + // initColumnsState, + table, }) -onBeforeMount(() => { - initColumnsState() - changeColumns() -}) +// onBeforeMount(() => { +// initColumnsState() +// changeColumns() +// }) // 多选框单选功能 const selectClick = (selection: any, row: any) => { if (!props.isMulti) { diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 791747a..d0a8430 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -1,6 +1,7 @@ + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue new file mode 100644 index 0000000..1579231 --- /dev/null +++ b/src/views/home/alarm/count/components/deptCount.vue @@ -0,0 +1,129 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue new file mode 100644 index 0000000..90399a1 --- /dev/null +++ b/src/views/home/alarm/count/components/layout.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ $props.title }} + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue new file mode 100644 index 0000000..a4c32cf --- /dev/null +++ b/src/views/home/alarm/count/components/locationAnalysis.vue @@ -0,0 +1,105 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue new file mode 100644 index 0000000..f14ee15 --- /dev/null +++ b/src/views/home/alarm/count/components/overallAlarm.vue @@ -0,0 +1,81 @@ + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue new file mode 100644 index 0000000..cea2495 --- /dev/null +++ b/src/views/home/alarm/count/components/trendAnalysis.vue @@ -0,0 +1,138 @@ + + + + + + + + + + 今日 + + + 本周 + + + 本月 + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue index 37bd226..1317575 100644 --- a/src/views/home/alarm/count/index.vue +++ b/src/views/home/alarm/count/index.vue @@ -1,9 +1,28 @@ + - 报警统计 + + + + + + + + + + + + + diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue new file mode 100644 index 0000000..d8f0859 --- /dev/null +++ b/src/views/home/alarm/current/components/map.vue @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue index 707b8dc..743e384 100644 --- a/src/views/home/alarm/current/index.vue +++ b/src/views/home/alarm/current/index.vue @@ -4,20 +4,24 @@ Date: 2023-06-28 --> @@ -106,43 +219,114 @@ /> - - - - - - - 导出 - - - - - + + - - - - - {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} - - - - - - - - 查看 {{ scope }} + + + + + + 导出 + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + - - - - + + + + + 查看 {{ scope.$index }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue index 94ef71e..37566c7 100644 --- a/src/views/home/alarm/history/index.vue +++ b/src/views/home/alarm/history/index.vue @@ -1,3 +1,240 @@ + + + - 历史报警 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 导出 + + + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + + + + + + + 查看 {{ scope.$index }} + + + + + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts new file mode 100644 index 0000000..ac7db9f --- /dev/null +++ b/src/views/home/dashboard/components/imgData.ts @@ -0,0 +1,14 @@ +export const img = { + bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url), + czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url), + dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url), + guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url), + gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url), + lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url), + ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url), + tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url), + tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url), + well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url), + zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url), + zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url), +} diff --git a/src/views/home/dashboard/components/showCard.vue b/src/views/home/dashboard/components/showCard.vue new file mode 100644 index 0000000..8650062 --- /dev/null +++ b/src/views/home/dashboard/components/showCard.vue @@ -0,0 +1,63 @@ + + + + + + + + {{ title }} + >>更多 + + + + + + + + + + diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue index 47658b0..3fc5cec 100644 --- a/src/views/home/dashboard/index.vue +++ b/src/views/home/dashboard/index.vue @@ -1,3 +1,395 @@ + + + - 首页 + + + + + + + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + {{ item.unit }} + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + 【{{ item.alarmTypeName }}】 + {{ item.alarmContent }} + + {{ item.alarmTime }} + + + + + + + + + + + + 内容1111111111111 + + + + + + 内容1111111111111 + + + + + + + + + 内容1111111111111 + + + + + + 内容1111111111111 + + + + + +