修改

assets/css/login.css

@@ -93,12 +93,12 @@
     height: 100%;
 }
 .codrops-header .logo{
-    width: 120px;
-    height: 120px;
+    width: auto;
+    height: 48px;
     position:absolute; 
     left:50%; 
     transform:translateX(-50%);
-    top: 120px;
+    top: 190px;
 }
 .codrops-header .logo.logo_hk{
     width: auto;

assets/js/controllers/mainCtrl.js

@@ -2675,6 +2675,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 $scope.list = requesters;
                 $scope.selectedItem = 0;
                 $scope.cancel = function () {
+                  $rootScope.newOrderShowOpen = false;
                   $modalInstance.dismiss('cancel');
                 };
                 $scope.changeBxr = function (id) {
@@ -2733,13 +2734,11 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
           });
         } else if (data.status == 201 && data.phone) {
           if (!$rootScope.newOrderShow && !$rootScope.newOrderShowOpen) {
-            $rootScope.newOrderShowOpen = true;
             seachBoxBxDept(data.phone, callID);
           }
         } else if (data.status == 201 && data.phone === "") {
           //没绑定科室
           if (!$rootScope.newOrderShow && !$rootScope.newOrderShowOpen) {
-            $rootScope.newOrderShowOpen = true;
             $rootScope.newOrder({
               incident: {
                 sockid: callID,
@@ -3693,6 +3692,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
     // $rootScope.getOrderCount();
     // 快速建单
     $rootScope.newOrder = function (model1) {
+      $rootScope.newOrderShowOpen = true;
       //进入弹窗,强制示忙
       if (localStorage.getItem('fenjiNumber')) {
         setTimeout(()=>{

assets/js/main.js

@@ -87,7 +87,9 @@ app.run(['$rootScope', '$state', '$stateParams', '$auth', '$http', '$cookieStore
         // 获取项目名称----网络与信息化运维管理系统
         $rootScope.getSysNameAndLogo = function () {
             api_login.getSysNameAndLogo().then(function (res) {
-                $rootScope.app.name = $rootScope.app.author = $rootScope.app.description = res.sysName;
+                $rootScope.app.name = $rootScope.app.author = $rootScope.app.description = res.sysName || '';
+                $rootScope.app.layout.favicon = location.origin + '/file' + res.favicon || '';
+                $rootScope.app.layout.logo = location.origin + '/file' + res.logo || '';
             })
         }
         $rootScope.getSysNameAndLogo();

assets/views/bigScreen/realtimeBroadcast.html

@@ -2,12 +2,12 @@
   <!-- 头部 start -->
   <div class="pharmacy-header">
     <div class="pharmacy-logo">
-      <img
-        src="assets/images/login/logo_default.png"
+      <img ng-if="app.layout.logo"
+        ng-src="{{app.layout.logo}}"
         class="pharmacy-logo__img"
         alt=""
       />
-      <h1 class="pharmacy-logo__name">网络与信息化运维管理系统</h1>
+      <h1 class="pharmacy-logo__name">{{app.name}}</h1>
     </div>
     <div class="pharmacy-name">
       <h2 class="pharmacy-name__title">{{ dutyOrBranch }}</h2>

assets/views/customform/tpl/cmdb/gudingzichan.html

@@ -117,7 +117,7 @@
     <div class="col-xs-12 uplodback margin-top-20" id="searchid" ng-if="state==1&&back">
         <div class="row padding-10">
             <div class="pull-left margin-right-30">
-                <img ng-src="assets/images/cmdb/Shape.png" style="width:50px;height:40px" alt="{{app.name}}" /></div>
+                <img ng-src="assets/images/cmdb/Shape.png" style="width:50px;height:40px" /></div>
             <div class="pull-left  fontsizes-12 formheardpad">
                 <div><span>请上传填好的固定资产信息（仅支持.xls格式，且文件大小不能超过2M）</span></div>
                 <!-- <a ng-click="importopen()">上传模版</a> -->
@@ -166,7 +166,7 @@
     <div class="col-xs-12 uplodback margin-top-20" id="searchid" ng-if="state==3">
         <div class="row padding-10">
             <div class="pull-left margin-right-30">
-                <img ng-src="assets/images/cmdb/success.png" style="width:30px;height:30px" alt="{{app.name}}" /></div>
+                <img ng-src="assets/images/cmdb/success.png" style="width:30px;height:30px" /></div>
             <div class="pull-left  fontsizes-12 formheardpad">
                 <div><span>导入成功</span></div>
             </div>
@@ -208,7 +208,7 @@
     <!-- <div class="col-xs-12 uplodback margin-top-20" id="searchid" ng-if="state==2">
         <div class="row padding-10">
             <div class="pull-left margin-right-30">
-                <img ng-src="assets/images/cmdb/xiazai.png" style="width:50px;height:40px" alt="{{app.name}}" /></div>
+                <img ng-src="assets/images/cmdb/xiazai.png" style="width:50px;height:40px" /></div>
             <div class="pull-left  fontsizes-12 formheardpad">
                 <div><span>本次可导入资产数：{{}}条</span></div>
             </div>
@@ -217,7 +217,7 @@
     <div class="col-xs-12 uplodback margin-top-20" id="searchid" ng-if="state==2">
         <div class="row padding-10">
             <div class="pull-left margin-right-30">
-                <img ng-src="assets/images/cmdb/xiazai.png" style="width:30px;height:30px" alt="{{app.name}}" /></div>
+                <img ng-src="assets/images/cmdb/xiazai.png" style="width:30px;height:30px" /></div>
             <div class="pull-left  fontsizes-12 formheardpad">
                 <div><span>本次不可导入资产数：{{}}条</span></div>
             </div>
@@ -232,7 +232,7 @@
     <div class="col-xs-12 uplodback margin-top-20" id="searchid" ng-if="state==2">
         <div class="row padding-10">
             <div class="pull-left margin-right-30">
-                <img ng-src="assets/images/cmdb/Shape.png" style="width:50px;height:40px" alt="{{app.name}}" /></div>
+                <img ng-src="assets/images/cmdb/Shape.png" style="width:50px;height:40px" /></div>
             <div class="pull-left  fontsizes-12 formheardpad">
                 <div><span>请上传填好的固定资产信息（仅支持.xls格式，且文件大小不能超过2M）</span></div>
                 <!-- <a ng-click="importopen()">上传模版</a> -->
@@ -304,7 +304,7 @@
     <div class="col-xs-12 uplodback margin-top-20" id="searchid" ng-if="state==1&&!back">
         <div class="row padding-10">
             <div class="pull-left margin-right-30">
-                <img ng-src="assets/images/cmdb/xiazai.png" style="width:50px;height:40px" alt="{{app.name}}" /></div>
+                <img ng-src="assets/images/cmdb/xiazai.png" style="width:50px;height:40px" /></div>
             <div class="pull-left  fontsizes-12 formheardpad">
                 <div><span>请填写导入固定资产信息</span></div>
                 <a ng-click="openmeans()">选择下载模版</a>
@@ -314,7 +314,7 @@
     <div class="col-xs-12 uplodback margin-top-20" id="searchid" ng-if="state==1&&!back">
         <div class="row padding-10">
             <div class="pull-left margin-right-30">
-                <img ng-src="assets/images/cmdb/Shape.png" style="width:50px;height:40px" alt="{{app.name}}" /></div>
+                <img ng-src="assets/images/cmdb/Shape.png" style="width:50px;height:40px" /></div>
             <div class="pull-left  fontsizes-12 formheardpad">
                 <div><span>请上传填好的固定资产信息（仅支持.xls格式，且文件大小不能超过2M）</span></div>
                 <!-- <a ng-click="importopen()">上传模版</a> -->

assets/views/customform/tpl/cmdb/ui-cmdbinformation.html

@@ -6,7 +6,7 @@
     </div>
     <div class="padding-bottom-6">
         <div class="col-md-3 center">
-            <img ng-src="assets/images/cmdb/icon_touxiang.png" style="width:40px;height:40px" alt="{{app.name}}" /></div>
+            <img ng-src="assets/images/cmdb/icon_touxiang.png" style="width:40px;height:40px" /></div>
         <div class="col-md-9  fontsizes-14 formheardpad">
             <div class="control-label fontcolor-ten" style="
             white-space: nowrap;text-overflow: ellipsis;

assets/views/customform/tpl/cmdb/ui-nodataimage.html

@@ -34,7 +34,7 @@
 <div class="imagedata row" ng-style="to.textpadding">
     <div class="imagediv">
         <p>
-            <img ng-src="assets/images/cmdb/nodataimage.png" style="width:210px;height:181px" alt="{{app.name}}" />
+            <img ng-src="assets/images/cmdb/nodataimage.png" style="width:210px;height:181px" />
             <!-- <div class="font-weight-500 fontcolor-two margin-top:20px">暂无表单内容</div>
             <div class="fontcolor-one">请根据您的需求先填写上栏信息。</div> -->
         </p>

assets/views/login_forgot.html

@@ -2,7 +2,7 @@
 <div class="row">
 	<div class="main-login col-xs-10 col-xs-offset-1 col-sm-8 col-sm-offset-2 col-md-4 col-md-offset-4">
 		<div class="logo">
-			<img ng-src="{{app.layout.logo}}" alt="{{app.name}}"/>
+			<img ng-src="{{app.layout.logo}}" ng-if="app.layout.logo"/>
 		</div>
 		<!-- start: FORGOT BOX -->
 		<div class="box-forgot">

assets/views/login_login.html

@@ -95,9 +95,7 @@
                 </a>
             </nav> -->
             <h1>{{app.name}}</h1>
-            <img class="logo" src="../../assets/images/login/logo_zncd.png" alt="" ng-if="isZncd">
-            <img class="logo logo_hk" src="../../assets/images/login/logo_hk2.png" alt="" ng-if="isHk">
-            <img class="logo" src="../../assets/images/login/logo_default.png" alt="" ng-if="!isZncd&&!isHk">
+            <img ng-if="app.layout.logo" class="logo" src="{{app.layout.logo}}" alt="">
             <img src="../../assets/images/login/bg01.png" alt="">
             <img class="map" src="../../assets/images/login/bg02.png" alt="">
         </header>

assets/views/login_registration.html

@@ -2,7 +2,7 @@
 <div class="row">
 	<div class="main-login col-xs-10 col-xs-offset-1 col-sm-8 col-sm-offset-2 col-md-4 col-md-offset-4">
 		<div class="logo">
-			<img ng-src="{{app.layout.logo}}" alt="{{app.name}}"/>
+			<img ng-src="{{app.layout.logo}}" ng-if="app.layout.logo"/>
 		</div>
 		<!-- start: REGISTER BOX -->
 		<div class="box-register">

assets/views/partials/settings.html

@@ -42,7 +42,7 @@
     <div class="colors-row setting-box">
         <div class="color-theme theme-1">
             <div class="color-layout">
-                <label ng-click=" app.layout.theme='theme-1'; app.layout.logo='assets/images/logo.png'; ">
+                <label ng-click=" app.layout.theme='theme-1'; ">
 					<input type="radio" name="setting-theme" ng-model="app.layout.theme" value="theme-1">
 					<span class="ti-check"></span>
 					<span class="split header"> <span class="color th-header"></span> <span class="color th-collapse"></span> </span>
@@ -52,7 +52,7 @@
         </div>
         <div class="color-theme theme-2">
             <div class="color-layout">
-                <label ng-click=" app.layout.theme='theme-2'; app.layout.logo='assets/images/logo.png'; ">
+                <label ng-click=" app.layout.theme='theme-2'; ">
 					<input type="radio" name="setting-theme" ng-model="app.layout.theme" value="theme-2">
 					<span class="ti-check"></span>
 					<span class="split header"> <span class="color th-header"></span> <span class="color th-collapse"></span> </span>
@@ -64,7 +64,7 @@
     <div class="colors-row setting-box">
         <div class="color-theme theme-3">
             <div class="color-layout">
-                <label ng-click=" app.layout.theme='theme-3'; app.layout.logo='assets/images/logo.png';">
+                <label ng-click=" app.layout.theme='theme-3';">
 					<input type="radio" name="setting-theme" ng-model="app.layout.theme" value="theme-3">
 					<span class="ti-check"></span>
 					<span class="split header"> <span class="color th-header"></span> <span class="color th-collapse"></span> </span>
@@ -74,7 +74,7 @@
         </div>
         <div class="color-theme theme-4">
             <div class="color-layout">
-                <label ng-click=" app.layout.theme='theme-4'; app.layout.logo='assets/images/logo.png';">
+                <label ng-click=" app.layout.theme='theme-4';">
 					<input type="radio" name="setting-theme" ng-model="app.layout.theme" value="theme-4">
 					<span class="ti-check"></span>
 					<span class="split header"> <span class="color th-header"></span> <span class="color th-collapse"></span> </span>
@@ -86,7 +86,7 @@
     <div class="colors-row setting-box">
         <div class="color-theme theme-5">
             <div class="color-layout">
-                <label ng-click=" app.layout.theme='theme-5'; app.layout.logo='assets/images/logo.png';">
+                <label ng-click=" app.layout.theme='theme-5';">
 					<input type="radio" name="setting-theme" ng-model="app.layout.theme" value="theme-5">
 					<span class="ti-check"></span>
 					<span class="split header"> <span class="color th-header"></span> <span class="color th-collapse"></span> </span>
@@ -96,7 +96,7 @@
         </div>
         <div class="color-theme theme-6">
             <div class="color-layout">
-                <label ng-click=" app.layout.theme='theme-6'; app.layout.logo='assets/images/logo.png';">
+                <label ng-click=" app.layout.theme='theme-6';">
 					<input type="radio" name="setting-theme" ng-model="app.layout.theme" value="theme-6">
 					<span class="ti-check"></span>
 					<span class="split header"> <span class="color th-header"></span> <span class="color th-collapse"></span> </span>

assets/views/partials/top-navbar.html

@@ -40,14 +40,8 @@
         <span class="sr-only">Toggle navigation</span>
         <i class="ti-view-grid"></i>
     </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="isZncd">
-        <img ng-src="assets/images/login/logo_zncd.png" style="width:40px;height: 40px;" alt="{{app.name}}"
-            class="jry_img_right" />{{app.author}} </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="isHk">
-        <img ng-src="assets/images/login/logo_hk2.png" style="width:auto;height: 35px;" alt="{{app.name}}"
-            class="jry_img_right" />{{app.author}} </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="!isZncd&&!isHk">
-        <img ng-src="assets/images/login/logo_default.png" style="width:40px;height: 40px;" alt="{{app.name}}"
+    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard">
+        <img ng-if="app.layout.logo" ng-src="{{app.layout.logo}}" style="width:40px;height: 40px;"
             class="jry_img_right" />{{app.author}} </a>
 </div>
 <!-- end: NAVBAR HEADER -->

assets/views/partials/top-navbar1.html

@@ -40,20 +40,8 @@
         <span class="sr-only">Toggle navigation</span>
         <i class="ti-view-grid"></i>
     </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="isZncd">
-        <!-- <img ng-src="/logo_large.png" style="width:160px;height:35px" alt="{{app.name}}" /> -->
-        <!-- <span class="padding-left-10 padding-right-5"><img ng-src="/line.png"  alt="{{app.name}}" /></span> -->
-        <img ng-src="assets/images/login/logo_zncd.png" style="width:40px;height: 40px;" alt="{{app.name}}"
-            class="jry_img_right" />{{app.author}} </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="isHk">
-        <!-- <img ng-src="/logo_large.png" style="width:160px;height:35px" alt="{{app.name}}" /> -->
-        <!-- <span class="padding-left-10 padding-right-5"><img ng-src="/line.png"  alt="{{app.name}}" /></span> -->
-        <img ng-src="assets/images/login/logo_hk2.png" style="width:auto;height: 35px;" alt="{{app.name}}"
-            class="jry_img_right" />{{app.author}} </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="!isZncd&&!isHk">
-        <!-- <img ng-src="/logo_large.png" style="width:160px;height:35px" alt="{{app.name}}" /> -->
-        <!-- <span class="padding-left-10 padding-right-5"><img ng-src="/line.png"  alt="{{app.name}}" /></span> -->
-        <img ng-src="assets/images/login/logo_default.png" style="width:40px;height: 40px;" alt="{{app.name}}"
+    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard">
+        <img ng-if="app.layout.logo" ng-src="{{app.layout.logo}}" style="width:40px;height: 40px;"
             class="jry_img_right" />{{app.author}} </a>
 </div>
 <!-- end: NAVBAR HEADER -->

assets/views/partials/top-navbar2.html

@@ -40,20 +40,8 @@
         <span class="sr-only">Toggle navigation</span>
         <i class="ti-view-grid"></i>
     </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="isZncd">
-        <!-- <img ng-src="/logo_large.png" style="width:160px;height:35px" alt="{{app.name}}" /> -->
-        <!-- <span class="padding-left-10 padding-right-5"><img ng-src="/line.png"  alt="{{app.name}}" /></span> -->
-        <img ng-src="assets/images/login/logo_zncd.png" style="width:40px;height: 40px;" alt="{{app.name}}"
-            class="jry_img_right" />{{app.author}} </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="isHk">
-        <!-- <img ng-src="/logo_large.png" style="width:160px;height:35px" alt="{{app.name}}" /> -->
-        <!-- <span class="padding-left-10 padding-right-5"><img ng-src="/line.png"  alt="{{app.name}}" /></span> -->
-        <img ng-src="assets/images/login/logo_hk2.png" style="width:auto;height: 35px;" alt="{{app.name}}"
-            class="jry_img_right" />{{app.author}} </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="!isZncd&&!isHk">
-        <!-- <img ng-src="/logo_large.png" style="width:160px;height:35px" alt="{{app.name}}" /> -->
-        <!-- <span class="padding-left-10 padding-right-5"><img ng-src="/line.png"  alt="{{app.name}}" /></span> -->
-        <img ng-src="assets/images/login/logo_default.png" style="width:40px;height: 40px;" alt="{{app.name}}"
+    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard">
+        <img ng-if="app.layout.logo" ng-src="{{app.layout.logo}}" style="width:40px;height: 40px;"
             class="jry_img_right" />{{app.author}} </a>
 </div>
 <!-- end: NAVBAR HEADER -->

assets/views/partials/top-navbar3.html

@@ -12,7 +12,7 @@
         <i class="ti-view-grid"></i>
     </a>
     <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard">
-        <img ng-src="assets/images/login/logo_hk2.png" style="width:160px;height:35px" alt="{{app.name}}" /><span class="padding-left-10 padding-right-5"></span> <span class="fontsizes-16 padding-right-5">{{app.author}}</span>
+        <img ng-src="assets/images/login/logo_hk2.png" style="width:160px;height:35px" /><span class="padding-left-10 padding-right-5"></span> <span class="fontsizes-16 padding-right-5">{{app.author}}</span>
     </a>
 </div>
 <!-- end: NAVBAR HEADER -->

assets/views/partials/top-navbar4.html

@@ -40,14 +40,8 @@
         <span class="sr-only">Toggle navigation</span>
         <i class="ti-view-grid"></i>
     </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="isZncd">
-        <img ng-src="assets/images/login/logo_zncd.png" style="width:40px;height: 40px;" alt="{{app.name}}"
-            class="jry_img_right" />{{app.author}} </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="isHk">
-        <img ng-src="assets/images/login/logo_hk2.png" style="width:auto;height: 35px;" alt="{{app.name}}"
-            class="jry_img_right" />{{app.author}} </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard" ng-if="!isZncd&&!isHk">
-        <img ng-src="assets/images/login/logo_default.png" style="width:40px;height: 40px;" alt="{{app.name}}"
+    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard">
+        <img ng-if="app.layout.logo" ng-src="{{app.layout.logo}}" style="width:40px;height: 40px;"
             class="jry_img_right" />{{app.author}} </a>
 </div>
 <!-- end: NAVBAR HEADER -->

index.html

@@ -20,9 +20,7 @@
     <!-- Bootstrap -->
     <link rel="stylesheet" href="assets/css/swiper-bundle.css">
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
-    <link rel="icon" type="image/png" sizes="32x32" href="assets/images/login/logo_zncd.png" ng-if="isZncd">
-    <link rel="icon" type="image/png" sizes="32x32" href="assets/images/login/logo_hk.png" ng-if="isHk">
-    <link rel="icon" type="image/png" sizes="32x32" href="assets/images/login/logo_default.png" ng-if="!isHk&&!isZncd">
+    <link rel="icon" id="favicon" type="image/png" sizes="32x32" href="{{app.layout.favicon}}">
     <!-- Font Awesome -->
     <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">