Home Explore Help
Register Sign In
CQ_JD
/
nazw
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'nacyy' of http://116.63.33.55/git/nazw into nacyy

zhao 6 months ago
parent
6bdaa076a7 48b39e78cf
commit
d40351abd8
7 changed files with 25 additions and 138 deletions
Split View Show Diff Stats
  1. 2 2
      nngkxxdp/src/main/resources/static/naxsb/css/qjt.css
  2. 0 50
      nngkxxdp/src/main/resources/static/naxsb/cytzs.html
  3. 2 0
      nngkxxdp/src/main/resources/static/naxsb/dqfwNew.html
  4. 0 50
      nngkxxdp/src/main/resources/static/naxsb/dqfwNews.html
  5. 12 12
      nngkxxdp/src/main/resources/static/naxsb/qjt.html
  6. 2 2
      nngkxxdp/src/main/resources/static/naxsb/tdcr.html
  7. 7 22
      nngkxxdp/src/main/resources/static/naxsb/wyyy.html

+ 2 - 2
nngkxxdp/src/main/resources/static/naxsb/css/qjt.css
View File 

@@ -23,7 +23,7 @@ body {
 
     font-size: 12px;
 
     width: 120px;
 
     position: absolute;
 
-    top: -84px;
 
+    top: 186px;
 
     left: -58px;
 
 }
 
 
@@ -50,7 +50,7 @@ body {
 
     height: 40px;
 
     border-left: 1px dashed #18A65A;
 
     position: absolute;
 
-    top: -41px;
 
+    top: 229px;
 
     left: 2px;
 
 }

+ 0 - 50
nngkxxdp/src/main/resources/static/naxsb/cytzs.html
View File 

@@ -1,50 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-
 
-<head>
 
-    <meta charset="UTF-8">
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <meta name="viewport" content="width=device-width" />
 
-    <meta name=”SiteName” content=”重庆市南岸区人民政府”>
 
-    <meta name="SiteDomain" content="http://ww.cqna.gov.cn" />
 
-    <meta name="SiteIDCode" content="5001080014">
 
-    <meta name="ColumnName" content="产业园区">
 
-    <meta name="ColumnDescription" content="产业园区" />
 
-    <meta name="ColumnKeywords" content="产业园区" />
 
-    <meta name="ColumnType" content="产业园区" />
 
-    <title>产业园区-重庆市南岸区人民政府网</title>
 
-</head>
 
-<style>
 
-    body {
 
-        width: 100%;
 
-        height: 100%;
 
-        margin: 0px;
 
-        padding: 0px;
 
-    }
 
-</style>
 
-
 
-<body>
 
-    <div style="width:100%;" id="header"></div>
 
-    <div id="childshell"></div>
 
-    <div style="width:100%;" id="footer"></div>
 
-
 
-</body>
 
-<script src="js/jquery-3.5.1.min.js"></script>
 
-
 
-<script>
 
-    setContent()
 
-    setHeader()
 
-    setFooter()
 
-    function setContent() {
 
-        $("#childshell").load("cytz.html")
 
-    }
 
-    function setHeader() {
 
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html")
 
-    }
 
-    function setFooter() {
 
-        $("#footer").load("https://www.cqna.gov.cn/data/footer/footer.html")
 
-    }
 
-</script>
 
-
 
-
 
-</html>

+ 2 - 0
nngkxxdp/src/main/resources/static/naxsb/dqfwNew.html
View File 

@@ -105,6 +105,8 @@
 
       padding: 20px;
 
       flex: 1;
 
       overflow: auto;
 
+      width: 100%;
 
+      box-sizing: border-box;
 
     }
 
 
     .yqfw {

+ 0 - 50
nngkxxdp/src/main/resources/static/naxsb/dqfwNews.html
View File 

@@ -1,50 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-
 
-<head>
 
-    <meta charset="UTF-8">
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <meta name="viewport" content="width=device-width" />
 
-    <meta name=”SiteName” content=”重庆市南岸区人民政府”>
 
-    <meta name="SiteDomain" content="http://ww.cqna.gov.cn" />
 
-    <meta name="SiteIDCode" content="5001080014">
 
-    <meta name="ColumnName" content="产业园区">
 
-    <meta name="ColumnDescription" content="产业园区" />
 
-    <meta name="ColumnKeywords" content="产业园区" />
 
-    <meta name="ColumnType" content="产业园区" />
 
-    <title>产业园区-重庆市南岸区人民政府网</title>
 
-</head>
 
-<style>
 
-    body {
 
-        width: 100%;
 
-        height: 100%;
 
-        margin: 0px;
 
-        padding: 0px;
 
-    }
 
-</style>
 
-
 
-<body>
 
-    <div style="width:100%;" id="header"></div>
 
-    <div id="childshell"></div>
 
-    <div style="width:100%;" id="footer"></div>
 
-
 
-</body>
 
-<script src="js/jquery-3.5.1.min.js"></script>
 
-
 
-<script>
 
-    setContent()
 
-    setHeader()
 
-    setFooter()
 
-    function setContent() {
 
-        $("#childshell").load("dqfwNew.html")
 
-    }
 
-    function setHeader() {
 
-        $("#header").load("https://www.cqna.gov.cn/ggbf_search/top/top_style.html")
 
-    }
 
-    function setFooter() {
 
-        $("#footer").load("https://www.cqna.gov.cn/data/footer/footer.html")
 
-    }
 
-</script>
 
-
 
-
 
-</html>

+ 12 - 12
nngkxxdp/src/main/resources/static/naxsb/qjt.html
View File 

@@ -81,7 +81,7 @@
 
 
 <body>
 
     <div style="width:100%;" class="header"></div>
 
-    <div class="container">
 
+    <div class="container" style="position: relative;">
 
         <div class="row">
 
             <div class="col-sm-12">
 
                 <div class="model-container"
 
@@ -348,14 +348,14 @@
 
                     const div = document.createElement('div');
 
                     div.id = child.uuid;
 
                     let html = '';
 
-                    html += '<div class="building-box" style="width: 100px; top: -146px; left: -48px;">';
 
+                    html += '<div class="building-box" style="width: 100px; top: 70px; left: -48px;">';
 
                     html += '<div class="building-text" style="background: #1D96E9;" onclick="handleClick()">';
 
                     html += '<span>1号楼</span><span style="font-size: 10px;">社保大厅、医保大厅</span>';
 
                     html += '</div>';
 
                     html += '<svg width="10" height="10"><polygon id="triangle" points="0,0 10,0 5,10" fill="#1D96E9"/></svg>';
 
                     html += '</div>';
 
-                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: -102px;"></div>';
 
-                    html += '<div class="building-bottom" style="background: #1D96E9;"></div>';
 
+                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: 110px;"></div>';
 
+                    // html += '<div class="building-bottom" style="background: #1D96E9;"></div>';
 
                     div.innerHTML = html;
 
                     let tag = new THREE.CSS2DObject(div);
 
                     child.add(tag);
 
@@ -371,15 +371,15 @@
 
                     const div = document.createElement('div');
 
                     div.id = child.uuid;
 
                     let html = '';
 
-                    html += '<div class="building-box" style="width: 100px; top: -146px; left: -48px;">';
 
+                    html += '<div class="building-box" style="width: 100px; top: 28px; left: -48px;">';
 
                     html += '<i class="el-icon-thumb" style="animation:blink 1s infinite;">点我</i>';
 
                     html += '<div class="building-text" style="background: #1D96E9;">';
 
                     html += '<span>2号楼</span></span></span><span style="font-size: 10px;">南岸区政务服务中心</span>';
 
                     html += '</div>';
 
                     html += '<svg width="10" height="10"><polygon id="triangle" points="0,0 10,0 5,10" fill="#1D96E9"/></svg>';
 
                     html += '</div>';
 
-                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: -102px;"></div>';
 
-                    html += '<div class="building-bottom" style="background: #1D96E9;"></div>';
 
+                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: 72px;"></div>';
 
+                    // html += '<div class="building-bottom" style="background: #1D96E9;"></div>';
 
                     div.innerHTML = html;
 
                     let tag = new THREE.CSS2DObject(div);
 
                     child.add(tag);
 
@@ -394,14 +394,14 @@
 
                     const div = document.createElement('div');
 
                     div.id = child.uuid;
 
                     let html = '';
 
-                    html += '<div class="building-box" style="width: 50px; top: -133px; left: -23px;">';
 
+                    html += '<div class="building-box" style="width: 50px; top: 73px; left: -23px;">';
 
                     html += '<div class="building-text" style="background: #1D96E9;">';
 
                     html += '<span>3号楼</span><span style="font-size: 10px;"></span>';
 
                     html += '</div>';
 
                     html += '<svg width="10" height="10"><polygon id="triangle" points="0,0 10,0 5,10" fill="#1D96E9"/></svg>';
 
                     html += '</div>';
 
-                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: -102px;"></div>';
 
-                    html += '<div class="building-bottom" style="background: #1D96E9;"></div>';
 
+                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: 90px;"></div>';
 
+                    // html += '<div class="building-bottom" style="background: #1D96E9;"></div>';
 
                     div.innerHTML = html;
 
                     let tag = new THREE.CSS2DObject(div);
 
                     child.add(tag);
 
@@ -412,7 +412,7 @@
 
                     div.id = child.uuid;
 
                     let html = '';
 
                     html += '<div class="building-box">';
 
-                    html += `<div class="text" style="top: -15px;left: 146px;position: absolute;display: flex;flex-direction: column;align-items: flex-start;color: #1A95EB;">
 
+                    html += `<div class="text" style="top: -30px;left: 146px;position: absolute;display: flex;flex-direction: column;align-items: flex-start;color: #1A95EB;">
 
                                 <span style="font-size: 18px;font-weight: bold;margin-bottom: 5px;">地铁6号线</span>
 
                                 <span>邱家湾站2B出口</span>
 
                                 <span>距离：800米</span>
 
@@ -424,7 +424,7 @@
 
                     html += '<svg width="10" height="10"><polygon id="triangle" points="0,0 10,0 5,10" fill="#18A65A"/></svg>';
 
                     html += '</div>';
 
                     html += '<div class="building-line"></div>';
 
-                    html += '<div class="building-bottom"></div>';
 
+                    // html += '<div class="building-bottom"></div>';
 
                     div.innerHTML = html;
 
                     let tag = new THREE.CSS2DObject(div);
 
                     child.add(tag);

+ 2 - 2
nngkxxdp/src/main/resources/static/naxsb/tdcr.html
View File 

@@ -260,8 +260,8 @@
 
                             <tr>
 
                                 <td class="tit">地块面积</td>
 
                                 <td class="cont">{{ tdcrDetail.landArea?tdcrDetail.landArea:'无' }}&nbsp;亩</td>
 
-                                <td class="tit">所属园区</td>
 
-                                <td class="cont">{{tdcrDetail.parkData?tdcrDetail.parkData.title:'无'}}</td>
 
+                                <td class="tit">所属区域</td>
 
+                                <td class="cont">{{tdcrDetail.parkData?tdcrDetail.parkData.title:'南岸区'}}</td>
 
                                 <td class="tit">联系人</td>
 
                                 <td class="cont">{{ tdcrDetail.contactName?tdcrDetail.contactName:'无' }}</td>
 
                             </tr>

+ 7 - 22
nngkxxdp/src/main/resources/static/naxsb/wyyy.html
View File 

@@ -244,16 +244,11 @@
 
                         </el-select>
 
                     </el-form-item>
 
                     <el-form-item label="预约时间周六上午" prop="date2">
 
-                        <!-- <el-col :span="11">
 
-                        <el-date-picker type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
 
-                            v-model="form.date1" style="width: 100%;">
 
-                        </el-date-picker>
 
-                    </el-col>
 
-                    <el-col class="line" :span="2">-</el-col> -->
 
-                        <el-col :span="11">
 
-                            <el-time-picker v-model="form.datte2" value-format="HH:mm" placeholder="选择时间"
 
-                                :picker-options="pickerOptions" style="width: 100%;"> </el-time-picker>
 
-                        </el-col>
 
+                        <el-select v-model="form.date2" placeholder="请选择选择时间" style="width: 100%;">
 
+                            <el-option label="09:00:00-10:00:00" value="09:00:00"></el-option>
 
+                            <el-option label="10:00:00-11:00:00" value="10:00:00"></el-option>
 
+                            <el-option label="11:00:00-12:00:00" value="11:00:00"></el-option>
 
+                        </el-select>
 
                     </el-form-item>
 
                     <el-form-item label="验证码" prop="imgCode">
 
                         <div style="display: flex;">
 
@@ -370,12 +365,8 @@
 
                     overtimeAge: '',
 
                     overtimePhone: '',
 
                     business: '',
 
-                    date1: '',
 
                     date2: '',
 
-                    imgCode: '',
 
-                    pickerOptions: {
 
-                        selectableRange: '09:00:00 - 12:00:00' // 限制可选时间为9点到12点 
-                    }
 
+                    imgCode: ''
 
                 },
 
                 /*图形验证码*/
 
                 imageCode: "",
 
@@ -410,12 +401,6 @@
 
                         message: '请输入验证码',
 
                         trigger: 'blur'
 
                     }]
 
-                },
 
-                pickerOptions: {
 
-                    selectableRange: '09:00:00-12:00:00',
 
-                    step: '00:15',
 
-                    format: 'HH:ss'
 
-
 
                 }
 
             }
 
         },
 
@@ -447,7 +432,7 @@
 
                             overtimeAge: this.form.overtimeAge,
 
                             overtimePhone: this.form.overtimePhone,
 
                             business: this.form.business,
 
-                            handleTime: this.form.date1 + ' ' + this.form.date2,
 
+                            handleTime: this.form.date2,
 
                             imgCode: this.form.imgCode
 
                         }
 
                         // AJAX 请求