diff --git a/src/views/projectAdmin/common/jChart/bar/JBarChart.vue b/src/views/projectAdmin/common/jChart/bar/JBarChart.vue new file mode 100644 index 00000000..71c60199 --- /dev/null +++ b/src/views/projectAdmin/common/jChart/bar/JBarChart.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/projectAdmin/common/jChart/bar/JProgressChart.vue b/src/views/projectAdmin/common/jChart/bar/JProgressChart.vue new file mode 100644 index 00000000..43e188a1 --- /dev/null +++ b/src/views/projectAdmin/common/jChart/bar/JProgressChart.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/src/views/projectAdmin/common/jChart/line/JLineChart.vue b/src/views/projectAdmin/common/jChart/line/JLineChart.vue new file mode 100644 index 00000000..4762da1d --- /dev/null +++ b/src/views/projectAdmin/common/jChart/line/JLineChart.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/src/views/projectAdmin/common/jChart/pie/JNestedRingChart.vue b/src/views/projectAdmin/common/jChart/pie/JNestedRingChart.vue new file mode 100644 index 00000000..103a9656 --- /dev/null +++ b/src/views/projectAdmin/common/jChart/pie/JNestedRingChart.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/views/projectAdmin/common/jChart/pie/JProblemChart.vue b/src/views/projectAdmin/common/jChart/pie/JProblemChart.vue new file mode 100644 index 00000000..0ac1a408 --- /dev/null +++ b/src/views/projectAdmin/common/jChart/pie/JProblemChart.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/src/views/projectAdmin/common/jChart/pie/JRingChart.vue b/src/views/projectAdmin/common/jChart/pie/JRingChart.vue new file mode 100644 index 00000000..35432e35 --- /dev/null +++ b/src/views/projectAdmin/common/jChart/pie/JRingChart.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/assets/images/sourse/bg-car-count.png b/src/views/projectAdmin/zjsj/assets/images/sourse/bg-car-count.png new file mode 100644 index 00000000..6181af16 Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/sourse/bg-car-count.png differ diff --git a/src/views/projectAdmin/zjsj/cim/index.vue b/src/views/projectAdmin/zjsj/cim/index.vue index cb58eb39..4fa17a12 100644 --- a/src/views/projectAdmin/zjsj/cim/index.vue +++ b/src/views/projectAdmin/zjsj/cim/index.vue @@ -1,6 +1,6 @@ @@ -37,8 +37,8 @@ export default { color: #fff; display: flex; justify-content: space-between; - background: url(../assets/temp/2.png) no-repeat; - background-size: 100% 100%; + // background: url(../assets/temp/2.png) no-repeat; + // background-size: 100% 100%; .between { width: 20%; height: 100%; @@ -52,7 +52,7 @@ export default { .center { width: calc(60% - 40px); height: 100%; - background: skyblue; + border: 1px solid skyblue; } } diff --git a/src/views/projectAdmin/zjsj/cim/leftBottom.vue b/src/views/projectAdmin/zjsj/cim/leftBottom.vue index 74ea4220..f89fe298 100644 --- a/src/views/projectAdmin/zjsj/cim/leftBottom.vue +++ b/src/views/projectAdmin/zjsj/cim/leftBottom.vue @@ -1,6 +1,8 @@ @@ -11,4 +13,19 @@ export default { } - + diff --git a/src/views/projectAdmin/zjsj/cim/leftTop.vue b/src/views/projectAdmin/zjsj/cim/leftTop.vue index 7ef1bb86..e93d7934 100644 --- a/src/views/projectAdmin/zjsj/cim/leftTop.vue +++ b/src/views/projectAdmin/zjsj/cim/leftTop.vue @@ -1,14 +1,63 @@ - + diff --git a/src/views/projectAdmin/zjsj/cim/rightBottom.vue b/src/views/projectAdmin/zjsj/cim/rightBottom.vue index 40296e6d..4a48ecd8 100644 --- a/src/views/projectAdmin/zjsj/cim/rightBottom.vue +++ b/src/views/projectAdmin/zjsj/cim/rightBottom.vue @@ -1,14 +1,82 @@ - + diff --git a/src/views/projectAdmin/zjsj/cim/rightTop.vue b/src/views/projectAdmin/zjsj/cim/rightTop.vue index 81d33233..9ff8e77f 100644 --- a/src/views/projectAdmin/zjsj/cim/rightTop.vue +++ b/src/views/projectAdmin/zjsj/cim/rightTop.vue @@ -1,14 +1,74 @@ - + diff --git a/src/views/projectAdmin/zjsj/progress/index.vue b/src/views/projectAdmin/zjsj/progress/index.vue index 1f8188f4..1ba20a3b 100644 --- a/src/views/projectAdmin/zjsj/progress/index.vue +++ b/src/views/projectAdmin/zjsj/progress/index.vue @@ -6,14 +6,34 @@ -
+
+
+
{{ v.date }}
+
{{ v.name }}
+
+
@@ -39,7 +59,41 @@ export default { } .bottom { height: 26%; - border: 1px solid skyblue; + color: #fff; + display: flex; + align-items: center; + .progress-item { + position: relative; + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + &::before { + content: ''; + width: 8px; + height: 8px; + background-color: #fff; + border: 1px solid #2de1fa; + border-radius: 50%; + } + &:not(:last-child)::after { + content: ''; + position: absolute; + left: 50%; + bottom: calc(100% - 5px); + width: 100%; + height: 1px; + background-color: #ccc; + } + &.success::after { + background-color: #2de1fa; + } + .date { + margin: 4px 0; + font-size: 12px; + color: #ddd; + } + } } } diff --git a/src/views/projectAdmin/zjsj/progress/topRight.vue b/src/views/projectAdmin/zjsj/progress/topRight.vue index 0a41b0bc..fbba0f01 100644 --- a/src/views/projectAdmin/zjsj/progress/topRight.vue +++ b/src/views/projectAdmin/zjsj/progress/topRight.vue @@ -1,14 +1,83 @@ - + diff --git a/src/views/projectAdmin/zjsj/sourse/components/CarTable.vue b/src/views/projectAdmin/zjsj/sourse/components/CarTable.vue new file mode 100644 index 00000000..0aaa89fe --- /dev/null +++ b/src/views/projectAdmin/zjsj/sourse/components/CarTable.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/sourse/components/MaterialTable.vue b/src/views/projectAdmin/zjsj/sourse/components/MaterialTable.vue new file mode 100644 index 00000000..d9c3fb5a --- /dev/null +++ b/src/views/projectAdmin/zjsj/sourse/components/MaterialTable.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/sourse/index.vue b/src/views/projectAdmin/zjsj/sourse/index.vue index 027573bd..250e8699 100644 --- a/src/views/projectAdmin/zjsj/sourse/index.vue +++ b/src/views/projectAdmin/zjsj/sourse/index.vue @@ -1,6 +1,6 @@ @@ -36,8 +36,8 @@ export default { color: #fff; display: flex; justify-content: space-between; - background: url(../assets/temp/3.png) no-repeat; - background-size: 100% 100%; + // background: url(../assets/temp/3.png) no-repeat; + // background-size: 100% 100%; .left { width: 22%; height: 100%; diff --git a/src/views/projectAdmin/zjsj/sourse/leftBottom.vue b/src/views/projectAdmin/zjsj/sourse/leftBottom.vue index e438dabb..c6804fae 100644 --- a/src/views/projectAdmin/zjsj/sourse/leftBottom.vue +++ b/src/views/projectAdmin/zjsj/sourse/leftBottom.vue @@ -1,14 +1,23 @@ - + diff --git a/src/views/projectAdmin/zjsj/sourse/leftTop.vue b/src/views/projectAdmin/zjsj/sourse/leftTop.vue index b27a1d69..a0bcea67 100644 --- a/src/views/projectAdmin/zjsj/sourse/leftTop.vue +++ b/src/views/projectAdmin/zjsj/sourse/leftTop.vue @@ -1,14 +1,50 @@ - + diff --git a/src/views/projectAdmin/zjsj/sourse/rightBottom.vue b/src/views/projectAdmin/zjsj/sourse/rightBottom.vue index f6f393d9..52dc8fd0 100644 --- a/src/views/projectAdmin/zjsj/sourse/rightBottom.vue +++ b/src/views/projectAdmin/zjsj/sourse/rightBottom.vue @@ -1,14 +1,28 @@ - + diff --git a/src/views/projectAdmin/zjsj/sourse/rightTop.vue b/src/views/projectAdmin/zjsj/sourse/rightTop.vue index 30c1c9b0..c894b927 100644 --- a/src/views/projectAdmin/zjsj/sourse/rightTop.vue +++ b/src/views/projectAdmin/zjsj/sourse/rightTop.vue @@ -1,13 +1,42 @@