瀏覽代碼

Merge branch 'master' of http://122.237.99.185:3000/dcs/realty

dcs 11 月之前
父節點
當前提交
4a3d27e08c
共有 23 個文件被更改,包括 372 次插入6 次删除
  1. 3 0
      virgo.wzfrontend/console/src/assets/scss/index.scss
  2. 23 0
      virgo.wzfrontend/console/src/router/modules/operation.js
  3. 6 0
      virgo.wzfrontend/console/src/views/system/log.vue
  4. 74 0
      virgo.wzfrontend/console/src/views/work/operation/meeting/organization.vue
  5. 74 0
      virgo.wzfrontend/console/src/views/work/operation/meeting/project.vue
  6. 179 0
      virgo.wzfrontend/console/src/views/work/operation/meeting/set.vue
  7. 1 1
      virgo.wzfrontend/src/main/resources/static/index.html
  8. 1 0
      virgo.wzfrontend/src/main/resources/static/static/css/2758.c91856b9.css
  9. 1 0
      virgo.wzfrontend/src/main/resources/static/static/css/app.1c4821bd.css
  10. 0 1
      virgo.wzfrontend/src/main/resources/static/static/css/app.fe59b970.css
  11. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/159-legacy.4635690a.js
  12. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/159.2ab37294.js
  13. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/2758-legacy.026dc0b8.js
  14. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/2758.8c3c5351.js
  15. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/6061-legacy.5ddb72de.js
  16. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/6061.d13ecb47.js
  17. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/6061.f90580e8.js
  18. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/7995-legacy.d56ddcf7.js
  19. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/7995.5a6cf35e.js
  20. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/app-legacy.93add9e8.js
  21. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/app-legacy.f8d24938.js
  22. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/app.2ac1125e.js
  23. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/app.5d668f35.js

+ 3 - 0
virgo.wzfrontend/console/src/assets/scss/index.scss

@@ -228,6 +228,9 @@
 		}
 	}
 }
+.no-tips-box{
+	text-align: center;
+}
 
 .no-tips {
 	opacity: 0.4;

+ 23 - 0
virgo.wzfrontend/console/src/router/modules/operation.js

@@ -0,0 +1,23 @@
+const operation = [{
+	path: 'operation/meeting/project',
+	component: () => import('@/views/work/operation/meeting/project'),
+	name: '项目会议',
+	meta: {
+		title: '项目会议'
+	}
+}, {
+	path: 'operation/meeting/organization',
+	component: () => import('@/views/work/operation/meeting/organization'),
+	name: '公司会议',
+	meta: {
+		title: '公司会议'
+	}
+}, {
+	path: 'operation/meeting/set',
+	component: () => import('@/views/work/operation/meeting/set'),
+	name: '会议设置',
+	meta: {
+		title: '会议设置'
+	}
+}]
+export default operation;

+ 6 - 0
virgo.wzfrontend/console/src/views/system/log.vue

@@ -114,6 +114,12 @@
 					</div>
 				</div>
 			</el-timeline-item>
+			<el-timeline-item timestamp="2024-06-27" placement="top">
+				<div class="log-box">
+					<div class="log-item">1、新增会议场所、会议类型前端逻辑。</div>
+					<div class="log-item">2、新增项目会议、公司会议UI页面。</div>
+				</div>
+			</el-timeline-item>
 		</el-timeline>
 	</div>
 </template>

+ 74 - 0
virgo.wzfrontend/console/src/views/work/operation/meeting/organization.vue

@@ -0,0 +1,74 @@
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-flex">
+			<div class="hui-content-title">
+				<div class="hui-title-item active">公司会议</div>
+			</div>
+			<div class="hui-flex-box hui-flex hui-table">
+				<div class="hui-content-insert">
+					<el-button type="primary" size="medium" @click="insert">新增会议</el-button>
+				</div>
+				<div class="hui-flex-box">
+					<el-table :data="tableData" row-key="id" border height="100%">
+						<el-table-column label="序号" width="50">
+							<template slot-scope="scope">
+								<div style="text-align: center;">{{scope.$index + 1}}</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="会议名称" prop="name"></el-table-column>
+						<el-table-column label="操作" width="150">
+							<template slot-scope="scope">
+								<div class="hui-table-operation">
+									<span class="table-operation">
+										详情
+									</span>
+									<span class="table-operation">
+										编辑
+									</span>
+									<span class="table-operation">
+										删除
+									</span>
+								</div>
+							</template>
+						</el-table-column>
+						<template slot="empty">
+							<empty description="暂无数据"></empty>
+						</template>
+					</el-table>
+				</div>
+				<div class="hui-content-pagination">
+					<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
+						@current-change="currentChange">
+					</el-pagination>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tableData: [],
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			insert() {
+				this.$message.warning('功能开发中')
+			},
+			currentChange() {
+
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+ 74 - 0
virgo.wzfrontend/console/src/views/work/operation/meeting/project.vue

@@ -0,0 +1,74 @@
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-flex">
+			<div class="hui-content-title">
+				<div class="hui-title-item active">项目会议</div>
+			</div>
+			<div class="hui-flex-box hui-flex hui-table">
+				<div class="hui-content-insert">
+					<el-button type="primary" size="medium" @click="insert">新增会议</el-button>
+				</div>
+				<div class="hui-flex-box">
+					<el-table :data="tableData" row-key="id" border height="100%">
+						<el-table-column label="序号" width="50">
+							<template slot-scope="scope">
+								<div style="text-align: center;">{{scope.$index + 1}}</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="会议名称" prop="name"></el-table-column>
+						<el-table-column label="操作" width="150">
+							<template slot-scope="scope">
+								<div class="hui-table-operation">
+									<span class="table-operation">
+										详情
+									</span>
+									<span class="table-operation">
+										编辑
+									</span>
+									<span class="table-operation">
+										删除
+									</span>
+								</div>
+							</template>
+						</el-table-column>
+						<template slot="empty">
+							<empty description="暂无数据"></empty>
+						</template>
+					</el-table>
+				</div>
+				<div class="hui-content-pagination">
+					<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
+						@current-change="currentChange">
+					</el-pagination>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tableData: [],
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			insert() {
+				this.$message.warning('功能开发中')
+			},
+			currentChange() {
+
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+ 179 - 0
virgo.wzfrontend/console/src/views/work/operation/meeting/set.vue

@@ -0,0 +1,179 @@
+<template>
+	<div class="meeting-set">
+		<div class="meeting-item hui-flex hui-content">
+			<div class="hui-content-title">
+				<div class="hui-title-item active">会议场所</div>
+			</div>
+			<div class="hui-flex-box">
+				<div class="tag">
+					<div class="target-item" v-for="item in placeList" :key="item.id">
+						<span class="label">{{item.name}}</span>
+						<i class="iconfont huifont-bianji" @click.stop="updateFunc(1,item)"></i>
+						<i class="iconfont huifont-guanbi" @click.stop="deleteFunc(1,item)"></i>
+					</div>
+					<div class="target-item target-item-insert" @click="insertFunc(1)">
+						<i class="iconfont huifont-xinzeng"></i>
+						<span class="label">新增场所</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="meeting-line"></div>
+		<div class="meeting-item hui-flex hui-content">
+			<div class="hui-content-title">
+				<div class="hui-title-item active">会议类型</div>
+			</div>
+			<div class="hui-flex-box">
+				<div class="tag">
+					<div class="target-item" v-for="item in typeList" :key="item.id">
+						<span class="label">{{item.name}}</span>
+						<i class="iconfont huifont-bianji" @click.stop="updateFunc(2,item)"></i>
+						<i class="iconfont huifont-guanbi" @click.stop="deleteFunc(2,item)"></i>
+					</div>
+					<div class="target-item target-item-insert" @click="insertFunc(2)">
+						<i class="iconfont huifont-xinzeng"></i>
+						<span class="label">新增类型</span>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				placeList: [],
+				typeList: [],
+				index: 1
+			}
+		},
+		methods: {
+			insertFunc(type) {
+				let msg = type === 1 ? '场所名称' : '类型名称';
+				this.$prompt(`请输入${msg}`, '有极', {
+					confirmButtonText: '确 定',
+					cancelButtonClass: 'cancel',
+					confirmButtonClass: 'confirm',
+					cancelButtonText: '取 消',
+					inputPattern: /\S/,
+					inputErrorMessage: `请输入${msg}`
+				}).then(({
+					value
+				}) => {
+					let item = {
+						id: this.index,
+						name: value
+					}
+					if (type === 1) {
+						this.placeList.push(item);
+					} else {
+						this.typeList.push(item);
+					}
+					this.index++;
+					this.$message.success('操作成功');
+				}).catch(() => {});
+			},
+			updateFunc(type, item) {
+				let msg = type === 1 ? '场所名称' : '类型名称';
+				this.$prompt(`请输入${msg}`, '有极', {
+					confirmButtonText: '确 定',
+					cancelButtonClass: 'cancel',
+					confirmButtonClass: 'confirm',
+					cancelButtonText: '取 消',
+					inputPattern: /\S/,
+					inputErrorMessage: `请输入${msg}`,
+					inputValue: item.name
+				}).then(({
+					value
+				}) => {
+					item.name = value;
+					this.$message.success('操作成功');
+				}).catch(() => {});
+			},
+			deleteFunc(type, item) {
+				let msg = type === 1 ? '场所名称' : '类型名称';
+				this.$confirm(`确定要删除该${msg}?`, () => {
+					if (type === 1) {
+						let index = this.placeList.findIndex(node => node.id === item.id);
+						this.placeList.splice(index, 1);
+					} else {
+						let index = this.typeList.findIndex(node => node.id === item.id);
+						this.typeList.splice(index, 1);
+					}
+					this.$message.success('操作成功');
+				});
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.meeting-set {
+		width: 100%;
+		height: 100%;
+		display: flex;
+
+		.meeting-item {
+			flex: 1;
+			height: 100%;
+		}
+
+		.hui-flex-box {
+			padding: 10px;
+		}
+
+		.meeting-line {
+			width: 15px;
+			height: 100%;
+			background: $--background;
+		}
+
+		.tag {
+			display: flex;
+			flex-wrap: wrap;
+
+			.target-item {
+				display: flex;
+				height: 28px;
+				align-items: center;
+				margin: 5px 0;
+				margin-right: 15px;
+				background: #46577a;
+				border-radius: 15px;
+				padding: 0 15px;
+
+				.label {
+					font-size: 12px;
+				}
+
+				.iconfont {
+					margin-left: 10px;
+					font-size: 12px;
+					cursor: pointer;
+				}
+
+				.huifont-bianji {
+					font-size: 18px;
+				}
+			}
+
+			.target-item-insert {
+				cursor: pointer;
+				background: transparent;
+				border: 1px solid #7383ad;
+
+				.iconfont {
+					margin-left: 0;
+					margin-right: 10px;
+				}
+			}
+
+			.target-item-insert:hover {
+				border-color: $--color-primary;
+				color: $--color-primary;
+			}
+		}
+	}
+</style>

文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/index.html


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/css/2758.c91856b9.css


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/css/app.1c4821bd.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/css/app.fe59b970.css


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/159-legacy.4635690a.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/159.2ab37294.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/2758-legacy.026dc0b8.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/2758.8c3c5351.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/6061-legacy.5ddb72de.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/6061.d13ecb47.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/6061.f90580e8.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/7995-legacy.d56ddcf7.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/7995.5a6cf35e.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/app-legacy.93add9e8.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/app-legacy.f8d24938.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/app.2ac1125e.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/app.5d668f35.js