Skip to content

S
saasio
Commit aa9ae39b by zhangxiaoyan
Options

Merge branch 'master' of git.minrow.com:reyun/saasio

parents 8a3cbaf8 9400beda
Showing with 207 additions and 64 deletions
src/main/websrc/js/manage/app.js
......@@ -45,10 +45,10 @@
});
},200);
//启用停用
$scope.onOff = function(id,flag){
var url = "mng/app/enable/"+id,tipmsg = "启用成功";
if(flag && flag==1){
url = "mng/app/forbidden/"+id;
$scope.onOff = function(info){
var url = "mng/app/enable/"+info.id,tipmsg = "启用成功";
if(info.regedbutton){
url = "mng/app/forbidden/"+info.id;
tipmsg = "停用成功";
}
var userPM = HttpService.putInfo(url,{});
......@@ -57,10 +57,26 @@
ToolService.hideLoading();
ToolService.showTips(tipmsg)
$scope.$emit("f5Applist",true);
$rootScope.operSubmitData(tipmsg.slice(0,2));
$rootScope.operSubmitData(tipmsg.slice(0,2));
});
}
$scope.limitCount = 9;
$scope.isShow = function() {
if(!$scope.appAlllistInfo){
return false;
}
$scope.resultList = $scope.appAlllistInfo;
if($scope.resultList && $scope.resultList.length > $scope.limitCount){
return true;
}else{
return false;
}
}
$scope.getMore = function(){
$scope.limitCount += $scope.limitCount+9;
};
$scope.gopage = function(id,flag){
if(flag){
isLog = true;
......
src/main/websrc/styles/style.scss
......@@ -461,13 +461,17 @@ ul li .darklabel,.darklabel{color:$darkfontcolor;}
margin-left: 3px;
}
.copyBtnIcon{
@extend .settingIcon;
background-position:-33px -100px;
background: url(../images/copy.png) no-repeat;
width:12px;
height:12px;
display: inline-block;
vertical-align:middle;
margin-left: 3px;
margin-top: -3px;
cursor: pointer;
&:hover{
background: url(../images/copy_hover.png) no-repeat;
}
}
.rightHeader .helpInfo:hover{
......@@ -4972,10 +4976,10 @@ pre{
top:10px;
}
.onOffBtn{
background-color:#d8d8d8;
width:34px;
height:18px;
border-radius:9px;
background-color:#d3d2d2;
width:24px;
height:14px;
border-radius:29px;
display:inline-block;
vertical-align:middle;
margin-left:10px;
......@@ -4984,8 +4988,8 @@ pre{
}
.onOffBtn:before{
content:"";
width:12px;
height:12px;
width:8px;
height:8px;
border-radius:50%;
background-color:#fff;
position:absolute;
......@@ -4993,7 +4997,7 @@ pre{
top:3px;
}
.onOffBtn.on{
background-color:#6cc9ee;
background-color:#87b2ff;
}
.onOffBtn.on:before{
left:inherit;
......@@ -6877,3 +6881,125 @@ pre{
float: right;
}
}
.appList{
margin-right: -14px;
.appWrap{
width: 33.333%;
float: left;
box-sizing: border-box;
padding-right: 14px;
padding-top: 14px;
display: inline-block;
height:140px;
.app{
background:#ffffff;
height: 100%;
border:1px solid #e4e4e4;
border-radius:3px;
cursor: pointer;
.setting{
background: url(../images/settings.png) no-repeat;
width:16px;
height:16px;
cursor: pointer;
margin-right: 20px;
float: right;
position: relative;
&:hover{
background: url(../images/settings_hover.png) no-repeat;
}
ul{
background:#ffffff;
border:1px solid #e4e4e4;
box-shadow:0 1px 5px 0 rgba(0,0,0,0.10);
border-radius:3px;
width:78px;
height:64px;
position: absolute;
top:17px;
right: 0px;
li{
height:32px;
line-height: 32px;
padding-left: 10px;
&:hover{
color: $menuliactiveft;
}
}
}
}
.iconfont{
margin-left: 0px;
color:#5f97fb;
}
.title{
font-size:16px;
color:#333333;
cursor: pointer;
}
.key{
font-size:12px;
color:#666666;
margin-left: 20px;
margin-top: 20px;
}
.bottom{
font-size:12px;
color:#666666;
margin-left: 20px;
margin-top: 14px;
span:last-child{
margin-right: 20px;
}
.debugbtn{
background:#ffa331;
border-radius:3px;
width:70px;
height:26px;
color: #ffffff;
text-align: center;
line-height: 26px;
display: inline-block;
cursor: pointer;
}
}
}
}
.more{
text-align: center;
margin: auto;
color:#1964d4;
cursor: pointer;
clear: both;
padding-top: 20px;
width: auto;
span:before{
content: "";
background: url(../images/drop.png) no-repeat;
width: 10px;
height: 11px;
display: inline-block;
}
label{
padding-left: 5px;
color: #b5b0b0;
display: inline-block;
}
}
.noData{
text-align: center;
span{
background: url(../images/no_data.png) no-repeat center center;
display: inline-block;
width:41px;
height:41px;
margin-top: 80px;
}
div{
font-size:14px;
color:#999999;
padding-top: 10px;
}
}
}
src/main/websrc/styles/value.scss
......@@ -16,21 +16,21 @@ $lightfontcolor:#999;
$labelfontcolor:#666;
$blackfontcolor:#171a1e;
$disfontcolor:#c8c8c8;
$activebgcolor:#00a9e8;
$activebgcolor:#1964d4;
$activeftcolor:#fff;
$iptheight:34px;
$btnheight:34px;
$comradius:3px;
$btndiscolor:#dcdcdc;
$btnformcolor:#01b9e0;
$btnformcolor:#1964d4;
$btngraybg:#cbcbcb;
$btngraybg1:#fbfbfb;
$disbgcolor:#f9f9f9;
$nofontcolor:#bababa;
$tipftcolor:#b5b0b0;
$comactiveftcolor:#00a9e8; //font active color eg:blue
$loadingbarcolor:#00a9e8;
$comactiveftcolor:#1964d4; //font active color eg:blue
$loadingbarcolor:#1964d4;
$darkbluecolor:#4e93cf;
$disbtncolor:#b8b8b8;
......@@ -43,7 +43,9 @@ $menulibw:3px; //li border-width
$menuliactivebc:#5f97fb;
$menuliactivebg:#f1f3f5;
$menuliactiveft:#4186ec;
$submenuliactiveft:#00a9e8;
$menulihoverbg:#f5f5f8;
$menulihoverft:#525559;
$submenuliactiveft:#1964d4;
$wraptitleH:50px;
$wraptitlebgc:#fbfbfb; //bg-color
......@@ -84,13 +86,13 @@ $labeldisft:#b4b4b4;
$labeldisbr:#c9c9c9;
$labeldistips:#e74646;
$selectactivebr:#00a9e8;
$selectactivebr:#1964d4;
$optionbr:#c9c9c9;
$optionliheight:34px;
$optionlifc:#666666;
$optionpad:16px;
$optionliactivebg:#edfaff;
$optionliactivefc:#00a9e8;
$optionliactivefc:#1964d4;
$datebr:#c9c9c9;
$datewrapgap:20px;
......@@ -102,7 +104,7 @@ $datethfc:#2f6fa6;
$datelabelfc:#666666;
$datedisfc:#999999;
$datefz:12px;
$dateactivecolor:#00a9e8;
$dateactivecolor:#1964d4;
$dateradius:13px;
$datecellhw:26px;
$datewcellhw:40px;
......@@ -146,4 +148,4 @@ $redcolor:#fb4c3f;
$exceptionbg:#fe7472;
$normalbg:#5cc291;
$relbg:#95959e;
\ No newline at end of file
$relbg:#95959e;
src/main/websrc/template/manage/app.html
<div class="mb20">
<h3>全部产品</h3>
</div>
<div class="btn3 mb20" ng-click="gopage()" ng-if="(appAlllistInfo.length<limitInfo.appNum || limitInfo.appNum==-1) && (isManage || isSuper)"><span class="formAddIcon"></span>新建产品</div>
<div class="btn2 big dis mb20" ng-if="(appAlllistInfo.length>=limitInfo.appNum && limitInfo.appNum!=-1) || (!isSuper && !isManage)"><span class="formAddIcon dis"></span>新建产品</div>
<span class="tiplabel" ng-if="limitInfo.appNum!=-1">主账号仅允许创建{{limitInfo.appNum}}个产品，如需升级请联系商务。</span>
<div class="clear"></div>
<div class="wrapTitle formTitleWrap">
<span>产品管理</span>
<div class="searchWrap">
<input type="text" class="searchIpt" ng-model="searchTxt" placeholder="搜索产品名称或APPKEY">
</div>
<div class="searchWrap">
<input type="text" class="searchIpt" ng-model="searchTxt" placeholder="搜索产品名称或APPKEY">
</div>
<div class="tableList yeswrap">
<table>
<tr>
<th>序号</th>
<th>平台</th>
<th>产品名称</th>
<th>APPKEY</th>
<th style="width:150px;">创建时间</th>
<th style="width:110px;">操作</th>
</tr>
<tr ng-repeat="info in appAlllistInfo | filterList:searchTxt:'name,appkey' track by $index" ng-if="$index>flipPage.start && $index < flipPage.end">
<td>{{$index+1}}</td>
<td>
<div class="appicon" style="margin-left: 0px;" ng-class="{'iOS':'apple','Android':'android','H5':'web'}[info.platform]"></div>
</td>
<td ng-if="!info.isDebug">
<span class="ckblue" ng-click="goReport(info)">{{info.name}}</span>
<span class="copyBtnIcon copyBtn" data-clipboard-text="{{info.name}}" title="点击复制"></span>
</td>
<td ng-if="info.isDebug">
{{info.name}}
</td>
<td>{{info.appkey}}</td>
<td>{{info.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td class="formOper">
<div class="formBtn" ng-click="gopage(info.id)" style="margin-right: 10px;"><span class="editIcon"></span>编辑</div>
<div class="formBtn" ng-click="doRemove(info.id)" ng-if="specialsAppkey.indexOf(info.appkey)==-1" style="margin-right: 10px;"><span class="removeIcon"></span>删除</div>
<!-- <div class="formBtn" ng-click="gopage(info.id,1)" ng-if="info.isDebug" style="margin-right: 10px;">调试</div> -->
<!-- <span class="label" ng-if="!info.isDebug" style="color:#999">已调试</span> -->
</td>
</tr>
</table>
<del-tip status="delstatus" delfn="removeInfo()">确定删除该产品？<br><b class="error">此应用的数据将彻底删除，无法恢复！</b></del-tip>
<div class="clear"></div>
<div class="appList">
<div ng-if="resultList.length>0" class="appWrap" ng-repeat="info in appAlllistInfo | limitTo:limitCount | filterList:searchTxt:'name,appkey' as filterResult track by $index">
<div class="app">
<div class="ml20 mt20">
<div class="iconfont platform" ng-class="{'iOS':'icon-ios','Android':'icon-android','H5':'icon-wrap'}[info.platform]"></div>
<span class="title" ng-click="goReport(info)">{{info.name}}</span>
<span class="copyBtnIcon copyBtn" data-clipboard-text="{{info.name}}" title="点击复制"></span>
<span class="setting" ng-click="info.isShow=!info.isShow" stop-event>
<ul ng-show="info.isShow" ng-mouseleave="info.isShow=false">
<li ng-click="gopage(info.id)">编辑</li>
<li ng-click="doRemove(info.id)" ng-if="specialsAppkey.indexOf(info.appkey)==-1">删除</li>
</ul>
</span>
</div>
<div class="key">APPKEY：{{info.appkey}}
<span class="copyBtnIcon copyBtn" data-clipboard-text="{{info.appkey}}" title="点击复制"></span>
</div>
<div class="bottom">
<span stop-event>自动生成日志<div class="onOffBtn" ng-class="{'on':info.regedbutton == true}" ng-click="onOff(info)"></div></span>
<span class="right">创建时间：{{info.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
</div>
</div>
</div>
<div class="more" ng-click="getMore()" ng-show="isShow() && filterResult.length>0"><span>更多产品<label>(共{{resultList.length}}个产品)</label></span></div>
<div class="noData" ng-if="resultList.length==0">
<span></span>
<div>暂无产品</div>
</div>
<div class="noData" ng-if="filterResult.length==0">
<span></span>
<div>无搜索结果</div>
</div>
</div>
<flip-info list-info="appAlllistInfo" search-txt="searchTxt" search-name="name,appkey"></flip-info>
<del-tip status="delstatus" delfn="removeInfo()">确定删除该产品？<br><b class="error">此应用的数据将彻底删除，无法恢复！</b></del-tip>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment