2 Commity 92eeccf244 ... 4e08d59747

Autor SHA1 Wiadomość Data
  dgf 4e08d59747 更新 8 lat temu
  dgf 821ada1c33 更新 8 lat temu

Plik diff jest za duży
+ 0 - 1
dist/web12345/app-23b557c311.css


Plik diff jest za duży
+ 0 - 716
dist/web12345/app-b349c27127.js


Plik diff jest za duży
+ 0 - 1
dist/web12345/app-e00de7b434.css


+ 2 - 31
dist/web12345/index.html

@@ -2,35 +2,6 @@
 <html>
 
 <head>
-<<<<<<< HEAD
-    <title>12345统一政务服务平台</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1, maximum-scale=1,user-scalable=no">
-    <!-- 新 Bootstrap 核心 CSS 文件 -->
-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
-    <link rel="stylesheet" href="../bower_components/swiper/dist/css/swiper.min.css">
-    <link rel="stylesheet" href="app-23b557c311.css">
-
-    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
-    <!--<script src="js/jquery.min.js"></script>-->
-    <script src="http://webapi.amap.com/maps?v=1.3&key=d7455920303550a45cb4e1a27bdbfc86"></script>
-    <script src="../bower_components/lodash/dist/lodash.js"></script>
-    <script src="../bower_components/jquery/dist/jquery.min.js"></script>
-    <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
-    <script src="../bower_components/swiper/dist/js/swiper.jquery.min.js"></script>
-    <script src="../bower_components/angular/angular.min.js"></script>
-    <script src="../bower_components/angular-cookies/angular-cookies.min.js"></script>
-    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
-    <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
-
-    <script src="app-b349c27127.js"></script>
-</head>
-
-<body ng-app="app">
-    <script src="https://qiyukf.com/script/acdf3e0b8a30e358652592e57b7d6a94.js"></script>
-=======
     <title>12345政务咨询投诉举报平台</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1, maximum-scale=1,user-scalable=no">
@@ -38,7 +9,7 @@
     <link rel="stylesheet" type="text/css" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="../bower_components/animate.css/animate.min.css">
     <link rel="stylesheet" type="text/css" href="../bower_components/swiper/dist/css/swiper.min.css">
-    <link rel="stylesheet" type="text/css" href="app-e00de7b434.css">
+    <link rel="stylesheet" type="text/css" href="app-79ed5f8d01.css">
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
     <!--<script src="js/jquery.min.js"></script>-->
@@ -57,8 +28,8 @@
 <body ng-app="app">
     <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=d7455920303550a45cb4e1a27bdbfc86"></script>
     <script type="text/javascript" src="https://qiyukf.com/script/acdf3e0b8a30e358652592e57b7d6a94.js"></script>
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
     <ui-view></ui-view>
+
 </body>
 
 </html>

BIN
lszw12345.rar


+ 5 - 4
lszw12345/src/js/controller/homeController.js

@@ -23,16 +23,17 @@ angular.module('app').controller('HomeController', ['$scope', 'messageService',
                 actived.addClass("actived");
                 $(actived[0].children).addClass("actived");
                 messageService.setCounty(actived[0].value);
-                messageService.getCounty(function(response) {
-                        console.log("Success", response);
-                    },
-                    function(error) { console.log("error!"); });
+                // messageService.getCounty(function(response) {
+                //         console.log("Success", response);
+                //     },
+                //     function(error) { console.log("error!"); });
             } else if (actived[0].innerText !== "") {
                 $("#city")[0].textContent = actived[0].innerText;
                 angular.element(".menu").removeClass("menu--visible");
                 angular.element(".actived").removeClass("actived");
                 actived.addClass("actived");
                 $(actived[0].children).addClass("actived");
+                messageService.setCounty(actived[0].value);
             }
         }
     };

+ 10 - 0
lszw12345/src/js/controller/serviceController.js

@@ -2,5 +2,15 @@
 
 angular.module('app').controller('ServiceController', ['$scope', 'messageService', function($scope, messageService) {
     //lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
+    messageService.getCounty(function(response) {
+        console.log("Success", response);
+        $scope.branchs = response.data;
+    }, function(error) { console.log("error!"); });
 
+    $scope.listView = function(id) {
+        console.log(id);
+        messageService.getByBranch(id, function(response) {
+            console.log("Success", response);
+        }, function(error) { console.log("error!"); });
+    };
 }]);

+ 1 - 1
lszw12345/src/js/router.js

@@ -25,7 +25,7 @@ angular.module('app').run(['$rootScope', '$state', '$stateParams',
             .state('webChat.maxOne', {
                 url: '/maxOne',
                 templateUrl: 'templates/maxOne.html',
-                controller: 'WebController'
+                controller: 'ServiceController'
             })
             .state('webChat.guide', {
                 url: '/guide',

+ 1 - 1
lszw12345/src/js/service/messageService.js

@@ -11,7 +11,7 @@ angular.module('app').service('messageService', ['$http', function($http) {
     this.getCounty = function(successCallback, failsCallback) {
         $http.get('http://192.168.0.75/api/branch/all/' + this.countyId).then(successCallback, failsCallback);
     };
-
+    //, { headers: { 'Access-Control-Allow-Origin': '*' } }
     this.getByBranch = function(guId, successCallback, failsCallback) {
         $http.get('http://192.168.0.75/api/powermatter/getByBranch/' + this.countyId + '/' + guId).then(successCallback, failsCallback);
     };

+ 0 - 143
lszw12345/src/less/app.detail.less

@@ -33,127 +33,6 @@
      }
 }
 
-.menu {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    top:0;
-    overflow: hidden;
-    pointer-events: none;
-    z-index: 1100;
-    .app-menu {
-        background-color: #fff;
-        color: #fff;
-        position: relative;
-        /*max-width: 400px;*/
-        width: 50%;
-        height: 100%;
-        background-color: #ddd;
-        box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5);
-        -webkit-transform: translateX(-103%);
-        transform: translateX(-103%);
-        display: flex;
-        flex-direction: column;
-        will-change: transform;
-        z-index: 160;
-        pointer-events: auto;
-        transition: all 0.5s ease-in;
-        transition: all 0.4s ease-out;
-        overflow: hidden;
-        .app-menu ul {
-            margin-top: 16px;
-            margin-bottom: 0px !important;
-        }
-
-    }
-    
-}
-
-.menu--visible {
-    pointer-events: auto;
-}
-
-
-
-
-.menu--visible .app-menu {
-    -webkit-transform: none;
-    transform: none;
-}
-
-.menu:after {
-    content: '';
-    display: block;
-    position: absolute;
-    left:0;
-    top:0;
-    width:100%;
-    height:100%;
-    background: rgba(0, 0, 0, 0.4);
-    opacity:0;
-    will-change:opacity;
-    pointer-events: none;
-    transition:opacity 1s cubic-bezier(0, 0, 0.3, 1);
-}
-
-.menu--visible.menu:after {
-    opacity:1;
-    pointer-events: auto;
-}
-
-.layout {
-    position: relative;
-}
-
-.header {
-    background-color: #ccc;
-}
-
-
-
-.sidenav {
-    background: white;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    padding: 0 0;
-    .title{
-        color: red;
-        margin-left: 20px;
-        margin-top: 6px;
-        font-size: medium;
-    }
-}
-
-.sidenav li {
-    height: 40px;
-    list-style-type: none;
-    text-decoration: none;
-    border-bottom:1px solid #EEEEEE;
-}
-
-.sidenav a {
-    margin-left:20px;
-    color: #000;
-    text-decoration: none !important;
-    .right{
-        float: right;
-        margin-top: 16px;
-    }
-}
-
-.sidenav b {
-    font: bold 12px/48px Montserrat;
-    opacity: 1;
-    transform: translateX(50px);
-    transition: all 0.1s;
-}
-
-
-
 ////////列表页。。。。//////////////////////
 
 .listview{
@@ -195,28 +74,6 @@
 
 //////详细页............//////////////
 
-.header {
-    position: fixed;
-    top: 0%;
-    z-index: 1000;
-    width: 100%;
-    height: 40px;
-    padding-top: 9px;
-    font-size: 15px;
-    color: #FFF;
-    text-align: center;
-    background-color: #3FA1E6;
-    .glyphicon-arrow-left {
-        float: left;
-        margin-left: 10px;
-        margin-top: 2px;
-    }
-    .glyphicon-home {
-        float: right;
-        margin-right: 10px;
-        margin-top: 2px;
-    }
-}
 .title{
     margin-top: 50px;
     color: #444;

+ 6 - 3
lszw12345/src/less/app.home.less

@@ -22,10 +22,13 @@
             border-radius: 6px;
             >p {
                 margin-bottom: 0px;
+                a:active,a:focus {
+                text-decoration: none;
+                }
             }
             .glyphicon {
                 vertical-align: top;//***
-                margin-top: -3px;
+                margin-top: 1px;
                 margin-right: 10px;
                 font-size: 18px;
             }
@@ -47,7 +50,7 @@
         .input-search{
             width: 80%;
             height: 50px;
-            margin: 5% 10% 3%;
+            margin: 2% 10% 2%;
             background-color: #FFF;
             #search {
                 float: right;
@@ -77,7 +80,7 @@
             .hot-title {
                 font-size: 16px;
                 width: 90%;
-                margin: 10px 5%;
+                margin: -5px 5% 10px;
                 .addHot {
                     float: right;
                     color: #279BE5;

+ 22 - 21
lszw12345/src/less/app.main.less

@@ -30,24 +30,25 @@ body{
 }
 
 .header {
-    position: fixed;
-    top: 0%;
-    z-index: 1000;
-    width: 100%;
-    height: 40px;
-    padding-top: 9px;
-    font-size: 15px;
-    color: #FFF;
-    text-align: center;
-    background-color: #3FA1E6;
-    .glyphicon-arrow-left {
-        float: left;
-        margin-left: 10px;
-        margin-top: 2px;
-    }
-    .glyphicon-home {
-        float: right;
-        margin-right: 10px;
-        margin-top: 2px;
-    }
-  }
+  position: fixed;
+  top: 0%;
+  z-index: 1000;
+  width: 100%;
+  height: 40px;
+  padding-top: 9px;
+  font-size: 15px;
+  color: #FFF;
+  text-align: center;
+  background-color: #3FA1E6;
+  .glyphicon-arrow-left {
+      float: left;
+      margin-left: 10px;
+      margin-top: 2px;
+  }
+  .glyphicon-home {
+      float: right;
+      margin-right: 10px;
+      margin-top: 2px;
+  }
+}
+

+ 44 - 47
lszw12345/src/less/app.service.less

@@ -1,50 +1,47 @@
+.service-content{
+    margin-top: 45px;
+    overflow-y: auto ;
+    overflow-x: hidden;
+    background-color: #FFF;     
+    >p{
+        width: 50%;
+        display:inline-block;
+        line-height: 60px;
+        height: 60px;
+        border-bottom: 1px solid #DCDCDC;   
+        margin: 0 -5px 0 1px;  
+        font-size: 13px;
+        white-space: nowrap;
+    >span{
+        margin-left: 21%;
+            color:#168DD9;
+            }
+    }
+        // >li{
+        //      list-style-type: none;
+        //      height: 60px;
+        //      border-bottom: 1px solid #DCDCDC;
+        //       >.right{
+        //          width: 50%;
+        //          display:inline-block;
+        //         text-align: center; 
+        //          margin-top: 20px;
+        //          >span{
+        //            color:#168DD9;
+        //          }
+        //       }
+        //       >.left{
+        //         width:50%;
+        //         float: left;
+        //          text-align: center; 
+        //          margin-top: 20px;
+        //          >span{
+        //            color:#168DD9;
+        //               }
+        //       }  
+                
+        //     }
 
-          .service-content{
-    
-             margin-top: 45px;
-             overflow-y: auto ;
-             overflow-x: hidden;
-             background-color: #FFF;     
-             >p{
-                 width: 49%;
-                 display:inline-block;
-                 line-height: 60px;
-                 height: 60px;
-                 border-bottom: 1px solid #DCDCDC;   
-                 margin: 0;  
-                 font-size: 13px;
-                 white-space: nowrap;
-                >span{
-                  margin-left: 21%;
-                     color:#168DD9;
-                      }
-              
-             }
-                  // >li{
-                  //      list-style-type: none;
-                  //      height: 60px;
-                  //      border-bottom: 1px solid #DCDCDC;
-                  //       >.right{
-                  //          width: 50%;
-                  //          display:inline-block;
-                  //         text-align: center; 
-                  //          margin-top: 20px;
-                  //          >span{
-                  //            color:#168DD9;
-                  //          }
-                  //       }
-                  //       >.left{
-                  //         width:50%;
-                  //         float: left;
-                  //          text-align: center; 
-                  //          margin-top: 20px;
-                  //          >span{
-                  //            color:#168DD9;
-                  //               }
-                  //       }  
-                         
-                  //     }
-
-          }
+}
 
 

+ 6 - 5
lszw12345/src/templates/home.html

@@ -5,17 +5,17 @@
         <p ng-click="menuLeft($event)" class="lf menu-icon"><span class="glyphicon glyphicon-map-marker"></span><span id="city">丽水市</span></p>
     </div>
     <div class="guides">
-        <div class="lab maxOne" ui-sref="">
+        <div class="lab maxOne" ui-sref="webChat.service">
             <p><span class="glyphicon glyphicon-send"></span><span>最多跑一次</span></p>
         </div>
-        <div class="lab service" ui-sref="">
+        <div class="lab service" ui-sref="webChat.service">
             <p><span class="glyphicon glyphicon-th-list"></span><span>服务事项</span></p>
         </div>
         <div class="lab guide" ui-sref="">
             <p><span class="glyphicon glyphicon-list-alt"></span><span>窗口引导</span></p>
         </div>
-        <div class="lab seacch " ui-sref="">
-            <p><span class="glyphicon glyphicon-phone-alt"></span><span>12345</span></p>
+        <div class="lab seacch">
+            <p><a href="http://www.lszszw.gov.cn/ws12345"><span class="glyphicon glyphicon-phone-alt"></span><span style="color:#333;">12345</span></a></p>
         </div>
     </div>
     <div class="hot-point">
@@ -25,7 +25,8 @@
             <span id="search">搜索</span>
         </div>
         <div class="hot">
-            <p class="hot-title"><span>热点事项</span><span class="addHot">+ 添加</span></p>
+            <p class="hot-title"><span>热点事项</span></p>
+            <!--<span class="addHot">+ 添加</span>-->
             <div class="line">
                 <div class="ico">
                     <span class="glyphicon glyphicon-tint" style="background-color: #71D5A6;"></span><span>社保</span>

+ 34 - 35
lszw12345/src/templates/service.html

@@ -3,8 +3,8 @@
         <span onClick="javascript :history.back(-1);" class="glyphicon glyphicon-arrow-left"></span><span>服务事项</span><span ui-sref="home" class="glyphicon glyphicon-home"></span>
     </div>
 
-    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市发改委</p>
-    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市经信委</p>
+    <p ng-repeat="branch in branchs track by $index" ng-click="listView(branch.GUID)"> <span class="glyphicon glyphicon-link"></span>&nbsp{{branch.ShortName}}</p>
+    <!--<p> <span class="glyphicon glyphicon-link"></span>&nbsp市经信委</p>
 
 
 
@@ -68,69 +68,68 @@
     <p> <span class="glyphicon glyphicon-link"></span>&nbsp市台办</p>
 
 
-    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市档案局/P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市审批中心</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市档案局</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市审批中心</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp开发区管委会</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp开发区公安分区</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp开发区管委会</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp开发区公安分区</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp市体育局</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市供销社</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市体育局</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市供销社</p>
 
 
 
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市金融办</p>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市公积金中心</p>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市金融办</p>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市公积金中心</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp市经合办</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市农科院</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市经合办</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市农科院</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp市林科院</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水中等专业学校</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市林科院</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水中等专业学校</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp丽水市公交公司</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市残联</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp丽水市公交公司</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市残联</p>
 
 
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市气象局</p>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市信访局</p>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市气象局</p>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市信访局</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp市烟草局</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市供排水公司</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市烟草局</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市供排水公司</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp市国安局</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp开发区散装水泥办</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市国安局</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp开发区散装水泥办</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp市公路管理局</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市运管局</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市公路管理局</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市运管局</p>
 
 
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市中介机构</p>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp市港航管理局</p>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市中介机构</p>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp市港航管理局</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp丽水天然气公司</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水华数公司</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp丽水天然气公司</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水华数公司</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp市广电总台</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水电大</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp市广电总台</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水电大</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp丽水日报社</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水职技院</p>
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp丽水日报社</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水职技院</p>
 
 
-        <P> <span class="glyphicon glyphicon-link"></span>&nbsp党史方志办</P>
-        <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水供电公司</p>
-
+    <P> <span class="glyphicon glyphicon-link"></span>&nbsp党史方志办</P>
+    <p> <span class="glyphicon glyphicon-link"></span>&nbsp丽水供电公司</p>-->
 
 </div>

+ 2 - 2
web12345/src/less/app.home.less

@@ -49,10 +49,10 @@ html {
         background-color: FFF;
     }
     footer {
-        //min-height: 150px;
+        position: relative;
+        top: 0%;
         width: 100%;
         height: 100%;
-        position: relative;
         .bg{
             width: 100%;
             height: 100%;

+ 4 - 4
web12345/src/less/app.main.less

@@ -156,14 +156,14 @@ body{
                 color: #000;
             }
             .cover-white {
-                height:20px;
-                width:20px;
+                height:33px;
+                width:22px;
                 font-size: 14px;
                 background-color: #FFF;
                 color: #3FA1E6;
                 float: right;
-                padding: 3px 3px 0px 0px;
-                margin-top: -22px;
+                padding: 13px 3px 0px 0px;
+                margin-top: -33px;
                 margin-right: -2%;
             }
             .image {

+ 4 - 4
web12345/src/less/app.results.less

@@ -259,14 +259,14 @@
                 color: #000;
             }
             .cover-white {
-                height:20px;
-                width:20px;
+                height:33px;
+                width:22px;
                 font-size: 14px;
                 background-color: #FFF;
                 color: #3FA1E6;
                 float: right;
-                padding: 3px 3px 0px 0px;
-                margin-top: -22px;
+                padding: 13px 3px 0px 0px;
+                margin-top: -33px;
             }
         }
         .btn {