diff --git a/src/views/projectAdmin/fourEngin/govComp/Col2.vue b/src/views/projectAdmin/fourEngin/govComp/Col2.vue
index 3ba3f8f5..6e542406 100644
--- a/src/views/projectAdmin/fourEngin/govComp/Col2.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/Col2.vue
@@ -44,31 +44,31 @@ export default {
return {
contentList: [
{
- time: "2022-11-21",
+ time: "2022-12-24",
question: 1,
utils: "中国建筑第四工程局有限公司",
safe: "谢文乐、陈鑫华",
- type: "安全",
- position: "5号桩",
+ type: "质量",
+ position: "首块地板",
change: "是"
},
{
- time: "2022-11-7",
+ time: "2022-11-2",
question: 1,
utils: "中国建筑第四工程局有限公司",
safe: "唐鹏程、陈鑫华",
- type: "安全",
- position: "25号桩",
- change: "是"
+ type: "质量",
+ position: "人工挖空终孔",
+ change: "否"
},
{
- time: "2022-10-25",
+ time: "2022-10-18",
question: 1,
utils: "中国建筑第四工程局有限公司",
safe: "周凌杰、唐鹏程",
- type: "安全",
- position: "垫层",
- change: "是"
+ type: "质量",
+ position: "天然地基",
+ change: "否"
},
{
time: "2022-10-11",
@@ -77,7 +77,7 @@ export default {
safe: "陈鑫华、唐鹏程",
type: "安全",
position: "基坑承台垫层",
- change: "是"
+ change: "否"
},
{
time: "2022-09-24",
@@ -95,7 +95,7 @@ export default {
safe: "唐鹏程、谢文乐",
type: "安全",
position: "14号桩",
- change: "是"
+ change: "否"
},
{
time: "2022-08-27",
@@ -104,7 +104,7 @@ export default {
safe: "谢文乐、周凌杰",
type: "安全",
position: "抗拔实验基础",
- change: "是"
+ change: "否"
},
{
time: "2022-08-13",
@@ -113,7 +113,7 @@ export default {
safe: "陈鑫华、周凌杰",
type: "安全",
position: "25号桩",
- change: "是"
+ change: "否"
},
{
time: "2022-07-22",
@@ -122,7 +122,7 @@ export default {
safe: "周凌杰、谢文乐",
type: "安全",
position: "20号桩",
- change: "是"
+ change: "否"
},
{
time: "2022-07-18",
@@ -131,7 +131,7 @@ export default {
safe: "周凌杰、唐鹏程",
type: "安全",
position: "5号桩",
- change: "是"
+ change: "否"
},
{
time: "2022-06-25",
@@ -140,7 +140,7 @@ export default {
safe: "唐鹏程、陈鑫华",
type: "安全",
position: "21号桩",
- change: "是"
+ change: "否"
},
{
time: "2022-06-11",
@@ -149,7 +149,7 @@ export default {
safe: "唐鹏程、陈鑫华",
type: "安全",
position: "三级沉淀池垫层",
- change: "是"
+ change: "否"
},
{
@@ -159,7 +159,7 @@ export default {
safe: "谢文乐、周凌杰",
type: "安全",
position: "4号桩",
- change: "是"
+ change: "否"
},
{
@@ -169,7 +169,7 @@ export default {
safe: "谢文乐、陈鑫华",
type: "安全",
position: "25号桩",
- change: "是"
+ change: "否"
},
]
};
diff --git a/src/views/projectAdmin/fourEngin/govComp/Col4.vue b/src/views/projectAdmin/fourEngin/govComp/Col4.vue
index 6b280c41..9e9458a8 100644
--- a/src/views/projectAdmin/fourEngin/govComp/Col4.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/Col4.vue
@@ -6,7 +6,7 @@
@@ -23,7 +23,7 @@
>
{{ item.date }}
- {{ item.building }}
+ {{ item.building }}
{{ item.quantity }}m³
@@ -42,126 +42,165 @@ export default {
return {
dataList: [
{
- date: "2022.12.20",
- building: "3号桩",
+ date: "2022/12/28",
+ building: "1/2轴往西3.5米-8轴×C轴往北4.5米-K轴承台底板",
+ quantity: 1124.5,
+ },
+ {
+ date: "2022/12/27",
+ building: "1/2轴往西3.5米-8轴×C轴往北4.5米-K轴承台底板",
+ quantity: 2000,
+ },
+ {
+ date: "2022/12/26",
+ building: "1/2轴往西3.5米-8轴×C轴往北4.5米-K轴承台底板",
+ quantity: 1000,
+ },
+ {
+ date: "2022/12/25",
+ building: "1/2轴往西3.5米-8轴×C轴往北4.5米-K轴承台底板",
+ quantity: 1000,
+ },
+ {
+ date: "2022/12/23",
+ building: "1-8轴×A-C轴往北4.5米承台底板",
+ quantity: 1260,
+ },
+ {
+ date: "2022/11/28",
+ building: "3#人工挖孔桩",
quantity: 97,
},
{
- date: "2022.12.20",
- building: "11号桩",
- quantity: 91.5,
- },
- {
- date: "2022.12.15",
- building: "7号桩",
- quantity: 134,
- },
- {
- date: "2022.12.14",
- building: "26号桩",
- quantity: 28,
- },
- {
- date: "2022.12.14",
- building: "16号桩",
- quantity: 91.5,
- },
- {
- date: "2022.12.14",
- building: "14号桩",
- quantity: 98.5,
- },
- {
- date: "2022.12.12",
- building: "20号桩",
- quantity: 120,
- },
- {
- date: "2022.12.12",
- building: "18号桩",
- quantity: 90.5,
- },
- {
- date: "2022.12.12",
- building: "基坑承台垫层",
- quantity: 40,
- },
-
- {
- date: "2022.12.12",
- building: "22号桩",
- quantity: 122,
- },
-
- {
- date: "2022.12.11",
- building: "23号桩",
- quantity: 110,
- },
- {
- date: "2022.12.10",
- building: "基坑承台垫层",
- quantity: 40,
- },
-
- {
- date: "2022.12.7",
- building: "北侧道路",
- quantity: 115,
- },
- {
- date: "2022.12.6",
- building: "21号桩",
- quantity: 132,
- },
- {
- date: "2022.12.6",
- building: "4号桩",
- quantity: 86,
- },
- {
- date: "2022.12.6",
- building: "北侧道路",
- quantity: 47.5,
- },
- {
- date: "2022.12.5",
- building: "北侧道路",
- quantity: 246.5,
- },
- {
- date: "2022.12.3",
- building: "北侧道路",
- quantity: 60.5,
- },
- {
- date: "2022.12.2",
- building: "北侧道路",
- quantity: 90,
- },
-
- {
- date: "2022.11.22",
- building: "垫层",
- quantity: 3,
- },
-
- {
- date: "2022.11.21",
- building: "抗拔实验基础",
- quantity: 13,
- },
-
- {
- date: "2022.11.21",
- building: "5号桩",
+ date: "2022/11/28",
+ building: "5#人工挖孔桩",
quantity: 93,
},
{
- date: "2022.11.20",
- building: "25号桩",
+ date: "2022/11/28",
+ building: "25#人工挖孔桩",
quantity: 31,
},
+ {
+ date: "2022/11/27",
+ building: "8#人工挖孔桩",
+ quantity: 110,
+ },
+ {
+ date: "2022/11/27",
+ building: "28#人工挖孔桩",
+ quantity: 25,
+ },
+ {
+ date: "2022/11/27",
+ building: "6#人工挖孔桩",
+ quantity: 120,
+ },
+ {
+ date: "2022/11/25",
+ building: "7#人工挖孔桩",
+ quantity: 134,
+ },
+ {
+ date: "2022/11/25",
+ building: "27#人工挖孔桩",
+ quantity: 35,
+ },
+ {
+ date: "2022/11/24",
+ building: "9#人工挖孔桩",
+ quantity: 113,
+ },
+ {
+ date: "2022/11/24",
+ building: "26#人工挖孔桩",
+ quantity: 35,
+ },
+ {
+ date: "2022/11/22",
+ building: "11#人工挖孔桩",
+ quantity: 106,
+ },
+ {
+ date: "2022/11/22",
+ building: "22#人工挖孔桩",
+ quantity: 122,
+ },
+ {
+ date: "2022/11/21",
+ building: "10#人工挖孔桩",
+ quantity: 99,
+ },
+ {
+ date: "2022/11/20",
+ building: "2#人工挖孔桩",
+ quantity: 94,
+ },
+ {
+ date: "2022/11/20",
+ building: "12#人工挖孔桩",
+ quantity: 88,
+ },
+ {
+ date: "2022/11/18",
+ building: "17#人工挖孔桩",
+ quantity: 116.5,
+ },
+ {
+ date: "2022/11/17",
+ building: "15#人工挖孔桩",
+ quantity: 105,
+ },
+ {
+ date: "2022/11/17",
+ building: "13#人工挖孔桩",
+ quantity: 96,
+ },
+ {
+ date: "2022/11/15",
+ building: "19#人工挖孔桩",
+ quantity: 100,
+ },
+ {
+ date: "2022/11/15",
+ building: "1#人工挖孔桩",
+ quantity: 85,
+ },
+ {
+ date: "2022/11/14",
+ building: "16#人工挖孔桩",
+ quantity: 91.5,
+ },
+ {
+ date: "2022/11/14",
+ building: "14#人工挖孔桩",
+ quantity: 98.5,
+ },
+ {
+ date: "2022/11/12",
+ building: "18#人工挖孔桩",
+ quantity: 75,
+ },
+ {
+ date: "2022/11/12",
+ building: "20#人工挖孔桩",
+ quantity: 120,
+ },
+ {
+ date: "2022/11/11",
+ building: "23#人工挖孔桩",
+ quantity: 111,
+ },
+ {
+ date: "2022/11/6",
+ building: "21#人工挖孔桩",
+ quantity: 134,
+ },
+ {
+ date: "2022/11/6",
+ building: "4#人工挖孔桩",
+ quantity: 86,
+ },
],
};
},
@@ -189,7 +228,7 @@ export default {
},
xAxis: {
type: "category",
- data: ["2022-8", "2022-9", "2022-10", "2022-11", "2022-12"],
+ data: ["4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
},
axisLabel: {
show: true,
@@ -211,7 +250,7 @@ export default {
},
series: [
{
- data: [12111.5, 12111.5, 12619.5, 12809.5, 12809.5],
+ data: [556, 16, 58, 26, 308,293.5,358.5,2257.5,9270],
type: "line",
smooth: true,
color: "#f56c35",
@@ -301,7 +340,13 @@ export default {
// margin-top: 20px;
color: white;
}
-
+ .addr{
+ width: calc(100% - 80px);
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
.area {
float: right;
color: #63cfd4;
diff --git a/src/views/projectAdmin/fourEngin/govComp/leftTop.vue b/src/views/projectAdmin/fourEngin/govComp/leftTop.vue
index f1517e61..12bb754a 100644
--- a/src/views/projectAdmin/fourEngin/govComp/leftTop.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/leftTop.vue
@@ -9,15 +9,16 @@
-->