瀏覽代碼

根据需求修改

seimin 3 年之前
父節點
當前提交
7fdf5e6bbc

+ 1 - 1
assets/js/controllers/incident/incidentCtrl.js

@@ -2757,7 +2757,7 @@ app.directive('incidentoperator', function () {
2757
             // '<a ng-click="changeCenter()"  ng-show="jry_modify()"  class="luyinfont">修改</a>' +
2757
             // '<a ng-click="changeCenter()"  ng-show="jry_modify()"  class="luyinfont">修改</a>' +
2758
             '<a ng-click="edit()"  ng-show="{{item.chaozuoPower&&chuli}}"  class="bianjifont">处理</a>' +
2758
             '<a ng-click="edit()"  ng-show="{{item.chaozuoPower&&chuli}}"  class="bianjifont">处理</a>' +
2759
             '<a ng-click="visit()"  ng-show="{{item.huifang&&huifang}}"  class="bianjifont">回访</a>' +
2759
             '<a ng-click="visit()"  ng-show="{{item.huifang&&huifang}}"  class="bianjifont">回访</a>' +
2760
-            // '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
2760
+            '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
2761
             '<a ng-click="toDetail(item)" class="bianjifont" >查看</a>' +
2761
             '<a ng-click="toDetail(item)" class="bianjifont" >查看</a>' +
2762
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +
2762
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +
2763
             // '<a ng-click="record()"  ng-show="{{item.listen}}" class="luyinfont" >录音</a>' +
2763
             // '<a ng-click="record()"  ng-show="{{item.listen}}" class="luyinfont" >录音</a>' +

+ 26 - 26
assets/js/controllers/system/systemFormCtrl.js

@@ -887,32 +887,32 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
887
                                                             confirmButtonColor: "#007AFF"
887
                                                             confirmButtonColor: "#007AFF"
888
                                                         }, function () {
888
                                                         }, function () {
889
                                                             console.log(vm.model);
889
                                                             console.log(vm.model);
890
-                                                            if (vm.fields[0].templateOptions.label == '新增/编辑用户') {
891
-                                                                var modalInstance = $modal.open({
892
-                                                                    templateUrl: 'assets/views/system/qxts.html',
893
-                                                                    controller: function ($scope, $modalInstance, scope, state) {
894
-                                                                        $scope.wt_ok = function () {
895
-                                                                            state.go('app.system.qxgl');
896
-                                                                            $modalInstance.dismiss('cancel');
897
-                                                                            console.log(state);
898
-                                                                        }
899
-                                                                        $scope.wt_cancel = function () {
900
-                                                                            state.go(scope.formData.cancelUrl);
901
-                                                                            $modalInstance.dismiss('cancel');
902
-                                                                            console.log(state);
903
-                                                                        }
904
-                                                                    }, size: 'sm',
905
-                                                                    backdrop: 'static',
906
-                                                                    resolve: {
907
-                                                                        scope: function () {
908
-                                                                            return $scope
909
-                                                                        },
910
-                                                                        state: function () {
911
-                                                                            return $state
912
-                                                                        }
913
-                                                                    }
914
-                                                                });
915
-                                                            }
890
+                                                            // if (vm.fields[0].templateOptions.label == '新增/编辑用户') {
891
+                                                            //     var modalInstance = $modal.open({
892
+                                                            //         templateUrl: 'assets/views/system/qxts.html',
893
+                                                            //         controller: function ($scope, $modalInstance, scope, state) {
894
+                                                            //             $scope.wt_ok = function () {
895
+                                                            //                 state.go('app.system.qxgl');
896
+                                                            //                 $modalInstance.dismiss('cancel');
897
+                                                            //                 console.log(state);
898
+                                                            //             }
899
+                                                            //             $scope.wt_cancel = function () {
900
+                                                            //                 state.go(scope.formData.cancelUrl);
901
+                                                            //                 $modalInstance.dismiss('cancel');
902
+                                                            //                 console.log(state);
903
+                                                            //             }
904
+                                                            //         }, size: 'sm',
905
+                                                            //         backdrop: 'static',
906
+                                                            //         resolve: {
907
+                                                            //             scope: function () {
908
+                                                            //                 return $scope
909
+                                                            //             },
910
+                                                            //             state: function () {
911
+                                                            //                 return $state
912
+                                                            //             }
913
+                                                            //         }
914
+                                                            //     });
915
+                                                            // }
916
                                                             // $state.go($scope.formData.cancelUrl);
916
                                                             // $state.go($scope.formData.cancelUrl);
917
                                                         });
917
                                                         });
918
                                                     }
918
                                                     }

+ 3 - 3
assets/views/knowledge/manager.html

@@ -416,13 +416,13 @@
416
                             </a> -->
416
                             </a> -->
417
                             <div class="btn btn_search margin-right-10 btn_top" ng-click="createKnowledge('lg')" ng-show="xinzeng"><span translate="list.button.CREATE">Add Data</span></div>
417
                             <div class="btn btn_search margin-right-10 btn_top" ng-click="createKnowledge('lg')" ng-show="xinzeng"><span translate="list.button.CREATE">Add Data</span></div>
418
 
418
 
419
-                            <!-- <a class="btn btn-default wt_btn1 wt_btns" ng-click="export()" ladda="ldloading.zoom_in" data-style="zoom-in">
419
+                            <a class="btn btn-default wt_btn1 wt_btns ladda-button" ng-click="export()" ladda="ldloading.zoom_in" data-style="zoom-in">
420
                                 <span translate="sidebar.nav.configuremanagerdb.LISTButton.EXPORT">Export Data</span>
420
                                 <span translate="sidebar.nav.configuremanagerdb.LISTButton.EXPORT">Export Data</span>
421
                             </a>
421
                             </a>
422
 
422
 
423
-                            <a uploader="importUploader" class="btn btn-default wt_btn1 wt_btns" ng-click="importopen()">
423
+                            <a uploader="importUploader" class="btn btn-default wt_btn1 wt_btns ladda-button" ng-click="importopen()">
424
                                 <span translate="sidebar.nav.configuremanagerdb.LISTButton.IMPORT">Import Data</span>
424
                                 <span translate="sidebar.nav.configuremanagerdb.LISTButton.IMPORT">Import Data</span>
425
-                            </a> -->
425
+                            </a>
426
                         </div>
426
                         </div>
427
                     </div>
427
                     </div>
428
                 </div>
428
                 </div>

+ 5 - 5
assets/views/system/user/power.html

@@ -472,7 +472,7 @@
472
                             </div>
472
                             </div>
473
                         </div>
473
                         </div>
474
                         <div class="tab-mainDiv-foot">
474
                         <div class="tab-mainDiv-foot">
475
-                            <div class="tab-mainDiv-body-button pointfont" ng-click="changerole(role)" ng-show="bianji&&chaoguan">
475
+                            <div class="tab-mainDiv-body-button pointfont" ng-click="changerole(role)" ng-show="bianji">
476
                                 确认
476
                                 确认
477
                             </div>
477
                             </div>
478
                             <!-- <button ng-click="changerole(role) " class="btn btn-primary btn-sm " ng-disabled="change">
478
                             <!-- <button ng-click="changerole(role) " class="btn btn-primary btn-sm " ng-disabled="change">
@@ -518,7 +518,7 @@
518
                                     <div class="powerListLeft">菜单权限</div>
518
                                     <div class="powerListLeft">菜单权限</div>
519
                                     <div class="powerListRight">
519
                                     <div class="powerListRight">
520
                                         <span class="headLeft">功能权限</span>
520
                                         <span class="headLeft">功能权限</span>
521
-                                        <span class="headRight" ng-click="allSelect()" ng-show="chaoguan">全选/反选</span>
521
+                                        <span class="headRight" ng-click="allSelect()">全选/反选</span>
522
                                     </div>
522
                                     </div>
523
                                 </div>
523
                                 </div>
524
                                 <div class="powerList" ng-repeat="a in my_power">
524
                                 <div class="powerList" ng-repeat="a in my_power">
@@ -554,12 +554,12 @@
554
                                 </div>
554
                                 </div>
555
                                 <!-- <input type="button" value="测试点击" ng-click="dianjiceshi()"> -->
555
                                 <!-- <input type="button" value="测试点击" ng-click="dianjiceshi()"> -->
556
                             </div>
556
                             </div>
557
-                            <div class="adminFix" ng-show="!chaoguan">
557
+                            <!-- <div class="adminFix" ng-show="!chaoguan">
558
 
558
 
559
-                            </div>
559
+                            </div> -->
560
                         </div>
560
                         </div>
561
                         <div class="tab-mainDiv-foot">
561
                         <div class="tab-mainDiv-foot">
562
-                            <div class="tab-mainDiv-body-button pointfont" ng-click="changeData()" ng-show="fenpeiquanxian&&chaoguan">
562
+                            <div class="tab-mainDiv-body-button pointfont" ng-click="changeData()" ng-show="fenpeiquanxian">
563
                                 确认
563
                                 确认
564
                             </div>
564
                             </div>
565
                         </div>
565
                         </div>