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/utils/request.ts

@@ -30,8 +30,9 @@ service.interceptors.response.use(
 		// 对响应数据做点什么
 		const res = response.data;
 		const code = response.data.code
-		if (code === 401) {
-			ElMessageBox.alert('登录状态已过期，请重新登录', '提示', { confirmButtonText: '确定' })
+		if (code === 401 || code === 51) {
+			ElMessageBox.alert('登录状态已过期，请重新登录', '提示',
+				{ confirmButtonText: '确定', showCancelButton: false, closeOnHashChange: false, closeOnPressEscape: false, closeOnClickModal: false, showClose: false })
 				.then(() => {
 					Session.clear(); // 清除浏览器全部临时缓存
 					window.location.href = '/'; // 去登录页
@@ -51,7 +52,7 @@ service.interceptors.response.use(
 				}
 			}
 			if (res.data?.Data) {
-				return res.data.Data 
+				return res.data.Data
 			}
 			if (res.data?.Data === undefined) {
 				return res.data
@@ -97,7 +98,7 @@ export function put(url: string, data?: any): any {
 		data
 	})
 }
-export function del(url: string, data?: any): any{
+export function del(url: string, data?: any): any {
 	return service({
 		url,
 		method: "delete",

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();
 		};
 		// 打开修改用户弹窗

src/views/datahub/modeling/component/editNode.vue

@@ -30,10 +30,10 @@
 				</div>
 
 				<el-form-item label="字段节点标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入字段节点名称" />
+					<el-input v-model="ruleForm.key" placeholder="请输入字段节点名称"  :disabled="ruleForm.from==2"/>
 				</el-form-item>
 				<el-form-item label="字段节点名称" prop="name">
-					<el-input v-model="ruleForm.name" placeholder="请输入字段节点名称" />
+					<el-input v-model="ruleForm.name" placeholder="请输入字段节点名称" :disabled="ruleForm.from==2"/>
 				</el-form-item>
 
 
@@ -53,7 +53,7 @@
 				</el-form-item>
 
 
-				<el-form-item label="默认值" prop="default">
+				<el-form-item label="默认值" prop="default" v-if="ruleForm.from==1">
 					<el-input v-model="ruleForm.default" placeholder="请输入取值项" />
 				</el-form-item>
 

src/views/datahub/modeling/detail.vue

@@ -76,8 +76,8 @@
 
 					<el-table-column label="操作" width="200" align="center" fixed="right">
 						<template #default="scope">
-							<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)">修改</el-button>
-							<el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
+							<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="developer_status==0">修改</el-button>
+							<el-button size="small" text type="danger" @click="onRowDel(scope.row)" v-if="developer_status==0">删除</el-button>
 						</template>
 					</el-table-column>
 				</el-table>

src/views/datahub/source/component/edit.vue

@@ -71,7 +71,7 @@
 								<el-input v-model="item.key" placeholder="请输入参数名" style="width: 320px" />
 								<el-input v-model="item.value" placeholder="请输入参数值" style="width: 320px" />
 								<div class="conicon">
-									<el-icon @click="delParams(index)" v-if="index > 0"><Delete /></el-icon>
+									<el-icon @click="delParams(index)" ><Delete /></el-icon>
 								</div>
 							</div>
 							<el-button type="primary" class="addbutton" @click="addParams">增加</el-button>
@@ -216,12 +216,7 @@ export default defineComponent({
 				},
 			],
 			requestParams: [
-				{
-					type: '',
-					key: '',
-					name: '',
-					value: '',
-				},
+				
 			],
 			methodData: [
 				{

src/views/datahub/source/component/editNode.vue

@@ -68,7 +68,7 @@
 				title="点击蓝色key值进行选择"
 				width="30%"
 			>
-					<JsonViewer :value="jsonData"  boxed sort theme="jv-dark" @click="onKeyclick" />
+					<JsonViewer :value="jsonData" :show-double-quotes="true"	  boxed sort theme="jv-dark" @click="onKeyclick" />
 
 				<template #footer>
 				<span class="dialog-footer">
@@ -310,17 +310,54 @@ export default defineComponent({
 		};
 
 		const onKeyclick=(e)=>{
+			//console.log(e);
 			if(e.target.innerText && e.target.className=='jv-key'){
 				let str = e.target.innerText;  
 				str = str.substr(0, str.length - 1);
 				state.ruleForm.value=str;
 				state.dialogVisible = false;
+				var con={
+					...
+					state.jsonData
+				}
+				var jsonstr=getOrgIdArr([],str,con);
+				state.ruleForm.value=jsonstr.join('.');
+			
 			}
 			
 		};
 
+		const getOrgIdArr=(parents, childNode, treeData)=>{
+			
+			if (treeData instanceof Object) {
+			
+				for (var key in treeData) {
+					
+						// 父节点查询条件
+						if (key === childNode) {
+							// 如果找到结果,保存当前节点
+							parents.push(key)
+							// 用当前节点再去原数据查找当前节点的父节点
+							//getOrgIdArr(parents, childNode,treeData[key])
+							break
+						} else {
+							if (treeData[key] instanceof Object) {
+							//	没找到，遍历该节点的子节点
+								parents.push(key)
+								getOrgIdArr(parents, childNode, treeData[key])
+								break
+							}
+						}
+					}
+			}
+				return parents
+
+		};
+
+
 		return {
 			onKeyclick,
+			getOrgIdArr,
 			addRule,
 			onTest,
 			delRule,

src/views/datahub/source/detail.vue

@@ -79,7 +79,7 @@
 							<div class="title">数据节点</div>
 							<div><el-button type="primary" @click="onOpenEdit()">添加</el-button></div>
 						</div>
-
+				
 						<el-table :data="tableData.data" style="width: 100%">
 							<el-table-column label="ID" align="center" prop="nodeId" width="80" />
 							<el-table-column label="数据标识" prop="key" :show-overflow-tooltip="true" />
@@ -91,8 +91,8 @@
 
 							<el-table-column label="操作" width="200" align="center" fixed="right">
 								<template #default="scope">
-									<el-button size="small" text type="warning" @click="onOpenEdit1(scope.row)">修改</el-button>
-									<el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
+									<el-button size="small" text type="warning" @click="onOpenEdit1(scope.row)" v-if="developer_status==0">修改</el-button>
+									<el-button size="small" text type="danger" @click="onRowDel(scope.row)" v-if="developer_status==0" >删除</el-button>
 								</template>
 							</el-table-column>
 						</el-table>
@@ -100,7 +100,6 @@
 							v-show="tableData.total > 0"
 							:total="tableData.total"
 							v-model:page="tableData.param.pageNum"
-							v-model:limit="tableData.param.pageSize"
 							@pagination="typeList"
 						/>
 					</div>