From 5993e2d4512c84e51312aa0d85b224772c6f0a58 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Tue, 31 Jul 2018 16:58:55 +0800
Subject: [PATCH] 登录模块提交

---
 resource/js/unit.js            | 38 +++++++++++++++++++++++++++++++-------
 topages/workfill/workfill.html | 42 ++++++++++++++----------------------------
 topages/workfill/workfill.js   | 20 ++++++++++++++++++++
 3 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/resource/js/unit.js b/resource/js/unit.js
index 1e83525..2d5818f 100644
--- a/resource/js/unit.js
+++ b/resource/js/unit.js
@@ -36,13 +36,19 @@ dataUrl.util = {
     login: function () {
         return parkcloudbaseUrl + 'oauth/login';
     },
+    //退出登录
     getLoginOut:function(){
         return parkcloudbaseUrl + 'oauth/loginout';
+    },
+    //查询项目列表
+    queryAsraProjectForList:function(){
+        return parkcloudbaseUrl + 'asraProject/queryAsraProjectForList';
     }
 
 
 
 
+
 }
 
 var fn ={
@@ -107,12 +113,9 @@ var fn ={
     },
     //登出系统
     loginOut: function () {
-        debugger;
-
+        //debugger;
         var token = fn.getToken();
-
         if (token != "" && token != null) {
-
             var opt = {
                 method: "post",
                 url: dataUrl.util.getLoginOut(),
@@ -120,12 +123,9 @@ var fn ={
                     sessionStorage.clear()
                     fn.setToken('');
                     fn.toLoginPage();
-
                 }
             };
             sysAjax(opt);
-
-
         }
 
     },
@@ -134,6 +134,30 @@ var fn ={
         sessionStorage.setItem("sys_parkLot", '');
         window.location.href = '../login/login.html'
     },
+    /**
+     * 查询项目信息
+     * @param projectId 可以为空
+     */
+    getAsraProject: function (projectId, callBack) {
+        if(projectId == null || projectId == ""){
+            projectId=null;
+        }
+        var req = {
+            id: projectId
+        };
+        var opt = {
+            data: JSON.stringify(req),
+            method: "POST",
+            async: false,
+            url: dataUrl.util.queryAsraProjectForList(),
+            success: function (res) {
+                callBack(res.data);
+
+            }
+        }
+        sysAjax(opt);
+    }
+
 };
 
 DateUtil = {
diff --git a/topages/workfill/workfill.html b/topages/workfill/workfill.html
index 6df9838..b31456c 100644
--- a/topages/workfill/workfill.html
+++ b/topages/workfill/workfill.html
@@ -16,10 +16,8 @@
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
-                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
-                    <option value="1">企业云</option>
-                    <option value="2">任你停</option>
-                    <option value="3">政府云</option>
+                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true" id="work-projectName1">
+
                 </select>
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
@@ -41,10 +39,8 @@
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
-                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
-                    <option value="1">企业云</option>
-                    <option value="2">任你停</option>
-                    <option value="3">政府云</option>
+                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true" id="work-projectName2">
+
                 </select>
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
@@ -66,10 +62,8 @@
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
-                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
-                    <option value="1">企业云</option>
-                    <option value="2">任你停</option>
-                    <option value="3">政府云</option>
+                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true" id="work-projectName3">
+
                 </select>
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
@@ -91,10 +85,8 @@
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
-                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
-                    <option value="1">企业云</option>
-                    <option value="2">任你停</option>
-                    <option value="3">政府云</option>
+                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true" id="work-projectName4">
+
                 </select>
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
@@ -116,10 +108,8 @@
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
-                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
-                    <option value="1">企业云</option>
-                    <option value="2">任你停</option>
-                    <option value="3">政府云</option>
+                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true" id="work-projectName5">
+
                 </select>
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
@@ -141,10 +131,8 @@
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
-                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
-                    <option value="1">企业云</option>
-                    <option value="2">任你停</option>
-                    <option value="3">政府云</option>
+                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true" id="work-projectName6">
+
                 </select>
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
@@ -166,10 +154,8 @@
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
-                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
-                    <option value="1">企业云</option>
-                    <option value="2">任你停</option>
-                    <option value="3">政府云</option>
+                <select class="work-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true" id="work-projectName7">
+
                 </select>
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
diff --git a/topages/workfill/workfill.js b/topages/workfill/workfill.js
index 48a59a3..a1458d3 100644
--- a/topages/workfill/workfill.js
+++ b/topages/workfill/workfill.js
@@ -16,6 +16,8 @@ var fun = {
         $('#time-opr-nowtime').text(todaytime);
         //
         fun.logout();
+        //获取项目
+        fun.getAsraProject();
     },
     timeoprprevbtn:function () {
         $('#time-opr-nextbtn').removeClass('display-none');
@@ -45,6 +47,24 @@ var fun = {
        $(document).on('click','#logoutId',function(){
            fn.loginOut();
        });
+    },
+    /***获取项目下拉框.*/
+    getAsraProject:function(){
+        //debugger;
+         fn.getAsraProject("",function(data){
+            var html="";
+            $.each(data,function(index,row){
+                html+='<option value="'+row.id+'">'+row.projecName+'</option>';
+            });
+            if(html != null && html != ""){
+                for(var i=1;i<8;i++){
+                    $("#work-projectName"+i).empty();
+                    $("#work-projectName"+i).append(html);
+                    $("#work-projectName"+i).selectpicker('refresh');
+
+                }
+            }
+        });
     }
 };
 fun.init();
--
libgit2 0.21.4