Home Explore Help
Sign In
lqq
/
LxtalkUIView
Watch 2
Star 1
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

更新

dgf 9 years ago
parent
1eb2e6b333
commit
db18ff5b2e
14 changed files with 82 additions and 67 deletions
Split View Show Diff Stats
  1. 0 1
      dist/userview/app-156e51c973.css
  2. 1 0
      dist/userview/app-89ce62284b.js
  3. 1 0
      dist/userview/app-9c39fee18b.css
  4. 0 1
      dist/userview/app-f5b165d8c8.js
  5. 14 14
      dist/userview/index.html
  6. 14 14
      userview/src/html/index.html
  7. 17 16
      userview/src/js/controller/userController.js
  8. 1 1
      userview/src/js/router.js
  9. 2 2
      userview/src/js/templates.js
  10. 20 6
      userview/src/less/app.details.new.less
  11. 9 9
      userview/src/templates/details-new-info.html
  12. 1 1
      userview/src/templates/details-new.html
  13. 1 1
      userview/temp/manifest/app-css-manifest.json
  14. 1 1
      userview/temp/manifest/app-js-manifest.json

File diff suppressed because it is too large
+ 0 - 1
dist/userview/app-156e51c973.css


File diff suppressed because it is too large
+ 1 - 0
dist/userview/app-89ce62284b.js


File diff suppressed because it is too large
+ 1 - 0
dist/userview/app-9c39fee18b.css


File diff suppressed because it is too large
+ 0 - 1
dist/userview/app-f5b165d8c8.js


+ 14 - 14
dist/userview/index.html
View File 

@@ -2,23 +2,23 @@
 
 <html>

 

 <head>

-	<title>chat view</title>

-	<meta charset="utf-8" />

-	<!-- 新 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="app-156e51c973.css">

+    <title>chat view</title>

+    <meta charset="utf-8" />

+    <!-- 新 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="app-9c39fee18b.css">

 </head>

 

-<body ng-app="app" ng-controller="UserController" class="full-client">

-	<ui-view></ui-view>

-	<!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->

-	<script src="../bower_components/jquery/dist/jquery.min.js"></script>

+<body ng-app="app" ng-controller="UserController" class="full-client" onselectstart="return false">

+    <ui-view></ui-view>

+    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->

+    <script src="../bower_components/jquery/dist/jquery.min.js"></script>

     <script src="../bower_components/jquery-qrcode/jquery.qrcode.min.js"></script>

-	<script src="../bower_components/angular/angular.min.js"></script>

-	<script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>

-	<script src="../bower_components/angular-animate/angular-animate.min.js"></script>

-	<script src="app-f5b165d8c8.js"></script>

+    <script src="../bower_components/angular/angular.min.js"></script>

+    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>

+    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>

+    <script src="app-89ce62284b.js"></script>

 </body>

 

 </html>

+ 14 - 14
userview/src/html/index.html
View File 

@@ -2,23 +2,23 @@
 
 <html>

 

 <head>

-	<title>chat view</title>

-	<meta charset="utf-8" />

-	<!-- 新 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="app.css">

+    <title>chat view</title>

+    <meta charset="utf-8" />

+    <!-- 新 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="app.css">

 </head>

 

-<body ng-app="app" ng-controller="UserController" class="full-client">

-	<ui-view></ui-view>

-	<!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->

-	<script src="../bower_components/jquery/dist/jquery.min.js"></script>

+<body ng-app="app" ng-controller="UserController" class="full-client" onselectstart="return false">

+    <ui-view></ui-view>

+    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->

+    <script src="../bower_components/jquery/dist/jquery.min.js"></script>

     <script src="../bower_components/jquery-qrcode/jquery.qrcode.min.js"></script>

-	<script src="../bower_components/angular/angular.min.js"></script>

-	<script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>

-	<script src="../bower_components/angular-animate/angular-animate.min.js"></script>

-	<script src="app.js"></script>

+    <script src="../bower_components/angular/angular.min.js"></script>

+    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>

+    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>

+    <script src="app.js"></script>

 </body>

 

 </html>

+ 17 - 16
userview/src/js/controller/userController.js
View File 

@@ -2,23 +2,23 @@
 
 

 angular.module('app').controller('UserController', ['$scope', '$state', function($scope, $state) {

 

-    // lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);

+    lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);

 

-    $scope.user = {

-        name: '陆趣趣',

-        l: '0578+0-lslqq',

-        shotL: 'lslqq',

-        comp: '浙江万赛软件科技有限公司浙江万赛软件科技有限公司浙江万赛软件科技有限公司浙江万赛软件科技有限公司浙江万赛软件科技有限公司浙江万赛软件科技有限公司',

-        branch: '运维部',

-        sex: '1',

-        mob: '15215756180',

-        sMob: '666666',

-        tel: '2189026',

-        duty: '运维部经理',

-        officeID: '运维室001',

-        email: 'lqq@wswin.cn',

-        shortL: 'lslqq'

-    };

+    // $scope.user = {

+    //     name: '陆趣趣',

+    //     l: '0578+0-lslqq',

+    //     shotL: 'lslqq',

+    //     comp: '浙江万赛软件科技有限公司浙江万赛软件科技有限公司',

+    //     branch: '运维部',

+    //     sex: '0',

+    //     mob: '15215756180',

+    //     sMob: '666666',

+    //     tel: '2189026',

+    //     duty: '运维部经理',

+    //     officeID: '运维室001',

+    //     email: 'lqq@wswin.cn',

+    //     shortL: 'lszhangzhangzhang'

+    // };

 

     $scope.getSex = function(sex) {

         if ($scope.user === undefined)

@@ -30,6 +30,7 @@ angular.module('app').controller('UserController', ['$scope', '$state', function
 
         else

             return '保密';

     }

+

     $scope.isActive = $state.$current.name == 'details-new.info' ? true : false;

     $scope.$on('$stateChangeStart',

         function(event, toState, toParams, fromState, fromParams, options) {

+ 1 - 1
userview/src/js/router.js
View File 

@@ -5,7 +5,7 @@ angular.module('app').run(['$rootScope', '$state', '$stateParams',
 
     }

 ]).config(['$stateProvider', '$urlRouterProvider',

     function($stateProvider, $urlRouterProvider) {

-        $urlRouterProvider.otherwise('/details-new/info');

+        $urlRouterProvider.otherwise('/simple'); //

         $stateProvider.state('simple', {

                 url: '/simple',

                 templateUrl: 'templates/simple.html'

File diff suppressed because it is too large
+ 2 - 2
userview/src/js/templates.js


+ 20 - 6
userview/src/less/app.details.new.less
View File 

@@ -48,7 +48,16 @@
 
             font-size: 18px;

             margin-left:5px; 

             font-family: "微软雅黑","宋体";

-            text-shadow:0px 0px 2px #666;

+            >input {

+                width: 80%;

+                margin-left: -4px; 

+                text-align: center;

+                text-shadow:0px 0px 2px #999;

+                border: none;

+                outline: none;

+                background: -o-linear-gradient(#72BBD7, #6CB8D5);

+                background: linear-gradient(#72BBD7, #6CB8D5); 

+            }

         }

         #watch {

             text-align: left;

@@ -83,7 +92,7 @@
 
             width: 50px;

             height: 30px;

             >a {

-            padding-left:13px; 

+            padding-left:14px; 

             font-size: 24px;

             color: #3EB0D2;

             text-decoration:none;

@@ -128,15 +137,20 @@
 
                 >li {

                     width: 340px;

                     font-family: "微软雅黑","宋体";

-                    padding-bottom:22px;

+                    padding-bottom:19px;

                     text-align: left;

                     font-size: 12px;

                     color: #444;

                     white-space: nowrap; /* 自适应宽度,不换行*/

-                    overflow: hidden;

-                    text-overflow: ellipsis;

-                    span.lr {

+                    >input.lr {

                         margin-left: 40px;

+                        border: none;

+                        outline: none;

+                        background: #E8F4F8;

+                        width: 73%;

+                        white-space: nowrap;

+                        overflow: hidden;

+                        text-overflow: ellipsis;

                     }

                 }

             }

+ 9 - 9
userview/src/templates/details-new-info.html
View File 

@@ -1,14 +1,14 @@
 
 <div id="content">

     <ul>

         <li id="head">个人资料</li>

-        <li><span class="lf">单位名称</span> <span class="lr" title="{{user.comp}}">{{user.comp}}</span></li>

-        <li><span class="lf">处室名称</span> <span class="lr" title="{{user.branch}}">{{user.branch}}</span></li>

-        <li><span class="lf">职务名称</span> <span class="lr" title="{{user.duty}}">{{user.duty}}</span></li>

-        <li><span class="lf">用户性别</span> <span class="lr">{{getSex()}}</span></li>

-        <li><span class="lf">办公电话</span> <span class="lr">{{user.tel}}</span></li>

-        <li><span class="lf">办公室号</span> <span class="lr">{{user.officeID}}</span></li>

-        <li><span class="lf">手机号码</span> <span class="lr">{{user.mob}}</span></li>

-        <li><span class="lf">手机短号</span> <span class="lr">{{user.sMob}}</span></li>

-        <li><span class="lf">办公邮箱</span> <span class="lr">{{user.email}}</span></li>

+        <li><span class="lf">单位名称</span> <input class="lr" type="text" readonly="readonly" title="{{user.comp}}" value="{{user.comp}}"></li>

+        <li><span class="lf">处室名称</span> <input class="lr" type="text" readonly="readonly" title="{{user.branch}}" value="{{user.branch}}"></li>

+        <li><span class="lf">职务名称</span> <input class="lr" type="text" readonly="readonly" title="{{user.duty}}" value="{{user.duty}}"></li>

+        <li><span class="lf">用户性别</span> <input class="lr" type="text" readonly="readonly" value="{{getSex()}}"></li>

+        <li><span class="lf">办公电话</span> <input class="lr" type="text" readonly="readonly" value="{{user.tel}}"></li>

+        <li><span class="lf">办公室号</span> <input class="lr" type="text" readonly="readonly" value="{{user.officeID}}"></li>

+        <li><span class="lf">手机号码</span> <input class="lr" type="text" readonly="readonly" value="{{user.mob}}"></li>

+        <li><span class="lf">手机短号</span> <input class="lr" type="text" readonly="readonly" value="{{user.sMob}}"></li>

+        <li><span class="lf">办公邮箱</span> <input class="lr" type="text" readonly="readonly" value="{{user.email}}"></li>

     </ul>

 </div>

+ 1 - 1
userview/src/templates/details-new.html
View File 

@@ -3,7 +3,7 @@
 
         <div id="icoImg">

             <img src="../img/DefaultHeadImage_96.png">

         </div>

-        <span class="displayname"> {{user.name}}&nbsp;({{user.shortL}})</span>

+        <span class="displayname"> <input type="text" readonly="readonly" value="{{user.name}}&nbsp;({{user.shortL}})"></span>

         <div id="watch">

             <span>个性签名：</span>

             <input type="text" readonly="readonly" class="watchword" title="{{user.watchword}}" value="{{user.watchword !== null && user.watchword !== undefined && user.watchword !== ''?user.watchword:'他什么都没有留下'}}">

+ 1 - 1
userview/temp/manifest/app-css-manifest.json
View File 

@@ -1,3 +1,3 @@
 
 {
 
-  "app.css": "app-156e51c973.css"
 
+  "app.css": "app-9c39fee18b.css"
 
 }

+ 1 - 1
userview/temp/manifest/app-js-manifest.json
View File 

@@ -1,3 +1,3 @@
 
 {
 
-  "app.js": "app-f5b165d8c8.js"
 
+  "app.js": "app-89ce62284b.js"
 
 }