diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index e7387add2..d9a6d861b 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -14,14 +14,17 @@ @change="tableOnChange" @onHeaderRow='onHeaderRow' > - - {{ text.sortOrder }} 查看 - - +
+ {{ item.db_field_txt }} + 查看 +
+ + - {{ record.dataValue == null? '--': record.dataValue}} + {{ record.dataValue == null? '--': record.dataValue}} {{ record.dataValue }} @@ -32,12 +35,12 @@ - + - + - - - + + + {{ item.label }} - - - + + + - +
{{$t('configurationName')}}: @@ -106,272 +111,281 @@ diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue index a97c3a2f4..3503f05f6 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue @@ -144,7 +144,7 @@ for (let j = 0; j < timeDataList.length; j++) { let time = JSON.stringify(timeDataList[j].time).slice(1, 11) if (time == list[i]) { - data.push([i, timeDataList[j].index, 14, j]) + data.push([i, timeDataList[j].index, 12, j]) } } } @@ -231,6 +231,7 @@ series: [ { type: 'scatter', + color:['#21c9cc'], symbolSize: function(val) { return val[2] * 2 },