Преглед на файлове

路径修改和地图token接口获取

seimin преди 2 години
родител
ревизия
0b2e47e11c

+ 5 - 5
assets/css/mainCtrl.js

@@ -91,7 +91,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
91 91
         var pushNotification = function (notification) {
92 92
             deskNotification.showNotification(notification.title, {
93 93
                 body: notification.body,
94
-                icon: notification.icon || '../bower_components/HTML5-Desktop-Notifications/alert.ico',
94
+                icon: notification.icon || './bower_components/HTML5-Desktop-Notifications/alert.ico',
95 95
                 onClick: notification.callback || function onNotificationClicked() {
96 96
                     // console.log('Notification clicked.');
97 97
                 },
@@ -583,7 +583,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
583 583
                                         Notification.requestPermission();
584 584
                                         var n = new Notification("你有来电", {
585 585
                                             body: "来电号码:" + mydata.ano,
586
-                                            icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
586
+                                            icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
587 587
                                             // onclick: function onNotificationClicked() {
588 588
                                             //     console.log('Notification clicked.');
589 589
                                             // }
@@ -844,7 +844,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
844 844
                         Notification.requestPermission();
845 845
                         var n = new Notification("签入失败!", {
846 846
                             body: data.errmsg,
847
-                            icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
847
+                            icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
848 848
                             // onclick: function onNotificationClicked() {
849 849
                             //     console.log('Notification clicked.');
850 850
                             // }
@@ -1473,7 +1473,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1473 1473
                     // SweetAlert.swal("用户名或者密码验证失败,请重试!", "登录错误", "error");
1474 1474
                     var n = new Notification("登录错误", {
1475 1475
                         body: "用户名或者密码验证失败,请重试!",
1476
-                        icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
1476
+                        icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
1477 1477
                         onclick: function onNotificationClicked() {
1478 1478
                             // console.log('Notification clicked.');
1479 1479
                         }
@@ -1487,7 +1487,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1487 1487
                     // SweetAlert.swal("系统错误,请重试!", "登录错误", "error");
1488 1488
                     var n = new Notification("登录错误", {
1489 1489
                         body: "系统错误,请重试!",
1490
-                        icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
1490
+                        icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
1491 1491
                         onclick: function onNotificationClicked() {
1492 1492
                             // console.log('Notification clicked.');
1493 1493
                         }

+ 61 - 61
assets/js/config.constant.js

@@ -13,28 +13,28 @@ app.constant('JS_REQUIRES', {
13 13
     //*** Scripts
14 14
     scripts: {
15 15
         //*** Javascript Plugins
16
-        'modernizr': ['../bower_components/components-modernizr/modernizr.js'],
17
-        'moment': ['../bower_components/moment/min/moment.min.js'],
18
-        'spin': '../bower_components/spin.js/spin.js',
19
-        'api-check': '../bower_components/api-check/dist/api-check.min.js',
20
-        'formly': '../bower_components/angular-formly/dist/formly.js',
21
-        'd3': '../bower_components/d3/d3.min.js',
22
-        'bpmn-js-properties': ['../bower_components/bpmn-js-properties/dist/index.js', '../bower_components/bpmn-js-properties/dist/css/diagram-js.css', '../bower_components/bpmn-js-properties/dist/vendor/bpmn-font/css/bpmn-embedded.css', '../bower_components/bpmn-js-properties/dist/css/app.css'],
16
+        'modernizr': ['./bower_components/components-modernizr/modernizr.js'],
17
+        'moment': ['./bower_components/moment/min/moment.min.js'],
18
+        'spin': './bower_components/spin.js/spin.js',
19
+        'api-check': './bower_components/api-check/dist/api-check.min.js',
20
+        'formly': './bower_components/angular-formly/dist/formly.js',
21
+        'd3': './bower_components/d3/d3.min.js',
22
+        'bpmn-js-properties': ['./bower_components/bpmn-js-properties/dist/index.js', './bower_components/bpmn-js-properties/dist/css/diagram-js.css', './bower_components/bpmn-js-properties/dist/vendor/bpmn-font/css/bpmn-embedded.css', './bower_components/bpmn-js-properties/dist/css/app.css'],
23 23
         'multiSelectTree': [
24
-            //             '../bower_components/bootstrap-css-only/css/bootstrap.min.css',
25
-            //             '../bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.min.css',
26
-            //             '../bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.min.js',
27
-            '../bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.tpl.js'
24
+            //             './bower_components/bootstrap-css-only/css/bootstrap.min.css',
25
+            //             './bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.min.css',
26
+            //             './bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.min.js',
27
+            './bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.tpl.js'
28 28
         ],
29 29
         //*** jQuery Plugins
30
-        'perfect-scrollbar-plugin': ['../bower_components/perfect-scrollbar/js/min/perfect-scrollbar.jquery.min.js', '../bower_components/perfect-scrollbar/css/perfect-scrollbar.min.css'],
31
-        'ladda': ['../bower_components/ladda/dist/ladda.min.js', '../bower_components/ladda/dist/ladda-themeless.min.css'],
32
-        'sweet-alert': ['../bower_components/sweetalert/lib/sweet-alert.js', '../bower_components/sweetalert/lib/sweet-alert.css'],
33
-        'chartjs': '../bower_components/chartjs/Chart.js',
34
-        'jquery-sparkline': '../bower_components/jquery.sparkline.build/dist/jquery.sparkline.min.js',
35
-        'ckeditor-plugin': '../bower_components/ckeditor/ckeditor.js',
36
-        'jquery-nestable-plugin': ['../bower_components/jquery-nestable/jquery.nestable.js'],
37
-        'touchspin-plugin': ['../bower_components/bootstrap-touchspin/dist/jquery.bootstrap-touchspin.min.js', '../bower_components/bootstrap-touchspin/dist/jquery.bootstrap-touchspin.min.css'],
30
+        'perfect-scrollbar-plugin': ['./bower_components/perfect-scrollbar/js/min/perfect-scrollbar.jquery.min.js', './bower_components/perfect-scrollbar/css/perfect-scrollbar.min.css'],
31
+        'ladda': ['./bower_components/ladda/dist/ladda.min.js', './bower_components/ladda/dist/ladda-themeless.min.css'],
32
+        'sweet-alert': ['./bower_components/sweetalert/lib/sweet-alert.js', './bower_components/sweetalert/lib/sweet-alert.css'],
33
+        'chartjs': './bower_components/chartjs/Chart.js',
34
+        'jquery-sparkline': './bower_components/jquery.sparkline.build/dist/jquery.sparkline.min.js',
35
+        'ckeditor-plugin': './bower_components/ckeditor/ckeditor.js',
36
+        'jquery-nestable-plugin': ['./bower_components/jquery-nestable/jquery.nestable.js'],
37
+        'touchspin-plugin': ['./bower_components/bootstrap-touchspin/dist/jquery.bootstrap-touchspin.min.js', './bower_components/bootstrap-touchspin/dist/jquery.bootstrap-touchspin.min.css'],
38 38
         'echarts': 'bower_components/echarts/dist/echarts.js',
39 39
         // 大屏
40 40
         'charts1Ctrl':'assets/js/controllers/charts1.js',
@@ -217,130 +217,130 @@ app.constant('JS_REQUIRES', {
217 217
     //*** angularJS Modules
218 218
     modules: [{
219 219
             name: 'angularMoment',
220
-            files: ['../bower_components/angular-moment/angular-moment.min.js']
220
+            files: ['./bower_components/angular-moment/angular-moment.min.js']
221 221
         }, {
222 222
             name: 'morph',
223
-            files: ['../bower_components/angular-morph/dist/angular-morph.js']
223
+            files: ['./bower_components/angular-morph/dist/angular-morph.js']
224 224
         }, {
225 225
             name: 'tweenLite',
226
-            files: ['../bower_components/TweenLite/index.min.js']
226
+            files: ['./bower_components/TweenLite/index.min.js']
227 227
         }, {
228 228
             name: 'toaster',
229
-            files: ['../bower_components/angularjs-toaster/toaster.js', '../bower_components/angularjs-toaster/toaster.css']
229
+            files: ['./bower_components/angularjs-toaster/toaster.js', './bower_components/angularjs-toaster/toaster.css']
230 230
         }, {
231 231
             name: 'angularBootstrapNavTree',
232
-            files: ['../bower_components/angular-bootstrap-nav-tree/dist/abn_tree_directive.js', '../bower_components/angular-bootstrap-nav-tree/dist/abn_tree.css']
232
+            files: ['./bower_components/angular-bootstrap-nav-tree/dist/abn_tree_directive.js', './bower_components/angular-bootstrap-nav-tree/dist/abn_tree.css']
233 233
         }, {
234 234
             name: 'angularTree',
235
-            files: ['../bower_components/angular-bootstrap-nav-tree/dist/abn_tree_directivechange.js', '../bower_components/angular-bootstrap-nav-tree/dist/abn_tree.css']
235
+            files: ['./bower_components/angular-bootstrap-nav-tree/dist/abn_tree_directivechange.js', './bower_components/angular-bootstrap-nav-tree/dist/abn_tree.css']
236 236
         }, {
237 237
             name: 'angular-ladda',
238
-            files: ['../bower_components/angular-ladda/dist/angular-ladda.min.js']
238
+            files: ['./bower_components/angular-ladda/dist/angular-ladda.min.js']
239 239
         }, {
240 240
             name: 'ngTable',
241
-            files: ['../bower_components/ng-table/dist/ng-table.min.js', '../bower_components/ng-table/dist/ng-table.min.css']
241
+            files: ['./bower_components/ng-table/dist/ng-table.min.js', './bower_components/ng-table/dist/ng-table.min.css']
242 242
         }, {
243 243
             name: 'angularPrint',
244
-            files: ['../bower_components/angularPrint/angularPrint.js', '../bower_components/angularPrint/angularPrint.css']
244
+            files: ['./bower_components/angularPrint/angularPrint.js', './bower_components/angularPrint/angularPrint.css']
245 245
         }, , {
246 246
             name: 'selector',
247
-            files: ['../bower_components/angular-selector/dist/angular-selector.js', '../bower_components/angular-selector/dist/angular-selector.css']
247
+            files: ['./bower_components/angular-selector/dist/angular-selector.js', './bower_components/angular-selector/dist/angular-selector.css']
248 248
         }, {
249 249
             name: 'ui.select',
250
-            files: ['../bower_components/angular-ui-select/dist/select.js', '../bower_components/angular-ui-select/dist/select.min.css', '../bower_components/select2/dist/css/select2.min.css', '../bower_components/select2-bootstrap-css/select2-bootstrap.min.css', '../bower_components/selectize/dist/css/selectize.bootstrap3.css']
250
+            files: ['./bower_components/angular-ui-select/dist/select.js', './bower_components/angular-ui-select/dist/select.min.css', './bower_components/select2/dist/css/select2.min.css', './bower_components/select2-bootstrap-css/select2-bootstrap.min.css', './bower_components/selectize/dist/css/selectize.bootstrap3.css']
251 251
         }, {
252 252
             name: 'ui.mask',
253
-            files: ['../bower_components/angular-ui-utils/mask.min.js']
253
+            files: ['./bower_components/angular-ui-utils/mask.min.js']
254 254
         }, {
255 255
             name: 'ngImgCrop',
256
-            files: ['../bower_components/ngImgCrop/compile/minified/ng-img-crop.js', '../bower_components/ngImgCrop/compile/minified/ng-img-crop.css']
256
+            files: ['./bower_components/ngImgCrop/compile/minified/ng-img-crop.js', './bower_components/ngImgCrop/compile/minified/ng-img-crop.css']
257 257
         }, {
258 258
             name: 'angularFileUpload',
259
-            files: ['../bower_components/angular-file-upload/angular-file-upload.min.js']
259
+            files: ['./bower_components/angular-file-upload/angular-file-upload.min.js']
260 260
         }, {
261 261
             name: 'ngAside',
262
-            files: ['../bower_components/angular-aside/dist/js/angular-aside.min.js', '../bower_components/angular-aside/dist/css/angular-aside.min.css']
262
+            files: ['./bower_components/angular-aside/dist/js/angular-aside.min.js', './bower_components/angular-aside/dist/css/angular-aside.min.css']
263 263
         }, {
264 264
             name: 'truncate',
265
-            files: ['../bower_components/angular-truncate/src/truncate.js']
265
+            files: ['./bower_components/angular-truncate/src/truncate.js']
266 266
         }, {
267 267
             name: 'oitozero.ngSweetAlert',
268
-            files: ['../bower_components/angular-sweetalert-promised/SweetAlert.min.js']
268
+            files: ['./bower_components/angular-sweetalert-promised/SweetAlert.min.js']
269 269
         }, {
270 270
             name: 'monospaced.elastic',
271
-            files: ['../bower_components/angular-elastic/elastic.js']
271
+            files: ['./bower_components/angular-elastic/elastic.js']
272 272
         }, {
273 273
             name: 'ngMap',
274
-            files: ['../bower_components/ngmap/build/scripts/ng-map.min.js']
274
+            files: ['./bower_components/ngmap/build/scripts/ng-map.min.js']
275 275
         }, {
276 276
             name: 'tc.chartjs',
277
-            files: ['../bower_components/tc-angular-chartjs/dist/tc-angular-chartjs.min.js']
277
+            files: ['./bower_components/tc-angular-chartjs/dist/tc-angular-chartjs.min.js']
278 278
         }, {
279 279
             name: 'flow',
280
-            files: ['../bower_components/ng-flow/dist/ng-flow-standalone.min.js']
280
+            files: ['./bower_components/ng-flow/dist/ng-flow-standalone.min.js']
281 281
         }, {
282 282
             name: 'uiSwitch',
283
-            files: ['../bower_components/angular-ui-switch/angular-ui-switch.js', '../bower_components/angular-ui-switch/angular-ui-switch.min.css']
283
+            files: ['./bower_components/angular-ui-switch/angular-ui-switch.js', './bower_components/angular-ui-switch/angular-ui-switch.min.css']
284 284
         }, {
285 285
             name: 'ckeditor',
286
-            files: ['../bower_components/angular-ckeditor/angular-ckeditor.js']
286
+            files: ['./bower_components/angular-ckeditor/angular-ckeditor.js']
287 287
         }, {
288 288
             name: 'mwl.calendar',
289
-            files: ['../bower_components/angular-bootstrap-calendar/dist/js/angular-bootstrap-calendar-tpls.js', '../bower_components/angular-bootstrap-calendar/dist/css/angular-bootstrap-calendar.css']
289
+            files: ['./bower_components/angular-bootstrap-calendar/dist/js/angular-bootstrap-calendar-tpls.js', './bower_components/angular-bootstrap-calendar/dist/css/angular-bootstrap-calendar.css']
290 290
         },
291 291
         {
292 292
             name: 'material-calendar',
293
-            files: ['../bower_components/material-calendar/dist/angular-material-calendar.js', '../bower_components/angular-material/angular-material.css', '../bower_components/angular-material/angular-material.layouts.css', '../bower_components/material-calendar/dist/angular-material-calendar.css']
293
+            files: ['./bower_components/material-calendar/dist/angular-material-calendar.js', './bower_components/angular-material/angular-material.css', './bower_components/angular-material/angular-material.layouts.css', './bower_components/material-calendar/dist/angular-material-calendar.css']
294 294
         },
295 295
 
296 296
         {
297 297
             name: 'ng-nestable',
298
-            files: ['../bower_components/ng-nestable/src/angular-nestable.js']
298
+            files: ['./bower_components/ng-nestable/src/angular-nestable.js']
299 299
         }, {
300 300
             name: 'vAccordion',
301
-            files: ['../bower_components/v-accordion/dist/v-accordion.min.js', '../bower_components/v-accordion/dist/v-accordion.min.css']
301
+            files: ['./bower_components/v-accordion/dist/v-accordion.min.js', './bower_components/v-accordion/dist/v-accordion.min.css']
302 302
         }, {
303 303
             name: 'xeditable',
304
-            files: ['../bower_components/angular-xeditable/dist/js/xeditable.js', '../bower_components/angular-xeditable/dist/css/xeditable.css', 'assets/js/config/config-xeditable.js']
304
+            files: ['./bower_components/angular-xeditable/dist/js/xeditable.js', './bower_components/angular-xeditable/dist/css/xeditable.css', 'assets/js/config/config-xeditable.js']
305 305
         }, {
306 306
             name: 'checklist-model',
307
-            files: ['../bower_components/checklist-model/checklist-model.js']
307
+            files: ['./bower_components/checklist-model/checklist-model.js']
308 308
         }, {
309 309
             name: 'angularFormly',
310 310
             files: [
311
-                '../bower_components/angular-formly-templates-bootstrap/dist/angular-formly-templates-bootstrap.js'
311
+                './bower_components/angular-formly-templates-bootstrap/dist/angular-formly-templates-bootstrap.js'
312 312
             ]
313 313
         }, {
314 314
             name: 'ui.grid',
315 315
             files: [
316
-                '../bower_components/angular-ui-grid/ui-grid.js', '../bower_components/angular-ui-grid/ui-grid.css'
316
+                './bower_components/angular-ui-grid/ui-grid.js', './bower_components/angular-ui-grid/ui-grid.css'
317 317
             ]
318 318
         }, {
319 319
             name: 'multi.select.tree',
320 320
             files: [
321
-                //'../bower_components/bootstrap-css-only/css/bootstrap.min.css',
322
-                '../bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.css',
323
-                '../bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.js'
321
+                //'./bower_components/bootstrap-css-only/css/bootstrap.min.css',
322
+                './bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.css',
323
+                './bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.js'
324 324
             ]
325 325
         }, {
326 326
             name: 'sortable',
327 327
             files: [
328
-                '../bower_components/ngDraggable/ngDraggable.js'
328
+                './bower_components/ngDraggable/ngDraggable.js'
329 329
             ]
330 330
         }, {
331 331
             name: 'nya-bs-select',
332 332
             files: [
333
-                '../bower_components/nya-bootstrap-select/dist/js/nya-bs-select.min.js',
334
-                '../bower_components/nya-bootstrap-select/dist/css/nya-bs-select.min.css',
333
+                './bower_components/nya-bootstrap-select/dist/js/nya-bs-select.min.js',
334
+                './bower_components/nya-bootstrap-select/dist/css/nya-bs-select.min.css',
335 335
             ]
336 336
         }, {
337 337
             name: 'textAngular',
338 338
             files: [
339
-                '../bower_components/textAngular/dist/textAngular-rangy.min.js',
340
-                '../bower_components/textAngular/dist/textAngular-sanitize.min.js',
341
-                '../bower_components/textAngular/dist/textAngular.min.js',
342
-                '../bower_components/textAngular/dist/textAngularSetup.js',
343
-                '../bower_components/textAngular/dist/textAngular.css'
339
+                './bower_components/textAngular/dist/textAngular-rangy.min.js',
340
+                './bower_components/textAngular/dist/textAngular-sanitize.min.js',
341
+                './bower_components/textAngular/dist/textAngular.min.js',
342
+                './bower_components/textAngular/dist/textAngularSetup.js',
343
+                './bower_components/textAngular/dist/textAngular.css'
344 344
             ]
345 345
         }, {
346 346
 

+ 143 - 142
assets/js/controllers/charts3.js

@@ -1,5 +1,5 @@
1 1
 'use strict';
2
-app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$interval", "$http", "$cookieStore", "Restangular", "api_hkreport", function ($scope, $rootScope, $state, $timeout, $interval, $http, $cookieStore, Restangular, api_hkreport) {
2
+app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$interval", "$http", "$cookieStore", "Restangular", "api_hkreport", "api_wechat_operate", function ($scope, $rootScope, $state, $timeout, $interval, $http, $cookieStore, Restangular, api_hkreport, api_wechat_operate) {
3 3
     $scope.ceshi = ["110", "105", "84", "125", "110", "92", "98"];
4 4
     // 来电趋势图
5 5
     var dom_laidianqushitu = document.getElementById("laidianqushitu");
@@ -1232,147 +1232,148 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
1232 1232
     }, 15000); //15秒
1233 1233
 
1234 1234
     // 获取地图token
1235
-    api_hkreport.incidentreport({}, 'large_screen_incident_total').then(function (res) {
1236
-        //#region 渲染地图--------------------start
1237
-        //arcgis字体文件资质
1238
-        //var arcgisFontUrl = "";
1239
-        var is3d = false;
1240
-        var username = "yunweixt20221207";
1241
-        var addressToken =
1242
-        "TGYnE2lw7X0RuR4cpJmCulyoRZnVgVW2XVfcQ08yHA-7x3SLMM1ByO6s12LUf63mliF8E6BRZvXDjiMq4CwpA5O0yp7ngbRAnoeZ1i3b2jhmPEMUchaHmmf4DCztMB6AHO5hA3mRHRSjJw8l7WZrPQ.."; //通过api获取
1243
-
1244
-        //点位聚合
1245
-        // var reductionCustom = {
1246
-        //     室内消火栓: {
1247
-        //         clusterRadius: 100,
1248
-        //         clusterMinSize: 28,
1249
-        //         clusterMaxSize: 36,
1250
-        //     },
1251
-        //     图层名称2: {
1252
-        //         clusterRadius: 100,
1253
-        //         clusterMinSize: 28,
1254
-        //         clusterMaxSize: 36,
1255
-        //     },
1256
-        // };
1257
-        var reductionCustom = null;
1258
-        // var layerColor = null;
1259
-        var layerColor = {
1260
-            baseMap: "dark",
1261
-            floorMap: "dark",
1262
-        };
1263
-
1264
-        $scope.$watch('$viewContentLoaded', function() {
1265
-            console.log('viewContentLoaded');
1266
-            $scope.cloudMap = Object.create(CloudMap); //页面加载完成后,创建map对象
1267
-            // $scope.cloudMap2 = Object.create(CloudMap); //页面加载完成后,创建map对象
1268
-            // $scope.cloudMap3 = Object.create(CloudMap); //页面加载完成后,创建map对象
1269
-            // $scope.cloudMap4 = Object.create(CloudMap); //页面加载完成后,创建map对象
1270
-            // $scope.cloudMap5 = Object.create(CloudMap); //页面加载完成后,创建map对象
1271
-            // $scope.cloudMap6 = Object.create(CloudMap); //页面加载完成后,创建map对象
1272
-            // 主校区
1273
-            $scope.cloudMap.initMap(
1274
-                "viewDiv",
1275
-                114.41276,
1276
-                30.51515,
1277
-                1,
1278
-                username,
1279
-                is3d,
1280
-                addressToken,
1281
-                null,
1282
-                reductionCustom,
1283
-                layerColor,
1284
-                mapReady
1285
-            );
1286
-            // $scope.cloudMap2.initMap(
1287
-            //     "viewDiv2",
1288
-            //     114.41276,
1289
-            //     30.51515,
1290
-            //     1,
1291
-            //     username,
1292
-            //     is3d,
1293
-            //     addressToken,
1294
-            //     null,
1295
-            //     reductionCustom,
1296
-            //     layerColor,
1297
-            //     mapReady
1298
-            // );
1299
-            // $scope.cloudMap3.initMap(
1300
-            //     "viewDiv3",
1301
-            //     114.41276,
1302
-            //     30.51515,
1303
-            //     1,
1304
-            //     username,
1305
-            //     is3d,
1306
-            //     addressToken,
1307
-            //     null,
1308
-            //     reductionCustom,
1309
-            //     layerColor,
1310
-            //     mapReady
1311
-            // );
1312
-            // // 同济校区
1313
-            // $scope.cloudMap4.initMap(
1314
-            //     "viewDiv4",
1315
-            //     114.254,
1316
-            //     30.5855,
1317
-            //     3,
1318
-            //     username,
1319
-            //     is3d,
1320
-            //     addressToken,
1321
-            //     null,
1322
-            //     reductionCustom,
1323
-            //     layerColor,
1324
-            //     mapReady
1325
-            // );
1326
-            // $scope.cloudMap5.initMap(
1327
-            //     "viewDiv5",
1328
-            //     114.254,
1329
-            //     30.5855,
1330
-            //     3,
1331
-            //     username,
1332
-            //     is3d,
1333
-            //     addressToken,
1334
-            //     null,
1335
-            //     reductionCustom,
1336
-            //     layerColor,
1337
-            //     mapReady
1338
-            // );
1339
-            // $scope.cloudMap6.initMap(
1340
-            //     "viewDiv6",
1341
-            //     114.254,
1342
-            //     30.5855,
1343
-            //     3,
1344
-            //     username,
1345
-            //     is3d,
1346
-            //     addressToken,
1347
-            //     null,
1348
-            //     reductionCustom,
1349
-            //     layerColor,
1350
-            //     mapReady
1351
-            // );
1352
-        });
1353
-
1354
-        function mapReady() {
1355
-            //cloudMap.changeLayerVisible('建筑物中心点', false);
1356
-            //地图加载成功
1357
-            // cloudMap.initLayerList("top-right"); //显示图层管理模块,位置top-right,top-left,bottom-right,bottom-right
1358
-            // cloudMap.initLegend("top-left"); //显示图例
1359
-            // cloudMap.click(doSomeThing); //绑定点击查询事件,点击空白处返回 “0”,点击具体的点则会返回相应数doSomeThing是回调函数,根据返回的结果
1360
-            //获取全部图层名称
1361
-            // var allLayerTitle = cloudMap.getAllLayerTitle();
1362
-            // console.log(allLayerTitle);
1363
-            //动态添加图层(下拉列表)
1364
-            // allLayerTitle.forEach((element) => {
1365
-            //     //console.log(element);
1366
-            //     document
1367
-            //     .getElementById("txt_layer")
1368
-            //     .options.add(new Option(element, element));
1369
-            //     document
1370
-            //     .getElementById("txt_layer2")
1371
-            //     .options.add(new Option(element, element));
1372
-            // });
1373
-        }
1235
+    api_wechat_operate.getWechatList({"idx":0,"sum":10}).then(function (res) {
1236
+        if(res.status == 200){
1237
+            //#region 渲染地图--------------------start
1238
+            //arcgis字体文件资质
1239
+            //var arcgisFontUrl = "";
1240
+            var is3d = false;
1241
+            var username = "yunweixt20221207";
1242
+            var addressToken = res.list[0].mapToken; //通过api获取
1243
+
1244
+            //点位聚合
1245
+            // var reductionCustom = {
1246
+            //     室内消火栓: {
1247
+            //         clusterRadius: 100,
1248
+            //         clusterMinSize: 28,
1249
+            //         clusterMaxSize: 36,
1250
+            //     },
1251
+            //     图层名称2: {
1252
+            //         clusterRadius: 100,
1253
+            //         clusterMinSize: 28,
1254
+            //         clusterMaxSize: 36,
1255
+            //     },
1256
+            // };
1257
+            var reductionCustom = null;
1258
+            // var layerColor = null;
1259
+            var layerColor = {
1260
+                baseMap: "dark",
1261
+                floorMap: "dark",
1262
+            };
1263
+
1264
+            $scope.$watch('$viewContentLoaded', function() {
1265
+                console.log('viewContentLoaded');
1266
+                $scope.cloudMap = Object.create(CloudMap); //页面加载完成后,创建map对象
1267
+                // $scope.cloudMap2 = Object.create(CloudMap); //页面加载完成后,创建map对象
1268
+                // $scope.cloudMap3 = Object.create(CloudMap); //页面加载完成后,创建map对象
1269
+                // $scope.cloudMap4 = Object.create(CloudMap); //页面加载完成后,创建map对象
1270
+                // $scope.cloudMap5 = Object.create(CloudMap); //页面加载完成后,创建map对象
1271
+                // $scope.cloudMap6 = Object.create(CloudMap); //页面加载完成后,创建map对象
1272
+                // 主校区
1273
+                $scope.cloudMap.initMap(
1274
+                    "viewDiv",
1275
+                    114.41276,
1276
+                    30.51515,
1277
+                    1,
1278
+                    username,
1279
+                    is3d,
1280
+                    addressToken,
1281
+                    null,
1282
+                    reductionCustom,
1283
+                    layerColor,
1284
+                    mapReady
1285
+                );
1286
+                // $scope.cloudMap2.initMap(
1287
+                //     "viewDiv2",
1288
+                //     114.41276,
1289
+                //     30.51515,
1290
+                //     1,
1291
+                //     username,
1292
+                //     is3d,
1293
+                //     addressToken,
1294
+                //     null,
1295
+                //     reductionCustom,
1296
+                //     layerColor,
1297
+                //     mapReady
1298
+                // );
1299
+                // $scope.cloudMap3.initMap(
1300
+                //     "viewDiv3",
1301
+                //     114.41276,
1302
+                //     30.51515,
1303
+                //     1,
1304
+                //     username,
1305
+                //     is3d,
1306
+                //     addressToken,
1307
+                //     null,
1308
+                //     reductionCustom,
1309
+                //     layerColor,
1310
+                //     mapReady
1311
+                // );
1312
+                // // 同济校区
1313
+                // $scope.cloudMap4.initMap(
1314
+                //     "viewDiv4",
1315
+                //     114.254,
1316
+                //     30.5855,
1317
+                //     3,
1318
+                //     username,
1319
+                //     is3d,
1320
+                //     addressToken,
1321
+                //     null,
1322
+                //     reductionCustom,
1323
+                //     layerColor,
1324
+                //     mapReady
1325
+                // );
1326
+                // $scope.cloudMap5.initMap(
1327
+                //     "viewDiv5",
1328
+                //     114.254,
1329
+                //     30.5855,
1330
+                //     3,
1331
+                //     username,
1332
+                //     is3d,
1333
+                //     addressToken,
1334
+                //     null,
1335
+                //     reductionCustom,
1336
+                //     layerColor,
1337
+                //     mapReady
1338
+                // );
1339
+                // $scope.cloudMap6.initMap(
1340
+                //     "viewDiv6",
1341
+                //     114.254,
1342
+                //     30.5855,
1343
+                //     3,
1344
+                //     username,
1345
+                //     is3d,
1346
+                //     addressToken,
1347
+                //     null,
1348
+                //     reductionCustom,
1349
+                //     layerColor,
1350
+                //     mapReady
1351
+                // );
1352
+            });
1353
+
1354
+            function mapReady() {
1355
+                //cloudMap.changeLayerVisible('建筑物中心点', false);
1356
+                //地图加载成功
1357
+                // cloudMap.initLayerList("top-right"); //显示图层管理模块,位置top-right,top-left,bottom-right,bottom-right
1358
+                // cloudMap.initLegend("top-left"); //显示图例
1359
+                // cloudMap.click(doSomeThing); //绑定点击查询事件,点击空白处返回 “0”,点击具体的点则会返回相应数doSomeThing是回调函数,根据返回的结果
1360
+                //获取全部图层名称
1361
+                // var allLayerTitle = cloudMap.getAllLayerTitle();
1362
+                // console.log(allLayerTitle);
1363
+                //动态添加图层(下拉列表)
1364
+                // allLayerTitle.forEach((element) => {
1365
+                //     //console.log(element);
1366
+                //     document
1367
+                //     .getElementById("txt_layer")
1368
+                //     .options.add(new Option(element, element));
1369
+                //     document
1370
+                //     .getElementById("txt_layer2")
1371
+                //     .options.add(new Option(element, element));
1372
+                // });
1373
+            }
1374 1374
 
1375
-        //#endregion 渲染地图--------------------end
1376
-        //
1375
+            //#endregion 渲染地图--------------------end
1376
+            //
1377
+        }
1377 1378
     })
1378 1379
 }]);

+ 2 - 2
assets/js/controllers/fixed/gdzc_meansformCtrl.js

@@ -319,7 +319,7 @@ cmdbFormly.controller('gdzc_meansformCtrl', ['$rootScope', '$scope', '$parse', '
319 319
                                 if (response && response.status == 200) {
320 320
                                     var n = new Notification("新增成功", {
321 321
                                         body: "新增关联成功",
322
-                                        icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
322
+                                        icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
323 323
                                         onclick: function onNotificationClicked() {
324 324
                                             // console.log('Notification clicked.');
325 325
                                         }
@@ -327,7 +327,7 @@ cmdbFormly.controller('gdzc_meansformCtrl', ['$rootScope', '$scope', '$parse', '
327 327
                                 } else {
328 328
                                     var n = new Notification("新增失败", {
329 329
                                         body: "新增关联失败",
330
-                                        icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
330
+                                        icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
331 331
                                         onclick: function onNotificationClicked() {
332 332
                                             // console.log('Notification clicked.');
333 333
                                         }

+ 3 - 3
assets/js/controllers/mainCtrl.js

@@ -89,7 +89,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
89 89
         var pushNotification = function(notification) {
90 90
             deskNotification.showNotification(notification.title, {
91 91
                 body: notification.body,
92
-                icon: notification.icon || '../bower_components/HTML5-Desktop-Notifications/alert.ico',
92
+                icon: notification.icon || './bower_components/HTML5-Desktop-Notifications/alert.ico',
93 93
                 onClick: notification.callback || function onNotificationClicked() {
94 94
                     // console.log('Notification clicked.');
95 95
                 },
@@ -571,7 +571,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
571 571
                                         Notification.requestPermission();
572 572
                                         var n = new Notification("你有来电", {
573 573
                                             body: "来电号码:" + mydata.ano,
574
-                                            icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
574
+                                            icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
575 575
                                             // onclick: function onNotificationClicked() {
576 576
                                             //     console.log('Notification clicked.');
577 577
                                             // }
@@ -777,7 +777,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
777 777
                         Notification.requestPermission();
778 778
                         var n = new Notification("签入失败!", {
779 779
                             body: data.errmsg,
780
-                            icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
780
+                            icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
781 781
                             // onclick: function onNotificationClicked() {
782 782
                             //     console.log('Notification clicked.');
783 783
                             // }

+ 22 - 3
assets/js/main.js

@@ -104,7 +104,7 @@ app.run(['$rootScope', '$state', '$stateParams', '$auth', '$http', '$cookieStore
104 104
                     data = {};
105 105
                     var n = new Notification("登录退出", {
106 106
                         body: "您的账号在其他地方登录,请确认后重新登录",
107
-                        icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
107
+                        icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
108 108
                         onclick: function onNotificationClicked() {
109 109
                             console.log('Notification clicked.');
110 110
                         }
@@ -115,7 +115,7 @@ app.run(['$rootScope', '$state', '$stateParams', '$auth', '$http', '$cookieStore
115 115
                     Notification.requestPermission();
116 116
                     var n = new Notification("无权限访问", {
117 117
                         body: "此页面无权限访问",
118
-                        icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
118
+                        icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
119 119
                         onclick: function onNotificationClicked() {
120 120
                             console.log('Notification clicked.');
121 121
                         }
@@ -223,10 +223,29 @@ app.factory('api_msg', ['msgRestangular', function(msgRestangular) {
223 223
         },
224 224
     };
225 225
 }]);
226
+// 微信配置查询接口seimin
227
+app.factory('wechatConfig', function (Restangular) {
228
+    return Restangular.withConfig(function (RestangularConfigurer) {
229
+        RestangularConfigurer.setBaseUrl(reportIp + '/wechat');
230
+    });
231
+});
232
+app.factory('api_wechat_operate', ['wechatConfig', function (wechatConfig) {
233
+    var dataService = wechatConfig.all("data");
234
+    return {
235
+        //获取微信配置信息
236
+        getWechatList: function (data) {
237
+            return dataService.customPOST(data, 'fetchDataList/wechatConfig');
238
+        },
239
+        //修改微信配置
240
+        // postWxList: function (data) {
241
+        //     return dataService.customPOST(data, 'addData/wechatConfig');
242
+        // }
243
+    };
244
+}]);
226 245
 //报表
227 246
 app.factory('hkreportRestangular', function(Restangular) {
228 247
     return Restangular.withConfig(function(RestangularConfigurer) {
229
-        RestangularConfigurer.setBaseUrl(reportIp + '/report');
248
+        RestangularConfigurer.setBaseUrl(reportIp + '/statistics');
230 249
     });
231 250
 });
232 251
 app.factory('api_hkreport', ['hkreportRestangular', function(hkreportRestangular) {

+ 36 - 36
assets/views/report/childpape.html

@@ -14,17 +14,17 @@
14 14
     <META HTTP-EQUIV="expires" CONTENT="0">
15 15
     <!-- Google fonts -->
16 16
     <!-- Bootstrap -->
17
-    <link rel="stylesheet" href="../../../bower_components/bootstrap/dist/css/bootstrap.css">
17
+    <link rel="stylesheet" href="./bower_components/bootstrap/dist/css/bootstrap.css">
18 18
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
19 19
     <!-- Font Awesome -->
20
-    <link rel="stylesheet" href="../../../bower_components/font-awesome/css/font-awesome.min.css">
21
-    <link rel="stylesheet" href="../../../bower_components/font-awesome/css/font-awesome.min.css">
20
+    <link rel="stylesheet" href="./bower_components/font-awesome/css/font-awesome.min.css">
21
+    <link rel="stylesheet" href="./bower_components/font-awesome/css/font-awesome.min.css">
22 22
     <!-- Themify Icons -->
23
-    <link rel="stylesheet" href="../../../bower_components/themify-icons/themify-icons.css">
23
+    <link rel="stylesheet" href="./bower_components/themify-icons/themify-icons.css">
24 24
     <!-- Loading Bar -->
25
-    <link rel="stylesheet" href="../../../bower_components/angular-loading-bar/build/loading-bar.min.css">
25
+    <link rel="stylesheet" href="./bower_components/angular-loading-bar/build/loading-bar.min.css">
26 26
     <!-- Animate Css -->
27
-    <link rel="stylesheet" href="../../../bower_components/animate.css/animate.min.css">
27
+    <link rel="stylesheet" href="./bower_components/animate.css/animate.min.css">
28 28
     <!-- Clip-Two CSS -->
29 29
     <link rel="stylesheet" href="../../../assets/css/styles.css">
30 30
     <link rel="stylesheet" href="../../../assets/css/newstyle.css">
@@ -37,48 +37,48 @@
37 37
     <!-- Clip-Two Theme -->
38 38
 </head>
39 39
 <script src="../../../assets/js/directives/jquery.js"></script>
40
-<!-- <script src="../bower_components/jquery/dist/jquery.min.js"></script> -->
41
-<!--<script src="../bower_components/jquery-ui/jquery-ui.min.js"></script>-->
40
+<!-- <script src="./bower_components/jquery/dist/jquery.min.js"></script> -->
41
+<!--<script src="./bower_components/jquery-ui/jquery-ui.min.js"></script>-->
42 42
 <!-- Fastclick -->
43
-<script src="../../../bower_components/fastclick/lib/fastclick.js"></script>
43
+<script src="./bower_components/fastclick/lib/fastclick.js"></script>
44 44
 <!-- interact -->
45
-<script src="../../../bower_components/interact/dist/interact.min.js"></script>
45
+<script src="./bower_components/interact/dist/interact.min.js"></script>
46 46
 <!-- Angular -->
47
-<script src="../../../bower_components/angular/angular.min.js"></script>
48
-<!--<script src="../bower_components/angular-ui-sortable/sortable.js"></script>-->
49
-<script src="../../../bower_components/i18n/angular-locale_zh-cn.js"></script>
50
-<script src="../../../bower_components/angular-cookies/angular-cookies.min.js"></script>
51
-<script src="../../../bower_components/angular-animate/angular-animate.min.js"></script>
52
-<script src="../../../bower_components/angular-touch/angular-touch.min.js"></script>
53
-<script src="../../../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
54
-<script src="../../../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
47
+<script src="./bower_components/angular/angular.min.js"></script>
48
+<!--<script src="./bower_components/angular-ui-sortable/sortable.js"></script>-->
49
+<script src="./bower_components/i18n/angular-locale_zh-cn.js"></script>
50
+<script src="./bower_components/angular-cookies/angular-cookies.min.js"></script>
51
+<script src="./bower_components/angular-animate/angular-animate.min.js"></script>
52
+<script src="./bower_components/angular-touch/angular-touch.min.js"></script>
53
+<script src="./bower_components/angular-sanitize/angular-sanitize.min.js"></script>
54
+<script src="./bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
55 55
 
56
-<script src="../../../bower_components/angular-cookie/angular-cookie.js"></script>
57
-<script src="../../../bower_components/ng-token-auth/dist/ng-token-auth.js"></script>
56
+<script src="./bower_components/angular-cookie/angular-cookie.js"></script>
57
+<script src="./bower_components/ng-token-auth/dist/ng-token-auth.js"></script>
58 58
 
59 59
 <!-- Angular storage -->
60
-<script src="../../../bower_components/ngstorage/ngStorage.min.js"></script>
60
+<script src="./bower_components/ngstorage/ngStorage.min.js"></script>
61 61
 <!-- Angular Translate -->
62
-<script src="../../../bower_components/angular-translate/angular-translate.min.js"></script>
63
-<script src="../../../bower_components/angular-translate-loader-url/angular-translate-loader-url.min.js"></script>
64
-<script src="../../../bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
65
-<script src="../../../bower_components/angular-translate-storage-local/angular-translate-storage-local.min.js"></script>
66
-<script src="../../../bower_components/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js"></script>
62
+<script src="./bower_components/angular-translate/angular-translate.min.js"></script>
63
+<script src="./bower_components/angular-translate-loader-url/angular-translate-loader-url.min.js"></script>
64
+<script src="./bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
65
+<script src="./bower_components/angular-translate-storage-local/angular-translate-storage-local.min.js"></script>
66
+<script src="./bower_components/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js"></script>
67 67
 <!-- oclazyload -->
68
-<script src="../../../bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
68
+<script src="./bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
69 69
 <!-- breadcrumb -->
70
-<script src="../../../bower_components/angular-breadcrumb/dist/angular-breadcrumb.min.js"></script>
70
+<script src="./bower_components/angular-breadcrumb/dist/angular-breadcrumb.min.js"></script>
71 71
 <!-- UI Bootstrap -->
72
-<script src="../../../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
72
+<script src="./bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
73 73
 <!-- Loading Bar -->
74
-<script src="../../../bower_components/angular-loading-bar/build/loading-bar.min.js"></script>
74
+<script src="./bower_components/angular-loading-bar/build/loading-bar.min.js"></script>
75 75
 <!-- Angular Scroll -->
76
-<script src="../../../bower_components/angular-scroll/angular-scroll.min.js"></script>
76
+<script src="./bower_components/angular-scroll/angular-scroll.min.js"></script>
77 77
 <!-- Angular restangular -->
78
-<script src="../../../bower_components/lodash/lodash.min.js"></script>
79
-<script src="../../../bower_components/restangular/dist/restangular.min.js"></script>
78
+<script src="./bower_components/lodash/lodash.min.js"></script>
79
+<script src="./bower_components/restangular/dist/restangular.min.js"></script>
80 80
 <!-- HTML Desktop Notifaction -->
81
-<script src="../../../bower_components/HTML5-Desktop-Notifications/desktop-notify.js"></script>
81
+<script src="./bower_components/HTML5-Desktop-Notifications/desktop-notify.js"></script>
82 82
 <script type="text/javascript" src="../../../assets/js/controllers/desk/echarts.min.js"></script>
83 83
 <!-- Clip-Two Scripts -->
84 84
 <script src="../../../assets/js/app.js"></script>
@@ -120,8 +120,8 @@
120 120
 <script src="../../../assets/js/controllers/qrgen.js"></script>
121 121
 <!-- <script src="http://rescdn.qqmail.com/node/ww/wwopenmng/js/sso/wwLogin-1.0.0.js"></script> -->
122 122
 <script src="../../../assets/js/atmosphere-min.js"></script>
123
-<script type="text/javascript" src="../../../bower_components/moment/min/moment.min.js"></script>
124
-<script type="text/javascript" src="../../../bower_components/angular-moment/angular-moment.min.js"></script>
123
+<script type="text/javascript" src="./bower_components/moment/min/moment.min.js"></script>
124
+<script type="text/javascript" src="./bower_components/angular-moment/angular-moment.min.js"></script>
125 125
 <script type="text/javascript" src="../../../assets/js/controllers/report/childpapeCtrl.js"></script>
126 126
 <!-- <script>
127 127
 </script> -->

+ 34 - 34
index.html

@@ -18,17 +18,17 @@
18 18
     <!-- Google fonts -->
19 19
     <!-- <link href="http://fonts.googleapis.com/css?family=Lato:300,400,400italic,600,700|Raleway:300,400,500,600,700|Crete+Round:400italic" rel="stylesheet" type="text/css" /> -->
20 20
     <!-- Bootstrap -->
21
-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
21
+    <link rel="stylesheet" href="./bower_components/bootstrap/dist/css/bootstrap.css">
22 22
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
23 23
     <!-- Font Awesome -->
24
-    <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
25
-    <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
24
+    <link rel="stylesheet" href="./bower_components/font-awesome/css/font-awesome.min.css">
25
+    <link rel="stylesheet" href="./bower_components/font-awesome/css/font-awesome.min.css">
26 26
     <!-- Themify Icons -->
27
-    <link rel="stylesheet" href="../bower_components/themify-icons/themify-icons.css">
27
+    <link rel="stylesheet" href="./bower_components/themify-icons/themify-icons.css">
28 28
     <!-- Loading Bar -->
29
-    <link rel="stylesheet" href="../bower_components/angular-loading-bar/build/loading-bar.min.css">
29
+    <link rel="stylesheet" href="./bower_components/angular-loading-bar/build/loading-bar.min.css">
30 30
     <!-- Animate Css -->
31
-    <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
31
+    <link rel="stylesheet" href="./bower_components/animate.css/animate.min.css">
32 32
     <!-- Clip-Two CSS -->
33 33
     <link rel="stylesheet" href="assets/css/styles.css">
34 34
     <link rel="stylesheet" href="assets/css/newstyle.css">
@@ -48,48 +48,48 @@
48 48
 
49 49
     <!-- jQuery -->
50 50
     <script src="assets/js/directives/jquery.js"></script>
51
-    <!-- <script src="../bower_components/jquery/dist/jquery.min.js"></script> -->
52
-    <!--<script src="../bower_components/jquery-ui/jquery-ui.min.js"></script>-->
51
+    <!-- <script src="./bower_components/jquery/dist/jquery.min.js"></script> -->
52
+    <!--<script src="./bower_components/jquery-ui/jquery-ui.min.js"></script>-->
53 53
     <!-- Fastclick -->
54
-    <script src="../bower_components/fastclick/lib/fastclick.js"></script>
54
+    <script src="./bower_components/fastclick/lib/fastclick.js"></script>
55 55
     <!-- interact -->
56
-    <script src="../bower_components/interact/dist/interact.min.js"></script>
56
+    <script src="./bower_components/interact/dist/interact.min.js"></script>
57 57
     <!-- Angular -->
58
-    <script src="../bower_components/angular/angular.min.js"></script>
59
-    <!--<script src="../bower_components/angular-ui-sortable/sortable.js"></script>-->
60
-    <script src="../bower_components/i18n/angular-locale_zh-cn.js"></script>
61
-    <script src="../bower_components/angular-cookies/angular-cookies.min.js"></script>
62
-    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
63
-    <script src="../bower_components/angular-touch/angular-touch.min.js"></script>
64
-    <script src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
65
-    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
58
+    <script src="./bower_components/angular/angular.min.js"></script>
59
+    <!--<script src="./bower_components/angular-ui-sortable/sortable.js"></script>-->
60
+    <script src="./bower_components/i18n/angular-locale_zh-cn.js"></script>
61
+    <script src="./bower_components/angular-cookies/angular-cookies.min.js"></script>
62
+    <script src="./bower_components/angular-animate/angular-animate.min.js"></script>
63
+    <script src="./bower_components/angular-touch/angular-touch.min.js"></script>
64
+    <script src="./bower_components/angular-sanitize/angular-sanitize.min.js"></script>
65
+    <script src="./bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
66 66
 
67
-    <script src="../bower_components/angular-cookie/angular-cookie.js"></script>
68
-    <script src="../bower_components/ng-token-auth/dist/ng-token-auth.js"></script>
67
+    <script src="./bower_components/angular-cookie/angular-cookie.js"></script>
68
+    <script src="./bower_components/ng-token-auth/dist/ng-token-auth.js"></script>
69 69
 
70 70
     <!-- Angular storage -->
71
-    <script src="../bower_components/ngstorage/ngStorage.min.js"></script>
71
+    <script src="./bower_components/ngstorage/ngStorage.min.js"></script>
72 72
     <!-- Angular Translate -->
73
-    <script src="../bower_components/angular-translate/angular-translate.min.js"></script>
74
-    <script src="../bower_components/angular-translate-loader-url/angular-translate-loader-url.min.js"></script>
75
-    <script src="../bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
76
-    <script src="../bower_components/angular-translate-storage-local/angular-translate-storage-local.min.js"></script>
77
-    <script src="../bower_components/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js"></script>
73
+    <script src="./bower_components/angular-translate/angular-translate.min.js"></script>
74
+    <script src="./bower_components/angular-translate-loader-url/angular-translate-loader-url.min.js"></script>
75
+    <script src="./bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
76
+    <script src="./bower_components/angular-translate-storage-local/angular-translate-storage-local.min.js"></script>
77
+    <script src="./bower_components/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js"></script>
78 78
     <!-- oclazyload -->
79
-    <script src="../bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
79
+    <script src="./bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
80 80
     <!-- breadcrumb -->
81
-    <script src="../bower_components/angular-breadcrumb/dist/angular-breadcrumb.min.js"></script>
81
+    <script src="./bower_components/angular-breadcrumb/dist/angular-breadcrumb.min.js"></script>
82 82
     <!-- UI Bootstrap -->
83
-    <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
83
+    <script src="./bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
84 84
     <!-- Loading Bar -->
85
-    <script src="../bower_components/angular-loading-bar/build/loading-bar.min.js"></script>
85
+    <script src="./bower_components/angular-loading-bar/build/loading-bar.min.js"></script>
86 86
     <!-- Angular Scroll -->
87
-    <script src="../bower_components/angular-scroll/angular-scroll.min.js"></script>
87
+    <script src="./bower_components/angular-scroll/angular-scroll.min.js"></script>
88 88
     <!-- Angular restangular -->
89
-    <script src="../bower_components/lodash/lodash.min.js"></script>
90
-    <script src="../bower_components/restangular/dist/restangular.min.js"></script>
89
+    <script src="./bower_components/lodash/lodash.min.js"></script>
90
+    <script src="./bower_components/restangular/dist/restangular.min.js"></script>
91 91
     <!-- HTML Desktop Notifaction -->
92
-    <script src="../bower_components/HTML5-Desktop-Notifications/desktop-notify.js"></script>
92
+    <script src="./bower_components/HTML5-Desktop-Notifications/desktop-notify.js"></script>
93 93
     <script type="text/javascript" src="assets/js/controllers/desk/echarts.min.js"></script>
94 94
     <!-- Clip-Two Scripts -->
95 95
     <script src="assets/js/app.js"></script>