diff --git a/src/components/e-charts/multiple_circle.vue b/src/components/e-charts/multiple_circle.vue index 7851ae83ed0d3f4a02cf7cfc7c1f6ac47db185c4..0e1bed0a7cb180eace2933f4dd4afe3abee75e33 100644 --- a/src/components/e-charts/multiple_circle.vue +++ b/src/components/e-charts/multiple_circle.vue @@ -24,6 +24,10 @@ export default { bar_width: { type: Number, default: 5 + }, + color:{ + type:Array, + default:null } }, components: {}, @@ -76,7 +80,7 @@ export default { }; var data = []; var total = 0; - var color = ["#274fee", "#25bdb1", "#ffc95c", "#e56600", "#e15260"]; + var color = this.color?this.color:["#274fee", "#25bdb1", "#ffc95c", "#e56600", "#e15260"]; var legendarr = []; var temp2_data = 0; data_val.forEach(e => { diff --git a/src/components/e-charts/process-top-list.vue b/src/components/e-charts/process-top-list.vue new file mode 100644 index 0000000000000000000000000000000000000000..c6aff89b22ad81bed609520e4e13076f1a69bb02 --- /dev/null +++ b/src/components/e-charts/process-top-list.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue index 46ec67705a093dac837dcfb9b47cc2617a50b2dd..1282faa7fdf791d217944f8874f3d6188d2d9d42 100644 --- a/src/components/table/table-um.vue +++ b/src/components/table/table-um.vue @@ -200,7 +200,7 @@ {{ scope.row[item.prop] }} - {{ scope.row[item.prop] }} + {{ scope.row[item.prop] }} {{ scope.row[item.prop] }} diff --git a/src/pages/workbench/component-center/process-management/monitoring/index.vue b/src/pages/workbench/component-center/process-management/monitoring/index.vue index 1fb81f36adc54dd391c54cf01dfad9a04ea82190..2456a81ea98b7fb0a6720442dab605ecf63951de 100644 --- a/src/pages/workbench/component-center/process-management/monitoring/index.vue +++ b/src/pages/workbench/component-center/process-management/monitoring/index.vue @@ -1,5 +1,392 @@ + + + + diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue index e958369224c8ca885d3a9e0e2c8d773a3cc42b7e..dc061a2058817ce707618d365fd3dfd38cc71d06 100644 --- a/src/pages/workbench/yygl/app_detail.vue +++ b/src/pages/workbench/yygl/app_detail.vue @@ -161,6 +161,7 @@ :auto-upload="false" :on-success="upload_success" :on-error="upload_error" + :on-change="change_file_state" :data="anotherData1" :multiple="false" > @@ -493,10 +494,17 @@ export default { this.now_page = 1; this.image_arr = []; this.get_image_list(); + this.get_file_name(); } else { this.$message.error(response.errMsg); } }, + change_file_state(file,fileList){ + console.log(file,fileList); + if(fileList.length>=2){ + this.fileList = [file] + } + }, upload_error() { this.$message.error("上传失败"); },