Merge branch 'master' into 'master'

static/css/commonArea1.css

+.content_top {
+  height: 1.4rem;
+  background: url("../images/topBg.png") center center no-repeat;
+}
+
+.content_box {
+  width: 13rem;
+  height: 8.8rem;
+  margin: 0.2rem;
+  background: rgba(0, 0, 0, 0.6);
+  padding: 0.25rem 0.52rem;
+  border-radius: 0.1rem;
+}
+
+.padding_box {
+  padding: 0.12rem 0.7rem;
+}
+
+.room_box {
+  position: relative;
+  height: 100%;
+}
+
+.bg_img {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+}
+
+.camera {
+  position: absolute;
+}
\ No newline at end of file

static/css/workshop1.css

+.padding_box {
+    padding: 1.4rem 1rem 0;
+}
+
+.flex-box {
+    display: flex;
+    align-content: center;
+    justify-content: center;
+}
+
+.menu_box {
+    width: 4rem;
+}
+
+.menu_title_box {
+    width: 100%;
+    text-align: center;
+    font-size: 0.32rem;
+    color: #fff;
+}
+
+.tab_list ul {
+    display: block;
+    width: 100%;
+}
+
+.tab_list ul li {
+    color: #fff;
+    font-weight: normal;
+    font-size: 0.24rem;
+    background: rgb(0 35 105 / 70%);
+    margin: 0.2rem 0;
+    border-radius: 0.2rem;
+    line-height: 0.6rem;
+}
+
+.tab_list ul li div {
+    font-size: 0.24rem;
+    justify-content: space-around;
+}
+
+.monitor {
+    font-size: 0.2rem;
+}
+
+.monitor span {
+    background: #006aec;
+    padding: 0.04rem 0.2rem;
+    border-radius: 0.2rem;
+    margin-left: 0.1rem;
+}
+
+.tab_list ul li a {
+    color: #a84c47;
+}
+
+.tab_list ul li.current {
+    line-height: 0.6rem;
+    border: none;
+    background: #006aec;
+    font-weight: normal;
+}
+
+.tab_list ul li.current .monitor span {
+    background: #0055bd;
+}
+
+.content_box {
+    flex: 1;
+}
\ No newline at end of file

wgs/beijian.html

@@ -7,8 +7,8 @@
     <script src="../static/js/jquery-1.8.1.min.js" type=text/javascript></script>
     <script src="../static/js/rem.js"></script>
     <link rel="stylesheet" type="text/css" href="../static/css/common.css" />
-    <link rel="stylesheet" type="text/css" href="../static/css/workshop.css" />
-    <link rel="stylesheet" type="text/css" href="../static/css/commonArea.css" />
+    <link rel="stylesheet" type="text/css" href="../static/css/workshop1.css" />
+    <link rel="stylesheet" type="text/css" href="../static/css/commonArea1.css" />
     <title>上海市人民检察院</title>
 </head>
 <style type="text/css">
@@ -18,9 +18,6 @@
         min-height: 100vh;
         background-size: cover;
     }
-    .padding_box {
-        padding:0.12rem 1rem 0;
-    }
 </style>
 <script type="text/javascript">
     $(function () {

wgs/jiaoyu.html

@@ -7,8 +7,8 @@
     <script src="../static/js/jquery-1.8.1.min.js" type=text/javascript></script>
     <script src="../static/js/rem.js"></script>
     <link rel="stylesheet" type="text/css" href="../static/css/common.css" />
-    <link rel="stylesheet" type="text/css" href="../static/css/workshop.css" />
-    <link rel="stylesheet" type="text/css" href="../static/css/commonArea.css" />
+    <link rel="stylesheet" type="text/css" href="../static/css/workshop1.css" />
+    <link rel="stylesheet" type="text/css" href="../static/css/commonArea1.css" />
     <title>上海市人民检察院</title>
 </head>
 <style type="text/css">
@@ -18,9 +18,6 @@
         min-height: 100vh;
         background-size: cover;
     }
-    .padding_box {
-        padding:0.12rem 1rem 0;
-    }
 </style>
 <script type="text/javascript">
     $(function () {

wgs/playground.html

@@ -24,11 +24,11 @@
 </style>
 <script type="text/javascript">
     var arr = [{
-        top: '1rem',
-        left: '1.6rem'
+        top: '12%',
+        left: '14%'
     }, {
-        top: '1rem',
-        left: '10.46rem',
+        top: '12%',
+        left: '87%',
     }]
     $(function () {
         // 1、点击上面的li，当前点击的li添加current类，其余兄弟移除类

wgs/workshop.html

@@ -7,8 +7,8 @@
     <script src="../static/js/jquery-1.8.1.min.js" type=text/javascript></script>
     <script src="../static/js/rem.js"></script>
     <link rel="stylesheet" type="text/css" href="../static/css/common.css" />
-    <link rel="stylesheet" type="text/css" href="../static/css/workshop.css" />
-    <link rel="stylesheet" type="text/css" href="../static/css/commonArea.css" />
+    <link rel="stylesheet" type="text/css" href="../static/css/workshop1.css" />
+    <link rel="stylesheet" type="text/css" href="../static/css/commonArea1.css" />
     <title>上海市人民检察院</title>
 </head>
 <style type="text/css">
@@ -19,7 +19,7 @@
         background-size: cover;
     }
     .padding_box {
-        padding:0.12rem 1rem 0;
+        align-items: normal;
     }
 </style>
 <script type="text/javascript">