Explorar o código

修改系统名称;登录页;添加项目选择

李顺 %!s(int64=2) %!d(string=hai) anos
pai
achega
eabadf1ea4

+ 3 - 3
src/bigDataPanel/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>三峡发展智慧EPC管理平台</title>
+    <title>三峡发展智慧EPC管网施工</title>
     <link rel=”icon” href=”favicon.ico” mce_href=”/dir/favicon.ico” type=”image/x-icon”>
     <link type="text/css" rel="stylesheet" href="../vendor/bootstrap-4.0.0/css/bootstrap.min.css">
     <link type="text/css" rel="stylesheet" href="./css/login.css">
@@ -14,12 +14,12 @@
         <div class="loadingCartoon">
             <div class="mask">
                 <div class="loading-logo">
-                    <img src="./css/img/back.png" alt="三峡发展智慧EPC管理平台">
+                    <img src="./css/img/back.png" alt="三峡发展智慧EPC管网施工">
                 </div>
                 <div class="title">
                     <h1>
                         <div class="marklog"><img src='./css/img/companymark.png' /></div>
-                        三峡发展智慧EPC管理平台
+                        三峡发展智慧EPC管网施工
                     </h1>
                 </div>
                 <div class="progressContainer">

+ 1 - 1
src/configure.ts

@@ -111,7 +111,7 @@ var AppX = {
         "copyright": {
             "company": "同飞科技",
             "url": "http://www.tofly.cn",
-            "title": "三峡发展智慧EPC管理平台",//系统标题
+            "title": "三峡发展智慧EPC管网施工",//系统标题
             "version": "V1.0",//主版本号.分子版本号.小版本号.日期版本号_阶段标识
             "helpUrl": "docs/help",//帮助
             "aboutUrl": "docs/about"//关于

+ 4 - 4
src/controlPanel/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>三峡发展智慧EPC管理平台</title>
+    <title>三峡发展智慧EPC管网施工</title>
     <link rel=”icon” href=”favicon.ico” mce_href=”/dir/favicon.ico” type=”image/x-icon”>
     <link type="text/css" rel="stylesheet" href="../vendor/bootstrap-4.0.0/css/bootstrap.min.css">
     <link type="text/css" rel="stylesheet" href="./css/login.css">
@@ -16,11 +16,11 @@
 
                 <div class="loading-logo">
                     <div class="marklog"><img src='./css/img/companymark.png' /></div>
-                    <img src="./css/img/loadback.png" alt="三峡发展智慧EPC管理平台">
+                    <img src="./css/img/loadback.png" alt="三峡发展智慧EPC管网施工">
                 </div>
                 <div class="title">
                     <h1>
-                        三峡发展智慧EPC管理平台
+                        三峡发展智慧EPC管网施工
                     </h1>
                 </div>
                 <div class="progressContainer">
@@ -40,7 +40,7 @@
         <div class="logoContainer">
             <p>
                      <img src='./css/img/companymark.png' />
-               三峡发展智慧EPC管理平台
+               三峡发展智慧EPC管网施工
             </p>
         </div>
               <div class='titlespan'>

+ 1 - 1
src/docs/version/index.html

@@ -10,7 +10,7 @@
 <body>
     <!--#insert file="-markdown.html" -->
     <link rel="stylesheet" href="github-markdown.css">
-    <h1 id="-3-0-0">三峡发展智慧EPC管理平台V1.0.0</h1>
+    <h1 id="-3-0-0">三峡发展智慧EPC管网施工V1.0.0</h1>
     <hr>
     <h3 id="-2019-03-22">更新日期:2019.3.22</h3>
     <p><strong>点选查询</strong></p>

+ 1 - 1
src/index.html

@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <title>三峡发展智慧EPC管理平台</title>
+    <title>三峡发展智慧EPC管网施工</title>
     <meta name="description" content="" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
     <link rel="apple-touch-icon" href="apple-touch-icon.png" />

BIN=BIN
src/login/css/img/background.png


BIN=BIN
src/login/css/img/background3.png


+ 109 - 35
src/login/css/login.css

@@ -13,9 +13,83 @@ body {
 #mainContainer {
     width: 100%;
     height: 100%;
-    background-image: url(./img/bg.png);
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background: url("./img/background.png") no-repeat fixed center/100%;
+    background-size: cover;
+}
+.company-name {
+    font-family: PingFang SC,Source Han Sans CN,Microsoft YaHei,Arial,sans-serif;
+    line-height: 1.1;
+    position: absolute;
+    font-size: 40px;
+    color: white;
+    font-weight: 500;
+    letter-spacing: 4px;
+    width: 100%;
+    text-align: center;
+    top: calc((100% - 534px) / 2);
+    -webkit-box-reflect: below 1px -webkit-gradient(linear, 0 0, 0 50%, from(transparent), color-stop(0.2, transparent), to(rgba(3, 3, 3, 0.1)));
+}
+.fill-container {
+    position: relative;
+    width: 926px;
+    height: 434px;
+    border-radius: 10px;
+    background-color: rgb(228, 242, 255);
+    left: calc((100% - 926px) / 2);
+    top: calc((100% - 334px) / 2);
+}
+.fill-container .left {
+    position: relative;
+    float: left;
+    width: 538px;
+    overflow: hidden;
+}
+.fill-container .right {
+    width: 388px;
+    width: 388px;
+    position: relative;
+    float: left;
+}
+.fill-container .right .top {
+    font-family: PingFang SC,Source Han Sans CN,Microsoft YaHei,Arial,sans-serif;
+    font-size: 25px;
+    font-weight: 700;
+    color: rgb(45, 116, 231);
+    text-align: center;
+    width: 100%;
+    top: 50px;
+    position: relative;
+    float: left;
+}
+.fill-container .right .top > span {
+    line-height: 30px;
+}
+.fill-container .right .top > span:nth-of-type(2) {
+    margin-top: 16px;
+}
+.middle {
+    width: 320px;
+    margin-bottom: 80px;
+    position: relative;
+    left: calc((100% - 320px) / 2);
+    top: 100px;
+}
+.bottom{
+    position: relative;
+    top:35px;
+}
+.middle > .form-input {
+    height: 36px;
+    line-height: 36px;
+}
+.middle > .form-input :nth-of-type(2) {
+    margin-top: 15px;
+}
+.middle > .form-input :nth-of-type(3) {
+    margin-top: 15px;
 }
 .username,
 .password {
@@ -27,21 +101,26 @@ body {
     height: 44px;
     /*width: 272px !important;*/
     /*width: 20% !important;*/
-    border: none;
 }
-input.username::-webkit-input-placeholder{
-    color:#999999;
+.title{
+    display: inline-block;
 }
-input.password::-webkit-input-placeholder{
-    color:#999999;
+input.title:focus{
+    box-shadow: none;
+}
+input.username::-webkit-input-placeholder {
+    color: #999999;
+}
+input.password::-webkit-input-placeholder {
+    color: #999999;
 }
 .login {
     border: none;
     color: white;
     padding: 0px;
-    letter-spacing: 8px;
-    background: #1ed7e5;
-    text-indent: 8px;
+    background: #2467d3;
+    border-radius: 22px;
+    margin-top: 20px;
 }
 .login .loginLoading {
     display: none;
@@ -57,8 +136,7 @@ input.password::-webkit-input-placeholder{
 }
 .login p {
     text-align: center;
-    font-size: 20px;
-    font-weight: 600;
+    font-size: 16px;
     vertical-align: middle;
     line-height: 44px;
     height: 44px;
@@ -75,12 +153,8 @@ input.password::-webkit-input-placeholder{
     border: none;
     border-radius: 0;
     background-color: transparent;
-    position: absolute;
     height: 40px;
-    top: calc(71.5% + 110px);
-    left: calc(19% + 50px);
-    text-align: center;
-    font-size: 14px;
+    font-size: 12px;
     display: none;
     color: #ff0000;
 }
@@ -93,20 +167,20 @@ input.password::-webkit-input-placeholder{
     font-weight: bold;
     color: #1cecfc;
     text-shadow: 0px 0px 2px rgba(7, 61, 104, 0.24);
-    width:157px;
+    width: 157px;
 }
-.feedback span{
+.feedback span {
     padding-bottom: 1px;
-    border-bottom:1px solid #1DDDEB;
-    cursor: pointer; 
+    border-bottom: 1px solid #1dddeb;
+    cursor: pointer;
 }
-.feedback span:hover{
-    color:#3cd5e0ed;
+.feedback span:hover {
+    color: #3cd5e0ed;
 }
-span.pwspan{
+span.pwspan {
     float: left;
 }
-span.feedspan{
+span.feedspan {
     float: right;
 }
 
@@ -136,33 +210,34 @@ span.feedspan{
 }
 .shadow {
     /* height: 17.78%; */
-    height:18.78%;
+    height: 18.78%;
     width: calc(59% - 50px);
     position: absolute;
     left: calc(19% + 50px);
     top: 70.5%;
 }
-.shadow .loginitem{
+.loginitem {
     flex-flow: row nowrap;
 }
-.shadow .loginimg {
+.loginimg {
     position: absolute;
     left: 10px;
     height: 44px;
     text-align: center;
 }
-.shadow .form-inline .form-control {
+.form-inline .form-control {
+    display: inline-block;
     width: 100%;
 }
 .usernameContainer,
 .passwordContainer,
-.loginContainer {
+.loginContainer,.codeContainer {
     position: relative;
 }
 .msginfo {
     padding-right: 90px;
 }
-.usernameContainer .msgBtn {
+.codeContainer .msgBtn {
     height: 44px;
     position: absolute;
     top: 0;
@@ -189,10 +264,9 @@ span.feedspan{
 
 .loginContainer {
     /* margin-left: 600px; */
-    width: 156px;
     height: 44px;
-    margin-left: 70px;
+    margin-top: 30px;
 }
-.shadow .loginimg img:last-child {
+.loginimg img:last-child {
     margin-left: 10px;
 }

+ 64 - 14
src/login/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>三峡发展智慧EPC管理平台</title>
+    <title>三峡发展智慧EPC管网施工</title>
     <link rel=”icon” href=”favicon.ico” mce_href=”/dir/favicon.ico” type=”image/x-icon”>
     <link type="text/css" rel="stylesheet" href="../vendor/bootstrap-4.0.0/css/bootstrap.min.css">
     <link type="text/css" rel="stylesheet" href="./css/login.css">
@@ -11,7 +11,67 @@
 
 <body>
     <div id='mainContainer'>
-        <div class="shadow form-inline">
+        <div class="company-name">
+            三峡发展智慧EPC管网施工
+        </div>
+        <div class="fill-container">
+            <div class="left">
+                <img src="./css/img/background3.png" />
+            </div>
+            <div class="right">
+                <div class="top">
+                    <span>用户登录</span>
+                    <!-- <span>城市排水综合管网管理平台</span> -->
+                </div>
+                <div class="middle">
+                    <div class='loginitem'>
+                        <div class='usernameContainer'>
+                            <div class='loginimg form-inline'>
+                                <img src="./css/img/username.png">
+                                <img src="./css/img/login_line.png">
+                            </div>
+                            <input type="text" class="form-control form-control-sm title username" autocomplete="off" placeholder="用户名/手机号">
+                        </div>
+                        <div class='passwordContainer' style="margin-top: 15px;">
+                            <div class='loginimg form-inline'>
+                                <img src="./css/img/password.png">
+                                <img src="./css/img/login_line.png">
+                            </div>
+                            <input type="password" class="form-control form-control-sm title password" placeholder="密码" autocomplete="off">
+                        </div>
+                        <div class='codeContainer' style="margin-top: 15px;">
+                            <div class='loginimg form-inline'>
+                                <img src="./css/img/msg.png">
+                                <img src="./css/img/login_line.png">
+                            </div>
+                            <input type="text" autocomplete="off" class="form-control form-control-sm title username msginfo"
+                                placeholder="短信验证码">
+                            <div class="form-inline msgBtn">
+                                <span class="msgcode">获取验证码</span>
+                            </div>
+                        </div>
+                        <div class='loginContainer'>
+                            <div class="login">
+                                <img class="loginLoading" src="./css/img/loading.gif">
+                                <p class="loginTxt">登录</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                    <div class="error bottom">
+                        <img src="./css/img/error.png" />
+                        <span class="spanbackground">
+                            <span class="errorInfoUsername">
+                                <div class="errorInfoUsername1"></div>
+                                <div class="errorInfoUsername2"></div>
+                                <div class="errorInfoUsername3"></div>
+                                <div class="errorInfoUsername4"></div>
+                            </span>
+                        </span>
+                    </div>
+            </div>
+        </div>
+        <!-- <div class="shadow form-inline">
             <div class='loginitem form-inline'>
                 <div class='usernameContainer'>
                     <div class='loginimg form-inline'>
@@ -45,22 +105,12 @@
                 </div>
             </div>
            
-        </div>
+        </div> -->
         <!-- <div class="feedback">
             <span class="pwspan">忘记密码?</span>
             <span class="feedspan">问题反馈</span>
         </div> -->
-        <div class="error">
-            <img src="./css/img/error.png"/>
-            <span class="spanbackground">
-                <span class="errorInfoUsername">
-                    <div class="errorInfoUsername1"></div>
-                    <div class="errorInfoUsername2"></div>
-                    <div class="errorInfoUsername3"></div>
-                    <div class="errorInfoUsername4"></div>
-                </span>
-            </span>
-        </div>
+        
         <!--<div class="info">
             <p><span>技术支持:成都同飞科技有限责任公司</span>
             <span>客服电话:(028)8734870</span>

+ 1 - 1
src/login/js/login.js

@@ -113,7 +113,7 @@ function load() {
                     setTime(btnMSG);
                 } else {
                     $(".error").show();
-                    $(".errorInfoUsername").text(result.result);
+                    $(".errorInfoUsername").text(result.message);
                 }
             },
             error: function (err) {

+ 1 - 1
src/newsPage/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>三峡发展智慧EPC管理平台</title>
+    <title>三峡发展智慧EPC管网施工</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <link rel=”icon” href=”favicon.ico” mce_href=”/dir/favicon.ico” type=”image/x-icon”>
     <link type="text/css" rel="stylesheet" href="../vendor/bootstrap-4.0.0/css/bootstrap.min.css">

+ 5 - 5
src/projectSelectPanel/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>三峡发展智慧EPC管理平台</title>
+    <title>三峡发展智慧EPC管网施工</title>
     <link rel=”icon” href=”favicon.ico” mce_href=”/dir/favicon.ico” type=”image/x-icon”>
     <link type="text/css" rel="stylesheet" href="../vendor/bootstrap-4.3.1/css/bootstrap.min.css">
     <link type="text/css" rel="stylesheet" href="../vendor/jquery-datatables-1.10.18/css/dataTables.bootstrap.min.css">
@@ -12,16 +12,16 @@
 </head>
 
 <body>
-    <!-- <div id='mainContainer' class='hidemainContainer'>
+    <div id='mainContainer' class='hidemainContainer'>
         <div class="loadingCartoon">
             <div class="mask">
                 <div class="loading-logo">
-                    <img src="./css/img/back.png" alt="三峡发展智慧EPC管理平台">
+                    <img src="./css/img/back.png" alt="三峡发展智慧EPC管网施工">
                 </div>
                 <div class="title">
                     <h1>
                         <div class="marklog"><img src='./css/img/companymark.png' /></div>
-                        三峡发展智慧EPC管理平台
+                        三峡发展智慧EPC管网施工
                     </h1>
                 </div>
                 <div class="progressContainer">
@@ -52,7 +52,7 @@
             </table>
         </div>
         </div>
-    </div> -->
+    </div>
 </body>
 <script type="text/javascript" src="../vendor/jquery-3.3.1/jquery.min.js"></script>
 <script type="text/javascript" src="../vendor/js-security/sha1.js"></script>

+ 7 - 9
src/projectSelectPanel/js/login.js

@@ -38,13 +38,13 @@ function load() {
                 console.log(data);
                 if (data.code == 1) {
                     $("#mainContainer").removeClass("hidemainContainer");
-                    // loadingCartoon();
-                    // initTable(data);
-                    // bindInit();
-                    // closeSys();
-                    // enterBigScreen();
-                    const prjaryy=getPrj(data,45);
-                    setPrj(prjaryy[0]);
+                    loadingCartoon();
+                    initTable(data);
+                    bindInit();
+                    closeSys();
+                    enterBigScreen();
+                    //const prjaryy=getPrj(data,45);
+                    //setPrj(prjaryy[0]);
                 } else {
                     console.error(data.message);
                     window.location.href = SYS_ADDR + "/login/";
@@ -139,9 +139,7 @@ function load() {
             { name: "index", title: "", data: "index", width: "3%" },
             { name: "prjid", title: "项目ID", data: "prjid", visible: false },
             { name: "position", title: "position", data: "position", visible: false },
-            { name: "orgName", title: "区域总部", data: "orgName", width: "15%" },
             { name: "province", title: "省市", data: "province", width: "10%" },
-            { name: "unit", title: "项目公司", data: "unit", width: "20%" },
             { name: "code", title: "项目编号", data: "code", width: "15%" },
             { name: "name", title: "项目名称", data: "name", width: "37%", render: prjNameRender },
             { name: "rowspan", title: "合并行", data: "rowspan", visible: false }

+ 1 - 1
src/rlogin/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>三峡发展智慧EPC管理平台</title>
+    <title>三峡发展智慧EPC管网施工</title>
     <link rel=”icon” href=”favicon.ico” mce_href=”/dir/favicon.ico” type=”image/x-icon”>
     <link type="text/css" rel="stylesheet" href="../vendor/bootstrap-4.0.0/css/bootstrap.min.css">
     <link type="text/css" rel="stylesheet" href="./css/login.css">

+ 6 - 6
src/widgets/Header/Widget.html

@@ -52,19 +52,19 @@
         </div>
         <div class="spli-btn"></div>
         <!--返回项目切换页按钮-->
-        <!-- <div class="projSel">
+        <div class="projSel">
             <select id="projSelect"></select>
-        </div> -->
+        </div>
         <!-- <div>
             <button type="button" class="btn btn-link"><i class="tool-info"></i>消息提醒</button>
-        </div>
+        </div>-->
         <div>
             <button type="button" class="btn btn-link"><i class="tool-feedback"></i>问题反馈</button>
         </div>
         <div>
             <button type="button" class="btn btn-link"><i class="tool-question"></i>常见问题</button>
-        </div> -->
-        <!-- <div class="dropdown helper">
+        </div>
+        <div class="dropdown helper">
             <button class="btn btn-link dropdown-toggle" type="button" id="systemHelper" data-toggle="dropdown" aria-expanded="false">
                 <i class="tool-help"></i>帮助
             </button>
@@ -74,7 +74,7 @@
                     <div><button class="btn btn-link" id="videoDownload">下载演示视频</button></div>
                 </div>
             </div>
-        </div> -->
+        </div>
     </div>
     <div class="switchover"><span>切换系统</span></div>
     <div class="switch_zz hideswitchbg"></div>

+ 2 - 2
src/widgets/Header/Widget.ts

@@ -101,7 +101,7 @@ class Header extends BaseWidget {
 
                 } else {
                     $(".error").show();
-                    $(".errorInfoUsername").text(result.result);
+                    $(".errorInfoUsername").text(result.message);
                 }
             }, (err) => {
                 console.log(err);
@@ -122,7 +122,7 @@ class Header extends BaseWidget {
                     this.setNewPassword(popup);
                 } else {
                     $(".error").show();
-                    $(".errorInfoUsername").text(result.result);
+                    $(".errorInfoUsername").text(result.message);
                 }
             }, (err) => {
 

+ 1 - 1
src/widgets/HomePage/Widget.html

@@ -1,6 +1,6 @@
 <div id='widget-homePage' class='widget-homePage'>
     <div class='header'>
-        <div class='title'><span>三峡发展智慧EPC管理平台</span></div>
+        <div class='title'><span>三峡发展智慧EPC管网施工</span></div>
         <div class='goSys'></div>
         <!-- <div class='closeSys'><span>退出系统</span></div> -->
     </div>

+ 1 - 1
src/widgets/HomePageNew/Widget.html

@@ -3,7 +3,7 @@
     <div class='header'>
         <div class="countTime">数据统计时间:<span class="specificTime"></span></div><div class="refresh"></div>
         <div class='title'>
-            <div><span class="systemName">三峡发展智慧EPC管理平台</span></div>
+            <div><span class="systemName">三峡发展智慧EPC管网施工</span></div>
             <div class='selectWrap' style="margin-top: 10px;width: 100%;">
                 <!-- <select class="specificProject" id="specificProject">
                 </select> -->

+ 1 - 1
src/widgets/Loading/config.json

@@ -3,6 +3,6 @@
     "tmplateUrl":"widgets/Loading/Widget.html",
     "styleUrl":"widgets/Loading/css/style.css",
     "logo":"widgets/Loading/images/companymark.png",
-    "title":"三峡发展智慧EPC管理平台",
+    "title":"三峡发展智慧EPC管网施工",
     "prompt":["检查浏览器","加载中...","加载中...","加载中...","初始化即将完毕"]
 }