Browse Source

fix: 修改基础配置接口,修改接口管理配置是关联页面不能为空的限制,去掉aksk配置等

yanglzh 1 year ago
parent
commit
e9d4904542

+ 2 - 2
src/api/system/index.ts

@@ -160,8 +160,8 @@ export default {
     changeStatus: (data: object) => post('/system/blacklist/status', data),
   },
   basicConfig: {
-    getDetails: () => get('/getBaseSetting'),
-    setDetails: (data: object) => put('/editBaseSetting', data),
+    getDetails: (params: object) => get('/common/getSysConfigSetting', params),
+    setDetails: (data: object) => put('/common/editSysConfigSetting', data),
   },
   certificate: {
     getList: () => get('/system/certificate/getAll')

+ 1 - 1
src/views/iot/device/template/component/edit.vue

@@ -117,7 +117,7 @@ export default {
 			(this.$refs['dataForm'] as any).validate((valid: boolean) => {
 				if (valid) {
 					api.template.editTemplate(this.temp).then(() => {
-						this.$emit('finish');
+						this.$emit('getList');
 						this.clsoeDialog();
 						ElMessage.success('操作成功!');
 					});

+ 1 - 1
src/views/system/api/component/bind.vue

@@ -37,7 +37,7 @@ const formData = reactive<ApiRow>({
 });
 
 const ruleForm = {
-	menuIds: [ruleRequired('关联页面不能为空', 'change')],
+	// menuIds: [ruleRequired('关联页面不能为空', 'change')],
 };
 
 // 加载菜单列表

+ 1 - 1
src/views/system/api/component/edit.vue

@@ -98,7 +98,7 @@ watch(
 
 const ruleForm = {
 	parentId: [ruleRequired('上级分类不能为空', 'change')],
-	menuIds: [ruleRequired('关联页面不能为空', 'change')],
+	// menuIds: [ruleRequired('关联页面不能为空', 'change')],
 	method: [ruleRequired('请求方式不能为空', 'change')],
 	name: [ruleRequired('接口名称不能为空')],
 	address: [ruleRequired('接口地址不能为空')],

+ 1 - 23
src/views/system/basicConfig/index.vue

@@ -10,12 +10,6 @@
 						<el-form-item label="系统版权" prop="keyWord">
 							<el-input v-model="state.info.copyright" placeholder="请输入系统版权" clearable size="default" />
 						</el-form-item>
-						<el-form-item label="开放接口AK" prop="keyWord">
-							<el-input v-model="state.info.accesskey" placeholder="请输入开放接口AK" clearable size="default" />
-						</el-form-item>
-						<el-form-item label="开放接口SK" prop="keyWord">
-							<el-input v-model="state.info.secretkey" placeholder="请输入开放接口SK" clearable size="default" />
-						</el-form-item>
 						<el-row>
 							<el-col :span="12">
 								<el-form-item label="系统LOGO" prop="keyWord">
@@ -90,17 +84,13 @@ const initBasicConfigInfo = () => {
 };
 const queryBasicConfigInfo = () => {
 	state.tableData.loading = true
-	api.basicConfig.getDetails().then((res: any) => {
+	api.basicConfig.getDetails({types: 0}).then((res: any) => {
 		state.data = res.data;
 		res.data.forEach((element: object) => {
 			if (element.configName == '系统名称') {
 				state.info.name = element.configValue
 			} else if (element.configName == '系统版权') {
 				state.info.copyright = element.configValue
-			} else if (element.configName == '开放接口AK') {
-				state.info.accesskey = element.configValue
-			} else if (element.configName == '开放接口SK') {
-				state.info.secretkey = element.configValue
 			} else if (element.configName == '系统LOGO') {
 				state.info.logo = element.configValue
 			} else if (element.configName == '系统LOGO(小图标)') {
@@ -121,14 +111,6 @@ const setDetails = () => {
 		ElMessage.error('请填写系统版权');
 		return;
 	}
-	if (!state.info.accesskey) {
-		ElMessage.error('请填写开放接口AK');
-		return;
-	}
-	if (!state.info.secretkey) {
-		ElMessage.error('请填写开放接口SK');
-		return;
-	}
 	if (!state.info.logo) {
 		ElMessage.error('请上传系统LOGO');
 		return;
@@ -146,10 +128,6 @@ const setDetails = () => {
 			element.configValue = state.info.name
 		} else if (element.configName == '系统版权') {
 			element.configValue = state.info.copyright
-		} else if (element.configName == '开放接口AK') {
-			element.configValue = state.info.accesskey
-		} else if (element.configName == '开放接口SK') {
-			element.configValue = state.info.secretkey
 		} else if (element.configName == '系统LOGO') {
 			element.configValue = state.info.logo
 		} else if (element.configName == '系统LOGO(小图标)') {

+ 3 - 1
src/views/system/manage/user/component/editUser.vue

@@ -191,9 +191,11 @@ export default defineComponent({
 			if (row) {
 				api.user.detail(row.id).then((user: any) => {
 					state.ruleForm = user;
+					state.isShowDialog = true;
 				});
+			} else {
+				state.isShowDialog = true;
 			}
-			state.isShowDialog = true;
 		};
 		// 关闭弹窗
 		const closeDialog = () => {