소스 검색

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

zhao 6 달 전
부모
커밋
13ec7d8fce

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

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8" />
-    <全景通>南岸全景政务通</title>
+    <title>南岸全景政务通</title>
     <script src="3ddemo/three.js"></script>
     <script src="3ddemo/Detector.js"></script>
     <script src="3ddemo/examples/js/libs/stats.min.js"></script>
@@ -57,6 +57,24 @@
         .building-box {
             cursor: pointer;
         }
+
+        @keyframes blink {
+            from {
+                opacity: 1;
+            }
+
+            to {
+                opacity: 0;
+            }
+        }
+
+        .el-icon-thumb {
+            position: absolute;
+            top: 47px;
+            right: 20px;
+            color: #1D96E9;
+            font-size: 20px;
+        }
     </style>
 </head>
 
@@ -240,12 +258,12 @@
             logarithmicDepthBuffer: true
         });
         // 设置渲染器背景颜色
-//    renderer.setClearColor(0xCFD1D3, 0.0);
+        //    renderer.setClearColor(0xCFD1D3, 0.0);
         renderer.setSize(mwidth, mheight);
         // 设置渲染编码为 RGB 模式编码
-     //   renderer.outputEncoding = THREE.sRGBEncoding;
-       // renderer.toneMapping = THREE.ACESFilmicToneMapping;
-     //   renderer.toneMappingExposure = 2.0;
+        //   renderer.outputEncoding = THREE.sRGBEncoding;
+        // renderer.toneMapping = THREE.ACESFilmicToneMapping;
+        //   renderer.toneMappingExposure = 2.0;
         renderer.shadowMap.enabled = true;
 
         // 2D 文字渲染
@@ -272,8 +290,8 @@
         // scene.add(directionalLight3);
 
         // 环境光
-       let ambient = new THREE.AmbientLight(0x404040, 0.1);
-         scene.add(ambient);
+        let ambient = new THREE.AmbientLight(0x404040, 0.1);
+        scene.add(ambient);
 
 
         var pointLight = new THREE.PointLight(0xf0e68c, 0.9, 12500);
@@ -286,7 +304,7 @@
         scene.add(pointLight);
 
 
-        
+
 
         // 加载模型文件
         let gLTFLoader = new THREE.GLTFLoader()
@@ -306,9 +324,9 @@
                     child.material.emissive = child.material.color;
                     child.material.emissiveMap = child.material.map;
                     child.material.transparent = true;
-                    child.material.emissiveIntensity  = 0.8 ;
-                //    child.material.opacity = 0.8;
-                //     child.material.color = 0xd2d2d2;
+                    child.material.emissiveIntensity = 0.8;
+                    //    child.material.opacity = 0.8;
+                    //     child.material.color = 0xd2d2d2;
                     if (child.name) {
                         const div = document.createElement('div');
                         div.id = child.uuid;
@@ -349,8 +367,9 @@
                         div.id = child.uuid;
                         let html = '';
                         html += '<div class="building-box" style="width: 100px; top: -146px; 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 style="font-size: 10px;">南岸区政务服务中心</span>';
+                        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>';

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

@@ -223,7 +223,7 @@
 
 <body>
     <div class="topBg" style="background-image: url(images/indexbg-bdb.png);" id="topBg">
-        <div class="topButton" style="background-image: url(images/button-bdb.png);" @click="dialogVisible = true">我要帮代办
+        <div class="topButton" style="background-image: url(images/button-bdb.png);" @click="wybdb">我要帮代办
         </div>
         <el-dialog title="南岸区重庆经开区帮办代办需求表" :visible.sync="dialogVisible" width="50%" @close="handleClose"
             :close-on-click-modal="false">
@@ -262,8 +262,15 @@
                             @blur="validatePhonejbr"></el-input>
                     </el-form-item>
                 </div>
-                <el-form-item label="需帮办代办具体事项" prop="proxyMatters">
+                <!-- <el-form-item label="需帮办代办具体事项" prop="proxyMatters">
                     <el-input type="textarea" v-model="form.proxyMatters" placeholder="请输入需帮办代办具体事项"></el-input>
+                </el-form-item> -->
+                <el-form-item label="需帮办代办具体事项" prop="proxyMatters">
+                    <el-select v-model="form.proxyMatters" placeholder="请选择需帮办代办具体事项" style="width: 100%;">
+                        <el-option label="需帮办代办具体事项1" value="需帮办代办具体事项1"></el-option>
+                        <el-option label="需帮办代办具体事项2" value="需帮办代办具体事项2"></el-option>
+                        <el-option label="需帮办代办具体事项3" value="需帮办代办具体事项3"></el-option>
+                    </el-select>
                 </el-form-item>
                 <!-- 帮办代办/联络人电话 -->
                 <div style="display: flex;">
@@ -464,7 +471,7 @@
                         { required: true, message: '请输入联络人联系电话', trigger: 'blur' }
                     ],
                     proxyMatters: [
-                        { required: true, message: '请输入拟办理业务', trigger: 'blur' }
+                        { required: true, message: '请选择需帮办代办具体事项', trigger: 'blur' }
                     ],
                     imgCode: [
                         { required: true, message: '请输入验证码', trigger: 'blur' }
@@ -477,6 +484,25 @@
                 this.dialogVisible = false;
                 this.$refs.form.resetFields();
             },
+            wybdb() {
+                $.ajax({
+                    url: conpath + '/proxyDemand/judge',
+                    type: 'get',
+                    contentType: 'application/json; charset=utf-8',
+                    success: function (data) {
+                        if (data.result === 'ok') {
+                            this.$message.success('提交成功!');
+                            this.dialogVisible = true;
+                        } else {
+                            this.$message.error(data.success || '提交失败!');
+                            this.dialogVisible = false;
+                        }
+                    }.bind(this),
+                    error: function (error) {
+                        console.error('error:', error);
+                    }
+                });
+            },
             validatePhonefzr() {
                 // 这里可以添加手机号校验逻辑
                 const reg = /^1[3-9]\d{9}$/;

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

@@ -144,8 +144,15 @@
                     <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-form-item label="拟办理业务" prop="business">
                     <el-input type="textarea" v-model="form.business" placeholder="请输入拟办理业务"></el-input>
+                </el-form-item> -->
+                <el-form-item label="拟办理业务" prop="business">
+                    <el-select v-model="form.business" placeholder="请选择拟办理业务" style="width: 100%;">
+                        <el-option label="拟办理业务1" value="拟办理业务1"></el-option>
+                        <el-option label="拟办理业务2" value="拟办理业务2"></el-option>
+                        <el-option label="拟办理业务3" value="拟办理业务3"></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="拟办时间">
                     <el-col :span="11">
@@ -239,7 +246,7 @@
                         { required: true, message: '请输入手机号', trigger: 'blur' }
                     ],
                     business: [
-                        { required: true, message: '请输入拟办理业务', trigger: 'blur' }
+                        { required: true, message: '请选择拟办理业务', trigger: 'blur' }
                     ],
                     imgCode: [
                         { required: true, message: '请输入验证码', trigger: 'blur' }

+ 46 - 9
nngkxxdp/src/main/resources/static/naxsb/znxz.html

@@ -214,7 +214,7 @@
                 <div class="choseButton" @click="newchoice">重新选择</div>
                 <div class="content">
                     <div class="zwsj" v-if="!this.contentList.length">暂无数据</div>
-                    <div class="list" v-for="(item,index) in contentList">
+                    <div class="list" v-for="(item,index) in contentList" @click="goDeteil(item.id)">
                         <div class="left">
                             <img :src="item.imgUrl" alt="">
                             <div class="number" style="" v-if="index < 10">0{{index+1}}</div>
@@ -267,7 +267,7 @@
                 window.history.go(-1);
                 sessionStorage.setItem('znxztabs', JSON.stringify({}));
                 sessionStorage.setItem('znxz', '');
-            }, 
+            },
             compare(property) {
                 return function (a, b) {
                     if (a[property] < b[property]) {
@@ -279,6 +279,11 @@
                     return 0;
                 }
             },
+            goDeteil(id) {
+                if (id) {
+                    window.location.href = "ztcrdetail.html?ztid=" + id;
+                }
+            },
             getListData(json) {
                 let that = this;
                 $.ajax({
@@ -289,14 +294,15 @@
                     dataType: "json",
                     success: function (data) {
                         let dataList = data.list;
-                        that.contentList= dataList.sort((a, b) => { return b.recommend - a.recommend });
+                        that.contentList = dataList.sort((a, b) => { return b.recommend - a.recommend });
 
                         dataList.forEach(function (d) {
+                            console.log(d.point)
                             // 添加选择地址
                             if (!d.point) return;
                             let pList = d.point.split('@');
                             pList.forEach(function (point) {
-                                that.pointList.push(point);
+                                that.pointList.push(d);
                             });
                         });
                         that.loadMap(dataList[0].point);
@@ -317,11 +323,42 @@
                 //中心坐标
                 that.parkMap.centerAndZoom(new BMap.Point(currPoint[0], currPoint[1]), 14);
                 that.parkMap.setMapType(BMAP_SATELLITE_MAP);
-                that.pointList.forEach(function (point) {
-                    let arr = point.split(',');
-                    let p = new BMap.Point(arr[0], arr[1]);
-                    let marker = new BMap.Marker(p);
-                    that.parkMap.addOverlay(marker);
+                that.pointList.forEach(function (d) {
+                    let pList = d.point.split('@');
+                    pList.forEach(function (point) {
+                        let arr = point.split(',');
+                        let p = new BMap.Point(arr[0], arr[1]);
+                        let marker = new BMap.Marker(p);
+
+                        // // 创建文本标注对象
+                        // var label = new BMap.Label(" " + data.data[i][4] + " ", { offset: new BMap.Size(10, -25) });
+                        // label.setStyle({
+                        //     color: "#fff",
+                        //     border: "0",
+                        //     padding: "0",
+                        //     display: "none",
+                        //     background: "rgba(66,117,202,0.9)",
+                        //     fontSize: "12px",
+                        //     height: "20px",
+                        //     lineHeight: "20px",
+                        //     fontFamily: "微软雅黑"
+                        // });
+                        // marker.setLabel(label);
+
+                        // marker.addEventListener("mouseover", function (e) {
+                        //     var label = this.getLabel()
+                        //     label.setStyle({ display: "block" });
+                        // });
+                        // marker.addEventListener("mouseout", function (e) {
+                        //     var label = this.getLabel()
+                        //     label.setStyle({ display: "none" });
+                        // });
+                        that.parkMap.addOverlay(marker);
+                        marker.addEventListener('click', function () {
+                            var id = d.id;
+                            window.location.href = 'ztcrdetail.html?ztid=' + id;
+                        });
+                    });
                 });
             }
         },