Merge branch 'dev-jack' into shenzhen-dev

src/assets/js/http.js

@@ -40,14 +40,14 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
   // 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.125:6023/' //杨意本地 http/1.1
-    axios.defaults.baseURL = 'http://192.168.34.216:6023/'   // 邱平毅本地
+  // axios.defaults.baseURL = 'http://192.168.34.216:6023/'   // 邱平毅本地
   // 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/'; 
+  // axios.defaults.baseURL = 'http://139.9.66.234:8/';
-    // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
+  // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
-    // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
+  // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
-    // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
+  // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
 
   // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
   // axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上

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

@@ -0,0 +1,14 @@
+<template>
+  <Card title="质安管理时间轴">
+    质安管理时间轴
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

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

@@ -0,0 +1,14 @@
+<template>
+  <Card title="质量检测">
+    质量检测
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

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

@@ -0,0 +1,14 @@
+<template>
+  <Card title="混泥土浇筑">
+    混泥土浇筑
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

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

@@ -1,16 +1,48 @@
 <template>
-  <div class="gov-comp">gov-comp</div>
+  <div class="gov-comp">
+    <div class="col">
+      <div class="top"><LeftTop /></div>
+      <div class="middle"><LeftMiddle /></div>
+      <div class="bottom"><LeftBottom /></div>
+    </div>
+    <div class="col"><Col2 /></div>
+    <div class="col"><Col3 /></div>
+    <div class="col"><Col4 /></div>
+  </div>
 </template>
 
 <script>
-export default {}
+import LeftTop from './leftTop.vue'
+import LeftMiddle from './leftMiddle.vue'
+import LeftBottom from './leftBottom.vue'
+import Col2 from './Col2.vue'
+import Col3 from './Col3.vue'
+import Col4 from './Col4.vue'
+export default {
+  components: { LeftTop, LeftMiddle, LeftBottom, Col2, Col3, Col4 }
+}
 </script>
 
 <style lang="less" scoped>
 .gov-comp {
   width: 100%;
   height: 100%;
-  background: url(../assets/temp/9.png) no-repeat;
+  // background: url(../assets/temp/9.png) no-repeat;
-  background-size: 100% 100%;
+  // background-size: 100% 100%;
+  display: flex;
+  justify-content: space-between;
+  .col {
+    width: 24%;
+    height: 100%;
+    .top {
+      height: 33%;
+    }
+    .middle {
+      height: 30%;
+    }
+    .bottom {
+      height: 37%;
+    }
+  }
 }
 </style>

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

@@ -0,0 +1,14 @@
+<template>
+  <Card title="疫情防控">
+    疫情防控
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

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

@@ -0,0 +1,14 @@
+<template>
+  <Card title="监督巡查">
+    监督巡查
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

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

@@ -0,0 +1,14 @@
+<template>
+  <Card title="基本信息">
+    基本信息
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

src/views/projectAdmin/zjsj/monitor/index.vue

@@ -1,5 +1,7 @@
 <template>
-  <div class="monitor">monitor</div>
+  <div class="monitor">
+    <div class="video" v-for="i in 12" :key="i"></div>
+  </div>
 </template>
 
 <script>
@@ -10,7 +12,15 @@ export default {}
 .monitor {
   width: 100%;
   height: 100%;
-  background: url(../assets/temp/8.png) no-repeat;
+  // background: url(../assets/temp/8.png) no-repeat;
-  background-size: 100% 100%;
+  // background-size: 100% 100%;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  .video {
+    width: 24.5%;
+    height: 32%;
+    border: 1px solid skyblue;
+  }
 }
 </style>

src/views/projectAdmin/zjsj/quality/index.vue

@@ -1,16 +1,48 @@
 <template>
-  <div class="quality">quality</div>
+  <div class="quality">
+    <div class="left">
+      <div class="top"><LeftTop /></div>
+      <div class="middle"><LeftMiddle /></div>
+      <div class="bottom"><LeftBottom /></div>
+    </div>
+    <div class="right"><Right /></div>
+  </div>
 </template>
 
 <script>
-export default {}
+import LeftTop from './leftTop.vue'
+import LeftMiddle from './leftMiddle.vue'
+import LeftBottom from './leftBottom.vue'
+import Right from './right.vue'
+export default {
+  components: { LeftTop, LeftMiddle, LeftBottom, Right }
+}
 </script>
 
 <style lang="less" scoped>
 .quality {
   width: 100%;
   height: 100%;
-  background: url(../assets/temp/6.png) no-repeat;
+  // background: url(../assets/temp/6.png) no-repeat;
-  background-size: 100% 100%;
+  // background-size: 100% 100%;
+  display: flex;
+  justify-content: space-between;
+  .left {
+    width: 25%;
+    height: 100%;
+    .top {
+      height: 36%;
+    }
+    .middle {
+      height: 18%;
+    }
+    .bottom {
+      height: 46%;
+    }
+  }
+  .right {
+    width: calc(75% - 20px);
+    height: 100%;
+  }
 }
 </style>

src/views/projectAdmin/zjsj/quality/leftBottom.vue

@@ -0,0 +1,14 @@
+<template>
+  <Card title="大面积混泥土展示">
+    大面积混泥土展示
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

src/views/projectAdmin/zjsj/quality/leftMiddle.vue

@@ -0,0 +1,14 @@
+<template>
+  <Card title="标养室培养">
+    标养室培养
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

src/views/projectAdmin/zjsj/quality/leftTop.vue

@@ -0,0 +1,14 @@
+<template>
+  <Card title="质量巡检">
+    质量巡检
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>

src/views/projectAdmin/zjsj/quality/right.vue

@@ -0,0 +1,14 @@
+<template>
+  <Card title="数字质控">
+    数字质控
+  </Card>
+</template>
+
+<script>
+import Card from '../components/Card.vue'
+export default {
+  components: { Card }
+}
+</script>
+
+<style></style>