SanHQin 3 mēneši atpakaļ
vecāks
revīzija
2772593b1e

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/css/app.bedb1832.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.b844a815.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.30ce0e31.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.9e4f5725.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.bedb1832.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>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/js/app.9e4f5725.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/js/app.9e4f5725.js.map


+ 65 - 23
src/components/desktopToolList.vue

@@ -21,17 +21,22 @@
 				v-loading="loading"
 				:header-cell-style="headerCellStyle"
 			>
-			<el-table-column label="标识" min-width="45" show-overflow-tooltip>
+				<el-table-column label="正式名称" min-width="45" show-overflow-tooltip>
+					<template slot-scope="scope">{{
+						scope.row.url[0].name ? scope.row.url[0].name : "-"
+					}}</template>
+				</el-table-column>
+				<el-table-column label="标识" min-width="45" show-overflow-tooltip>
 					<template slot-scope="scope">{{
 						scope.row.toolId ? scope.row.toolId : "-"
 					}}</template>
 				</el-table-column>
-				<el-table-column label="宽度" min-width="45" show-overflow-tooltip>
+				<el-table-column label="窗口宽度" min-width="45" show-overflow-tooltip>
 					<template slot-scope="scope">{{
 						scope.row.dialogWidth ? scope.row.dialogWidth : "-"
 					}}</template>
 				</el-table-column>
-				<el-table-column label="高度" min-width="45" show-overflow-tooltip>
+				<el-table-column label="窗口高度" min-width="45" show-overflow-tooltip>
 					<template slot-scope="scope">{{
 						scope.row.dialogHeight ? scope.row.dialogHeight : "-"
 					}}</template>
@@ -43,7 +48,7 @@
 					}}</template>
 				</el-table-column>
 
-				<el-table-column label="工具设置" min-width="45" show-overflow-tooltip>
+				<el-table-column label="工具设置" width="102" show-overflow-tooltip>
 					<template slot-scope="scope">
 						<el-popover placement="bottom" width="840" trigger="hover">
 							<div class="urlItemBox">
@@ -86,7 +91,7 @@
 												<span v-else>-</span>
 											</div>
 										</div>
-										<div>
+										<!-- <div>
 											<span>默认图标:</span>
 											<div class="ui_m_image">
 												<el-image
@@ -109,11 +114,11 @@
 												></el-image>
 												<span v-else>-</span>
 											</div>
-										</div>
+										</div> -->
 									</div>
 								</div>
 							</div>
-							<el-button slot="reference">查看设置</el-button>
+							<el-button slot="reference" size="small">查看设置</el-button>
 						</el-popover>
 					</template>
 				</el-table-column>
@@ -181,7 +186,7 @@
 							v-if="scope.row.status == '1'"
 							@click="changeToolStatus(scope.row, '0')"
 							style="
-								color: #67C23A;
+								color: #67c23a;
 								background: none;
 								border: none;
 								cursor: pointer;
@@ -214,10 +219,15 @@
 <script>
 import { API_CONFIG } from "@/common/apiConfig";
 import addDesktopToolDialog from "./dialog/addDesktopToolDialog.vue";
+import { addOp } from "@/api/user";
+import { mapGetters } from "vuex";
 export default {
 	components: {
 		addDesktopToolDialog,
 	},
+	computed: {
+		...mapGetters(["userid"]),
+	},
 	data() {
 		return {
 			desktopList: [],
@@ -282,7 +292,7 @@ export default {
 					{
 						functionName: "update_desktopToolById",
 						id: form.id,
-						toolId:form.toolId,
+						toolId: form.toolId,
 						width: form.dialogWidth,
 						height: form.dialogHeight,
 						description: form.description,
@@ -296,12 +306,18 @@ export default {
 				this.$refs.addDesktopToolDialogRef.loading = true;
 				this.$ajax
 					.post(API_CONFIG.baseUrl, params)
-					.then((res) => {
+					.then(async (res) => {
 						if (res.data == 1) {
 							this.$refs.addDesktopToolDialogRef.close();
 							this.$message.success("修改工具成功");
-						} else if(res.data[0][0].message == "repeat toolId"){
-							this.$message.error("工具标识重复!")
+							await addOp({
+								uid: this.userid,
+								cid: "",
+								type: "user_op",
+								content: `修改了了工具:${form.toolId}`,
+							});
+						} else if (res.data[0][0].message == "repeat toolId") {
+							this.$message.error("工具标识重复!");
 						} else {
 							this.$message.error("修改工具失败");
 						}
@@ -317,7 +333,7 @@ export default {
 				let params = [
 					{
 						functionName: "insert_desktopTool",
-						toolId:form.toolId,
+						toolId: form.toolId,
 						width: form.dialogWidth,
 						height: form.dialogHeight,
 						description: form.description,
@@ -330,14 +346,20 @@ export default {
 				this.$refs.addDesktopToolDialogRef.loading = true;
 				this.$ajax
 					.post(API_CONFIG.baseUrl, params)
-					.then((res) => {
-						console.log(res)
+					.then(async (res) => {
+						console.log(res);
 						if (res.data == 1) {
 							this.$refs.addDesktopToolDialogRef.close();
 							this.$message.success("添加工具成功");
-						} else if(res.data[0][0].message == "repeat toolId"){
-							this.$message.error("工具标识重复!")
-						}else{
+							await addOp({
+								uid: this.userid,
+								cid: "",
+								type: "user_op",
+								content: `添加了工具:${form.toolId}`,
+							});
+						} else if (res.data[0][0].message == "repeat toolId") {
+							this.$message.error("工具标识重复!");
+						} else {
 							this.$message.error("添加工具失败");
 						}
 						this.$refs.addDesktopToolDialogRef.loading = false;
@@ -365,7 +387,7 @@ export default {
 				{
 					functionName: "update_desktopToolById",
 					id: _data.id,
-					toolId:_data.toolId,
+					toolId: _data.toolId,
 					width: _data.dialogWidth,
 					height: _data.dialogHeight,
 					description: _data.description,
@@ -378,11 +400,31 @@ export default {
 			];
 			this.$ajax
 				.post(API_CONFIG.baseUrl, params)
-				.then((res) => {
+				.then(async (res) => {
 					if (res.data == 1) {
-						this.$message.success("已停用");
+						if (newValue == 1) {
+							this.$message.success("已停用");
+							await addOp({
+								uid: this.userid,
+								cid: "",
+								type: "user_op",
+								content: `停用了工具:${item.toolId}`,
+							});
+						} else {
+							this.$message.success("已启用");
+							await addOp({
+								uid: this.userid,
+								cid: "",
+								type: "user_op",
+								content: `启用了工具:${item.toolId}`,
+							});
+						}
 					} else {
-						this.$message.error("停用失败");
+						if (newValue == 1) {
+							this.$message.success("停用失败");
+						} else {
+							this.$message.success("启用失败");
+						}
 					}
 					this.loading = false;
 					this.getData();
@@ -438,7 +480,7 @@ export default {
 
 .urlItem {
 	width: 400px;
-	height: 250px;
+	height: 170px;
 	overflow: auto;
 	position: relative;
 	box-sizing: border-box;

+ 69 - 17
src/components/dialog/permissionSettingDialog.vue

@@ -747,11 +747,16 @@ import "@/common/aws-sdk-2.235.1.min.js";
 import selectToolDialog from "./selectToolDialog.vue";
 import { API_CONFIG } from "@/common/apiConfig";
 import addMenuDialog from "./addMenuDialog.vue";
+import { addOp } from "@/api/user";
+import { mapGetters } from "vuex";
 export default {
 	components: {
 		selectToolDialog,
 		addMenuDialog,
 	},
+	computed: {
+		...mapGetters(["userid"]),
+	},
 	data() {
 		return {
 			show: false,
@@ -831,6 +836,12 @@ export default {
 			let _url = await this.uploadFile("image/*");
 			if (_url) {
 				this.form.basics.logo = _url;
+				await addOp({
+					uid:this.userid,
+					cid: this.data.id,
+					type: "user_op",
+					content:`修改了${this.data.name}的基本信息的logo`
+				})
 			} else {
 				return console.log("无图片");
 			}
@@ -905,15 +916,27 @@ export default {
 					: []
 			);
 		},
-		selectToolSuccess([_list, type]) {
+		async selectToolSuccess([_list, type]) {
 			console.log(type, "===", _list);
 			let list = _list;
 			if (type == "desktop") {
 				this.form.desktop.list = list;
 				this.$refs.selectToolDialogRef.close();
+				await addOp({
+					uid:this.userid,
+					cid: this.data.id,
+					type: "user_op",
+					content:`修改了${this.data.name}的桌面端工具`
+				})
 			} else if (type == "admin-index") {
 				this.form.admin.index.list = list;
 				this.$refs.selectToolDialogRef.close();
+				await addOp({
+					uid:this.userid,
+					cid: this.data.id,
+					type: "user_op",
+					content:`修改了${this.data.name}的平台首页工具`
+				})
 			} else if (type == "admin-sidebar" || type == "admin-sidebar2") {
 				if (this.addToolIndex != null) {
 					let _index = this.form.admin.sidebar.list.findIndex(
@@ -931,7 +954,12 @@ export default {
 						...JSON.parse(JSON.stringify(list))
 					);
 				}
-
+				await addOp({
+					uid:this.userid,
+					cid: this.data.id,
+					type: "user_op",
+					content:`修改了${this.data.name}的平台侧边栏工具`
+				})
 				this.$refs.selectToolDialogRef.close();
 			}
 			this.$forceUpdate();
@@ -1131,12 +1159,18 @@ export default {
 			this.loading = true;
 			this.$ajax
 				.post(API_CONFIG.baseUrl, params)
-				.then((res) => {
+				.then(async (res) => {
 					let _data = res.data;
 					if (_data == 1) {
 						this.$message.success("修改权限成功");
 						this.$emit("getData");
 						this.close();
+						await addOp({
+							uid:this.userid,
+							cid: this.data.id,
+							type: "user_op",
+							content:`修改了${this.data.name}的权限设置`
+						})
 					} else {
 						this.$message.error("修改权限失败");
 					}
@@ -1171,18 +1205,22 @@ export default {
 			_form.admin.sidebar.list.forEach((i, index) => {
 				if (i.children) {
 					i.children.forEach((i2, index2) => {
-						let _toolList = JSON.parse(JSON.stringify(toolList))
+						let _toolList = JSON.parse(JSON.stringify(toolList));
 						let _index = _toolList.findIndex((i3) => i2 == i3.id);
-						
+
 						if (_index != -1) {
-							_form.admin.sidebar.list[index].children[index2] = _toolList[_index];
-							_form.admin.sidebar.list[index].children[index2].typeId = _form.admin.sidebar.list[index].typeId + "," +_toolList[_index].id;
+							_form.admin.sidebar.list[index].children[index2] =
+								_toolList[_index];
+							_form.admin.sidebar.list[index].children[index2].typeId =
+								_form.admin.sidebar.list[index].typeId +
+								"," +
+								_toolList[_index].id;
 						} else {
 							console.log("无工具", i);
 						}
 					});
 				} else {
-					let _toolList = JSON.parse(JSON.stringify(toolList))
+					let _toolList = JSON.parse(JSON.stringify(toolList));
 					let _index = _toolList.findIndex((i2) => i == i2.id);
 					if (_index != -1) {
 						_form.admin.sidebar.list[index] = _toolList[_index];
@@ -1209,19 +1247,33 @@ export default {
 				this.form.desktop.list
 			);
 		},
-		addMenuSuccess({item,type}) {
-			console.log(item,type)
-			if(type=='add'){
+		async addMenuSuccess({ item, type }) {
+			console.log(item, type);
+			if (type == "add") {
 				this.form.admin.sidebar.list.push(item);
 				item.id = String(new Date().getTime());
 				item.typeId = item.id;
-			}else if(type=='edit'){
-				let _index = this.form.admin.sidebar.list.findIndex(i=>i.typeId==item.typeId);
-				if(_index!=-1){
+				await addOp({
+					uid: this.userid,
+					cid: "",
+					type: "user_op",
+					content: `添加了一级菜单:${item.menuName}`,
+				});
+			} else if (type == "edit") {
+				let _index = this.form.admin.sidebar.list.findIndex(
+					(i) => i.typeId == item.typeId
+				);
+				if (_index != -1) {
 					let _sidebar = JSON.parse(JSON.stringify(this.form.admin.sidebar));
 					_sidebar.list[_index] = item;
-					this.form.admin.sidebar = JSON.parse(JSON.stringify(_sidebar))
+					this.form.admin.sidebar = JSON.parse(JSON.stringify(_sidebar));
 					this.$forceUpdate();
+					await addOp({
+						uid: this.userid,
+						cid: "",
+						type: "user_op",
+						content: `修改了了一级菜单:${item.menuName}`,
+					});
 				}
 			}
 			this.$refs.addMenuDialogRef.close();
@@ -1229,8 +1281,8 @@ export default {
 		addMenu() {
 			this.$refs.addMenuDialogRef.open();
 		},
-		editMenu(row){
-			this.$refs.addMenuDialogRef.open(row,"edit");
+		editMenu(row) {
+			this.$refs.addMenuDialogRef.open(row, "edit");
 		},
 	},
 };

+ 3 - 2
src/components/organList.vue

@@ -28,7 +28,7 @@
                         <div class="operate">
                             <button @click="update(scope.row)">编辑</button>
                             <button @click="toPage(scope.row)">批量创建</button>
-														<button @click="permissionSetting(scope.row)">权限设置</button>
+														<button @click="permissionSetting(scope.row)" v-show="!unShowJurUser.includes(userid)">权限设置</button>
                             <button @click="delete_organ(scope.row)" style="color:red;">删除</button>
                             
                         </div>
@@ -186,7 +186,8 @@ export default {
             form: {
                 organ: ""
             },
-            organ: {}
+            organ: {},
+						unShowJurUser:['0abcb118-9110-11eb-80ad-005056b86db5']
         }
     },
     computed: {

+ 2 - 1
src/components/schoolList.vue

@@ -105,7 +105,7 @@
 						<div class="operate">
 							<button @click="update(scope.row)">编辑</button>
 							<button @click="toPage(scope.row)">批量创建</button>
-							<button @click="permissionSetting(scope.row)">权限设置</button>
+							<button @click="permissionSetting(scope.row)" v-show="!unShowJurUser.includes(userid)">权限设置</button>
 							<button @click="delete_school(scope.row)" style="color: red">
 								删除
 							</button>
@@ -425,6 +425,7 @@ export default {
 			schoolType: "1", //学校单选框类型
 			loginPermission: "1", //是否允许登录
 			nid: "", //修改学校的id
+			unShowJurUser:['0abcb118-9110-11eb-80ad-005056b86db5']
 		};
 	},
 	methods: {

+ 1 - 1
src/views/HomeView.vue

@@ -25,7 +25,7 @@
           <!-- <router-link class="menu_left" to="/version-add">
             <i class="el-icon-office-building"></i>版本更新
           </router-link> -->
-					<router-link class="menu_left" to="/desktopTool-list">
+					<router-link class="menu_left" to="/desktopTool-list" v-show="userinfo.userid != '0abcb118-9110-11eb-80ad-005056b86db5'">
 						<i class="el-icon-s-grid"></i>工具列表
 					</router-link>
         </ul>

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels