diff --git a/src/assets/systemImg/operationData.png b/src/assets/systemImg/operationData.png new file mode 100644 index 0000000..0557a75 Binary files /dev/null and b/src/assets/systemImg/operationData.png differ diff --git a/src/components/common/selectPeople/SelectPeople.vue b/src/components/common/selectPeople/SelectPeople.vue index 1b1055d..3b582c7 100644 --- a/src/components/common/selectPeople/SelectPeople.vue +++ b/src/components/common/selectPeople/SelectPeople.vue @@ -142,7 +142,7 @@ list.forEach((person)=>{ if (!this.selectedPeople.some((selected)=>{return selected.person_id === person.person_id})){ this.selectedRowKeys.push(person.person_id); - this.selectedPeople.push({person_id:person.person_id,person_name:person.person_name,org_id:parseInt(person.org_id)}) + this.selectedPeople.push({person_id:person.person_id,identity_id:person.identity_id,person_name:person.person_name,org_id:parseInt(person.org_id)}) } }) }); @@ -159,9 +159,9 @@ onManulSelect:function(record, selected){ if (selected){//选择 if(this.isMultipleChoice){ - this.selectedPeople.push({person_id:record.person_id,person_name:record.person_name,org_id:parseInt(record.org_id)}); + this.selectedPeople.push({person_id:record.person_id,identity_id:record.identity_id,person_name:record.person_name,org_id:parseInt(record.org_id)}); }else{ - this.selectedPeople = [{person_id:record.person_id,person_name:record.person_name,org_id:parseInt(record.org_id)}]; + this.selectedPeople = [{person_id:record.person_id,identity_id:record.identity_id,person_name:record.person_name,org_id:parseInt(record.org_id)}]; } }else{//取消选择 this.selectedPeople.splice(this.selectedPeople.findIndex((item)=>{return item.person_id === record.person_id}),1); diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/electronicdDatabases/electronicdDatabases.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/electronicdDatabases/electronicdDatabases.vue index b0ea27d..2f0ba33 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/electronicdDatabases/electronicdDatabases.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/electronicdDatabases/electronicdDatabases.vue @@ -32,7 +32,7 @@ - +

{{item.title}}

diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorInfo.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorInfo.vue new file mode 100644 index 0000000..dcad0d2 --- /dev/null +++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorInfo.vue @@ -0,0 +1,257 @@ + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorList.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorList.vue index 6df2ee4..e66ce5f 100644 --- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorList.vue +++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorList.vue @@ -2,6 +2,11 @@
+
@@ -162,6 +219,9 @@ justify-content: space-between; align-items: center; padding: 0 0.5rem; + .ant-select { + width: 100px; + } } .ant-table-wrapper { /deep/ .upload-container-style { diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/interConfig.js b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/interConfig.js index 4417936..c5071c8 100644 --- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/interConfig.js +++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/interConfig.js @@ -199,5 +199,24 @@ const InterfaceConfig = { isTestLogin: true, }, + /* + * 新增师生荣誉信息(批量选择人员,保存为多个条目) + * "category_id":"分类id,number,必填" + "honor_list_json":"获奖信息,获奖情况列表对象,必填,,需要JSON.stringify转成json字符串再传" + | [{ + | "honor_person_id": "必填,人员id", + | "honor_identity_id": "必填,人员身份id", + | "attachment_json": "非必填 获奖照片对象" + | }] + "person_id":"必填 int 操作人ID" + "identity_id":"必填 int 操作人身份ID" + "bureau_id":"必填 int 机构ID" + * */ + 'saveHonor': { + url: 'intellioa/center/honor/save', + method: 'post', + isTestLogin: true, + }, + }; export default InterfaceConfig; diff --git a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js index c26d89c..f07a904 100644 --- a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js +++ b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js @@ -156,5 +156,35 @@ export const systemCenterConfig = [ ] }, ] + }, + { + id:"operationData", + title:'运行数据', + menus:[ + { + id:"operationData-1", + title:"校园风采", + path:'/', + component:() => import("./servicePlatform/administration/administration.vue"), + children:[ + { + id:"operationData-1-1", + title:"学生荣誉", + path:'/workBench/servicePlatform/studentHonor/:id/:name/:menuId', + name:'studentHonor', + component:() => import("./servicePlatform/honor/honorList.vue"), + props:true, + }, + { + id:"operationData-1-2", + title:"教师荣誉", + path:'/workBench/servicePlatform/teacherHonor/:id/:name/:menuId', + name:'teacherHonor', + component:() => import("./servicePlatform/honor/honorList.vue"), + props:true, + }, + ] + }, + ] } ]