diff --git a/package.json b/package.json index 8ebf1acca..6c8d0b496 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "echarts-gl": "^2.0.9", "element-theme": "2.0.1", "element-ui": "2.13.2", + "exceljs": "^4.4.0", "file-saver": "^2.0.5", "gulp-autoprefixer": "^6.1.0", "gulp-clean-css": "^4.2.0", @@ -47,7 +48,6 @@ "luckyexcel": "^1.0.1", "mint-ui": "^2.2.13", "moment": "^2.29.4", - "node-sass": "^4.12.0", "ol": "7.2.2", "portfinder": "^1.0.21", "proj4": "^2.8.0", @@ -80,13 +80,14 @@ "dai-js": "^0.0.12", "element-theme-chalk": "^2.13.0", "filemanager-webpack-plugin": "^2.0.5", + "increase-memory-limit": "^1.0.7", "natives": "^1.1.6", + "node-sass": "^4.14.1", "ol": "^7.2.2", "sass-loader": "^7.3.1", "script-loader": "^0.7.2", "style-loader": "^3.3.3", "tinymce": "5.8.2", - "increase-memory-limit": "^1.0.7", "vue-template-compiler": "^2.6.11" }, "eslintConfig": { diff --git a/src/router/index.js b/src/router/index.js index f7ac63a8c..1c8964f4e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -286,6 +286,18 @@ function cookApiDataItem3(item, parent = []) { } return item; } +//临沂大屏 +// export const dataAnalysisRoutes = { +// path: "/dataAnalysis", +// name: "dataAnalysis", +// redirect: { +// path: "/dataAnalysis/overView/index", +// }, +// meta: { +// title: "主入口布局", +// }, +// } + // 新数据模块 export const dataBoardRoutes = { path: "/dataBoard", @@ -990,7 +1002,7 @@ const router = new Router({ scrollBehavior: () => ({ y: 0, }), - routes: pageRoutes.concat(moduleRoutes, moduleShujuRoutes, dataBoardRoutes), + routes: pageRoutes.concat(moduleRoutes, moduleShujuRoutes, dataBoardRoutes,dataAnalysisRoutes), }); router.beforeEach((to, from, next) => { diff --git a/src/views/dataAnalysis/overView/index.vue b/src/views/dataAnalysis/overView/index.vue new file mode 100644 index 000000000..f2c9dec7f --- /dev/null +++ b/src/views/dataAnalysis/overView/index.vue @@ -0,0 +1,118 @@ + \ No newline at end of file diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 2584f0344..70d641c36 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -302,6 +302,13 @@ export default { }); // window.open(this.$router.push({ name: 'dataBoard' })) window.open(routeData.href, '_blank'); + }, + handleCLickNav1() { + let routeData = this.$router.resolve({ + name: 'dataAnalysis' + }); + // window.open(this.$router.push({ name: 'dataBoard' })) + window.open(routeData.href, '_blank'); } } }; diff --git a/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue b/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue index 0cf6275e1..cf2041380 100644 --- a/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue +++ b/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue @@ -54,8 +54,7 @@ value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"> - 、 - + -
+
基本信息
diff --git a/src/views/modules/informationArchive/elderlyArchives/cpts/pairup-volunteers.vue b/src/views/modules/informationArchive/elderlyArchives/cpts/pairup-volunteers.vue index eb62cbc5c..a09d47d76 100644 --- a/src/views/modules/informationArchive/elderlyArchives/cpts/pairup-volunteers.vue +++ b/src/views/modules/informationArchive/elderlyArchives/cpts/pairup-volunteers.vue @@ -60,7 +60,7 @@ methods: { this.showVolunteers=true this.$nextTick(() => { console.log(row,"sdlj"); - this.$refs.ref_vol.initForm(row) + this.$refs.ref_vol.initForm(row.volunteerId) }) }, diff --git a/src/views/modules/informationArchive/volunteerProfile/cpts/service-info.vue b/src/views/modules/informationArchive/volunteerProfile/cpts/service-info.vue index b2dd66404..ea04d9ee9 100644 --- a/src/views/modules/informationArchive/volunteerProfile/cpts/service-info.vue +++ b/src/views/modules/informationArchive/volunteerProfile/cpts/service-info.vue @@ -56,17 +56,17 @@ -
{{this.formData.serviceTime }}
+
{{formData.serviceTime }}
 -
{{this.formData.points }}
+
{{formData.points }}
 -
{{this.formData.createdTime }}
+
{{formData.createdTime }}
 @@ -132,6 +132,29 @@ export default { data() { return { + identityList: [{ name: '医疗急救', key: '0' }, + { name: '体育竞技', key: '1' }, + { name: '驾驶运输', key: '2' }, + { name: '法律服务', key: '3' }, + { name: '信息技术', key: '4' }, + { name: '经营管理', key: '5' }, + { name: '公共关系', key: '6' }, + { name: '教育培训', key: '7' }, + { name: '电器维修', key: '8' }, + { name: '安全保卫', key: '9' }, + { name: '财会金融', key: '10' }, + { name: '设计创意', key: '11' }, + { name: '客服接待', key: '12' }, + { name: '物业养护', key: '13' }, + { name: '新闻写作', key: '14' }, + { name: '精通外语', key: '15' }, + { name: '音乐', key: '16' }, + { name: '心理咨询', key: '17' }, + { name: '护理照护', key: '18' }, + { name: '手工制作', key: '19' }, + { name: '文化艺术', key: '20' }, + { name: '网络技术', key: '21' }, + { name: '摄像摄影', key: '22' }], id:"", TheElderlyShow:false, serviceRecord:false, @@ -157,24 +180,31 @@ this.elderlyInfo=data console.log( this.elderlyInfo,"sdfkljdsfjkl;"); + } else { this.$message.error(msg) } }, //志愿者详情 //详情 - async getVoluntaryInfo(row) { - const url = "/voluntary/volunteerInfo/page" - console.log(row,"sdfl;jsd"); + async getVoluntaryInfo(id) { + const url = "/voluntary/volunteerInfo/getVolunteerDetail" const param={ - id:row.volunteerId, - name:row.volunteerName + id:id, } const { data, code, msg } = await requestPost(url,param) if (code === 0) { - // this.tableData = data.list - this.formData = data.list[0] + this.formData = data console.log(this.elderlyInfo, "sdfkljdsfjkl;"); + this.formData.identityName = this.formData.identityType + .map(typeValue => { + console.log(typeValue.toString(), "sdflj;sdfl;"); + const match = this.identityList.find(identity => identity.key === typeValue.toString()); + return match ? match.name : ''; + }) + .filter(name => name !== '') // 过滤掉没匹配到的 + .join('，'); // 中文逗号连接 + } else { this.$message.error(msg) @@ -194,11 +224,10 @@ this.$refs.ref_vol.initForm( row) }) }, - async initForm(row) { + async initForm(id) { this.startLoading() - console.log(row,"dsclkjdslk"); // this.formData=row - this.getVoluntaryInfo(row) + this.getVoluntaryInfo(id) this.endLoading() }, diff --git a/src/views/modules/informationArchive/volunteerProfile/index.vue b/src/views/modules/informationArchive/volunteerProfile/index.vue index 56ed25d9e..3153beaa4 100644 --- a/src/views/modules/informationArchive/volunteerProfile/index.vue +++ b/src/views/modules/informationArchive/volunteerProfile/index.vue @@ -339,7 +339,8 @@ handleDetail (row) { this.detailShow = true this.$nextTick(() => { - this.$refs.ref_detail.initForm(row) + console.log(row,"sdkljsdjlk"); + this.$refs.ref_detail.initForm(row.id) }) }, diff --git a/src/views/modules/serTeamVisualization/serTeam/index.vue b/src/views/modules/serTeamVisualization/serTeam/index.vue new file mode 100644 index 000000000..baa4ca85b --- /dev/null +++ b/src/views/modules/serTeamVisualization/serTeam/index.vue @@ -0,0 +1,120 @@ + + + + + \ No newline at end of file