diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index 36ba5d382..83c08a32e 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -4,11 +4,54 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@babel/runtime": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "requires": { + "regenerator-runtime": "^0.13.4" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" + } + } + }, + "@riophae/vue-treeselect": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz", + "integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==", + "requires": { + "@babel/runtime": "^7.3.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "easings-css": "^1.0.0", + "fuzzysearch": "^1.0.3", + "is-promise": "^2.1.0", + "lodash": "^4.0.0", + "material-colors": "^1.2.6", + "watch-size": "^2.0.0" + } + }, "@sindresorhus/is": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==" }, + "@svgdotjs/svg.js": { + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/@svgdotjs/svg.js/-/svg.js-3.0.16.tgz", + "integrity": "sha512-yZ4jfP/SeLHEnCi9PIrzienKCrA4vW9+jm5uUV3N5DG2e9zgXLY5FgywK2u8/gMFIeKO0HuqTLFFfWJj+MfMLA==" + }, + "@svgdotjs/svg.panzoom.js": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@svgdotjs/svg.panzoom.js/-/svg.panzoom.js-2.1.1.tgz", + "integrity": "sha512-fsGP+i64jcpaG1UXOmNDUWq2ZLpiMf+EwfHZn5NNnYp5K7J2gk96NcPhzMtgmCUZtu61Ro8Z5D2P3RdzBzpc3g==", + "requires": { + "@svgdotjs/svg.js": "^3.0.16" + } + }, "@types/q": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz", @@ -3576,6 +3619,11 @@ "stream-shift": "^1.0.0" } }, + "easings-css": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/easings-css/-/easings-css-1.0.0.tgz", + "integrity": "sha512-7Uq7NdazNfVtr0RNmPAys8it0zKCuaqxJStYKEl72D3j4gbvXhhaM7iWNbqhA4C94ygCye6VuyhzBRQC4szeBg==" + }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -4461,8 +4509,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -4483,14 +4530,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4505,20 +4550,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4635,8 +4677,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4648,7 +4689,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4663,7 +4703,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4671,14 +4710,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4697,7 +4734,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4778,8 +4814,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4791,7 +4826,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4877,8 +4911,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -4914,7 +4947,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4934,7 +4966,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4978,14 +5009,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -5005,6 +5034,11 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "fuzzysearch": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fuzzysearch/-/fuzzysearch-1.0.3.tgz", + "integrity": "sha1-3/yA9tawQiPyImqnndGUIxCW0Ag=" + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -5942,6 +5976,11 @@ "isobject": "^3.0.1" } }, + "is-promise": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" + }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -6371,6 +6410,11 @@ "object-visit": "^1.0.0" } }, + "material-colors": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", + "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + }, "math-expression-evaluator": { "version": "1.2.17", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", @@ -12354,6 +12398,11 @@ "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz", "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ==" }, + "watch-size": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/watch-size/-/watch-size-2.0.0.tgz", + "integrity": "sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ==" + }, "watchpack": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index 353500894..349632272 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -10,6 +10,9 @@ "build": "node build/build.js" }, "dependencies": { + "@riophae/vue-treeselect": "^0.4.0", + "@svgdotjs/svg.js": "^3.0.16", + "@svgdotjs/svg.panzoom.js": "^2.1.1", "axios": "^0.19.0", "cytoscape": "^3.15.2", "echarts": "^4.7.0", diff --git a/nezha-fronted/src/assets/css/font/iconfont.eot b/nezha-fronted/src/assets/css/font/iconfont.eot index 57e266006..d2441ded8 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.eot and b/nezha-fronted/src/assets/css/font/iconfont.eot differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.svg b/nezha-fronted/src/assets/css/font/iconfont.svg index b63fab621..b27b9f0a5 100644 --- a/nezha-fronted/src/assets/css/font/iconfont.svg +++ b/nezha-fronted/src/assets/css/font/iconfont.svg @@ -20,6 +20,12 @@ Created by iconfont /> + + + + + + diff --git a/nezha-fronted/src/assets/css/font/iconfont.ttf b/nezha-fronted/src/assets/css/font/iconfont.ttf index 03cade8cc..325fb7f9d 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.ttf and b/nezha-fronted/src/assets/css/font/iconfont.ttf differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff b/nezha-fronted/src/assets/css/font/iconfont.woff index 649e60afa..4344d6ee9 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff and b/nezha-fronted/src/assets/css/font/iconfont.woff differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff2 b/nezha-fronted/src/assets/css/font/iconfont.woff2 index 59ee44a1f..57450b8ed 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff2 and b/nezha-fronted/src/assets/css/font/iconfont.woff2 differ diff --git a/nezha-fronted/src/assets/css/nzIcon.css b/nezha-fronted/src/assets/css/nzIcon.css index 17db9601a..b8fd9b520 100644 --- a/nezha-fronted/src/assets/css/nzIcon.css +++ b/nezha-fronted/src/assets/css/nzIcon.css @@ -1,10 +1,10 @@ @font-face {font-family: "nz-icon"; - src: url('font/iconfont.eot?t=1604565299924'); /* IE9 */ - src: url('font/iconfont.eot?t=1604565299924#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), - url('font/iconfont.woff?t=1604565299924') format('woff'), - url('font/iconfont.ttf?t=1604565299924') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('font/iconfont.svg?t=1604565299924#nz-icon') format('svg'); /* iOS 4.1- */ + src: url('font/iconfont.eot?t=1608017748786'); /* IE9 */ + src: url('font/iconfont.eot?t=1608017748786#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), + url('font/iconfont.woff?t=1608017748786') format('woff'), + url('font/iconfont.ttf?t=1608017748786') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('font/iconfont.svg?t=1608017748786#nz-icon') format('svg'); /* iOS 4.1- */ } .nz-icon { @@ -15,6 +15,14 @@ -moz-osx-font-smoothing: grayscale; } +.nz-icon-unlock:before { + content: "\e6e9"; +} + +.nz-icon-lock:before { + content: "\e6e8"; +} + .nz-icon-batch-edit:before { content: "\e600"; } diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index 956bf0569..f96bdc3cc 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -20,7 +20,7 @@ - + {{chartInfo.title}} @@ -61,8 +61,9 @@
{{data.title}}
+
- +
{{$t("project.endpoint.dialogTitle")}}
- +
- + @@ -151,7 +152,8 @@ export default { }, chartInfo:{}, id:'', - from: {type: String} + from: {type: String}, + isLock:{type:Boolean,default:false} }, data() { return { @@ -549,7 +551,7 @@ export default { if(this.searchLabel.orderBy){ queryParam.orderBy=this.searchLabel.orderBy; } - this.startLoading(filterType); + // this.startLoading(filterType); this.$get('/alert/message', queryParam).then(response => { if (response.code == 200) { this.storedTableData = response.data.list; @@ -783,10 +785,6 @@ export default { let container = document.querySelector('#chartTableDiv' + this.chartIndex + " .table-container"); container.style.height = `calc(100% - ${deHeight}px)`; this.tableHeight = `calc(100% - 34px)`; - this.$nextTick(() => { - this.ps = container.querySelector(".el-table__body-wrapper")._ps_; - this.ps.update(); - }); }, showLoad(chartItem) { //设置高度 chart-table @@ -818,7 +816,6 @@ export default { //this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss'); //this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss'); //this.showTable = false; - this.searchTime = [...time]; this.seriesItemScreen = []; for(let i=0;i<8;i++){ this.seriesItemScreen.push({//表格数据 @@ -829,7 +826,7 @@ export default { value: '',//数值 }); } - this.startLoading('screen'); + // this.startLoading('screen'); //this.tableLoading = true; //this.firstShow = false; this.$emit('on-search-data', this.data.id, this.searchTime); diff --git a/nezha-fronted/src/components/charts/chart-detail.vue b/nezha-fronted/src/components/charts/chart-detail.vue index c74bd7c9c..e8550690a 100644 --- a/nezha-fronted/src/components/charts/chart-detail.vue +++ b/nezha-fronted/src/components/charts/chart-detail.vue @@ -7,7 +7,7 @@
-
+
- {{data.title}} + {{data.title}} +
@@ -250,7 +251,7 @@
- +
@@ -286,7 +287,8 @@ chartIndex:{ type: Number, default: 0, - } + }, + isLock:{type:Boolean,default:false} }, data() { return { diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index ad5ff5bd2..56251c812 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -51,7 +51,7 @@ - @@ -86,6 +87,7 @@ @on-drag-chart="editChartForDrag" @on-edit-chart-block="editData" :chart-data="item" + :is-lock="panelLock" :panel-id="filter.panelId" :chart-index="index"> @@ -96,6 +98,7 @@ @on-duplicate-chart-block="duplicateChart" @on-drag-chart="editChartForDrag" @on-edit-chart-block="editData" + :is-lock="panelLock" :panel-id="filter.panelId" :chart-data="item" :chart-index="index"> @@ -106,6 +109,7 @@ @on-remove-chart-block="removeChart" @on-duplicate-chart-block="duplicateChart" @on-drag-chart="editChartForDrag" + :is-lock="panelLock" @on-edit-chart-block="editData" :panel-id="filter.panelId" :chart-data="item" @@ -115,6 +119,7 @@ :from="from" :panel-id="filter.panelId" :chart-index="index" @on-refresh-data="refreshChart" + :is-lock="panelLock" :chart-data="item" :editChartId="'editChartId' + item.id" > @@ -125,6 +130,7 @@ @on-duplicate-chart-block="duplicateChart" @on-drag-chart="editChartForDrag" @on-edit-chart-block="editData" + :is-lock="panelLock" :panel-id="filter.panelId" :chart-data="item" :chart-index="index" @@ -135,6 +141,7 @@ :chart-index="index" v-if="item.type === 'alertList'" :editChartId="'editChartId' + item.id" + :is-lock="panelLock" :chart-info="item" @on-refresh-data="refreshChart" @on-search-data="searchData" @@ -170,7 +177,8 @@ additionalInfo:{}, draggable: {type: Boolean, default: true}, detail: Object, - from: {type: String} + from: {type: String}, + panelLock:{type:Boolean,default:false} }, components: { @@ -219,7 +227,7 @@ this.tempDom.width = span.offsetWidth; }, start (event) { - //console.log('start', event, this.dataList); + // console.log('start', event, this.dataList); event.item.querySelector('.chartTitle').style.background = '#d8dce1'; let projectAndAssetFeatureInfos = event.item.querySelectorAll(".feature-content"); if (projectAndAssetFeatureInfos && projectAndAssetFeatureInfos.length > 0) { diff --git a/nezha-fronted/src/components/charts/chart-single-stat.vue b/nezha-fronted/src/components/charts/chart-single-stat.vue index 12d6a21b3..4b0fb674e 100644 --- a/nezha-fronted/src/components/charts/chart-single-stat.vue +++ b/nezha-fronted/src/components/charts/chart-single-stat.vue @@ -20,7 +20,7 @@ - + {{chartData.title}} @@ -53,9 +53,10 @@
{{data.title}}
- + +
- +
@@ -66,7 +67,7 @@
- +
@@ -101,7 +102,8 @@ export default { type: Number, default: 0, }, - from: {type: String} + from: {type: String}, + isLock:{type:Boolean,default:false} }, data() { return { @@ -344,7 +346,6 @@ export default { }, //全屏时间条件查询 dateChange(time) { - this.searchTime = [...time]; this.seriesItemScreen = []; this.serieSingleStat = ""; this.startLoading('screen'); @@ -384,7 +385,7 @@ export default { this.searchTime = []; this.$set(this.searchTime, 0, this.oldSearchTime[0]); this.$set(this.searchTime, 1, this.oldSearchTime[1]); - this.$refs.calendarPanel.setCustomTime(this.searchTime); + // this.$refs.calendarPanel.setCustomTime(this.searchTime); this.seriesItemScreen = this.seriesItem; this.screenModal = true; diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 8e962879b..8b2293878 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -21,7 +21,7 @@ - + {{chartData.title}} @@ -78,10 +78,11 @@
{{data.title}}
- + + +
- +
@@ -105,7 +106,7 @@ @pageSize='screenPageSize' ref="Pagination" :popper-append-to-body="false"> - + @@ -141,7 +142,8 @@ type: Number, default: 0, }, - from: {type: String} + from: {type: String}, + isLock:{type:Boolean,default:false} }, data() { return { @@ -315,7 +317,6 @@ }, //全屏时间条件查询 dateChange(time) { - this.searchTime = [...time]; this.seriesItemScreen = []; for (let i = 0; i < 8; i++) { this.seriesItemScreen.push({//表格数据 @@ -362,7 +363,7 @@ this.searchTime = []; this.$set(this.searchTime, 0, this.oldSearchTime[0]); this.$set(this.searchTime, 1, this.oldSearchTime[1]); - this.$refs.calendarPanel.setCustomTime(this.searchTime); + // this.$refs.calendarPanel.setCustomTime(this.searchTime); this.seriesItemScreen = this.seriesItem; this.screenModal = true; diff --git a/nezha-fronted/src/components/charts/chart-url.vue b/nezha-fronted/src/components/charts/chart-url.vue index 4d99bb558..a33e12f59 100644 --- a/nezha-fronted/src/components/charts/chart-url.vue +++ b/nezha-fronted/src/components/charts/chart-url.vue @@ -8,7 +8,7 @@
- + {{chartData.title}} @@ -51,7 +51,7 @@
- +
@@ -86,7 +86,8 @@ export default { type: Number, default: 0, }, - from: {type: String} + from: {type: String}, + isLock:{type:Boolean,default:false} }, data() { return { diff --git a/nezha-fronted/src/components/charts/chart.scss b/nezha-fronted/src/components/charts/chart.scss index b063b8be4..bf7f85970 100644 --- a/nezha-fronted/src/components/charts/chart.scss +++ b/nezha-fronted/src/components/charts/chart.scss @@ -277,13 +277,13 @@ height: 100%; position: relative; background-color: white; - .chart-title:hover { + .chartTitle:hover { background-color:#d8dce1; } - .chart-title:not(.drag-disabled) { - cursor: move; - } - .chart-title { + //.chartTitle:not(.drag-disabled) { + // cursor: move; + //} + .chartTitle { text-align: center; width: 100%; line-height: 30px; @@ -292,7 +292,7 @@ .nz-chart-top{ width:100%; } - .el-dropdown-link { + .move-able .el-dropdown-link { cursor: move; } .nz-icon-arrow-down { @@ -506,7 +506,7 @@ .nz-chart-top{ width:100%; } - .el-dropdown-link { + .move-able .el-dropdown-link { cursor: move; } .nz-icon-arrow-down { diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index be9155039..c4d8a8576 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -34,7 +34,7 @@ - + {{chartData.title}} @@ -130,10 +130,10 @@  
- - + +
- +
No Data
@@ -174,7 +174,7 @@ - + @@ -218,7 +218,8 @@ default:false, }, tempDom: Object, - from: {type: String} + from: {type: String}, + isLock:{type:Boolean,default:false} }, computed: { getButtonCode() { @@ -344,8 +345,25 @@ }) } }, - clickLegend(legendName,index){ + let curIsGrey=this.isGrey[index]; + let echart=getChart(this.chartIndex) + if(echart) { + if(curIsGrey){ + echart.dispatchAction({ + type: 'legendSelect', + name: legendName + }) + }else{ + echart.dispatchAction({ + type: 'legendUnSelect', + name: legendName + }) + } + this.$set(this.isGrey,index,!curIsGrey) + } + }, + clickLegend2(legendName,index){ //点击图表某一个legend，图表只显示当前点击的曲线或柱状图，其它隐藏，再次点击已选中的legend ，显示全部 let curIsGrey=this.isGrey[index]; if(getChart(this.chartIndex)){ @@ -393,6 +411,23 @@ } }, clickScreenLegend(legendName,index){ + let curIsGrey=this.isGreyScreen[index]; + if(this.echartModalStore) { + if(curIsGrey){ + this.echartModalStore.dispatchAction({ + type: 'legendSelect', + name: legendName + }) + }else{ + this.echartModalStore.dispatchAction({ + type: 'legendUnSelect', + name: legendName + }) + } + this.$set(this.isGreyScreen,index,!curIsGrey) + } + }, + clickScreenLegend2(legendName,index){ //点击图表某一个legend，图表只显示当前点击的曲线或柱状图，其它隐藏，再次点击已选中的legend ，显示全部 let curIsGrey=this.isGreyScreen[index]; if(this.echartModalStore){ @@ -645,8 +680,7 @@ if(i===0){ let value=item.data[0]; let t_date = new Date(value); - str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " " - + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':'); + str += bus.timeFormate(t_date) str +=`
`; } let val =item.data[1]?parseFloat(Number(item.data[1]).toFixed(2)):''; @@ -879,8 +913,7 @@ if(i===0){ let value=item.data[0]; let t_date = new Date(value); - str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " " - + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':'); + str += bus.timeFormate(t_date) str +=`
`; } let val = parseFloat(Number(item.data[1]).toFixed(2)); @@ -1043,8 +1076,7 @@ if(i===0){ let value=item.data[0]; let t_date = new Date(value); - str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " " - + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':'); + str += bus.timeFormate(t_date) str +=`
`; } let val = parseFloat(Number(item.data[1]).toFixed(2)); @@ -1262,7 +1294,7 @@ //this.searchTime = this.oldSearchTime; this.$set(this.searchTime, 0, this.oldSearchTime[0]); this.$set(this.searchTime, 1, this.oldSearchTime[1]); - this.$refs.calendarPanel.setCustomTime(this.searchTime); + // this.$refs.calendarPanel.setCustomTime(this.searchTime); this.screenModal = true; this.isGreyScreen=[]; @@ -1300,7 +1332,6 @@ }); }, dateChange(time) { - this.searchTime = [...time]; this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss'); this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss'); this.echartModalStore.clear(); diff --git a/nezha-fronted/src/components/charts/richTextEditor.vue b/nezha-fronted/src/components/charts/richTextEditor.vue index da1ad09a4..36cfea4eb 100644 --- a/nezha-fronted/src/components/charts/richTextEditor.vue +++ b/nezha-fronted/src/components/charts/richTextEditor.vue @@ -11,7 +11,7 @@ export default { name: "richTextEditor", props:{ - editData:String + editData:String, }, data(){ return { diff --git a/nezha-fronted/src/components/charts/text-chart.vue b/nezha-fronted/src/components/charts/text-chart.vue index 1a0be241c..60ac5b7b1 100644 --- a/nezha-fronted/src/components/charts/text-chart.vue +++ b/nezha-fronted/src/components/charts/text-chart.vue @@ -8,7 +8,7 @@
- + {{chartData.title}} @@ -52,7 +52,7 @@
- +
@@ -84,7 +84,8 @@ type: Number, default: 0, }, - from: {type: String} + from: {type: String}, + isLock:{type:Boolean,default:false} }, data() { return { diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue index 98ab4235c..e844115c6 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue @@ -874,7 +874,9 @@ */ }, beforeDestroy(){ - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + } } } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue index 04d1c8d3e..80d9dabdf 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue @@ -55,6 +55,9 @@ + + + +
- +
@@ -108,6 +112,7 @@ name: "panel", data() { return { + panelLock:true, showTopBtn: false, //top按钮 visible: false, rightBox: { //面板弹出框相关 diff --git a/nezha-fronted/src/libs/bus.js b/nezha-fronted/src/libs/bus.js index 2a3a8218c..6ce778520 100644 --- a/nezha-fronted/src/libs/bus.js +++ b/nezha-fronted/src/libs/bus.js @@ -66,7 +66,7 @@ export default new Vue({ } return `${yy}${mm}${dd}`; }, - timeFormate(date, fmt) { + timeFormate(date, fmt='yyyy-MM-dd hh:mm:ss') { const time = new Date(date); let fm = fmt; // fmt 自定义格式,如：yy-MM-dd