Home Explore Help
Sign In
CocoRoboLabs
/
pblUserManage
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

gxgx

SanHQin 3 months ago
parent
a5d4f011c1
commit
f2065bde02
7 changed files with 109 additions and 23 deletions
Split View Show Diff Stats
  1. 0 0
      dist/css/app.2b12fe82.css
  2. 1 1
      dist/index.html
  3. 0 0
      dist/js/app.62dfa142.js
  4. 0 0
      dist/js/app.62dfa142.js.map
  5. 15 3
      src/components/desktopToolList.vue
  6. 54 18
      src/components/dialog/addDesktopToolDialog.vue
  7. 39 1
      src/components/dialog/permissionSettingDialog.vue

File diff suppressed because it is too large
+ 0 - 0
dist/css/app.2b12fe82.css


+ 1 - 1
dist/index.html
View File 

@@ -36,4 +36,4 @@
 
         width: 100%;
 
         background: #e6eaf0;
 
         font-family: '黑体';
 
-      }</style><script defer="defer" src="/js/chunk-vendors.3a922260.js"></script><script defer="defer" src="/js/app.a17a9171.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.fb8b9b8b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but userManage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 
+      }</style><script defer="defer" src="/js/chunk-vendors.3a922260.js"></script><script defer="defer" src="/js/app.62dfa142.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.2b12fe82.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but userManage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

File diff suppressed because it is too large
+ 0 - 0
dist/js/app.62dfa142.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.62dfa142.js.map


+ 15 - 3
src/components/desktopToolList.vue
View File 

@@ -91,7 +91,7 @@
 
 												<span v-else>-</span>
 
 											</div>
 
 										</div>
 
-										<!-- <div>
 
+										<div>
 
 											<span>默认图标：</span>
 
 											<div class="ui_m_image">
 
 												<el-image
 
@@ -114,7 +114,19 @@
 
 												></el-image>
 
 												<span v-else>-</span>
 
 											</div>
 
-										</div> -->
 
+										</div>
 
+										<div>
 
+											<span>激活图标：</span>
 
+											<div class="ui_m_image">
 
+												<el-image
 
+													v-if="item.hoverIcon"
 
+													style="width: 100%; height: 100%"
 
+													:src="item.hoverIcon"
 
+													fit="cover"
 
+												></el-image>
 
+												<span v-else>-</span>
 
+											</div>
 
+										</div>
 
 									</div>
 
 								</div>
 
 							</div>
 
@@ -480,7 +492,7 @@ export default {
 
 
 .urlItem {
 
 	width: 400px;
 
-	height: 170px;
 
+	height: 300px;
 
 	overflow: auto;
 
 	position: relative;
 
 	box-sizing: border-box;

+ 54 - 18
src/components/dialog/addDesktopToolDialog.vue
View File 

@@ -148,7 +148,7 @@
 
 										</el-tooltip>
 
 									</div>
 
 								</div>
 
-<!-- 
+
 
 								<div class="f_aRow f_ar_icon">
 
 									<span>默认图标</span>
 
 									<div class="f_icon" style="margin-left: 10px">
 
@@ -201,7 +201,34 @@
 
 											</el-image>
 
 										</el-tooltip>
 
 									</div>
 
-								</div> -->
 
+								</div>
 
+
 
+								<div class="f_aRow f_ar_icon">
 
+									<span>hover图标</span>
 
+									<div class="f_icon" style="margin-left: 10px">
 
+										<el-tooltip
 
+											class="item"
 
+											effect="dark"
 
+											:content="item.hoverIcon ? '更改图标' : '上传图标'"
 
+											placement="top"
 
+										>
 
+											<el-image
 
+												style="width: 100%; height: 100%"
 
+												:src="item.hoverIcon"
 
+												fit="cover"
 
+												@click="addUrlIcon(index, 'hoverIcon')"
 
+											>
 
+												<div
 
+													slot="error"
 
+													class="image-slot"
 
+														@click="addUrlIcon(index, 'hoverIcon')"
 
+												>
 
+													<i class="el-icon-picture-outline"></i>
 
+												</div>
 
+											</el-image>
 
+										</el-tooltip>
 
+									</div>
 
+								</div>
 
 							</div>
 
 							<div class="f_hr"></div>
 
 						</div>
 
@@ -237,8 +264,9 @@ export default {
 
 						icon: "",
 
 						name: "",
 
 						platformIcon: "",
 
-						// activeIcon: "",
 
-						// defaultIcon: "",
 
+						activeIcon: "",
 
+						defaultIcon: "",
 
+						hoverIcon:""
 
 					},
 
 					{
 
 						region: "beta",
 
@@ -246,8 +274,9 @@ export default {
 
 						icon: "",
 
 						name: "",
 
 						platformIcon: "",
 
-						// activeIcon: "",
 
-						// defaultIcon: "",
 
+						activeIcon: "",
 
+						defaultIcon: "",
 
+						hoverIcon:""
 
 					},
 
 					{
 
 						region: "hk",
 
@@ -255,8 +284,9 @@ export default {
 
 						icon: "",
 
 						name: "",
 
 						platformIcon: "",
 
-						// activeIcon: "",
 
-						// defaultIcon: "",
 
+						activeIcon: "",
 
+						defaultIcon: "",
 
+						hoverIcon:""
 
 					},
 
 					{
 
 						region: "com",
 
@@ -264,8 +294,9 @@ export default {
 
 						icon: "",
 
 						name: "",
 
 						platformIcon: "",
 
-						// activeIcon: "",
 
-						// defaultIcon: "",
 
+						activeIcon: "",
 
+						defaultIcon: "",
 
+						hoverIcon:""
 
 					},
 
 				],
 
 				json: "",
 
@@ -311,8 +342,9 @@ export default {
 
 						icon: "",
 
 						name: "",
 
 						platformIcon: "",
 
-						// activeIcon: "",
 
-						// defaultIcon: "",
 
+						activeIcon: "",
 
+						defaultIcon: "",
 
+						hoverIcon:""
 
 					},
 
 					{
 
 						region: "beta",
 
@@ -320,8 +352,9 @@ export default {
 
 						icon: "",
 
 						name: "",
 
 						platformIcon: "",
 
-						// activeIcon: "",
 
-						// defaultIcon: "",
 
+						activeIcon: "",
 
+						defaultIcon: "",
 
+						hoverIcon:""
 
 					},
 
 					{
 
 						region: "hk",
 
@@ -329,8 +362,9 @@ export default {
 
 						icon: "",
 
 						name: "",
 
 						platformIcon: "",
 
-						// activeIcon: "",
 
-						// defaultIcon: "",
 
+						activeIcon: "",
 
+						defaultIcon: "",
 
+						hoverIcon:""
 
 					},
 
 					{
 
 						region: "com",
 
@@ -338,8 +372,9 @@ export default {
 
 						icon: "",
 
 						name: "",
 
 						platformIcon: "",
 
-						// activeIcon: "",
 
-						// defaultIcon: "",
 
+						activeIcon: "",
 
+						defaultIcon: "",
 
+						hoverIcon:""
 
 					},
 
 				],
 
 				json: "",
 
@@ -363,6 +398,7 @@ export default {
 
 			let _url = await this.uploadFile("image/*");
 
 			if (_url) {
 
 				this.form.url[index][type] = _url;
 
+				this.$forceUpdate();
 
 			} else {
 
 				return console.log("无图片");
 
 			}

+ 39 - 1
src/components/dialog/permissionSettingDialog.vue
View File 

@@ -263,6 +263,18 @@
 
 																<span v-else>-</span>
 
 															</div>
 
 														</div>
 
+														<div>
 
+															<span>hover图标：</span>
 
+															<div class="ui_m_image">
 
+																<el-image
 
+																	v-if="item.hoverIcon"
 
+																	style="width: 100%; height: 100%"
 
+																	:src="item.hoverIcon"
 
+																	fit="cover"
 
+																></el-image>
 
+																<span v-else>-</span>
 
+															</div>
 
+														</div>
 
 													</div>
 
 												</div>
 
 											</div>
 
@@ -479,6 +491,19 @@
 
 																<span v-else>-</span>
 
 															</div>
 
 														</div>
 
+
 
+														<div>
 
+															<span>hover图标：</span>
 
+															<div class="ui_m_image">
 
+																<el-image
 
+																	v-if="item.hoverIcon"
 
+																	style="width: 100%; height: 100%"
 
+																	:src="item.hoverIcon"
 
+																	fit="cover"
 
+																></el-image>
 
+																<span v-else>-</span>
 
+															</div>
 
+														</div>
 
 													</div>
 
 												</div>
 
 											</div>
 
@@ -711,6 +736,19 @@
 
 																<span v-else>-</span>
 
 															</div>
 
 														</div>
 
+
 
+														<div>
 
+															<span>hover图标：</span>
 
+															<div class="ui_m_image">
 
+																<el-image
 
+																	v-if="item.hoverIcon"
 
+																	style="width: 100%; height: 100%"
 
+																	:src="item.hoverIcon"
 
+																	fit="cover"
 
+																></el-image>
 
+																<span v-else>-</span>
 
+															</div>
 
+														</div>
 
 													</div>
 
 												</div>
 
 											</div>
 
@@ -1582,7 +1620,7 @@ export default {
 
 
 .urlItem {
 
 	width: 400px;
 
-	height: 250px;
 
+	height: 300px;
 
 	overflow: auto;
 
 	position: relative;
 
 	box-sizing: border-box;

Some files were not shown because too many files changed in this diff