Skip to content

Z
zrch-risk-39
提交 a9bd555c authored 作者: kxjia's avatar kxjia
浏览文件
操作

修改西部矿业发现的bug

上级 db772caf
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 131 行增加 和 71 行删除
zrch-risk-client-39/package.json
浏览文件 @ a9bd555c
......@@ -25,6 +25,8 @@
"dependencies": {
"@ant-design/colors": "^7.2.1",
"@ant-design/icons-vue": "^7.0.1",
"@form-create/ant-design-vue": "^2.6.3",
"@form-create/core": "^2.6.3",
"@iconify/iconify": "^3.1.1",
"@jeecg/aiflow": "3.9.0-beta2",
"@jeecg/online": "3.9.0-beta2",
......@@ -39,6 +41,7 @@
"@zxcvbn-ts/core": "^3.0.4",
"ant-design-vue": "^4.2.6",
"axios": "^1.12.2",
"bpmn-js": "^18.10.1",
"china-area-data": "^5.0.1",
"clipboard": "^2.0.11",
"codemirror": "^5.65.20",
......@@ -51,6 +54,7 @@
"emoji-mart-vue-fast": "^15.0.5",
"enquire.js": "^2.1.6",
"event-source-polyfill": "^1.0.31",
"exceljs": "^4.4.0",
"highlight.js": "^11.11.1",
"intro.js": "^7.2.0",
"lodash-es": "^4.17.21",
......@@ -68,6 +72,7 @@
"qrcode": "^1.5.4",
"qs": "^6.14.0",
"resize-observer-polyfill": "^1.5.1",
"sass-embedded": "^1.97.2",
"showdown": "^2.1.0",
"sortablejs": "^1.15.6",
"swagger-ui-dist": "^5.29.3",
......@@ -85,6 +90,7 @@
"vxe-pc-ui": "4.6.12",
"vxe-table": "4.13.31",
"vxe-table-plugin-antd": "4.0.8",
"vxe-table-plugin-export-xlsx": "^4.0.7",
"xe-utils": "3.5.26",
"xlsx": "^0.18.5",
"xss": "^1.0.15"
......@@ -92,6 +98,8 @@
"devDependencies": {
"@commitlint/cli": "^18.6.1",
"@commitlint/config-conventional": "^18.6.3",
"@form-create/data": "^2.6.2",
"@form-create/utils": "^2.6.3",
"@iconify/json": "^2.2.394",
"@purge-icons/generated": "^0.10.0",
"@rys-fe/vite-plugin-theme": "^0.8.6",
......
zrch-risk-client-39/src/views/metric/MetricStatReport.data.ts
浏览文件 @ a9bd555c
......@@ -8,13 +8,10 @@ export const columns: BasicColumn[] = [
{
title: '类型',
align:"center",
dataIndex: 'tp',
dataIndex: 'tp_dictText',
resizable:true,
sorter:true,
width:80,
customRender: ({ text }) => {
return render.renderDict(text, 'metric_sta_report_tp');
},
width:80
},
{
title: '主标题',
......@@ -76,14 +73,10 @@ export const columns: BasicColumn[] = [
{
title: '统计方法',
align:"center",
dataIndex: 'statMethod',
dataIndex: 'statMethod_dictText',
resizable:true,
sorter:true,
width:90,
customRender: ({ text }) => {
return render.renderDict(text, 'metric_sta_method');
},
width:90
},
{
......@@ -158,11 +151,7 @@ export const formSchema: FormSchema[] = [
field: 'tp',
component: 'JDictSelectTag',
// defaultValue:2,
dynamicRules: ({model,schema}) => {
return [
{ required: true},
];
},
required: true,
componentProps: ({ formActionType, formModel }) => {
return {
dictCode: 'metric_sta_report_tp',
......@@ -171,12 +160,45 @@ export const formSchema: FormSchema[] = [
sync: true,
onChange: async (tp) => {
const { updateSchema } = formActionType;
const objTmp={2:"week",3:"month",4:"quarter",6:"year"}
const objTmp={2:"week",3:"month",4:"quarter",5:"harfYear",6:"year"}
const statSetMap = await getMetricStatSet();
if(tp==5){
updateSchema(
{
field: 'reportDate',
component:'RadioGroup',
componentProps: {
type:"radio",
options: [
{ label: '上半年', value: 1 },
{ label: '下半年', value: 2 },
],
onChange: (val) => {
let stDate = "";
let endDate="";
let date = new Date();
let year = date.getFullYear();
if(val==1) {
stDate = year + "-01-01";
endDate = year + "-06-31"
} else {
stDate = year + "-07-01";
endDate = year + "-12-31"
}
formModel.stDate=stDate
formModel.endDate= endDate
}
},
})
} else {
updateSchema([
{
field: 'reportDate',
component:'DatePicker',
componentProps: {
picker:objTmp[tp],
valueFormat: 'YYYY-MM-DD',
......@@ -207,6 +229,11 @@ export const formSchema: FormSchema[] = [
let lastDate = new Date(year, lastMonth, 0).getDate();
stDate = firstDate.toISOString().slice(0, 10)
endDate = year + "-" + (lastMonth<10?'0'+lastMonth:lastMonth) + "-" + lastDate
} else if(formModel.tp==5) {
// stDate = year + "-01-01";
// endDate = year + "-6-31"
} else if(formModel.tp==6) {
stDate = year + "-01-01";
endDate = year + "-12-31"
......@@ -218,6 +245,7 @@ export const formSchema: FormSchema[] = [
},
},
]);
}
formModel.reportDate=''
formModel.stDate= ""
......@@ -242,7 +270,7 @@ export const formSchema: FormSchema[] = [
label: '主标题',
field: 'title',
component: 'Input',
dynamicRules: ({model,schema}) => {
dynamicRules: () => {
return [
{ required: true, message: '请输入主标题!'},
{ min: 0, max: 32, message: '长度不能超过 32 个字符', trigger: 'blur' },
......@@ -253,7 +281,7 @@ export const formSchema: FormSchema[] = [
label: '副标题',
field: 'subtitle',
component: 'Input',
dynamicRules: ({model,schema}) => {
dynamicRules: () => {
return [
{ required: false, message: '请输入主标题!'},
{ min: 0, max: 32, message: '长度不能超过 32 个字符', trigger: 'blur' },
......@@ -264,33 +292,33 @@ export const formSchema: FormSchema[] = [
label: '监测时间',
field: 'reportDate',
component: 'DatePicker',
dynamicRules: ({model,schema}) => {
return [
{ required: true},
];
},
componentProps: ({ formActionType, formModel }) => {
return {
valueFormat: 'YYYY',
format: "YYYY",
};
},
required:true,
// componentProps: ({ formActionType, formModel }) => {
// return {
// sync: true,
// onChange: async (tp) => {
// const { updateSchema } = formActionType;
// updateSchema(
// {
// field: 'inclueData',
// componentProps: {
// },
// }
// )}
// }
// }
},
{
label: '开始日期',
field: 'stDate',
component: 'DatePicker',
dynamicDisabled:true,
dynamicRules: ({model,schema}) => {
return [
{ required: true},
];
},
componentProps: ({ formActionType, formModel }) => {
return {
required: true,
// colProps: { span: 12 },
componentProps: {
valueFormat: 'YYYY-MM-DD',
format: "YYYY-MM-DD",
};
},
},
{
......@@ -298,11 +326,8 @@ export const formSchema: FormSchema[] = [
field: 'endDate',
component: 'DatePicker',
dynamicDisabled:true,
dynamicRules: ({model,schema}) => {
return [
{ required: true},
];
},
required: true,
// colProps: { span: 12 },
componentProps: {
valueFormat: 'YYYY-MM-DD',
format: "YYYY-MM-DD",
......@@ -313,32 +338,28 @@ export const formSchema: FormSchema[] = [
label: '报告部门',
field: 'reportDepart',
component: 'JSelectDept',
dynamicRules: ({model,schema}) => {
return [
{ required: true},
];
},
},
{
label: '统计指标数',
field: 'statTargetNum',
component: 'InputNumber',
},
{
label: '低风险指标数',
field: 'riskLowNum',
component: 'InputNumber',
},
{
label: '中风险指标数',
field: 'riskMediumNum',
component: 'InputNumber',
},
{
label: '高风险指标数',
field: 'riskHighNum',
component: 'InputNumber',
required: true,
},
// {
// label: '统计指标数',
// field: 'statTargetNum',
// component: 'InputNumber',
// },
// {
// label: '低风险指标数',
// field: 'riskLowNum',
// component: 'InputNumber',
// },
// {
// label: '中风险指标数',
// field: 'riskMediumNum',
// component: 'InputNumber',
// },
// {
// label: '高风险指标数',
// field: 'riskHighNum',
// component: 'InputNumber',
// },
{
label: '统计方法',
field: 'statMethod',
......@@ -350,6 +371,17 @@ export const formSchema: FormSchema[] = [
stringToNumber: true,
}
},
{
label: '包含同期',
field: 'inclueData',
component: 'JDictSelectTag',
defaultValue:[],
componentProps: {
dictCode: 'metric_sta_report_tp',
mode: 'multiple'
}
},
// TODO 主键隐藏字段，目前写死为ID
{
label: '',
......
zrch-risk-client-39/src/views/system/user/user.api.ts
浏览文件 @ a9bd555c
......@@ -22,14 +22,20 @@ enum Api {
userDepartList = '/sys/user/userDepartList',
changePassword = '/sys/user/changePassword',
frozenBatch = '/sys/user/frozenBatch',
getUserAgent = '/sys/sysUserAgent/queryByUserName',
userQuitAgent = '/sys/user/userQuitAgent',
getQuitList = '/sys/user/getQuitList',
putCancelQuit = '/sys/user/putCancelQuit',
resetPassword = '/sys/user/resetPassword',
updateUserTenantStatus='/sys/tenant/updateUserTenantStatus',
getUserTenantPageList='/sys/tenant/getUserTenantPageList',
getDepPostIdByDepId = '/sys/sysDepart/getDepPostIdByDepId',
queryUserByDepId = '/sys/user/queryUserByDepId',
getUserAgent = '/sys/sysUserAgent/queryByUserName',
agentEdit = '/sys/sysUserAgent/edit',
agentSave = '/sys/sysUserAgent/add',
userQuitAgent = '/sys/user/userQuitAgent',
}
/**
* 导出api
......@@ -247,3 +253,16 @@ export const updateUserTenantStatus = (params) => {
export const getDepPostIdByDepId = (params) => {
return defHttp.get({ url: Api.getDepPostIdByDepId, params },{ isTransformResponse: false });
};
export const queryUserByDepId = (params) => defHttp.get({ url: Api.queryUserByDepId, params });
export const getUserAgent = (params) => defHttp.get({ url: Api.getUserAgent, params }, { isTransformResponse: false });
export const saveOrUpdateAgent = (params) => {
let url = params.id ? Api.agentEdit : Api.agentSave;
return defHttp.post({ url: url, params });
};
export const userQuitAgent = (params) => {
return defHttp.put({ url: Api.userQuitAgent, params });
};
\ No newline at end of file
zrch-risk-client-39/src/views/system/user/user.data.ts
浏览文件 @ a9bd555c
......@@ -450,7 +450,7 @@ export const formSchema: FormSchema[] = [
label: '手机号码',
field: 'phone',
component: 'Input',
required: true,
required: false,
dynamicRules: ({ model, schema }) => {
return [
{ ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0], trigger: 'blur' },
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论