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

package-lock.json

@@ -606,11 +606,6 @@
         "fastq": "^1.6.0"
       }
     },
-    "@popperjs/core": {
-      "version": "npm:@sxzz/popperjs-es@2.11.7",
-      "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
-    },
     "@types/d3-timer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-2.0.1.tgz",
@@ -1441,6 +1436,13 @@
         "lodash-unified": "^1.0.2",
         "memoize-one": "^6.0.0",
         "normalize-wheel-es": "^1.2.0"
+      },
+      "dependencies": {
+        "@popperjs/core": {
+          "version": "npm:@sxzz/popperjs-es@2.11.7",
+          "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+          "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+        }
       }
     },
     "element-resize-detector": {
@@ -2438,6 +2440,11 @@
         "argparse": "^2.0.1"
       }
     },
+    "jsencrypt": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.3.2.tgz",
+      "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",

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

@@ -1,7 +1,7 @@
 <template>
-	<div class="system-add-flag-container">
+	<div class="add-or-edit-assess">
 		<el-dialog :title="isEdit?'编辑标识项':'新建标识项'" v-model="isShowDialog" width="569px">
-			<el-form class="add-flag-container" 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="100px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="标识" prop="name">
@@ -9,8 +9,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="名称" prop="title">
-							<el-input v-model="ruleForm.title" placeholder="请输入名称" clearable></el-input>
+						<el-form-item label="数据项名称" prop="title">
+							<el-input v-model="ruleForm.title" placeholder="请输入数据项名称" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -33,9 +33,9 @@
 						<div class="left-wrap">
 							<span class="symbol">*</span>
 							<span class="label">取值范围</span>
-							<el-input size="small" v-model="item.start_value" placeholder="请输入最小值" clearable></el-input>
+							<el-input size="small" v-model.number="item.start_value" placeholder="请输入最小值" clearable></el-input>
 							<span> ～ </span>
-							<el-input size="small" v-model="item.end_value" placeholder="请输入最大值" clearable></el-input>
+							<el-input size="small" v-model.number="item.end_value" placeholder="请输入最大值" clearable></el-input>
 						</div>
 						<div class="right-wrap">
 							<span class="symbol">*</span>
@@ -68,11 +68,6 @@ interface DeptData {
 	end_value: string;
 	base_value: string;
 }
-// interface RangeData {
-// 	minVal: number | string;
-// 	maxVal: number | string;
-// 	score: number | string;
-// }
 interface UserState {
 	isShowDialog: boolean;
 	ruleForm: {
@@ -83,11 +78,10 @@ interface UserState {
 	};
 	index: any;
 	isEdit: Boolean;
-	// deptData: Array<DeptData>;
 }
 
 export default defineComponent({
-	name: 'systemAddUser',
+	name: 'AddOrEditAssess',
 	setup(prop, { emit }) {
 		const state = reactive<UserState>({
 			isShowDialog: false,
@@ -106,7 +100,7 @@ export default defineComponent({
 				{ required: true, message: '请输入标识', trigger: 'blur' },
 			],
 			title: [
-				{ required: true, message: '请输入名称', trigger: 'blur' },
+				{ required: true, message: '请输入数据项名称', trigger: 'blur' },
 			],
 			weight: [
 				{ required: true, message: '请输入权重', trigger: 'blur' },
@@ -138,11 +132,6 @@ export default defineComponent({
 		const onCancel = () => {
 			closeDialog();
 		};
-		// // 新增
-		// const onSubmit = () => {
-
-
-		// };
 		// 保存数据
 		const onSubmit = async (formEl: FormInstance | undefined) => {
 			if (!formEl) return
@@ -155,46 +144,16 @@ export default defineComponent({
 							ElMessage.error('请完善表单');
 							return
 						}
+						if(start_value >= end_value) {
+							ElMessage.error('最大值最小值范围设置错误');
+							return
+						}
 					}
 					emit('handleChange', state.ruleForm, state.index, state.isEdit)
 					closeDialog();
 				}
 			})
 		}
-		// 初始化组织数据
-		// const initTableData = () => {
-		// 	state.deptData.push({
-		// 		deptName: 'vueNextAdmin',
-		// 		createTime: new Date().toLocaleString(),
-		// 		status: true,
-		// 		sort: Math.random(),
-		// 		describe: '顶级组织',
-		// 		id: Math.random(),
-		// 		children: [
-		// 			{
-		// 				deptName: 'IT外包服务',
-		// 				createTime: new Date().toLocaleString(),
-		// 				status: true,
-		// 				sort: Math.random(),
-		// 				describe: '总部',
-		// 				id: Math.random(),
-		// 			},
-		// 			{
-		// 				deptName: '资本控股',
-		// 				createTime: new Date().toLocaleString(),
-		// 				status: true,
-		// 				sort: Math.random(),
-		// 				describe: '分部',
-		// 				id: Math.random(),
-		// 			},
-		// 		],
-		// 	});
-		// 	state.ruleForm.list = [{
-		// 		minVal: 10,
-		// 		maxVal: 100,
-		// 		score: 90
-		// 	}]
-		// };
 		const addRange = () => {
 			if(!state.ruleForm.ranges.length) {
 				state.ruleForm.ranges.push({
@@ -210,6 +169,10 @@ export default defineComponent({
 				ElMessage.error('请完善表单');
 				return
 			}
+			if(start_value >= end_value) {
+				ElMessage.error('最大值最小值范围设置错误');
+				return
+			}
 			state.ruleForm.ranges.push({
 				start_value: '',
 				end_value: '',
@@ -217,22 +180,8 @@ export default defineComponent({
 			})
 		};
 		const deleteRange = (index: number) => {
-			state.ruleForm.ranges.splice(index, 1)
-			// const { minVal, maxVal, score } = item
-			// if(!minVal || !maxVal || !score.toString()) {
-			// 	ElMessage.error('请完善表单');
-			// 	return
-			// }
-			// state.ruleForm.list.push({
-			// 	minVal: '',
-			// 	maxVal: '',
-			// 	score: ''
-			// })
+			state.ruleForm.ranges.splice(index, 1);
 		};
-		// 页面加载时
-		onMounted(() => {
-			// initTableData();
-		});
 		return {
 			rules,
 			ruleTagRef,
@@ -260,7 +209,6 @@ export default defineComponent({
 	border-bottom: 1px solid var(--el-border-color);
 }
 .add-value-range {
-	// background-color: pink;
 	padding: 10px 0;
 	.header {
 		display: flex;

src/views/system/assess/totalIndex/component/detailItem.vue

@@ -12,7 +12,7 @@
         </div>
         <div class="table-item-wrap">
           <div class="label">SecretKey</div>
-          <div class="value">调用API的安全密码、请联系管理员获取</div>
+          <div class="value">调用API的安全密码，请联系管理员获取</div>
         </div>
         <div class="table-item-wrap">
           <div class="label" style="display: flex;flex-direction: column;justify-content: center;">

src/views/system/datahub/modeling/component/edit.vue

@@ -170,14 +170,14 @@ export default defineComponent({
 						//修改
 
 						api.template.edit(state.ruleForm).then(() => {
-							ElMessage.success('模型类型修改成功');
+							ElMessage.success('修改成功');
 							closeDialog(); // 关闭弹窗
 							emit('typeList');
 						});
 					} else {
 						//添加
 						api.template.add(state.ruleForm).then(() => {
-							ElMessage.success('模型类型添加成功');
+							ElMessage.success('添加成功');
 							closeDialog(); // 关闭弹窗
 							emit('typeList');
 						});

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

@@ -490,19 +490,19 @@ export default defineComponent({
 
 						if (state.ruleForm.from == 1) {
 							api.common.edit(state.ruleForm).then(() => {
-								ElMessage.success('数据源类型修改成功');
+								ElMessage.success('修改成功');
 								closeDialog(); // 关闭弹窗
 								emit('typeList');
 							});
 						} else if (state.ruleForm.from == 4) {
 							api.common.devedit(state.ruleForm).then(() => {
-								ElMessage.success('数据源类型修改成功');
+								ElMessage.success('修改成功');
 								closeDialog(); // 关闭弹窗
 								emit('typeList');
 							});
 						} else if (state.ruleForm.from == 2) {
 							api.common.dbedit(state.ruleForm).then(() => {
-								ElMessage.success('数据源类型修改成功');
+								ElMessage.success('修改成功');
 								closeDialog(); // 关闭弹窗
 								emit('typeList');
 							});
@@ -511,19 +511,19 @@ export default defineComponent({
 						//添加
 						if (state.ruleForm.from == 1) {
 							api.common.add(state.ruleForm).then(() => {
-								ElMessage.success('数据源类型添加成功');
+								ElMessage.success('添加成功');
 								closeDialog(); // 关闭弹窗
 								emit('typeList');
 							});
 						} else if (state.ruleForm.from == 4) {
 							api.common.devadd(state.ruleForm).then(() => {
-								ElMessage.success('数据源类型添加成功');
+								ElMessage.success('添加成功');
 								closeDialog(); // 关闭弹窗
 								emit('typeList');
 							});
 						} else if (state.ruleForm.from == 2) {
 							api.common.dbadd(state.ruleForm).then(() => {
-								ElMessage.success('数据源类型添加成功');
+								ElMessage.success('添加成功');
 								closeDialog(); // 关闭弹窗
 								emit('typeList');
 							});

src/views/system/dict/component/editDic.vue

@@ -115,14 +115,14 @@ export default defineComponent({
           if(state.ruleForm.dictId!==0){
             //修改
             api.dict.editType(state.ruleForm).then(()=>{
-              ElMessage.success('字典类型修改成功');
+              ElMessage.success('修改成功');
               closeDialog(); // 关闭弹窗
               emit('typeList')
             })
           }else{
             //添加
             api.dict.addType(state.ruleForm).then(()=>{
-              ElMessage.success('字典类型添加成功');
+              ElMessage.success('添加成功');
               closeDialog(); // 关闭弹窗
               emit('typeList')
             })

src/views/system/task/index.vue

@@ -4,7 +4,7 @@
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="任务名称" prop="jobName">
-            <el-input v-model="tableData.param.jobName" placeholder="请输入参数名称" clearable size="default" @keyup.enter="dataList" />
+            <el-input v-model="tableData.param.jobName" placeholder="请输入任务名称" clearable size="default" @keyup.enter="dataList" />
           </el-form-item>
           <el-form-item label="任务组名" prop="jobGroup">
             <el-select v-model="tableData.param.jobGroup" size="mini" placeholder="请选择">