Browse Source

no message

Cake 3 days ago
parent
commit
4aa94f55a8

+ 3 - 2
src/views/system/device/crud.tsx

@@ -333,7 +333,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 								type: 'form',
 								limit: 1,
 								accept: ".jpg,.png",
-								uploadRequest: uploadRequestHandler,
+								// uploadRequest: uploadRequestHandler,
 								// uploadRequest: async (file) => {
 								// // eslint-disable-next-line no-console
 								// // console.log("files::",file);
@@ -377,6 +377,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					title: '租户id',
 					type: 'dict-select',
 					column: {
+						show:false,
 						minWidth: 120,
 					},
 					dict: dict({
@@ -439,7 +440,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					title: '维修名称',
 					type: 'input',
 					search: { show: false },
-					column: { minWidth: 100 },
+					column: { show:false,minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入设备购入价格' },
 						rules: [{ required: true, message: '请输入设备购入价格' }],

+ 3 - 2
src/views/system/devicelabel/crud.tsx

@@ -79,6 +79,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					title: '颜色',
 					type: 'input',
 					column: {
+						show:false,
 						minWidth: 120,
 					},
 					form: {
@@ -94,7 +95,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					form: {
 						component: { placeholder: '请填写标签描述' },
-						rules: [{ required: true, message: '请填写标签描述' }],
+						rules: [{ required: false, message: '请填写标签描述' }],
 					},
 				},
 				sort:{
@@ -105,7 +106,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					form: {
 						component: { placeholder: '请填写排序' },
-						rules: [{ required: true, message: '请填写排序' }],
+						rules: [{ required: false, message: '请填写排序' }],
 					},
 				},
 			},

+ 11 - 0
src/views/system/screenconsole/api.ts

@@ -0,0 +1,11 @@
+import { request } from '/@/utils/service';
+import { UserPageQuery, AddReq, DelReq, EditReq, InfoReq } from '@fast-crud/fast-crud';
+
+export const apiPrefix = '/api/system/login_log/';
+export function GetList(query: UserPageQuery) {
+	return request({
+		url: 'api/dashboard/stats',
+		method: 'get',
+		params: { ...query, tenant_id: 1 },
+	});
+}

File diff suppressed because it is too large
+ 348 - 0
src/views/system/screenconsole/index.vue


+ 16 - 10
src/views/system/suppliermanage/crud.tsx

@@ -109,7 +109,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					column: { minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入地址' },
-						rules: [{ required: true, message: '请输入地址' }],
+						rules: [{ required: false, message: '请输入地址' }],
 					},
 				},
 				website: {
@@ -119,7 +119,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					column: { minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入网址' },
-						rules: [{ required: true, message: '请输入网址' }],
+						rules: [{ required: false, message: '请输入网址' }],
 					},
 				},
 				business_license: {
@@ -129,7 +129,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					column: { minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入营业执照' },
-						rules: [{ required: true, message: '请输入营业执照' }],
+						rules: [{ required: false, message: '请输入营业执照' }],
 					},
 				},
 				tax_number: {
@@ -139,7 +139,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					column: { minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入税号' },
-						rules: [{ required: true, message: '请输入税号' }],
+						rules: [{ required: false, message: '请输入税号' }],
 					},
 				},
 				bank_account: {
@@ -149,7 +149,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					column: { minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入银行卡号' },
-						rules: [{ required: true, message: '请输入银行卡号' }],
+						rules: [{ required: false, message: '请输入银行卡号' }],
 					},
 				},
 				credit_rating: {
@@ -159,7 +159,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					column: { minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入信用评级' },
-						rules: [{ required: true, message: '请输入信用评级' }],
+						rules: [{ required: false, message: '请输入信用评级' }],
 					},
 				},
 				cooperation_years: {
@@ -169,7 +169,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					column: { minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入合作年份' },
-						rules: [{ required: true, message: '请输入合作年份' }],
+						rules: [{ required: false, message: '请输入合作年份' }],
 					},
 				},
 				remark: {
@@ -179,21 +179,25 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					column: { minWidth: 100 },
 					form: {
 						component: { placeholder: '请输入备注' },
-						rules: [{ required: true, message: '请输入备注' }],
+						rules: [{ required: false, message: '请输入备注' }],
 					},
 				},
 				tenant_id:{
 					title: '租户id',
 					type: 'dict-select',
 					column: {
+						show:false,
 						minWidth: 120,
 					},
 					dict: dict({
 						url: '/api/system/tenant/list/',
 						value: 'id', 
-						label: 'name'
+						label: 'name',
+						 
 					}),
-					form: {
+					form: {	
+						show:false,
+						value:'1',
 						component: { placeholder: '请填租户id' },
 						rules: [{ required: false, message: '请填租户id' }],
 					},
@@ -210,6 +214,8 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					}),
 					column: { minWidth: 100 },
 					form: {
+						show:false,
+						value:true,
 						component: { placeholder: '请选择状态' },
 						rules: [{ required: true, message: '请选择状态' }],
 					},

Some files were not shown because too many files changed in this diff