修改与调整

assets/js/controllers/customform/customformCtrl.js

@@ -11071,6 +11071,18 @@ appFormly.config(function config(formlyConfigProvider) {
                   selectedItem.place ? selectedItem.place.area.id : null;
                 scope.$parent.$parent.$parent.model.incident.place.id =
                   selectedItem.place ? selectedItem.place.id : null;
+                if(scope.$parent.$parent.$parent.model.incident.area.id){
+                  options.templateOptions.APIService.fetchDataList(
+                    'place',
+                    {"place":{"areaId":scope.$parent.$parent.$parent.model.incident.area.id},"idx":0,"sum":1000}
+                  ).then(function (response1) {
+                      for (var i = 0; i < scope.fields.length; i++) {
+                        if(scope.fields[i].templateOptions.onlyKey == 'place_start'){
+                          scope.fields[i].templateOptions.options = response1.status == 200?response1.list:[];
+                        }
+                      }
+                  })
+                }
                 console.log(scope, 89898998);
                 // console.log(scope.formData,'接单页面');
                 //1，选择报修人后带入区域地点2020年4月23日19:34:17
@@ -14501,8 +14513,56 @@ appFormly.config(function config(formlyConfigProvider) {
       "api_user_data",
       "api_statistic",
       "$stateParams",
-      function ($scope, api_user_data, api_statistic, $stateParams) {
+      "api_bpm_data",
+      function ($scope, api_user_data, api_statistic, $stateParams,api_bpm_data) {
         console.log($stateParams)
+        // 一键复制
+        $scope.quickCopy = function(model){
+          // 姓名，工号，来电电话，地点，详细地址，事件描述 liaomingming
+          console.log(model);
+          var text = '';
+          if(model.place.id){
+            api_bpm_data.fetchData("place", model.place.id)
+                  .then(function (response) {
+                    if (response.status == 200) {
+                      text = `姓名：${model.requester?model.requester.name:''}\r\n工号：${model.requester?model.requester.account:''}\r\n来电电话：${model.contactsInformation||''}\r\n地点：${response.data.place||''}\r\n详细地址：${model.houseNumber||''}\r\n事件描述：${model.description||''}`;
+                      var textarea = document.createElement('textarea');
+                      document.body.appendChild(textarea);
+                      // 隐藏此输入框
+                      textarea.style.position = 'fixed';
+                      textarea.style.clip = 'rect(0 0 0 0)';
+                      textarea.style.top = '10px';
+                      // 赋值
+                      textarea.value = text;
+                      // 选中
+                      textarea.select();
+                      // 复制
+                      document.execCommand('copy', true);
+                      // 移除输入框
+                      document.body.removeChild(textarea);
+                    }
+                  });
+          }else{
+            text = `姓名：${model.contacts||''}\r\n工号：${model.account||''}\r\n来电电话：${model.contactsInformation||''}\r\n地点：${''}\r\n详细地址：${model.houseNumber||''}\r\n事件描述：${model.description||''}`;
+            var textarea = document.createElement('textarea');
+            document.body.appendChild(textarea);
+            // 隐藏此输入框
+            textarea.style.position = 'fixed';
+            textarea.style.clip = 'rect(0 0 0 0)';
+            textarea.style.top = '10px';
+            // 赋值
+            textarea.value = text;
+            // 选中
+            textarea.select();
+            // 复制
+            document.execCommand('copy', true);
+            // 移除输入框
+            document.body.removeChild(textarea);
+          }
+          event.preventDefault();
+          //提示
+          alert('复制成功');
+        }
         if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
           var paramsModel = JSON.parse($stateParams.model)
           //来电-添加报修人
@@ -21995,7 +22055,8 @@ appFormly.controller("CustomformCtrl", [
                                     return;
                                 }
                                 api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
-                                  var auditState = $scope.complexityConfirm.complexity.value == $scope.complexity?res.find(v=>v.value == 1):res.find(v=>v.value == 0);
+                                  // var auditState = $scope.complexityConfirm.complexity.value == $scope.complexity?res.find(v=>v.value == 1):res.find(v=>v.value == 0);
+                                  var auditState = res.find(v=>v.value == 0);
                                   var postData = { 
                                     incidentIntegral: {
                                       incidentId:incidentData.id,

assets/js/controllers/mainCtrl.js

@@ -4,7 +4,9 @@
  */
 app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$localStorage', '$cookieStore', '$window', '$modal', '$document', '$timeout', '$filter', '$auth', 'cfpLoadingBar', 'DDP', 'deskNotification', 'Restangular', 'api_login', 'api_text', 'api_user_data', 'api_wechatfile', 'api_bpm_data', 'api_msg', 'Myservice', '$interval', 'jry_api_bpm',
   function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $window, $modal, $document, $timeout, $filter, $auth, cfpLoadingBar, DDP, deskNotification, Restangular, api_login, api_text, api_user_data, api_wechatfile, api_bpm_data, api_msg, Myservice, $interval, jry_api_bpm) {
-
+    if(localStorage.getItem('version_qd')){
+      $rootScope[localStorage.getItem('version_qd')] = true;
+    }
     // 未读消息数量seimin
     $rootScope.getMsgNum = function (id) {
       api_msg.msgDataList({ idx: 0, sum: 1, messageStation: { readStatus: 0, userId: id } }).then(function (data) {
@@ -322,7 +324,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           if (message == 'changed') {
             if (changedDoc.eventName) {
               if (changedDoc.eventName.indexOf('/') > -1) {
-                var [mineId, action] = changedDoc.eventName.split('/');
+                // var [mineId, action] = changedDoc.eventName.split('/');
+                var mineId = changedDoc.eventName.split('/');
+                var action = mineId;
                 if (action == 'notification') {
                   angular.forEach(changedDoc.args, function (item) {
                     if ($rootScope.filternotifyuser.indexOf(item.payload.sender._id) > -1) {
@@ -847,10 +851,368 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     // }
     // // 东经呼叫中心结束
 
+    // 华科呼叫中心 start
+    /* status[已签入：1/通话中:3/来电:2]，state[示闲：1，示忙：2] */
+    $rootScope.statuscall = 0; //话机状态
+    $rootScope.statecall = 1; //示忙示闲
+    $scope.login = false; //签入签出
+    $rootScope.callout = 0; //呼入：1，呼出:2
+    $scope.group = 2000;
+    $scope.phone = 1500;
+    $rootScope.phoneChange = function(phone) {
+        if (phone == 1500||phone == 1501||phone == 1502) {
+            $scope.group = 2000;
+        } else if(phone == 1511) {
+            $scope.group = 2001;
+        }else if(phone == 1507) {
+            $scope.group = 2002;
+        }
+    }
+    $rootScope.start = function(phone) {
+        if (phone == 1500||phone == 1501||phone == 1502) {
+            $scope.group = 2000;
+        } else if(phone == 1511) {
+            $scope.group = 2001;
+        }else if(phone == 1507) {
+            $scope.group = 2002;
+        }
+        api_text.start(phone, $rootScope.user.id).then(function(data) {
+            var token = data.token;
+            $rootScope.takes = token;
+            api_text.logout($rootScope.takes, $rootScope.user.id).then(function(data) { if (data.errno == 0) {} });
+            api_text.login($scope.group, token, $rootScope.user.id).then(function(data) {
+                if (data.errno == 0) {
+                    $rootScope.setidle();
+                    $scope.login = true;
+                    $rootScope.statuscall = 1;
+                    $rootScope.callout = 0;
+
+                    // function hello() {
+                    //     var ws = new WebSocket('ws://192.168.3.49:28088/events');
+                    //     ws.onopen = function() { ws.send(JSON.stringify(register)); };
+                    // };
+                    // window.setTimeout("hello()", 1000);
+                    // var ws = new WebSocket('ws://192.168.77.57:28088/events');
+                    function reconnect() {
+                        // var ws = new WebSocket('ws://192.168.3.49:28088/events');
+                      var ws = new WebSocket('ws://192.168.77.57:8088/IXServer/messagestation/hjzx');
+                        var register = { "msgtype": "login", "adn": phone };
+                        ws.onopen = function() {
+                            heartCheck.start();
+                            ws.send(JSON.stringify(register));
+                        };
+                        ws.onmessage = function(evt) {
+                            heartCheck.reset();
+                            if (evt.data == "HeartBeat") {
+
+                            } else {
+                                var mydata = JSON.parse(evt.data);
+                                $scope.filterData = [];
+                                if (mydata.evttype == "callincome" && mydata.uud != "misc:callback") {
+                                    $rootScope.$apply(function() {
+                                        $rootScope.statuscall = 2;
+                                        $rootScope.callout = 1;
+                                    });
+                                    $rootScope.phone = mydata.ano;
+                                    var Notification = window.Notification;
+                                    Notification.requestPermission();
+                                    var n = new Notification("你有来电", {
+                                        body: "来电号码：" + mydata.ano,
+                                        icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
+                                        // onclick: function onNotificationClicked() {
+                                        //     console.log('Notification clicked.');
+                                        // }
+                                    });
+                                } else if (mydata.evttype == "callincome" && mydata.uud == "misc:callback") {
+                                    $rootScope.callout = 2;
+                                } else if (mydata.evttype == "ringstop") {
+                                    // $rootScope.status=7;
+                                    // $rootScope.$apply(function() {
+                                    $rootScope.statuscall = 1;
+                                    // });
+                                    $rootScope.phone = ""
+                                } else if (mydata.evttype == 'hookchanged' && $rootScope.callout == 2) {
+                                    if (mydata.status && mydata.status == '1') {
+                                        $rootScope.$apply(function() {
+                                            $rootScope.statuscall = 1;
+                                        });
+                                        $rootScope.phone = "";
+                                    } else if (mydata.status && mydata.status != '1') {
+                                        $rootScope.$apply(function() {
+                                            $rootScope.statuscall = 3;
+                                        });
+                                    }
+                                } else if (mydata.evttype == 'hookchanged' && $rootScope.callout == 1) {
+                                    if ($rootScope.phone != "") {
+                                        if (mydata.status && mydata.status == '1') { //挂机
+                                            $rootScope.$apply(function() {
+                                                $rootScope.statuscall = 1;
+                                                $rootScope.callout = 0;
+                                            });
+                                            // console.log("挂机");
+                                            if ($rootScope.statecall == 1 && !$rootScope.isSetidle) {
+                                                $rootScope.setbusy();
+                                            }
+                                        } else if (mydata.status && mydata.status != '1' && $rootScope.statecall != 2 && $rootScope.callout == 1) { //摘机
+                                            $rootScope.status = 6
+                                            $rootScope.statuscall = 3;
+                                            $rootScope.isSetidle = false;
+                                            $rootScope.app.layout.isSidebarClosed = true;
+                                            // console.log("摘机");
+                                            // console.log(mydata);
+                                            api_text.getcdrid($rootScope.takes).then(function(response) {
+                                                if (response.cdrid) {
+                                                    var cdrid = response.cdrid;
+                                                    // var response={cdrid:'219023836'}
+                                                    var filterData = { "idx": 0, "sum": 10, "requester": { "mphone": $rootScope.phone, "telephone": $rootScope.phone, "selectType": 1 } }
+                                                    api_user_data.fetchDataList('requester', filterData).then(function(data) {
+                                                        var myData = Restangular.stripRestangular(data);
+                                                        // $rootScope.phone="";
+                                                        if (myData.list.length == 0) {
+                                                            var modalInstance = $modal.open({
+                                                                backdrop: "static",
+                                                                templateUrl: 'assets/views/customform/tpl/modal-add-callrequester.html',
+                                                                controller: function($scope, $modalInstance, api_user_data, SweetAlert) {
+                                                                    $scope.title = "新增报修人";
+                                                                    $scope.requester = {};
+                                                                    $scope.onChangeadd = function(searchData) {
+                                                                        $scope.searchKey = searchData.account;
+                                                                        // $scope.searchDataadd = searchData;
+                                                                        var requesdata = angular.copy(searchData)
+                                                                            // if (requesdata.mphone) {
+                                                                            //     delete requesdata.mphone;
+                                                                            // }
+                                                                        if (requesdata.telephone) {
+                                                                            delete requesdata.telephone;
+                                                                        }
+                                                                        angular.extend($scope.requester, requesdata);
+                                                                    }
+                                                                    $scope.refreshUseradd = function(searchKey) { //请求人搜索
+                                                                        $scope.requester.account = searchKey;
+                                                                        $scope.searchData = searchKey;
+                                                                        serchdataadd(searchKey);
+                                                                    }
+                                                                    $scope.getMydata = function(x) {
+                                                                        var reqestdatap = JSON.parse(x[0])
+                                                                            // if ($scope.requester.mphone) {
+                                                                            //     delete reqestdatap.mphone;
+                                                                            // }
+                                                                        if ($scope.requester.telephone) {
+                                                                            delete reqestdatap.telephone;
+                                                                        }
+                                                                        $scope.searchField = JSON.parse(x[0]).account;
+                                                                        angular.extend($scope.requester, reqestdatap);
+                                                                        if ($scope.requester.areaDTO && $scope.requester.areaDTO.id && $scope.requester.areaDTO.id != "") {
+                                                                            api_user_data.fetchDataList('place', { place: { areaId: $scope.requester.areaDTO.id }, idx: 0, sum: 1000 }).then(function(response) {
+                                                                                if (response.status == 200) {
+                                                                                    $scope.places = response.list;
+                                                                                }
+                                                                            })
+                                                                        }
+                                                                    }
+                                                                    $scope.getMydataone = function(x) {
+                                                                        $scope.searchField = x;
+                                                                        $scope.requester.account = x;
+                                                                    }
+                                                                    serchdataadd();
+
+                                                                    function serchdataadd(searchKey) {
+                                                                        if (searchKey) {
+                                                                            var filterData = {
+                                                                                'requester': {
+                                                                                    'searchKey': searchKey,
+                                                                                },
+                                                                                idx: 0,
+                                                                                sum: 10
+                                                                            };
+                                                                        } else {
+                                                                            var filterData = {
+                                                                                idx: 0,
+                                                                                sum: 10
+                                                                            };
+                                                                        }
+                                                                        api_user_data.fetchDataList('requester', filterData).then(function(response) {
+                                                                            var myData = response;
+                                                                            $scope.myData = myData.list;
+                                                                        });
+                                                                    }
+                                                                    api_user_data.fetchDataList('area', { idx: 0, sum: 100 }).then(function(response) {
+                                                                            if (response.status == 200) {
+                                                                                $scope.areas = response.list;
+                                                                            }
+                                                                        })
+                                                                        // api_user_data.fetchDataList('place', { idx: 0, sum: 1000 }).then(function(response) {
+                                                                        //         if (response.status == 200) {
+                                                                        //             $scope.places = response.list;
+                                                                        //         }
+                                                                        //     }) //地点
+                                                                    api_user_data.fetchDataList('requesterType', { idx: 0, sum: 100 }).then(function(response) {
+                                                                        if (response.status == 200) {
+                                                                            $scope.networktypes = response.list;
+                                                                        }
+                                                                    })
+                                                                    $scope.requesterAreaid = "";
+                                                                    $scope.onChange = function(item) {
+                                                                            $scope.requesterAreaid = item.id;
+                                                                            $scope.requester.placeDTO = {};
+                                                                            api_user_data.fetchDataList('place', { place: { areaId: item.id }, idx: 0, sum: 1000 }).then(function(response) {
+                                                                                if (response.status == 200) {
+                                                                                    $scope.places = response.list;
+                                                                                }
+                                                                            })
+                                                                        }
+                                                                        //地点搜索
+                                                                    $scope.refresh = function(searchVal) {
+                                                                        var faildata = {};
+                                                                        if ($scope.requesterAreaid) {
+                                                                            faildata = {
+                                                                                'idx': 0,
+                                                                                'sum': 1000,
+                                                                                'place': { 'areaId': $scope.requesterAreaid, 'place': searchVal, 'selectType': 'pinyin_qs' }
+                                                                            }
+                                                                        } else {
+                                                                            faildata = {
+                                                                                'idx': 0,
+                                                                                'sum': 1000,
+                                                                                'place': { 'place': searchVal, 'selectType': 'pinyin_qs' }
+                                                                            }
+                                                                        }
+                                                                        api_user_data.fetchDataList('place', faildata).then(function(response) {
+                                                                            $scope.places = response.list;
+                                                                            delete $scope.requester.placeDTO;
+                                                                        })
+                                                                    }
+                                                                    $scope.requester = { 'telephone': $rootScope.phone };
+                                                                    $scope.ok = function() {
+                                                                        // $modalInstance.close($scope.requester);
+                                                                        if (angular.isUndefined($scope.requester.name) || $scope.requester.name == null || $scope.requester.name == "") {
+                                                                            SweetAlert.swal("报修人姓名未填!", "请填写报修人姓名", "error");
+                                                                        } else if (angular.isUndefined($scope.requester.mphone) || $scope.requester.mphone == null || $scope.requester.mphone == "") {
+                                                                            SweetAlert.swal("报修人电话未填!", "请填写报修人电话", "error");
+                                                                        } else {
+                                                                            $modalInstance.close($scope.requester);
+                                                                        }
+                                                                    };
+
+                                                                    $scope.cancel = function() {
+                                                                        $modalInstance.dismiss('cancel');
+                                                                        $rootScope.setidle();
+                                                                    };
+                                                                },
+                                                            });
+                                                            modalInstance.result.then(function(selectedItem) {
+                                                                if (selectedItem) {
+                                                                    if (selectedItem.telephone && !selectedItem.mphone) {
+                                                                        selectedItem.telephone = angular.copy(selectedItem.mphone);
+                                                                        delete selectedItem.mphone;
+                                                                    }
+                                                                    var data = {
+                                                                        'requester': selectedItem
+                                                                    };
+                                                                    api_user_data.addData('requester', data).then(function(response) {
+                                                                        if (response.status == 200) {
+                                                                            var data = { 'model': { 'requestershow': response.data, 'incident': { 'requester': response.data, 'area': response.data.areaDTO, 'place': response.data.placeDTO, 'houseNumber': response.data.houseNumber, 'contactsInformation': response.data.telephone, 'callID': cdrid, 'source': { 'id': 1 } } } }
+                                                                            $state.go('app.incident.title', { 'model': JSON.stringify(data) });
+                                                                        }
+                                                                    })
+                                                                }
+                                                            });
+                                                        } else if (myData.list.length == 1) {
+                                                            angular.extend(myData.list[0], { 'telephone': $rootScope.phone });
+                                                            var data = { 'model': { 'requestershow': myData.list[0], 'incident': { 'requester': myData.list[0], 'area': myData.list[0].areaDTO, 'place': myData.list[0].placeDTO, 'contactsInformation': myData.list[0].telephone, 'houseNumber': myData.list[0].houseNumber, 'callID': cdrid, 'source': { 'id': 1 } } } }
+                                                            $state.go('app.incident.title', { 'model': JSON.stringify(data) });
+                                                        } else {
+                                                            var modalInstance = $modal.open({
+                                                                templateUrl: 'assets/views/createincident.html',
+                                                                backdrop: "static",
+                                                                controller: function($scope, $modalInstance, api_user_data) {
+                                                                    $scope.title = "请确定报修人";
+                                                                    $scope.requester = myData.list;
+                                                                    $scope.choice = function(requester) {
+                                                                        $modalInstance.dismiss('cancel');
+                                                                        angular.extend(requester, { 'telephone': $rootScope.phone });
+                                                                        var data = { 'model': { 'requestershow': requester, 'incident': { 'requester': requester, 'area': requester.areaDTO, 'place': requester.placeDTO, 'houseNumber': requester.houseNumber, 'contactsInformation': requester.telephone, 'callID': cdrid, 'source': { 'id': 1 } } } }
+                                                                        $state.go('app.incident.title', { 'model': JSON.stringify(data) });
+                                                                    };
+
+                                                                    $scope.cancel = function() {
+                                                                        $modalInstance.dismiss('cancel');
+                                                                        $rootScope.setidle();
+                                                                    };
+                                                                },
+                                                                size: "lg"
+                                                            });
+                                                        }
+
+                                                    });
+                                                }
+                                            })
+                                        }
+                                    }
+                                }
+                            }
+                        };
+                        var heartCheck = {
+                            timeout: 12000, //60ms
+                            timeoutObj: null,
+                            serverTimeoutObj: null,
+                            reset: function() {
+                                clearTimeout(this.timeoutObj);
+                                clearTimeout(this.serverTimeoutObj);　　　　
+                                this.start();
+                            },
+                            start: function() {
+                                var self = this;
+                                this.timeoutObj = setTimeout(function() {
+                                    if ($scope.login) {
+                                        ws.send("HeartBeat");
+                                        self.serverTimeoutObj = setTimeout(function() {
+                                            ws.close(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+                                        }, self.timeout)
+                                    }
+                                }, this.timeout)
+                            },
+                        }
+                        ws.onclose = function(evt) { reconnect(); }
+                        ws.onerror = function(evt) { reconnect(); };
+                    }
+                    reconnect();
+                } else {
+                    var Notification = window.Notification;
+                    Notification.requestPermission();
+                    var n = new Notification("签入失败！", {
+                        body: data.errmsg,
+                        icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
+                        // onclick: function onNotificationClicked() {
+                        //     console.log('Notification clicked.');
+                        // }
+                    });
+                }
+            })
+
+        })
+    }
+    setInterval(function() {
+        if ($scope.login && $rootScope.statuscall == 1 && $rootScope.statecall == 1) {
+            $rootScope.setidle();
+        } else if ($scope.login && $rootScope.statuscall != 3 && $rootScope.statecall == 2 && statuscall != 0) {
+            $rootScope.setbusy
+        }
+    }, 3000);
+    // 华科呼叫中心 end
+
     //话机呼叫中心--开始
     // 1是老的呼叫中心
     // 2是2021年12月29日新增的呼叫中心
-    $rootScope.seiminHj = 2;
+    console.log($rootScope.isHk,'hk')
+    console.log($rootScope.isZncd,'zncd')
+    if($rootScope.isZncd){
+      $rootScope.seiminHj = 2;
+    }else if($rootScope.isHk){
+      $rootScope.seiminHj = 3;
+    }else{
+      $rootScope.seiminHj = 1;
+    }
     $rootScope.getExtnDirect = function () {
       $rootScope['getExtnDirect' + $rootScope.seiminHj]();
     }
@@ -1954,6 +2316,20 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         }
       })
     }
+    $rootScope.getExtnDirect3 = function(){
+      console.log($rootScope.user)
+      var user = $rootScope.user;
+      initImUser(user.email, user.msgUuid);
+      // $rootScope.start(JSON.parse(localStorage.userdata).commonExtension.name);
+      api_wechatfile.getDictionary({ "type": "list", "key": "hjzx_cornet" }).then(function(data) {
+          $scope.runNumber = data;
+          $scope.phone = $scope.runNumber[0].name;
+          $rootScope.phoneChange($scope.phone);
+      })
+      if ($rootScope.userMenus.length == 0) {
+          getMenus();
+      }
+    }
     $rootScope.jry_state = 'weiqianru';
     window.addEventListener('load', function () {
       if ($rootScope.isFuwutai) {
@@ -2548,13 +2924,17 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             // $auth.deleteData('auth_headers')
             sessionStorage.clear();
             localStorage.clear();
-            if ($rootScope.isFuwutai) {
-              tlwsa.tlaClose();
-              $.toaster({
-                priority: 'info',
-                title: '操作',
-                message: '呼叫中心断开连接'
-              });
+            console.log($rootScope.isHk,'hk');
+            console.log($rootScope.isZncd,'zncd');
+            if($rootScope.isZncd){
+              if ($rootScope.isFuwutai) {
+                tlwsa.tlaClose();
+                $.toaster({
+                  priority: 'info',
+                  title: '操作',
+                  message: '呼叫中心断开连接'
+                });
+              }
             }
             $state.go("login.signin");
           })

assets/js/controllers/system/hospitalCtrl.js

@@ -81,13 +81,13 @@ app.controller("hospitalCtrl", [
       },
       {
         name: "hosName",
-        displayName: "院区名称",
+        displayName: "校区名称",
         width: "35%",
         enableFiltering: false,
       },
       {
         name: "hosNo",
-        displayName: "院区编码",
+        displayName: "校区编码",
         width: "35%",
         enableFiltering: false,
       },
@@ -142,7 +142,7 @@ app.controller("hospitalCtrl", [
         controller: function ($scope, scope, $modalInstance, api_user_data) {
           $scope.hospital = {};
           $scope.hospital = selectdata;
-          $scope.title = "院区编辑";
+          $scope.title = "校区编辑";
           $scope.cancel = function () {
             $modalInstance.dismiss("cancel");
           };
@@ -174,7 +174,7 @@ app.controller("hospitalCtrl", [
                       SweetAlert.swal(
                         {
                           title: "修改失败!",
-                          text: "该院区已存在",
+                          text: "该校区已存在",
                           type: "error",
                         },
                         function () {
@@ -230,7 +230,7 @@ app.controller("hospitalCtrl", [
       var modalInstance = $modal.open({
         templateUrl: "assets/views/system/tpl/hospitalchange.html",
         controller: function ($scope, $modalInstance, api_user_data) {
-          $scope.title = "院区新增";
+          $scope.title = "校区新增";
           $scope.cancel = function () {
             $modalInstance.dismiss("cancel");
           };
@@ -301,8 +301,8 @@ app.controller("hospitalCtrl", [
         templateUrl: "assets/views/incident/tpl/acceptTask.tpl.html",
         controller: function ($scope, scope, $modalInstance, api_bpm_data) {
           var rmvList = [];
-          $scope.title = "院区删除";
-          $scope.connect = "确定要删除此院区？";
+          $scope.title = "校区删除";
+          $scope.connect = "确定要删除此校区？";
           rmvList.push(rmData);
           $scope.ok = function () {
             $modalInstance.close(rmvList);

assets/js/main.js

@@ -1,4 +1,4 @@
-console.info('v1.0.1');
+console.info('v1.0.2');
 var app = angular.module('itsmApp', ['itsm-dep']);
 var domainName = document.domain;//域名
 var protocolName = document.location.protocol;//http协议
@@ -12,7 +12,8 @@ var protocolName = document.location.protocol;//http协议
 //线上
 var serverIp = protocolName + "//" + domainName + "/service";
 var reportIp = protocolName + "//" + domainName + "/service";
-var inspectIp = protocolName + "//" + domainName + "/service";
+// var inspectIp = protocolName + "//" + domainName + "/service";
+var inspectIp = "http://192.168.77.57";
 var imgBaseUrl = protocolName + "//" + domainName;
 var callIp = protocolName + "//" + domainName;
 // var seiminCallIp = '192.168.3.233';//本地

assets/views/app.html

@@ -23,6 +23,5 @@
 <!-- footer -->
 <footer data-ng-include=" 'assets/views/partials/footer.html' " ng-mouseup="returnRemoveClass()"></footer>
 <!-- / footer -->
-<div ng-if="seiminHj === 1" ng-mouseup="returnRemoveClass()" data-ng-include=" 'assets/views/partials/off-sidebar1.html' " id="off-sidebar" class="sidebar" toggleable parent-active-class="app-offsidebar-open"></div>
-<div ng-if="seiminHj === 2" ng-mouseup="returnRemoveClass()" data-ng-include=" 'assets/views/partials/off-sidebar2.html' " id="off-sidebar" class="sidebar" toggleable parent-active-class="app-offsidebar-open"></div>
+<div ng-mouseup="returnRemoveClass()" data-ng-include=" 'assets/views/partials/off-sidebar'+seiminHj+'.html' " id="off-sidebar" class="sidebar" toggleable parent-active-class="app-offsidebar-open"></div>
 <!-- <div data-ng-include=" 'assets/views/partials/settings.html' " toggleable class="settings panel panel-default hidden-xs hidden-sm" id="settings"></div> -->

assets/views/customform/tpl/ui-requesterinformation.html

@@ -94,10 +94,17 @@
                     
         <button style=" margin: 0;line-height: 10px;" ng-click="options.templateOptions['addRequeter']('lg',options,to.modal,$event);"
             class="btn btn-addbutton  addbutton col-md-offset-5 col-md-12">添加报修人</button>
+        <button style=" margin: 8px 0 0;line-height: 10px;" ng-click="quickCopy(options.model)"
+            class="btn btn-addbutton  addbutton col-md-offset-5 col-md-12">一键复制</button>
         <div style="margin-top: 8px;float: left;"><input type="checkbox" ng-click="selectGradeBox()" ng-checked="saveReqPlace" id="saveAreaPlace" ng-disabled="!(model.place.id&&model.area.id)"><label for="saveAreaPlace" style="user-select: none;font-size: 15px;margin-left:8px;font-weight: bold;cursor: pointer;color: #333;">报修人区域地点保存</label></div>
         <!-- <button class="btn btn-default default col-md-4 col-md-offset-1" ng-click="options.templateOptions['changeRequeter']('lg',options,to.modal,model)">修改</button> -->
         <!-- </div> -->
     </div>
+    <div class="col-md-12 col-10 fontcolor-three fontsizes-14 requestconnect padding-bottom-10 border-bottom-left-2 border-bottom-right-2"
+        ng-if="!options.templateOptions.onlyshow">
+        <button style=" margin: 8px 0 0;line-height: 10px;" ng-click="quickCopy(options.model)"
+            class="btn btn-addbutton  addbutton col-md-offset-5 col-md-12">一键复制</button>
+    </div>
     <!-- </div> -->
 </div>
 <!-- <input class="form-control pull-right inputcolor" style="width:132px !important;border-color: #dedede;color: #93989e;" type="text" ng-model="searchkeys.contactsInformation" placeholder="" /> -->

assets/views/incident/tpl/toIntegralMechanism.tpl.html

@@ -22,7 +22,7 @@
             </div>
         </div>
     </div>
-    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="flag && complexityConfirm.complexity.value != complexity">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
         <div class="input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">升级原因<span class="red">*</span></label>:</div>
@@ -31,7 +31,7 @@
             </div>
         </div>
     </div>
-    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="!flag">
+    <!-- <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="flag && complexityConfirm.complexity.value != complexity">
         <div class="input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">升级原因<span class="red">*</span></label>:</div>
@@ -40,6 +40,15 @@
             </div>
         </div>
     </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="!flag">
+        <div class="input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">升级原因<span class="red">*</span></label>:</div>
+            <div class="pull-right">
+                <textarea placeholder="请输入升级原因" class="pull-left" style="width:220px;height: 100px;resize:none;" ng-model="complexityConfirm.updateReason"></textarea>
+            </div>
+        </div>
+    </div> -->
 </div>
 <div class="modal-footer modelfooter-hint pointfont">
     <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;">确定</div>

assets/views/partials/off-sidebar3.html

@@ -0,0 +1,104 @@
+<!-- start: OFF RIGHT SIDEBAR TABSET -->
+<tabset class="sidebar-wrapper" justified="true">
+    <!-- start: TAB FAVORITES  -->
+    <tab>
+        <tab-heading>
+            <!-- <i class="ti-heart"></i> -->
+            <i class="fa fa-phone"></i>
+        </tab-heading>
+        <div class="tab-pane" id="getup">
+            <div class="users-list fontsizes-14">
+                <!-- <botton href="#" ng-click="setbusy(1)" translate="offsidebar.login.SETBUSY" ng-if="statecall==1&&login">setbusy</botton>
+                <botton href="#" ng-click="setidle()" translate="offsidebar.login.SETIDLE" ng-if="statecall==2">setidle</botton> -->
+                <!-- <botton href="#" style="float:right" ng-click="end()" translate="offsidebar.login.GETOUT" ng-if="login">getout</botton> -->
+                <botton href="#" ng-click="setbusy(1)" translate="offsidebar.login.SETBUSY" class="btn btn-setbusy setbusy" ng-if="statecall==1&&login&&statuscall!=3&&statuscall!=2">setbusy</botton>
+                <botton href="#" ng-click="setidle()" translate="offsidebar.login.SETIDLE" class="btn btn-setidle setidle" ng-if="login&&statecall==2&&statuscall!=3&&statuscall!=2">setidle</botton>
+                <botton href="#" style="float:right" ng-click="end()" translate="offsidebar.login.GETOUT" class="btn btn-getout getout" ng-if="login">getout</botton>
+                <div class="row form-group fontcolor-two" style="margin-top:30px" id="updata" ng-if="!login">
+                    <div class="col-xs-12 fontsizes-14">
+                        <div class="col-xs-12">
+                            <div class="control-label" for="title">
+                                绑定分机:
+                            </div>
+                            <!-- <label class="control-label text-right pull-left" for="range">分机号:</label> -->
+                            <!-- <ui-select ng-model="hjzx.phone" theme="bootstrap">
+                                <ui-select-match placeholder="选择分机号">
+                                    {{$select.selected.name}}
+                                </ui-select-match>
+                                <ui-select-choices repeat="item in runNumber | filter: $select.search">
+                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                </ui-select-choices>
+                            </ui-select> -->
+                            <select class="form-control" ng-model="phone" ng-change="phoneChange(phone)">  
+                                        <option ng-repeat="x in runNumber" value="{{x.name}}">{{x.name}}</option>  
+                                    </select>
+
+                            <!-- <select class="cs-select cs-skin-slide" ng-model="hjzx.phone">
+                                        <option value=""></option>
+                                        <option ng-repeat="row in runNumber" value="{{row.id}}" >{{row.name}}</option>
+                                    </select> -->
+                            <!-- <div class="">
+                                <input id="title" name="title" ng-model="phone" class="form-control" placeholder="分机号" />
+                            </div> -->
+                        </div>
+                        <!-- <div class="col-xs-12">
+                            <div class="control-label" for="title" style="padding-right:0px">
+                                ACD技能组:
+                            </div>
+                            <div class="">
+                                <select-input class="openaddinput" onChangeadd="onChangeadd()" model={{telephone}} requesdata="telephone" showkeys="phone"></select-input>
+                            </div>
+                        </div> -->
+                        <div class="col-xs-12">
+                            <button class="btn btn-addbutton  addbutton pull-right" style="margin-top:20px" ng-click="start(phone)" translate="offsidebar.login.GETIN"></button>
+                        </div>
+                    </div>
+                </div>
+                <div class="row form-group fontcolor-two" style="margin-top:30px" id="dialout" ng-if="login&&statuscall!=3">
+                    <div class="col-xs-12 fontsizes-14">
+                        <!-- <div class="col-xs-12">
+                            <div class="control-label" for="title">
+                                中继选择:
+                            </div>
+                            <div class="">
+                                <input id="gid" name="gid" ng-model="gid" class="form-control" placeholder="中继选择" />
+                            </div>
+                        </div> -->
+                        <div class="col-xs-12">
+                            <div>
+                                <div class="control-label" for="title">
+                                    目的号码:
+                                </div>
+                                <div class="">
+                                    <input id="teleno" name="teleno" ng-model="teleno" class="form-control" placeholder="目的号码" />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12">
+                            <button class="btn btn-primary col-md-offset-6" style="margin-top:20px" ng-click="dialout(gid,teleno)" translate="offsidebar.login.DIALOUT"></button>
+                        </div>
+                    </div>
+                </div>
+                <div class="row form-group fontcolor-two" style="margin-top:30px" ng-if="login&&statuscall==3">
+                    <div class="col-xs-12 fontsizes-14">
+                        <div class="col-xs-12">
+                            <div class="control-label" for="title" style="padding-right:0px">
+                                转接号码:
+                            </div>
+                            <div class="">
+                                <select-input class="openaddinput" onChangeadd="onChangeadd()" model={{telephone}} requesdata="telephone" showkeys="phone"></select-input>
+                            </div>
+                        </div>
+                        <div class="col-xs-12">
+                            <button class="btn btn-primary" style="margin-top:20px" ng-click="inittrans(telephone)" translate="offsidebar.login.INITTRANS"></button>
+                            <!-- <button class="btn btn-primary" ng-click="comptrans()" style="margin-top:20px" translate="offsidebar.login.COMPTRANS"></button> -->
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- </div> -->
+    </tab>
+    <!-- end: TAB FAVORITES -->
+</tabset>
+<!-- end: OFF RIGHT SIDEBAR TABSET -->

assets/views/system/hospital.html

@@ -35,8 +35,8 @@
   <div class="row">
     <div class="col-sm-8">
       <h1 class="mainTitle">
-        院区设置<i
-          tooltip="新增或编辑院区。"
+        校区设置<i
+          tooltip="新增或编辑校区。"
           tooltip-placement="right"
           class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"
         ></i>

assets/views/system/processdesign/incidentplan/incidentSetUp.html

@@ -572,7 +572,7 @@
                                 </div>
                                 <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">
-                                        是否分院区处理:
+                                        是否分校区处理:
                                     </div>
                                     <div class="tab-mainDiv-body-content userGroupType">
                                         <label>
@@ -585,7 +585,7 @@
                                         </label>
                                     </div>
                                 </div>
-                                <!-- 分院区处理-否 -->
+                                <!-- 分校区处理-否 -->
                                 <div class="tab-mainDiv-body-lineDiv-50" ng-if="subdata.branchType == 0">
                                     <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
                                     <div class="userGroupType">
@@ -621,7 +621,7 @@
                                         </ui-select>
                                     </div>
                                 </div>
-                                <!-- 分院区处理-是 -->
+                                <!-- 分校区处理-是 -->
                                 <div class="tab-mainDiv-body-lineDiv-50" ng-if="subdata.branchType == 1" ng-repeat="item in subdata.branchUserGroups">
                                     <div class="tab-mainDiv-body-lable">{{item.branchName}} - 运维组/运维人员:</div>
                                     <div class="userGroupType">
@@ -787,7 +787,7 @@
                                     </div>
                                     <div class="tab-mainDiv-body-lineDiv-50">
                                         <div class="tab-mainDiv-body-lable">
-                                            是否分院区处理:
+                                            是否分校区处理:
                                         </div>
                                         <div class="tab-mainDiv-body-content userGroupType">
                                             <label>
@@ -800,7 +800,7 @@
                                             </label>
                                         </div>
                                     </div>
-                                    <!-- 分院区处理-否 -->
+                                    <!-- 分校区处理-否 -->
                                     <div class="tab-mainDiv-body-lineDiv-50" ng-if="adddata.branchType == 0">
                                         <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
                                         <div class="userGroupType">
@@ -836,7 +836,7 @@
                                             </ui-select>
                                         </div>
                                     </div>
-                                    <!-- 分院区处理-是 -->
+                                    <!-- 分校区处理-是 -->
                                     <div class="tab-mainDiv-body-lineDiv-50" ng-if="adddata.branchType == 1" ng-repeat="item in adddata.branchUserGroups">
                                         <div class="tab-mainDiv-body-lable">{{item.branchName}} - 运维组/运维人员:</div>
                                         <div class="userGroupType">

assets/views/system/tpl/area.html

@@ -11,7 +11,7 @@
 <div class="modal-body">
     <div class="well-lg"><br/>
         <div class="row form-group">
-            <label class="col-md-3 col-md-offset-1 control-label">所属院区*:</label>
+            <label class="col-md-3 col-md-offset-1 control-label">所属校区*:</label>
             <div class="col-md-7">
                 <ui-select style="width: 100%;" ng-model="search.hospital"
                     theme="bootstrap">

assets/views/system/tpl/hospitalchange.html

@@ -14,13 +14,13 @@
         <div
           class="pull-left openaddlable control-label fontcolor-two fontsizes-14"
         >
-          院区名称*:
+          校区名称*:
         </div>
         <div class="pull-right openaddinput">
           <input
             class="form-control"
             ng-model="hospital.hosName"
-            placeholder="院区名称"
+            placeholder="校区名称"
           />
         </div>
       </div>
@@ -28,13 +28,13 @@
         <div
           class="pull-left openaddlable control-label fontcolor-two fontsizes-14"
         >
-          院区编码*:
+          校区编码*:
         </div>
         <div class="pull-right openaddinput">
           <input
             class="form-control"
             ng-model="hospital.hosNo"
-            placeholder="院区编码"
+            placeholder="校区编码"
           />
         </div>
       </div>