SanHQin 3 月之前
父節點
當前提交
47ea3529e5

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


+ 1 - 1
dist/index.html

@@ -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.53cb8606.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.7ffbafec.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.8c726af4.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.5876741f.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.8c726af4.js


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


+ 155 - 11
src/components/dialog/permissionSettingDialog.vue

@@ -37,6 +37,11 @@
 							@click="changeTagType('admin-cocoFlow')"
 							>平台首页CocoFlow</span
 						>
+						<span
+							:class="{ pa_a_h_active: tagType == 'admin-cocoFlow2' }"
+							@click="changeTagType('admin-cocoFlow2')"
+							>平台首页CocoFlow2</span
+						>
 						<span
 							:class="{ pa_a_h_active: tagType == 'admin-sidebar' }"
 							@click="changeTagType('admin-sidebar')"
@@ -67,7 +72,7 @@
 						>
 						<el-button
 							size="mini"
-							v-if="['admin-cocoFlow'].includes(tagType)"
+							v-if="['admin-cocoFlow', 'admin-cocoFlow2'].includes(tagType)"
 							type="primary"
 							@click="addApp()"
 							>添加应用</el-button
@@ -175,6 +180,32 @@
 								</el-image>
 							</el-tooltip>
 						</div>
+
+						<div class="ea_basics_logo">
+							<span>CocoFlow图标</span>
+							<el-tooltip
+								class="item"
+								effect="dark"
+								:content="form.basics.cocoFlow ? '更改图标' : '上传图标'"
+								placement="top"
+							>
+								<el-image
+									style="width: 60px; height: 60px; margin-left: 20px"
+									:src="form.basics.cocoFlow"
+									fit="cover"
+									@click="addBasicsIcon('cocoFlow')"
+								>
+									<div
+										slot="error"
+										class="image-slot"
+										@click="addBasicsIcon('cocoFlow')"
+									>
+										<i class="el-icon-picture-outline"></i>
+									</div>
+								</el-image>
+							</el-tooltip>
+						</div>
+
 					</div>
 					<div class="editArea pa_a_eb_desktop" v-show="tagType == 'desktop'">
 						<div class="ea_table">
@@ -385,9 +416,10 @@
 							>
 								<div class="ai_left">
 									<el-image
-										style="width: 100%; height: 100%"
-										:src="item.json.icon"
+										style="width: 100%; height: 100%; cursor: pointer"
+										:src="item.setIcon ? item.setIcon : item.json.icon"
 										fit="cover"
+										@click="updateIconCocoFLow(index)"
 									></el-image>
 								</div>
 								<div class="ai_right">
@@ -434,6 +466,67 @@
 							</div>
 						</template>
 					</div>
+
+					<div class="editArea appList" v-show="tagType == 'admin-cocoFlow2'">
+						<template v-if="form.admin.cocoFlow2">
+							<div
+								class="appItem"
+								v-for="(item, index) in form.admin.cocoFlow2"
+								:key="item.id"
+							>
+								<div class="ai_left">
+									<el-image
+										style="width: 100%; height: 100%; cursor: pointer"
+										:src="item.setIcon ? item.setIcon : item.json.icon"
+										fit="cover"
+										@click="updateIconCocoFLow(index)"
+									></el-image>
+								</div>
+								<div class="ai_right">
+									<div>{{ item.name }}</div>
+									<div class="ai_r_btn">
+										<svg
+											@click="moveApp(item.id, 0)"
+											v-if="index != 0"
+											t="1744598539024"
+											class="icon"
+											viewBox="0 0 1470 1024"
+											version="1.1"
+											xmlns="http://www.w3.org/2000/svg"
+											p-id="2613"
+											width="200"
+											height="200"
+										>
+											<path
+												d="M664.965051 36.390373L20.010522 880.212016c-44.471546 58.191134-2.978155 142.114864 70.271066 142.114863h1289.8254c73.232489 0 114.725879-83.923729 70.271065-142.114863L805.473719 36.390373a88.441155 88.441155 0 0 0-140.508668 0z"
+												p-id="2614"
+											></path>
+										</svg>
+										<svg
+											@click="moveApp(item.id, 1)"
+											v-if="index != form.admin.cocoFlow2.length - 1"
+											style="transform: rotate(180deg)"
+											t="1744598539024"
+											class="icon"
+											viewBox="0 0 1470 1024"
+											version="1.1"
+											xmlns="http://www.w3.org/2000/svg"
+											p-id="2613"
+											width="200"
+											height="200"
+										>
+											<path
+												d="M664.965051 36.390373L20.010522 880.212016c-44.471546 58.191134-2.978155 142.114864 70.271066 142.114863h1289.8254c73.232489 0 114.725879-83.923729 70.271065-142.114863L805.473719 36.390373a88.441155 88.441155 0 0 0-140.508668 0z"
+												p-id="2614"
+											></path>
+										</svg>
+									</div>
+									<span>{{ item.detail }}</span>
+								</div>
+							</div>
+						</template>
+					</div>
+
 					<div
 						class="editArea pa_a_eb_admin-index"
 						v-show="tagType == 'admin-index'"
@@ -1194,7 +1287,7 @@
 		<selectSchoolDialog
 			ref="selectSchoolDialogRef"
 			@success="selectSchoolSuccess"
-			:id="data?data.id:''"
+			:id="data ? data.id : ''"
 		/>
 	</div>
 </template>
@@ -1235,6 +1328,9 @@ export default {
 					title: "",
 					brief: "",
 					logo: "",
+					loginLogo: "",
+					loginBanner: "",
+					cocoFlow:"",
 				},
 				//桌面  管理平台首页  管理平台侧边栏
 				desktop: {
@@ -1289,6 +1385,7 @@ export default {
 					logo: "",
 					loginLogo: "",
 					loginBanner: "",
+					cocoFlow:"",
 				},
 				//桌面  管理平台首页  管理平台侧边栏
 				desktop: {
@@ -1788,7 +1885,13 @@ export default {
 				}
 			});
 			_form.admin.cocoFlow = _form.admin.cocoFlow
-				? _form.admin.cocoFlow.map((i) => i.id)
+				? _form.admin.cocoFlow.map((i) => {
+						return { id: i.id, setIcon: i.setIcon }})
+				: [];
+
+				_form.admin.cocoFlow2 = _form.admin.cocoFlow2
+				? _form.admin.cocoFlow2.map((i) => {
+						return { id: i.id, setIcon: i.setIcon }})
 				: [];
 			let params = [
 				{
@@ -1836,12 +1939,26 @@ export default {
 					console.log("无工具", i);
 				}
 			});
-
 			if (_form.admin.cocoFlow) {
 				_form.admin.cocoFlow.forEach((i, index) => {
-					let _index = appList.findIndex((i2) => i == i2.id);
+					let _index = appList.findIndex((i2) => i.id == i2.id);
+					if (_index != -1) {
+						let _setData = appList[_index];
+						_setData.setIcon = i.setIcon;
+						_form.admin.cocoFlow[index] = _setData;
+					} else {
+						console.log("无应用", i);
+					}
+				});
+			}
+
+			if (_form.admin.cocoFlow2) {
+				_form.admin.cocoFlow2.forEach((i, index) => {
+					let _index = appList.findIndex((i2) => i.id == i2.id);
 					if (_index != -1) {
-						_form.admin.cocoFlow[index] = appList[_index];
+						let _setData = appList[_index];
+						_setData.setIcon = i.setIcon;
+						_form.admin.cocoFlow2[index] = _setData;
 					} else {
 						console.log("无应用", i);
 					}
@@ -1972,8 +2089,18 @@ export default {
 			this.$refs.addMenuDialogRef.open(row, "edit", this.tagType);
 		},
 		addApp() {
+			let _list = [];
+			let _max = 0
+			if (this.tagType == "admin-cocoFlow") {
+				_list = this.form.admin.cocoFlow ? this.form.admin.cocoFlow : [];
+				_max = 8;
+			} else if (this.tagType == "admin-cocoFlow2") {
+				_list = this.form.admin.cocoFlow2 ? this.form.admin.cocoFlow2 : [];
+				_max = 4;
+			}
 			this.$refs.selectAppDialogRef.open({
-				select: this.form.admin.cocoFlow ? this.form.admin.cocoFlow : [],
+				select: _list,
+				max:_max
 			});
 		},
 		moveApp(id, type) {
@@ -1991,7 +2118,11 @@ export default {
 			this.$forceUpdate();
 		},
 		selectAppSuccess(data) {
-			this.form.admin.cocoFlow = JSON.parse(JSON.stringify(data));
+			if (this.tagType == "admin-cocoFlow") {
+				this.form.admin.cocoFlow = JSON.parse(JSON.stringify(data));
+			} else if (this.tagType == "admin-cocoFlow2") {
+				this.form.admin.cocoFlow2 = JSON.parse(JSON.stringify(data));
+			}
 			this.$forceUpdate();
 			this.$refs.selectAppDialogRef.close();
 		},
@@ -2006,11 +2137,24 @@ export default {
 			let _data = JSON.parse(JSON.stringify(data));
 			_data.forEach((i) => {
 				delete i.json;
-				i.typeId = `${type}-${i.code}`
+				i.typeId = `${type}-${i.code}`;
 			});
 			this.form.admin.school.list.find((i) => i.id == type).children = _data;
 			this.$refs.selectSchoolDialogRef.close();
 		},
+		async updateIconCocoFLow(index) {
+			let _url = await this.uploadFile("image/*");
+			if (_url) {
+				if (this.tagType == "admin-cocoFlow") {
+					this.form.admin.cocoFlow[index].setIcon = _url;
+				} else if (this.tagType == "admin-cocoFlow2") {
+					this.form.admin.cocoFlow2[index].setIcon = _url;
+				}
+				this.$forceUpdate();
+			} else {
+				return console.log("无图片");
+			}
+		},
 	},
 };
 </script>

+ 8 - 2
src/components/dialog/selectAppDialog.vue

@@ -51,6 +51,7 @@ export default {
 			loading: false,
 			dataList: [],
 			selectList: [],
+			max: 0,
 		};
 	},
 	methods: {
@@ -58,8 +59,9 @@ export default {
 		headerCellStyle() {
 			return { backgroundColor: "#f1f1f1" };
 		},
-		open({ select }) {
+		open({ select, max = 0 }) {
 			this.selectList = JSON.parse(JSON.stringify(select));
+			this.max = max;
 			this.getData();
 			this.show = true;
 		},
@@ -107,7 +109,11 @@ export default {
 			if (this.selectList.map((i) => i.id).includes(item.id)) {
 				this.selectList = this.selectList.filter((i) => i.id !== item.id);
 			} else {
-				this.selectList.push(item);
+				if (this.selectList.length < this.max || this.max == 0) {
+					this.selectList.push(item);
+				} else {
+					this.$message.error(`最多能选择${this.max}个`);
+				}
 			}
 		},
 		beforeClose(done) {

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