From 4cef9a63afe347bcc007f2f18c21da69b346da64 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 19 11월 2021 14:41:30 +0900
Subject: [PATCH] 이슈 상세 수정 -부서 [프론트]
---
src/main/webapp/views/issue/issueDetail.html | 199 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 172 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index e1cd779..6366d1f 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -86,18 +86,18 @@
<!-- �긽�꽭 �솕硫� -->
<div class="support-ticket-content-w" ng-controller="issueDetailController">
<div class="support-ticket-content">
- <div class="support-ticket-content-header issue-detail-word-break">
- <h3 class="ticket-header">
+ <div class="support-ticket-content-header issue-detail-word-break" style="height: 8vh">
+ <span class="ticket-header">
<div class="tasks-header-w">
<span class="tags">
<span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>
</span>
</div>
- {{vm.viewer.title}}
- </h3>
+ <span class="h3-div">{{vm.viewer.title}}</span>
+ </span>
<div class="col-sm-2">
- <div class="form-group">
- <label class="issue-detail-label"><span translate="issue.issueType">�씠�뒋 ���엯</span> </label>
+ <div class="form-group ml-4">
+ <label class="issue-detail-label"><span translate="issue.issueType">�씠�뒋 �쑀�삎</span> </label>
<span class="status-pill smaller"
ng-style="{'background-color': vm.viewer.issueTypeVo.color }"></span><span>{{vm.viewer.issueTypeVo.name}}</span>
</div>
@@ -116,7 +116,6 @@
</span>
</div>
-
<a class="show-ticket-info cursor">
<i class="os-icon os-icon-email-forward mr-20" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)" data-toggle="tooltip" data-placement="right" title="�떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 蹂대궡湲�"></i>
<i class="os-icon os-icon-airplay mr-20" ng-click="fn.versionView(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 蹂�寃� �씠�젰 �긽�꽭 蹂닿린"></i>
@@ -130,7 +129,7 @@
<div class="ticket-thread">
<div class="todo-content">
- <h6 class="todo-content-subheader mt-20" translate="common.detailInformation">�긽�꽭 �젙蹂�</h6>
+ <h6 class="todo-content-subheader" translate="issue.issueInfo">�씠�뒋 �젙蹂�</h6>
<div class="row mt-20">
<div class="col-md-4">
<div class="form-group">
@@ -140,14 +139,13 @@
<label class="issue-detail-label"><span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
<div class="">
<div class="select3-selection__choicediv">
- <span class="select3-selection__choice" ng-repeat="user in vm.viewer.userVos">
- <span class="avatar-w"><img ng-src="{{::user.profile}}"></span>
- <span>{{::user.byName}}</span>
+ <span class="select3-selection__choice" ng-repeat="department in vm.viewer.departmentVos">
+ <span>{{::department.byName}}</span>
</span>
- <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span>
+ <span ng-if="vm.viewer.departmentVos.length < 1" translate="common.noDepartment">�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.</span>
<i class="fa fa-edit fa-2x issue-status-edit cursor"
- ng-click="fn.modifyIssueUser()" data-toggle="tooltip" data-placement="right" title="�떞�떦�옄 蹂�寃� �븯湲�"></i>
+ ng-click="fn.modifyIssueDepartment()" data-toggle="tooltip" data-placement="right" title="�떞�떦�옄 蹂�寃� �븯湲�"></i>
</div>
</div>
@@ -195,7 +193,7 @@
<div class="row">
<div class="col-md-4">
<div class="form-group">
- <label class="issue-detail-label"><span translate="common.detectingInfo">�깘吏��젙蹂�</span> </label>
+ <h6 class="info_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
<div class="">
<label class="issue-detail-label"><span translate="common.diffuserURL">�쑀�룷�옄URL</span> </label>
<label class="issue-detail-label offset-2"><span translate="common.country">援�媛�</span></label>
@@ -206,36 +204,183 @@
<!-- <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span>-->
</div>
</div>
-
+ </div>
+ </div>
+ <hr>
+<!-- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>-->
+ <div class="row">
+ <div class="col-sm-2">
+ <div class="form-group">
+ <h6 class="info_font" translate="companyField.info">�뾽泥댁젙蹂�</h6>
+ <button style="display: inline">1111</button>
+ </div>
</div>
</div>
<div class="row">
- <div class="col-md-4">
+ <div class="col-sm-2">
<div class="form-group">
- <label class="issue-detail-label"><span translate="common.registrationDate">�벑濡앹씪</span>
- </label>
+ <span translate="companyField.companyName">�뾽泥대챸</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].name}}</span>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
<div class="">
- {{vm.viewer.registerDate}}
+ <span translate="companyField.manager">�떞�떦�옄</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].manager}}</span>
</div>
</div>
</div>
- <div class="col-md-4">
+ <div class="col-sm-2">
<div class="form-group">
- <label class="issue-detail-label"><span translate="common.register">�벑濡앹옄</span></label>
<div class="">
- <div class="select3-selection__choicediv">
- <span class="select3-selection__choice">
- <span class="avatar-w"><img ng-src="{{vm.viewer.registerVo.profile}}"></span>
- <span>{{vm.viewer.registerVo.byName}}</span>
- </span>
- </div>
+ <span translate="companyField.tel">�쟾�솕踰덊샇</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].tel}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.email">�씠硫붿씪</span>:
+ <span class="email_color">{{vm.viewer.issueCompanyVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.memo">鍮꾧퀬</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].memo}}</span>
</div>
</div>
</div>
</div>
+ <div class="row">
+ <div class="col-sm-2">
+ <div class="form-group">
+ <h6 class="info_font" translate="ispField.info">ISP�젙蹂�</h6>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-2">
+ <div class="form-group">
+ <span translate="ispField.ispName">ISP紐�</span>:
+ <span>{{vm.viewer.issueIspVos[0].name}}</span>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <span translate="ispField.code">肄붾뱶</span>:
+ <span>{{vm.viewer.issueIspVos[0].code}}</span>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="ispField.manager">�떞�떦�옄</span>:
+ <span>{{vm.viewer.issueIspVos[0].manager}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="ispField.tel">�쟾�솕踰덊샇</span>:
+ <span>{{vm.viewer.issueIspVos[0].tel}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="ispField.email">�씠硫붿씪</span>:
+ <span class="email_color">{{vm.viewer.issueIspVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="ispField.memo">鍮꾧퀬</span>:
+ <span>{{vm.viewer.issueIspVos[0].memo}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-2">
+ <div class="form-group">
+ <h6 class="info_font" translate="hostingField.info">�샇�뒪�똿�젙蹂�</h6>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-2">
+ <div class="form-group">
+ <span translate="hostingField.hostingName">�샇�뒪�똿紐�</span>:
+ <span>{{vm.viewer.issueHostingVos[0].name}}</span>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <span translate="hostingField.code">肄붾뱶</span>:
+ <span>{{vm.viewer.issueHostingVos[0].code}}</span>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="hostingField.manager">�떞�떦�옄</span>:
+ <span>{{vm.viewer.issueHostingVos[0].manager}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="hostingField.tel">�쟾�솕踰덊샇</span>:
+ <span>{{vm.viewer.issueHostingVos[0].tel}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="hostingField.email">�씠硫붿씪</span>:
+ <span class="email_color">{{vm.viewer.issueHostingVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="hostingField.memo">鍮꾧퀬</span>:
+ <span>{{vm.viewer.issueHostingVos[0].memo}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
<div class="row">
--
Gitblit v1.8.0