Quellcode durchsuchen

Merge branch 'master' of http://116.63.33.55/git/nazw

FinalYu vor 7 Monaten
Ursprung
Commit
b378be9327

+ 27 - 10
nngkxxdp/src/main/resources/static/naxsb/css/floorcon.css

@@ -8,17 +8,19 @@ body {
     padding: 0;
 }
 .detailDiv {
-    width: 836px;
-    height: 569px;
+    width: 45%;
+    max-width: 836px;
+    max-height: 569px;
+    height: 60%;
     background-image: url(../images/floorbg.png);
     background-size: 100% 100%;
     font-family: Source Han Sans SC;
     color: #2895FF;
-    padding: 40px;
+    padding: 30px;
     box-sizing: border-box;
     position: absolute;
     right: 0;
-    top: 60px;
+    top: 5%;
 }
 
 .detailDiv .top {
@@ -64,9 +66,10 @@ body {
     font-weight: bold;
     font-size: 26px;
     color: #F4F4F4;
-    width: 836px;
+    width: 45%;
+    max-width: 836px;
     position: absolute;
-    bottom: 50px;
+    top: 63%;
     right: 0;
     padding-left: 180px;
     box-sizing: border-box;
@@ -93,7 +96,7 @@ body {
 .ysqgk {
     width: 100%;
     background-color: #fff;
-    height: 375px;
+    height: 100%;
 }
 
 .floorTabs {
@@ -121,14 +124,19 @@ body {
 }
 
 .sxqd {
-    margin-top: 15px;
+    height: calc(100% - 32px);
     padding-left: 25px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-evenly;
+}
+.sxqd ul{
+    padding-top: 0;
+    margin-top: 0;
 }
 
 .sxqd li {
     cursor: pointer;
-    margin-bottom: 10px;
-    cursor: pointer;
 }
 
 .sxqd li span {
@@ -158,4 +166,13 @@ body {
 
 .bottomBtn .active {
     background: #0D74F2;
+}
+.el-tabs{
+    height: calc(100% - 42px);
+}
+.el-tabs__content{
+    height: calc(100% - 58px);
+}
+.el-tabs__content>div{
+    height: 95%;
 }

+ 7 - 2
nngkxxdp/src/main/resources/static/naxsb/floorone.html

@@ -17,7 +17,6 @@
     }
 
     .el-pagination {
-        margin-top: 15px;
         text-align: center;
     }
 
@@ -31,6 +30,12 @@
     .el-pagination.is-background .el-pager li:not(.disabled).active {
         background-color: #2895FF !important;
     }
+
+    .el-tab-pane {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-evenly;
+    }
 </style>
 
 <body>
@@ -71,7 +76,7 @@
         </div>
         <div class="detailDiv" v-if="currentFloor === 2">
             <div class="top">
-                <div style="font-weight: bold;font-size: 26px;">无差别综合办理区您可以办理:</div>
+                <div style="font-weight: bold;font-size: 26px;white-space: nowrap;">无差别综合办理区您可以办理:</div>
                 <div class="right">
                     <span>工作时间:</span>
                     <span>法定工作日 9:00-12:30 14:00-18:00</span>

+ 135 - 117
nngkxxdp/src/main/resources/static/naxsb/qjt.html

@@ -86,6 +86,7 @@
 
         .conList {
             position: absolute;
+            width: 35%;
             height: 40%;
         }
 
@@ -106,22 +107,25 @@
         }
 
         .floortitle {
-            width: 562px;
-            height: 96px;
+            max-width: 562px;
+            width: 100%;
+            max-height: 96px;
+            height: 26%;
             background-image: url(images/qjt-titlebg.png);
-            background-size: cover;
+            background-size: 100% 100%;
             font-family: Microsoft YaHei;
             font-size: 24px;
             color: #FFFFFF;
-            line-height: 110px;
+            display: flex;
             font-style: italic;
             padding-left: 60px;
             box-sizing: border-box;
+            align-items: center;
         }
 
         .floorcontent {
-            width: 559px;
-            height: 70%;
+            width: calc(100% - 40px);
+            height: 72%;
             background: #D3EBFF;
             box-shadow: 5px 9px 9px 0px rgba(17, 126, 202, 0.24);
             border-radius: 20px;
@@ -262,7 +266,7 @@
 
 <body>
 
-    <div class="container" id="ggyq">
+    <div class="container">
         <div class="row">
             <div class="col-sm-12">
                 <div class="model-container"
@@ -270,141 +274,143 @@
                     <div class="model-view">
                         <canvas id="canvas-model-view" style="width: 100%;height: 100%;">您的浏览器不支持canvas!</canvas>
                     </div>
-                    <div class="qjttitle"></div>
-                    <div class="nowtime">{{currentTime }}</div>
-                    <div class="onefloor conList">
-                        <div class="floortitle">1号楼概览</div>
-                        <div class="floorcontent">
-                            <div class="list blue">
-                                <div class="top radio">1号楼当前排队人数:</div>
-                                <div class="bottom">
-                                    <img src="images/floor1.png" alt="">
-                                    <div><span class="number">12</span>
-                                        <span>人</span>
+                    <div id="qjt">
+                        <div class="qjttitle"></div>
+                        <div class="nowtime">{{currentTime }}</div>
+                        <div class="onefloor conList">
+                            <div class="floortitle">1号楼概览</div>
+                            <div class="floorcontent">
+                                <div class="list blue">
+                                    <div class="top radio">1号楼当前排队人数:</div>
+                                    <div class="bottom">
+                                        <img src="images/floor1.png" alt="">
+                                        <div><span class="number">12</span>
+                                            <span>人</span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="list yellow">
-                                <div class="top radio">可办事项数量:</div>
-                                <div class="bottom">
-                                    <img src="images/floor2.png" alt="">
-                                    <div><span class="number">798</span>
-                                        <span>项</span>
+                                <div class="list yellow">
+                                    <div class="top radio">可办事项数量:</div>
+                                    <div class="bottom">
+                                        <img src="images/floor2.png" alt="">
+                                        <div><span class="number">798</span>
+                                            <span>项</span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="list green">
-                                <div class="top radio">平均等待时长:</div>
-                                <div class="bottom">
-                                    <img src="images/floor2.png" alt="">
-                                    <div><span class="number">2</span>
-                                        <span>分钟</span>
+                                <div class="list green">
+                                    <div class="top radio">平均等待时长:</div>
+                                    <div class="bottom">
+                                        <img src="images/floor2.png" alt="">
+                                        <div><span class="number">2</span>
+                                            <span>分钟</span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="list purple">
-                                <div class="top radio">窗口数:</div>
-                                <div class="bottom">
-                                    <img src="images/floor2.png" alt="">
-                                    <div><span class="number">28</span>
-                                        <span>个</span>
+                                <div class="list purple">
+                                    <div class="top radio">窗口数:</div>
+                                    <div class="bottom">
+                                        <img src="images/floor2.png" alt="">
+                                        <div><span class="number">28</span>
+                                            <span>个</span>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="twofloor conList">
-                        <div class="floortitle">2号楼概览</div>
-                        <div class="floorcontent">
-                            <div class="list blue">
-                                <div class="top radio">2号楼当前排队人数:</div>
-                                <div class="bottom">
-                                    <img src="images/floor1.png" alt="">
-                                    <div><span class="number">12</span>
-                                        <span>人</span>
+                        <div class="twofloor conList">
+                            <div class="floortitle">2号楼概览</div>
+                            <div class="floorcontent">
+                                <div class="list blue">
+                                    <div class="top radio">2号楼当前排队人数:</div>
+                                    <div class="bottom">
+                                        <img src="images/floor1.png" alt="">
+                                        <div><span class="number">12</span>
+                                            <span>人</span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="list yellow">
-                                <div class="top radio">可办事项数量:</div>
-                                <div class="bottom">
-                                    <img src="images/floor2.png" alt="">
-                                    <div><span class="number">798</span>
-                                        <span>项</span>
+                                <div class="list yellow">
+                                    <div class="top radio">可办事项数量:</div>
+                                    <div class="bottom">
+                                        <img src="images/floor2.png" alt="">
+                                        <div><span class="number">798</span>
+                                            <span>项</span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="list green">
-                                <div class="top radio">平均等待时长:</div>
-                                <div class="bottom">
-                                    <img src="images/floor2.png" alt="">
-                                    <div><span class="number">2</span>
-                                        <span>分钟</span>
+                                <div class="list green">
+                                    <div class="top radio">平均等待时长:</div>
+                                    <div class="bottom">
+                                        <img src="images/floor2.png" alt="">
+                                        <div><span class="number">2</span>
+                                            <span>分钟</span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="list purple">
-                                <div class="top radio">窗口数:</div>
-                                <div class="bottom">
-                                    <img src="images/floor2.png" alt="">
-                                    <div><span class="number">28</span>
-                                        <span>个</span>
+                                <div class="list purple">
+                                    <div class="top radio">窗口数:</div>
+                                    <div class="bottom">
+                                        <img src="images/floor2.png" alt="">
+                                        <div><span class="number">28</span>
+                                            <span>个</span>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="blsl conList">
-                        <div class="floortitle">累计办理数量</div>
-                        <div class="floorcontent">
-                            <div class="list">
-                                <div class="img">
-                                    <img src="images/blsl1.png" alt="">
-                                </div>
-                                <div class="right">
-                                    <span>本日办理数量</span>
-                                    <div class="number">
-                                        <span>98</span>
-                                        <span>项</span>
+                        <div class="blsl conList">
+                            <div class="floortitle">累计办理数量</div>
+                            <div class="floorcontent">
+                                <div class="list">
+                                    <div class="img">
+                                        <img src="images/blsl1.png" alt="">
                                     </div>
-                                </div>
-                            </div>
-                            <div class="list">
-                                <div class="img">
-                                    <img src="images/blsl2.png" alt="">
-                                </div>
-                                <div class="right">
-                                    <span>本月办理数量</span>
-                                    <div class="number">
-                                        <span>1298</span>
-                                        <span>项</span>
+                                    <div class="right">
+                                        <span>本日办理数量</span>
+                                        <div class="number">
+                                            <span>98</span>
+                                            <span>项</span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="list">
-                                <div class="img">
-                                    <img src="images/blsl3.png" alt="">
+                                <div class="list">
+                                    <div class="img">
+                                        <img src="images/blsl2.png" alt="">
+                                    </div>
+                                    <div class="right">
+                                        <span>本月办理数量</span>
+                                        <div class="number">
+                                            <span>1298</span>
+                                            <span>项</span>
+                                        </div>
+                                    </div>
                                 </div>
-                                <div class="right">
-                                    <span>本年办理数量</span>
-                                    <div class="number">
-                                        <span>6298</span>
-                                        <span>项</span>
+                                <div class="list">
+                                    <div class="img">
+                                        <img src="images/blsl3.png" alt="">
+                                    </div>
+                                    <div class="right">
+                                        <span>本年办理数量</span>
+                                        <div class="number">
+                                            <span>6298</span>
+                                            <span>项</span>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="pdgdf conList">
-                        <div class="floortitle">大厅排队高低峰图</div>
-                        <div class="floorcontent">
-                            <div id="pdgdfechart" style="width: 100%;height: 100%;"></div>
-                        </div>
-                        <div class="text">
-                            <span style="font-size: 18px;font-weight: bold;margin-bottom: 5px;">地铁6号线</span>
-                            <span>邱家湾站2B出口</span>
-                            <span>距离:800米</span>
-                            <img src="images/qjtArrow.png" alt="">
+                        <div class="pdgdf conList">
+                            <div class="floortitle">大厅排队高低峰图</div>
+                            <div class="floorcontent">
+                                <div id="pdgdfechart" style="width: 100%;height: 100%;"></div>
+                            </div>
+                            <div class="text">
+                                <span style="font-size: 18px;font-weight: bold;margin-bottom: 5px;">地铁6号线</span>
+                                <span>邱家湾站2B出口</span>
+                                <span>距离:800米</span>
+                                <img src="images/qjtArrow.png" alt="">
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -627,7 +633,7 @@
 <script>
     // 初始化Vue实例
     new Vue({
-        el: '#ggyq',
+        el: '#qjt',
         data: function () {
             return {
                 currentTime: ""
@@ -642,8 +648,20 @@
         },
         methods: {
             updateTime() {
+                // 获取当前日期时间对象
                 const now = new Date();
-                this.currentTime = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${now.getHours()}:${now.getMinutes()}:${now.getSeconds()}`;
+
+                // 获取年月日时分秒,并补零
+                const year = String(now.getFullYear()).padStart(4, '0');
+                const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的
+                const day = String(now.getDate()).padStart(2, '0');
+                const hours = String(now.getHours()).padStart(2, '0');
+                const minutes = String(now.getMinutes()).padStart(2, '0');
+                const seconds = String(now.getSeconds()).padStart(2, '0');
+
+                // 组合成格式化的字符串
+                const formattedDateTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+                this.currentTime = formattedDateTime;
             }
         }
     });
@@ -695,7 +713,7 @@
         ],
         series: [
             {
-                name: 'Line 1',
+                name: '大厅排队高低峰图',
                 type: 'line',
                 stack: 'Total',
                 smooth: true,

+ 11 - 11
nngkxxdp/src/main/resources/static/naxsb/wybdb.html

@@ -180,10 +180,10 @@
             <!-- 表单内容 -->
             <el-form ref="form" :model="form" :rules="rules" label-width="150px">
                 <el-form-item label="项目单位名称" prop="unitName">
-                    <el-input v-model="form.unitName"></el-input>
+                    <el-input v-model="form.unitName" placeholder="请输入项目单位名称"></el-input>
                 </el-form-item>
                 <el-form-item label="项目编码" prop="projectCoding">
-                    <el-input v-model="form.projectCoding"></el-input>
+                    <el-input v-model="form.projectCoding" placeholder="请输入项目编码"></el-input>
                 </el-form-item>
                 <el-form-item label="是否重点项目" prop="keyProject">
                     <el-radio-group v-model="form.keyProject">
@@ -192,42 +192,42 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="项目单位地址" prop="projectAddr">
-                    <el-input type="textarea" v-model="form.projectAddr"></el-input>
+                    <el-input type="textarea" v-model="form.projectAddr" placeholder="请输入项目单位地址"></el-input>
                 </el-form-item>
                 <div style="display: flex;">
                     <el-form-item label="项目单位负责人" prop="chargeName">
-                        <el-input v-model="form.chargeName"></el-input>
+                        <el-input v-model="form.chargeName" placeholder="请输入项目单位负责人"></el-input>
                     </el-form-item>
                     <el-form-item label="联系电话" prop="phone">
-                        <el-input v-model="form.chargePhone" placeholder="请输入手机号" maxlength="11" show-word-limit
+                        <el-input v-model="form.chargePhone" placeholder="请输入联系电话" maxlength="11" show-word-limit
                             @blur="validatePhone"></el-input>
                     </el-form-item>
                 </div>
                 <div style="display: flex;">
                     <el-form-item label="项目单位经办人" prop="handlerName">
-                        <el-input v-model="form.handlerName"></el-input>
+                        <el-input v-model="form.handlerName" placeholder="请输入项目单位经办人"></el-input>
                     </el-form-item>
                     <el-form-item label="联系电话" prop="phone">
-                        <el-input v-model="form.handlerPhone" placeholder="请输入手机号" maxlength="11" show-word-limit
+                        <el-input v-model="form.handlerPhone" placeholder="请输入联系电话" maxlength="11" show-word-limit
                             @blur="validatePhone"></el-input>
                     </el-form-item>
                 </div>
                 <el-form-item label="需帮办代办具体事项" prop="proxyMatters">
-                    <el-input type="textarea" v-model="form.proxyMatters"></el-input>
+                    <el-input type="textarea" v-model="form.proxyMatters" placeholder="请输入需帮办代办具体事项"></el-input>
                 </el-form-item>
                 <!-- 帮办代办/联络人电话 -->
                 <div style="display: flex;">
                     <el-form-item label="帮办代办联络人" prop="proxyName">
-                        <el-input v-model="form.proxyName"></el-input>
+                        <el-input v-model="form.proxyName" placeholder="请输入帮办代办联络人"></el-input>
                     </el-form-item>
                     <el-form-item label="联系电话" prop="phone">
-                        <el-input v-model="form.proxyPhone" placeholder="请输入手机号" maxlength="11" show-word-limit
+                        <el-input v-model="form.proxyPhone" placeholder="请输入联系电话" maxlength="11" show-word-limit
                             @blur="validatePhone"></el-input>
                     </el-form-item>
                 </div>
                 <el-form-item label="验证码" prop="imgCode">
                     <div style="display: flex;">
-                        <el-input v-model="form.imgCode" style="width: 36%;"></el-input>
+                        <el-input v-model="form.imgCode" style="width: 36%;" placeholder="请输入验证码"></el-input>
                         <el-image :src="imageCode"></el-image>
                     </div>
                 </el-form-item>

+ 4 - 4
nngkxxdp/src/main/resources/static/naxsb/wyyy.html

@@ -83,21 +83,21 @@
             <!-- 表单内容 -->
             <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                 <el-form-item label="姓名" prop="overtimeName">
-                    <el-input v-model="form.overtimeName"></el-input>
+                    <el-input v-model="form.overtimeName" placeholder="请输入姓名"></el-input>
                 </el-form-item>
                 <el-form-item label="年龄" prop="overtimeAge">
-                    <el-input v-model.number="form.overtimeAge"></el-input>
+                    <el-input v-model.number="form.overtimeAge" placeholder="请输入年龄"></el-input>
                 </el-form-item>
                 <el-form-item label="手机号" prop="overtimePhone">
                     <el-input v-model="form.overtimePhone" placeholder="请输入手机号" maxlength="11" show-word-limit
                         @blur="validatePhone"></el-input>
                 </el-form-item>
                 <el-form-item label="拟办理业务" prop="business">
-                    <el-input type="textarea" v-model="form.business"></el-input>
+                    <el-input type="textarea" v-model="form.business" placeholder="请输入拟办理业务"></el-input>
                 </el-form-item>
                 <el-form-item label="验证码" prop="imgCode">
                     <div style="display: flex;">
-                        <el-input v-model="form.imgCode"></el-input>
+                        <el-input v-model="form.imgCode" placeholder="请输入验证码"></el-input>
                         <el-image :src="imageCode"></el-image>
                     </div>
                 </el-form-item>

+ 6 - 6
nngkxxdp/src/main/resources/static/naxsb/zwfwtyy.html

@@ -130,27 +130,27 @@
             <!-- 表单内容 -->
             <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                 <el-form-item label="姓名" prop="experienceName">
-                    <el-input v-model="form.experienceName"></el-input>
+                    <el-input v-model="form.experienceName" placeholder="请输入姓名"></el-input>
                 </el-form-item>
                 <el-form-item label="年龄" prop="experienceAge">
-                    <el-input v-model.number="form.experienceAge"></el-input>
+                    <el-input v-model.number="form.experienceAge" placeholder="请输入年龄"></el-input>
                 </el-form-item>
                 <el-form-item label="单位" prop="workunit">
-                    <el-input v-model="form.workunit"></el-input>
+                    <el-input v-model="form.workunit" placeholder="请输入单位"></el-input>
                 </el-form-item>
                 <el-form-item label="职务" prop="duty">
-                    <el-input v-model="form.duty"></el-input>
+                    <el-input v-model="form.duty" placeholder="请输入职务"></el-input>
                 </el-form-item>
                 <el-form-item label="手机号" prop="experiencePhone">
                     <el-input v-model="form.experiencePhone" placeholder="请输入手机号" maxlength="11" show-word-limit
                         @blur="validatePhone"></el-input>
                 </el-form-item>
                 <el-form-item label="拟办理业务">
-                    <el-input type="textarea" v-model="form.business"></el-input>
+                    <el-input type="textarea" v-model="form.business" placeholder="请输入拟办理业务"></el-input>
                 </el-form-item>
                 <el-form-item label="验证码" prop="imgCode">
                     <div style="display: flex;">
-                        <el-input v-model="form.imgCode"></el-input>
+                        <el-input v-model="form.imgCode" placeholder="请输入验证码"></el-input>
                         <el-image :src="imageCode"></el-image>
                     </div>
                 </el-form-item>