Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/theme/dark.scss

@@ -91,6 +91,88 @@
 	.home-card-item {
 		border: 1px solid var(--next-border-color-light) !important;
 	}
+	.el-card {
+		background-color: var(--el-color-white) !important;
+		color: var(--el-text-color-primary) !important;
+		border: 1px solid var(--next-border-color-light) !important;
+	}
+	.el-button.is-text:not(.is-disabled):focus, .el-button.is-text:not(.is-disabled):hover {
+		background-color: var(--el-color-white) !important;
+	}
+	.el-scrollbar__view {
+		background-color: var(--el-color-white) !important;
+	}
+	.pagination-container {
+		background-color: var(--el-color-white) !important;
+	}
+	.el-tag {
+		background-color: var(--el-color-white) !important;
+	}
+	.el-collapse {
+		--el-collapse-header-bg-color: var(--el-color-white) !important;
+	}
+	// .el-switch__core {
+	// 	background-color: var(--el-text-color-primary) !important;
+	// }
+	.el-select-dropdown__item.selected {
+		background-color: var(--el-color-white) !important;
+	}
+	.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
+		background-color: var(--el-text-color-primary) !important;
+	}
+	.el-dialog {
+		background-color: var(--el-color-white) !important;
+	}
+	.el-dialog__body {
+		border-top-color: var(--next-border-color-light) !important;
+	}
+	.el-textarea__inner {
+		background-color: var(--el-color-white) !important;
+	}
+	.el-textarea {
+		--el-input-border-color: var(--next-border-color-light) !important;
+	}
+	.el-button--large {
+		background-color: var(--el-color-white) !important;
+		border: 1px solid var(--next-border-color-light) !important;
+	}
+	.el-input-number__decrease,
+	.el-input-number__increase {
+		border-color: var(--next-border-color-light) !important;
+	}
+	.el-collapse-item__wrap {
+		background-color: var(--el-color-white) !important;
+	}
+	.el-input__wrapper {
+		background-color: var(--el-color-white) !important;
+		color: var(--el-text-color-primary) !important;
+	}
+	.el-input {
+		--el-input-border-color: var(--next-border-color-light) !important;
+	}
+	.el-table th.el-table__cell,
+	.el-table tr {
+		background-color: var(--el-color-white) !important;
+		color: var(--el-text-color-primary) !important;
+		border: 1px solid var(--next-border-color-light) !important;
+	}
+	.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+		background-color: var(--next-color-seting) !important;
+	}
+	.add-flag-container {
+		// .el-form {
+			border-bottom-color: var(--next-border-color-light) !important;
+		// }
+	}
+	.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+		background-color: var(--el-color-white) !important;
+	}
+	.help-wrap .help-item .help-item-label {
+		background-color: var(--next-border-color-light) !important;
+	}
+	.table-wrap .table-item-wrap .label {
+		background-color: var(--el-color-white) !important;
+	}
 	.el-alert,
 	.notice-bar {
 		border: 1px solid var(--next-border-color) !important;

src/views/assess/totalIndex/component/addSign.vue

@@ -1,7 +1,7 @@
 <template>
-	<div class="system-add-user-container">
+	<div class="system-add-flag-container">
 		<el-dialog :title="isEdit?'编辑标识项':'新建标识项'" v-model="isShowDialog" width="569px">
-			<el-form ref="ruleTagRef" :rules="rules" :model="ruleForm" size="default" label-width="90px">
+			<el-form class="add-flag-container" ref="ruleTagRef" :rules="rules" :model="ruleForm" size="default" label-width="90px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="标识" prop="name">

src/views/assess/totalIndex/component/editItem.vue

@@ -155,15 +155,29 @@ export default defineComponent({
 		})
 		// 打开弹窗
 		const openDialog = (row:any) => {
-			if(!row) return
-			console.log(row.item_code)
-			api.getList({itemcode: row.item_code}).then((res: any) => {
-				console.log(res)
-				state.ruleForm = res;
-				state.tableData.data = res.targets
+			// if(!row) return
+			// console.log(row.item_code)
+			if(row) {
+				api.getList({itemcode: row.item_code}).then((res: any) => {
+					console.log(res)
+					state.ruleForm = res;
+					state.tableData.data = res.targets
+					state.isShowDialog = true;
+				});
+			}else {
+				state.ruleForm = {
+					title: '', // 评价名称
+					explain: '', // 描述
+					config: '',
+					item_code: '',
+					targets: []
+				},
+				state.tableData.data = [];
 				state.isShowDialog = true;
+			}
+	
+
 
-			});
 		};
 		// 关闭弹窗
 		const closeDialog = () => {

src/views/assess/totalIndex/index.vue

@@ -134,6 +134,7 @@ export default defineComponent({
 		};
 		// 打开新增用户弹窗
 		const onOpenAddItem = () => {
+			console.log(111)
 			EditOrAddItem.value.openDialog();
 		};
 		// 打开修改用户弹窗