中建四局(政企联合):混泥土浇筑模块

public/js/config.js

@@ -16,7 +16,7 @@ var PROJECT = {
 }
 
 
-var PROJECT_TYPE = PROJECT.online_hq
+var PROJECT_TYPE = PROJECT.local_test
 
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs

src/assets/js/http.js

@@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  axios.defaults.baseURL = 'http://192.168.34.216:6023/'   // 邱平毅本地
+  axios.defaults.baseURL = 'http://192.168.34.216:6025/'   // 邱平毅本地
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';

src/components/account.vue

@@ -15,7 +15,7 @@
           <div style="margin-left:10px">
             <p>{{ $store.state.userInfo.companyName }}</p>
             <!-- 横琴和鹤洲不需要客服电话-->
-            <!-- <p v-if="projectType != 'hengqin'">客服电话：{{$store.state.userInfo.customerServicePhone}}</p> -->
+            <p v-if="projectType != 'hengqin'">客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
             <p
               v-if="projectType == 'hengqin' && $store.state.currentProDetail != null "
             >入场码：{{$store.state.currentProDetail.placeCode}}</p>

src/store/index.js

@@ -45,8 +45,8 @@ export default new Vuex.Store({
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
-    UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
+    // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
-    FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+    // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
     /* 2022-05-16 */
     // tag: 部署河南项目时，需要打开这两行代码
     // UPLOADURL: 'http://124.71.178.44:100/upload/image',
@@ -56,8 +56,8 @@ export default new Vuex.Store({
     // UPLOADURL: 'http://192.168.34.125:6023/upload/image',
     // FILEURL: 'http://192.168.34.125:6023/image/',
     // 邱平毅的
-    // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+    UPLOADURL: 'http://192.168.34.216:6023/upload/image',
-    // FILEURL: 'http://192.168.34.216:6023/image/',
+    FILEURL: 'http://192.168.34.216:6023/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式

src/views/projectAdmin/zjsj/govComp/Col2.vue

@@ -150,7 +150,7 @@ export default {
   position: absolute;
   left: 4px;
   height: 100%;
-  border-left: 3px solid #2ac9e2;
+  border-left: 3px solid #274b5f;
 }
 ::v-deep .el-timeline-item__content {
   color: #888e98;

src/views/projectAdmin/zjsj/govComp/Col3.vue

@@ -39,7 +39,12 @@
             <el-table-column prop="date" label="建材类型" width="150"></el-table-column>
             <el-table-column prop="name" label="检测报告数" width="120"></el-table-column>
             <el-table-column prop="address" label="合格数"></el-table-column>
-            <el-table-column prop="rale" style="color:red" label="合格率"></el-table-column>
+            <el-table-column prop="rale" style="color:red" label="合格率">
+               <template slot-scope="scope">
+                <span class="raleRow"
+	          >{{ scope.row.rale }}</span>
+               </template>
+            </el-table-column>
           </el-table>
         </template>
       </div>
@@ -179,6 +184,11 @@ export default {
     color: white;
   }
 }
+.raleRow{
+  color: #5ec2c8 !important;
+  font-weight:bold;
+  
+}
 ::v-deep .el-table {
   color: #7f8691;
 }

src/views/projectAdmin/zjsj/govComp/Col4.vue

@@ -1,14 +1,186 @@
 <template>
   <Card title="混泥土浇筑">
-    混泥土浇筑
+    <div class="contentBox">
+      <div class="point"></div>
+      <span class="mintit">混凝土浇筑统计</span>
+      <div class="rowInfo">
+        <span class="point"></span>
+        <span>混凝土浇筑重量</span>
+        <span style="color:#5ec2c8;">58974㎡</span>
+      </div>
+      <div class="checkChart" ref="checkChart"></div>
+      <div class="midTit">
+        <div class="point"></div>
+        <span class="mintit">混凝土浇筑记录</span>
+      </div>
+      <el-timeline class="timeline">
+        <el-timeline-item timestamp="2022-07-28" placement="top">
+          <el-card>
+            <span>2022-07-28</span>
+            <p>C栋2号楼十一层</p>
+            <span class="area">43㎡</span>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2022-07-28" placement="top">
+          <el-card>
+            <span>2022-07-28</span>
+            <p>C栋2号楼十一层</p>
+            <span class="area">56㎡</span>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2022-07-28" placement="top">
+          <el-card>
+            <span>2022-07-28</span>
+            <p>C栋2号楼十一层</p>
+            <span class="area">39㎡</span>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2022-07-28" placement="top">
+          <el-card>
+            <span>2022-07-28</span>
+            <p>C栋2号楼十一层</p>
+            <span class="area">78㎡</span>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </div>
   </Card>
 </template>
 
 <script>
-import Card from '../components/Card.vue'
+import Card from "../components/Card.vue";
+import echarts from "echarts4";
 export default {
-  components: { Card }
+  components: { Card },
-}
+  mounted() {
+    this.createChart();
+  },
+  methods: {
+    createChart() {
+      const checkChart = echarts.init(this.$refs.checkChart);
+      const option = {
+        grid: {
+          x: "9%", //x 偏移量
+          y: "10%", // y 偏移量
+          width: "86%", // 宽度
+          height: "60%" // 高度
+        },
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          data: ["2022-1", "2022-3", "2022-6", "2022-8"],
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#9ea3ab"
+            }
+          }
+        },
+        yAxis: {
+          type: "value",
+          splitNumber: 4,
+          splitLine: {
+            show: true,
+            lineStyle: {
+              type: "dashed",
+              color: "#777f8a"
+            }
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#9ea3ab"
+            }
+          }
+        },
+        series: [
+          {
+            data: [4500, 5100, 2000, 6200],
+            type: "line",
+            smooth: true,
+            color: "#f56c35"
+            // areaStyle: {
+            //   color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            //     { offset: 0, color: "rgba(213, 97, 52,0.5)" },
+            //     { offset: 1, color: "rgba(213, 97, 52,0.3)" }
+            //   ])
+            // }
+          }
+        ]
+      };
+      checkChart.setOption(option);
+    }
+  }
+};
 </script>
 
-<style></style>
+<style lang="less" scoped>
+.contentBox {
+  width: 100%;
+  height: 100%;
+  color: #c4c7cc;
+  margin-top: 2%;
+  margin-left: 1%;
+  .point {
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    background-color: #c4c7cc;
+    display: inline-block;
+    margin-right: 2%;
+    margin-top: 15px;
+  }
+  .mintit {
+    font-size: 16px;
+    color: #c4c7cc;
+  }
+  .rowInfo {
+    margin-top: 3%;
+    margin-bottom: 3%;
+    height: 40px;
+    line-height: 40px;
+    color: #c4c7cc;
+    background-image: url(../assets/images/common/bg-intro.png);
+    background-size: 100%;
+    background-repeat: no-repeat;
+    span {
+      margin-left: 5%;
+    }
+  }
+  .midTit {
+    margin-bottom: 3%;
+  }
+  .checkChart {
+    width: 95%;
+    height: 21%;
+  }
+  .timeline {
+    height: 30%;
+  }
+}
+::v-deep .el-card {
+  border: none;
+  background-color: #182337;
+  background-image: url(../assets/images/common/bg_time.png);
+  background-size: 100%;
+  background-repeat: no-repeat;
+  span {
+    color: #63cfd4;
+    font-weight: bold;
+  }
+  p {
+    margin-top: 20px;
+    color: white;
+  }
+  .area {
+    float: right;
+    margin-bottom: 20px;
+  }
+}
+::v-deep .el-timeline-item__tail {
+  position: absolute;
+  left: 4px;
+  height: 100%;
+  border-left: 3px solid #274b5f;
+}
+</style>