Commit @05432dcdcb24d4d6e34b0a4e97a85aa3f3076726

방선주 03-20

250320 방선주 ip접근제어 적용

@05432dcdcb24d4d6e34b0a4e97a85aa3f3076726

05432dc

client/resources/img/logo-color.png (Binary) (added)

+++ client/resources/img/logo-color.png

Binary file is not shown

2feedcd

05432dc

client/views/layout/UserHeader.vue

--- client/views/layout/UserHeader.vue

+++ client/views/layout/UserHeader.vue


 <template>
-  <header
-    :class="
-      pageRole === 'company' && $route.path === '/company/main.page'
-        ? 'company-header'
-        : ''
-    "
-  >
+  <header>
     <div class="header-wrap">
       <div class="flex justify-between align-center header">
         <div class="logo">
           <router-link
             :to="{ path: '/' }"
-            v-if="pageRole === 'company'"
           >
             <img
-              src=""
+              src="../../resources/img/logo-color.png"
               alt="홈"
             />
           </router-link>

           </div>
           <UserMenu />
         <div class="flex justify-end align-center user-info-wrap">
-         
-         
+
           <div
             class="user-info pc-menu"
           >

2feedcd

05432dc

client/views/pages/adm/system/networkAccessControl/NetworkAccessControlInsert.vue

--- client/views/pages/adm/system/networkAccessControl/NetworkAccessControlInsert.vue

+++ client/views/pages/adm/system/networkAccessControl/NetworkAccessControlInsert.vue


                         <td>
                             <div class="gd-12 pr0">
                                 <label for="" class="form-title point-font2 mb10">제어 IP</label>
+                                <span class="ml10 gray">※ 1~255 범위의 숫자로 구성하여 형식에 맞게 작성해주세요. ex) 192.168.0.1 / 192.168.0.*</span>
+                                
                                 <input type="text" class="full-input" v-model="accesCtrl.cntrlIp" />
                             </div>
                         </td>

 
     }
 }
-</script>
+</script>

Add a comment

Open 0
Closed 0

List

...	...	@@ -29,6 +29,8 @@
29	29	<td>
30	30	<div class="gd-12 pr0">
31	31	<label for="" class="form-title point-font2 mb10">제어 IP</label>
	32	+ <span class="ml10 gray">※ 1~255 범위의 숫자로 구성하여 형식에 맞게 작성해주세요. ex) 192.168.0.1 / 192.168.0.*</span>
	33	+
32	34	<input type="text" class="full-input" v-model="accesCtrl.cntrlIp" />
33	35	</div>
34	36	</td>
...	...	@@ -189,4 +191,4 @@
189	191
190	192	}
191	193	}
192		-</script>
	194	+</script> (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -1,20 +1,13 @@
1	1	<template>
2		- <header
3		- :class="
4		- pageRole === 'company' && $route.path === '/company/main.page'
5		- ? 'company-header'
6		- : ''
7		- "
8		- >
	2	+ <header>
9	3	<div class="header-wrap">
10	4	<div class="flex justify-between align-center header">
11	5	<div class="logo">
12	6	<router-link
13	7	:to="{ path: '/' }"
14		- v-if="pageRole === 'company'"
15	8	>
16	9	<img
17		- src=""
	10	+ src="../../resources/img/logo-color.png"
18	11	alt="홈"
19	12	/>
20	13	</router-link>
...	...	@@ -36,8 +29,7 @@
36	29	</div>
37	30	<UserMenu />
38	31	<div class="flex justify-end align-center user-info-wrap">
39		-
40		-
	32	+
41	33	<div
42	34	class="user-info pc-menu"
43	35	>

Delete comment