From 398a4927e195755bd6a46be99337efd8dacc3dc2 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:08:13 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/webapp/views/workspace/workspaceUserConfig.html | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/workspace/workspaceUserConfig.html b/src/main/webapp/views/workspace/workspaceUserConfig.html
index 10de62f..90ba5e8 100644
--- a/src/main/webapp/views/workspace/workspaceUserConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserConfig.html
@@ -81,14 +81,34 @@
</div>
</div>
- <div class="col-xl-3">
+ <div class="col-xl-2">
<div class="form-group">
- <label translate="common.status">�긽�깭</label>
+ <label translate="common.status">李몄뿬 �긽�깭</label>
<ng-dropdown-multiselect class="multiSelect cursor"
data-input-name="statuses"
selected-model="vm.search.statuses"
extra-settings="{ stringTypeOption : true }"
options="vm.options.statuses"></ng-dropdown-multiselect>
+ </div>
+ </div>
+
+ <div class="col-xl-2">
+ <div class="form-group">
+ <label>�벑湲�</label>
+ <ng-dropdown-multiselect class="multiSelect cursor"
+ data-input-name="levels"
+ selected-model="vm.search.levels"
+ options="vm.levels"></ng-dropdown-multiselect>
+ </div>
+ </div>
+
+ <div class="col-xl-3">
+ <div class="form-group">
+ <label>遺��꽌</label>
+ <ng-dropdown-multiselect class="multiSelect cursor"
+ data-input-name="departments"
+ selected-model="vm.search.departments"
+ options="vm.departments"></ng-dropdown-multiselect>
</div>
</div>
@@ -99,7 +119,7 @@
</div>
</div>
- <div class="col-xl-4">
+ <div class="col-xl-11">
<div class="form-group form-buttons-w2">
<button class="btn btn-xlg btn-navy" ng-click="fn.getUserWorkspaceList(0)">
<i class="os-icon os-icon-ui-37"></i>
@@ -132,22 +152,6 @@
</label>
</div>
</div>
- <!--<div class="col-sm-6 text-right">
- <div class="btn-group">
- <button aria-expanded="false"
- aria-haspopup="true"
- class="btn btn-secondary dropdown-toggle"
- data-toggle="dropdown"
- type="button">異붽�湲곕뒫
- </button>
- <div aria-labelledby="dropdownMenuButton2"
- class="dropdown-menu"
- x-placement="bottom-start"
- style="position: absolute; transform: translate3d(0px, 30px, 0px); top: 0px; left: 0px; will-change: transform;">
- <a class="dropdown-item" href="#"> �궘�젣</a>
- </div>
- </div>
- </div>-->
</div>
</div>
--
Gitblit v1.8.0