From 8c38750b3bbfbcd42863d11117c46f59f372866e Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Tue, 24 Dec 2024 00:04:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mac?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clean | 1 + bin/clean.bat | 2 +- bin/mac-auth | 1 + bin/mac-gateway | 1 + bin/mac-modules-file | 1 + bin/mac-modules-gen | 1 + bin/mac-modules-job | 1 + bin/mac-modules-manage | 1 + bin/mac-modules-system | 1 + bin/mac-monitor | 1 + bin/package | 1 + bin/package.bat | 2 +- bin/run-auth.bat | 4 +--- bin/run-gateway.bat | 4 +--- bin/run-modules-file.bat | 4 +--- bin/run-modules-gen.bat | 3 --- bin/run-modules-job.bat | 4 +--- bin/run-modules-manage.bat | 4 +--- bin/run-modules-system.bat | 4 +--- bin/run-monitor.bat | 4 +--- yanzhu-modules/yanzhu-manage/pom.xml | 6 +++++- 21 files changed, 24 insertions(+), 27 deletions(-) create mode 100755 bin/clean create mode 100755 bin/mac-auth create mode 100755 bin/mac-gateway create mode 100755 bin/mac-modules-file create mode 100755 bin/mac-modules-gen create mode 100755 bin/mac-modules-job create mode 100755 bin/mac-modules-manage create mode 100755 bin/mac-modules-system create mode 100755 bin/mac-monitor create mode 100755 bin/package diff --git a/bin/clean b/bin/clean new file mode 100755 index 00000000..2f3d3e51 --- /dev/null +++ b/bin/clean @@ -0,0 +1 @@ +mvn clean \ No newline at end of file diff --git a/bin/clean.bat b/bin/clean.bat index 24c09741..578e77da 100644 --- a/bin/clean.bat +++ b/bin/clean.bat @@ -1,6 +1,6 @@ @echo off echo. -echo [信息] 清理工程target生成路径。 +echo [淇℃伅] 娓呯悊宸ョ▼target鐢熸垚璺緞銆 echo. %~d0 diff --git a/bin/mac-auth b/bin/mac-auth new file mode 100755 index 00000000..0bae0f1b --- /dev/null +++ b/bin/mac-auth @@ -0,0 +1 @@ +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar yanzhu-auth/target/yanzhu-auth.jar \ No newline at end of file diff --git a/bin/mac-gateway b/bin/mac-gateway new file mode 100755 index 00000000..e246881e --- /dev/null +++ b/bin/mac-gateway @@ -0,0 +1 @@ +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar yanzhu-gateway/target/yanzhu-gateway.jar diff --git a/bin/mac-modules-file b/bin/mac-modules-file new file mode 100755 index 00000000..1aead7e6 --- /dev/null +++ b/bin/mac-modules-file @@ -0,0 +1 @@ +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar yanzhu-modules/yanzhu-file/target/yanzhu-modules-file.jar diff --git a/bin/mac-modules-gen b/bin/mac-modules-gen new file mode 100755 index 00000000..1dcb2054 --- /dev/null +++ b/bin/mac-modules-gen @@ -0,0 +1 @@ +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar ruoyi-modules/ruoyi-gen/target/yanzhu-modules-gen.jar diff --git a/bin/mac-modules-job b/bin/mac-modules-job new file mode 100755 index 00000000..b14bcb55 --- /dev/null +++ b/bin/mac-modules-job @@ -0,0 +1 @@ +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar ruoyi-modules/ruoyi-job/target/yanzhu-modules-job.jar diff --git a/bin/mac-modules-manage b/bin/mac-modules-manage new file mode 100755 index 00000000..d24a5513 --- /dev/null +++ b/bin/mac-modules-manage @@ -0,0 +1 @@ +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar yanzhu-modules/yanzhu-manage/target/yanzhu-modules-manage.jar diff --git a/bin/mac-modules-system b/bin/mac-modules-system new file mode 100755 index 00000000..c53efb1e --- /dev/null +++ b/bin/mac-modules-system @@ -0,0 +1 @@ +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar yanzhu-modules/yanzhu-system/target/yanzhu-modules-system.jar diff --git a/bin/mac-monitor b/bin/mac-monitor new file mode 100755 index 00000000..00a50133 --- /dev/null +++ b/bin/mac-monitor @@ -0,0 +1 @@ +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar ruoyi-visual/ruoyi-monitor/target/yanzhu-visual-monitor.jar diff --git a/bin/package b/bin/package new file mode 100755 index 00000000..502174cd --- /dev/null +++ b/bin/package @@ -0,0 +1 @@ +mvn clean package -Dmaven.test.skip=true \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat index c693ec06..735b65ea 100644 --- a/bin/package.bat +++ b/bin/package.bat @@ -1,6 +1,6 @@ @echo off echo. -echo [信息] 打包Web工程，生成war/jar包文件。 +echo [淇℃伅] 鎵撳寘Web宸ョ▼锛岀敓鎴恮ar/jar鍖呮枃浠躲 echo. %~d0 diff --git a/bin/run-auth.bat b/bin/run-auth.bat index 050c48c3..41cff3fe 100644 --- a/bin/run-auth.bat +++ b/bin/run-auth.bat @@ -1,7 +1,5 @@ @echo off -echo. -echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Auth锟斤拷锟教★拷 -echo. + cd %~dp0 cd ../yanzhu-auth/target diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat index bb58985f..bde43131 100644 --- a/bin/run-gateway.bat +++ b/bin/run-gateway.bat @@ -1,7 +1,5 @@ @echo off -echo. -echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Gateway锟斤拷锟教★拷 -echo. + cd %~dp0 cd ../yanzhu-gateway/target diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat index 4db62b7a..b69b1c15 100644 --- a/bin/run-modules-file.bat +++ b/bin/run-modules-file.bat @@ -1,7 +1,5 @@ @echo off -echo. -echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Modules-File锟斤拷锟教★拷 -echo. + cd %~dp0 cd ../yanzhu-modules/yanzhu-file/target diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat index 7b9cea1b..1f6f05eb 100644 --- a/bin/run-modules-gen.bat +++ b/bin/run-modules-gen.bat @@ -1,7 +1,4 @@ @echo off -echo. -echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Modules-Gen锟斤拷锟教★拷 -echo. cd %~dp0 cd ../ruoyi-modules/ruoyi-gen/target diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat index fa88e955..e56ab30c 100644 --- a/bin/run-modules-job.bat +++ b/bin/run-modules-job.bat @@ -1,7 +1,5 @@ @echo off -echo. -echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Modules-Job锟斤拷锟教★拷 -echo. + cd %~dp0 cd ../ruoyi-modules/ruoyi-job/target diff --git a/bin/run-modules-manage.bat b/bin/run-modules-manage.bat index 01b26e20..12ae8e22 100644 --- a/bin/run-modules-manage.bat +++ b/bin/run-modules-manage.bat @@ -1,7 +1,5 @@ @echo off -echo. -echo [ 息] 使 Jar Modules-System 獭 -echo. + cd %~dp0 cd ../yanzhu-modules/yanzhu-manage/target diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat index 652a3aa2..69bca826 100644 --- a/bin/run-modules-system.bat +++ b/bin/run-modules-system.bat @@ -1,7 +1,5 @@ @echo off -echo. -echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Modules-System锟斤拷锟教★拷 -echo. + cd %~dp0 cd ../yanzhu-modules/yanzhu-system/target diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat index 17c42ffc..53bf2be3 100644 --- a/bin/run-monitor.bat +++ b/bin/run-monitor.bat @@ -1,7 +1,5 @@ @echo off -echo. -echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Monitor锟斤拷锟教★拷 -echo. + cd %~dp0 cd ../ruoyi-visual/ruoyi-monitor/target diff --git a/yanzhu-modules/yanzhu-manage/pom.xml b/yanzhu-modules/yanzhu-manage/pom.xml index 0f8f1138..2b7ec9d3 100644 --- a/yanzhu-modules/yanzhu-manage/pom.xml +++ b/yanzhu-modules/yanzhu-manage/pom.xml @@ -168,7 +168,11 @@ system ${pom.basedir}\libs\aspose-tasks-24.10-jdk17.jar - + + net.sf.mpxj + mpxj + 13.5.1 + From d7bdc1849f5c013badf67edd10336338190f3dbc Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Tue, 24 Dec 2024 00:52:38 +0800 Subject: [PATCH 2/5] update code --- .../src/views/manage/proProjectInfo/index.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue index d543881f..e6eb61de 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue @@ -106,6 +106,20 @@ v-hasPermi="['manage:proProjectInfo:edit']">淇敼 鍒犻櫎 + + + 鎿嶄綔 + + + + + + From 72fe8bdc16157cbd2da9592f4c7e0c9b1ab39452 Mon Sep 17 00:00:00 2001 From: lijun Date: Tue, 24 Dec 2024 23:41:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=BA=A7=E5=80=BC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-bigscreen/src/api/detail.js | 79 +++++ yanzhu-bigscreen/src/utils/request.js | 1 - yanzhu-bigscreen/src/views/projectDetail.vue | 42 ++- .../controller/ProCostOutputController.java | 55 +++ .../impl/ProCostOutputServiceImpl.java | 14 +- yanzhu-ui-vue3/src/App.vue | 5 +- yanzhu-ui-vue3/src/api/manage/costOutput.js | 33 ++ .../src/views/manage/costOutput/costMonth.vue | 83 +++++ .../manage/costOutput/costOutputDrawer.vue | 185 ++++++++++ .../src/views/manage/costOutput/costYear.vue | 86 +++++ .../src/views/manage/costOutput/index.vue | 128 ++----- .../views/manage/greenCarbonData/index.vue | 4 +- .../src/views/manage/proProjectInfo/index.vue | 325 ++++++++++-------- 13 files changed, 773 insertions(+), 267 deletions(-) create mode 100644 yanzhu-ui-vue3/src/views/manage/costOutput/costMonth.vue create mode 100644 yanzhu-ui-vue3/src/views/manage/costOutput/costOutputDrawer.vue create mode 100644 yanzhu-ui-vue3/src/views/manage/costOutput/costYear.vue diff --git a/yanzhu-bigscreen/src/api/detail.js b/yanzhu-bigscreen/src/api/detail.js index fa5d7d9a..9d1ef10a 100644 --- a/yanzhu-bigscreen/src/api/detail.js +++ b/yanzhu-bigscreen/src/api/detail.js @@ -99,10 +99,89 @@ const milestoneList = (data) => { }); }); }; + +const costOutputSelectYearAndMonth=(data)=> { + return new Promise(reslove=>{ + let data2={...data}; + let y=data2.year; + let m=data2.month-1; + if(m==0){ + m=12; + y--; + } + data2.year=y; + data2.month=m; + var ajaxs=[request({ + url: `/manage/costOutput/selectYearAndMonth`, + method: 'post', + data:data + }), + request({ + url: `/manage/costOutput/selectYearAndMonth`, + method: 'post', + data:data2 + })]; + + axios.all(ajaxs).then(res=>{ + let d=res[0] + const getValue=(tmps,type)=>{ + let objs=tmps.filter(d=>d.costType==type); + return objs.length>0?objs[0]:{}; + } + let tmps=(d.data||[]).map(it=>{ + it.money=it.money?it.money/10000.0:0; + return it; + }); + let y=data.year; + let m=data.month-1; + if(m==0){ + m=12; + y--; + } + let tmps2=(res[1].data||[]).map(it=>{ + it.money=it.money?it.money/10000.0:0; + return it; + }); + let curM=tmps2.filter(it=>it.costType==9 && it.year==y && it.month==m); + curM=curM.length>0?curM[0]:{}; + + let totalObjs=tmps.filter(it=>it.costType==9); + let total=0; + totalObjs.forEach(it=>{ + if(it.money){ + total+=it.money; + } + }); + let yearObjs=tmps.filter(it=>it.costType==9 && it.year==y); + let totalY=0; + yearObjs.forEach(it=>{ + if(it.money){ + totalY+=it.money; + } + }); + let obj={ + totalInv:getValue(tmps,1).money||0,//鎬绘姇璧 + curYear:getValue(tmps,2).money||0,//骞存绘姇璧 + contract1:getValue(tmps,3).money||0,//鍚堝悓閲戦 + contract2:getValue(tmps,4).money||0,//鍚堝悓鏀粯閲戦 + contract3:getValue(tmps,5).money||0,//鍚堝悓鎸傝处閲戦 + safety1:getValue(tmps,6).money||0,//瀹夋帾閲戦 + safety2:getValue(tmps,7).money||0,//瀹夋帾鏀粯閲戦 + safety3:getValue(tmps,8).money||0,//瀹夋帾鎸傝处閲戦 + curMonth:curM.money||0,//褰撴湀鎶曡祫 + totalMonth:total,//寮绱姇璧 + totalYear:totalY,//鏈勾瀹屾垚 + } + reslove(obj); + }) + }) +} + export default { groupByCraftType, groupByCraftTypeByAttendance, subdeptsUsersList, attendanceUbiDataList, milestoneList, + costOutputSelectYearAndMonth }; diff --git a/yanzhu-bigscreen/src/utils/request.js b/yanzhu-bigscreen/src/utils/request.js index bfff3fc0..812e5c20 100644 --- a/yanzhu-bigscreen/src/utils/request.js +++ b/yanzhu-bigscreen/src/utils/request.js @@ -76,7 +76,6 @@ service.interceptors.response.use(res => { return res.data } if (code === 401) { - debugger if (!isRelogin.show) { isRelogin.show = true; MessageBox.confirm('鐧诲綍鐘舵佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬呴噸鏂扮櫥褰', '绯荤粺鎻愮ず', { confirmButtonText: '閲嶆柊鐧诲綍', cancelButtonText: '鍙栨秷', type: 'warning' }).then(() => { diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index b66aceb1..11b4a595 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -224,7 +224,7 @@ 鎬绘姇璧

- {{ 1000 }} 涓囧厓 + {{ costOutData.totalInv||0 }} 涓囧厓
@@ -237,7 +237,7 @@ 鏈湀瀹屾垚

- {{ 1000 }} 涓囧厓 + {{ costOutData.curMonth||0 }} 涓囧厓
@@ -251,7 +251,7 @@ 鏈勾瀹屾垚

- {{ 1000 }} 涓囧厓 + {{ costOutData.totalYear||0 }} 涓囧厓
@@ -265,7 +265,7 @@ 寮绱畬鎴

- {{ 1000 }} 涓囧厓 + {{ costOutData.totalMonth||0 }} 涓囧厓
@@ -280,7 +280,7 @@ 璁″垝寮宸ユ棩鏈

- {{ new Date() | toDate }} + {{ selProject.scheduledStartTime | toDate }}
@@ -295,7 +295,7 @@ 璁″垝绔ｅ伐鏃ユ湡

- {{ new Date() | toDate }} + {{ selProject.plannedCompletionTime | toDate }}
@@ -309,7 +309,7 @@ 瀹為檯寮宸ユ棩鏈

- {{ new Date() | toDate }} + {{ selProject.actualOperatingTime | toDate }}
@@ -323,7 +323,7 @@ 鍚堝悓宸ユ湡

- {{ 2100 }} 澶 + {{ selProject.projectTimeLimit||'' }} 澶
@@ -338,7 +338,7 @@ 寤虹瓚闈㈢Н

- {{ 10000 }} 骞虫柟绫 + {{ selProject.floorArea||'' }} 骞虫柟绫
@@ -503,7 +503,6 @@ import projectInfoDialog from './detail/projectInfoDialog.vue'; import staffSurveyChart from '@/components/staffSurveyChart.vue'; import MonitAndWarning from './components/MonitAndWarning.vue'; import attendanceInfoDlg from './detail/attendanceInfoDlg.vue'; -import testData from './test/detail' import debounce from 'lodash.debounce' export default { components: { @@ -549,6 +548,7 @@ export default { projectBuildNode: [], maxWidth: 0, minWidth: 100, + costOutData:{}, } }, mounted() { @@ -615,13 +615,25 @@ export default { }); this.loadAttendanceData(); this.loadMilestoneData(); + this.loadCostOutput(); }, - loadMilestoneData() { + loadCostOutput(){ + let dt = this.$dt(new Date()); + this.$api.detail.costOutputSelectYearAndMonth({ + comId: this.selProject.comId, + projectId: this.selProject.id, + year: dt.$y, + month: dt.$M + 1, + }).then(d=>{ + this.costOutData=d; + }); + }, + loadMilestoneData() { this.$api.detail.milestoneList({ pageNum: 1, pageSize: 100, - comId: this.prjInfo.comId, - projectId: this.prjInfo.id + comId: this.selProject.comId, + projectId: this.selProject.id }).then(d => { this.projectBuildNode = d; let itemWidth = this.$dpi() == "1K" ? 200 : this.$dpi() == "2K" ? 300 : 500; @@ -638,8 +650,8 @@ export default { loadAttendanceData() { let ajax = this.$api.detail.groupByCraftType; let posData = { - comId: this.prjInfo.comId, - projectId: this.prjInfo.id + comId: this.selProject.comId, + projectId: this.selProject.id } if (this.attendanceNav == 1) { ajax = this.$api.detail.groupByCraftTypeByAttendance; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProCostOutputController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProCostOutputController.java index 45f44af7..67c1b8c2 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProCostOutputController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProCostOutputController.java @@ -142,4 +142,59 @@ public class ProCostOutputController extends BaseController Map>> list=proCostOutputService.selectForBigEnginList(where); return AjaxResult.success(list); } + + /** + * 鎸夐」鐩甀D鏌ヨ锛屽鏋滄病鏈夋暟鎹繘琛屽垵濮嬪寲 + * @param projectId + * @return + */ + @GetMapping("/listByProjectId") + public AjaxResult listByProjectId(long projectId,long comId){ + ProCostOutput where =new ProCostOutput(); + where.setProjectId(projectId); + where.setComId(comId); + List list=proCostOutputService.selectProCostOutputList(where); + if(list.size()==0){ + proCostOutputService.initProject(projectId,comId); + } + list=proCostOutputService.selectProCostOutputList(where); + return AjaxResult.success(list); + } + /** + * 澧炲姞骞村害鎶曡祫 + * @param projectId + * @param year + * @return + */ + @PostMapping("/addYearInvestment") + public AjaxResult addYearInvestment(@RequestBody ProCostOutput where){ + List list=proCostOutputService.selectProCostOutputList(where); + if(list.size()==0){ + proCostOutputService.addYearInvestment(where); + return AjaxResult.success("澧炲姞骞村害鎶曡祫鎴愬姛!"); + }else{ + return AjaxResult.error("姝ゅ勾搴︽姇璧勫凡瀛樺湪!"); + } + } + @PostMapping("/addMonthInvestment") + public AjaxResult addMonthInvestment(@RequestBody ProCostOutput where) { + List list=proCostOutputService.selectProCostOutputList(where); + if(list.size()==0){ + proCostOutputService.addMonthInvestment(where); + return AjaxResult.success("澧炲姞鏈堝害鎶曡祫鎴愬姛!"); + }else{ + return AjaxResult.error("姝ゆ湀搴︽姇璧勫凡瀛樺湪!"); + } + } + + + @PostMapping("/batchUpdate") + public AjaxResult batchUpdate(@RequestBody List list){ + try { + proCostOutputService.batchUpdate(list); + return AjaxResult.success("淇濆瓨鎴愬姛!"); + }catch (Exception ex){ + return AjaxResult.error(ex.getMessage()); + } + } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProCostOutputServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProCostOutputServiceImpl.java index 02ee3180..02294c80 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProCostOutputServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProCostOutputServiceImpl.java @@ -118,19 +118,19 @@ public class ProCostOutputServiceImpl implements IProCostOutputService insertProCostOutput(it); it.setYear(null); it.setCostType(3l);//鍚堝悓閲戦 - insertProCostOutput(it); + //insertProCostOutput(it); it.setCostType(4l);//鍚堝悓鏀粯閲戦 - insertProCostOutput(it); + //insertProCostOutput(it); it.setCostType(5l);//鍚堝悓鎸傝处閲戦 - insertProCostOutput(it); + //insertProCostOutput(it); it.setCostType(6l);//瀹夋帾閲戦 - insertProCostOutput(it); + //insertProCostOutput(it); it.setCostType(7l);//瀹夋帾鏀粯閲戦 - insertProCostOutput(it); + //insertProCostOutput(it); it.setCostType(8l);//瀹夋帾鎸傝处閲戦 - insertProCostOutput(it); + //insertProCostOutput(it); it.setCostType(10l);//寤哄畨璐归噾棰 - insertProCostOutput(it); + //insertProCostOutput(it); it.setCostType(9l);//鏈堝害鎶曡祫 it.setYear(year*1l); for(int i=1;i<=12;i++){ diff --git a/yanzhu-ui-vue3/src/App.vue b/yanzhu-ui-vue3/src/App.vue index 045bc42e..1ead6db3 100644 --- a/yanzhu-ui-vue3/src/App.vue +++ b/yanzhu-ui-vue3/src/App.vue @@ -65,5 +65,8 @@ onMounted(() => { top: 16px; display: none; } -} +} +:focus-visible { + outline: none !important; +} \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/api/manage/costOutput.js b/yanzhu-ui-vue3/src/api/manage/costOutput.js index 44a0e23f..97603ba2 100644 --- a/yanzhu-ui-vue3/src/api/manage/costOutput.js +++ b/yanzhu-ui-vue3/src/api/manage/costOutput.js @@ -42,3 +42,36 @@ export function delCostOutput(id) { method: 'delete' }) } + +export function listByProjectId(query){ + return request({ + url: '/manage/costOutput/listByProjectId', + method: 'get', + params: query + }) +} + + +export function addYearInvestment(data){ + return request({ + url: '/manage/costOutput/addYearInvestment', + method: 'post', + data:data + }) +} + +export function addMonthInvestment(data){ + return request({ + url: '/manage/costOutput/addMonthInvestment', + method: 'post', + data:data + }) +} + +export function batchUpdate(datas){ + return request({ + url: '/manage/costOutput/batchUpdate', + method: 'post', + data:datas + }) +} diff --git a/yanzhu-ui-vue3/src/views/manage/costOutput/costMonth.vue b/yanzhu-ui-vue3/src/views/manage/costOutput/costMonth.vue new file mode 100644 index 00000000..58e69c94 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/costOutput/costMonth.vue @@ -0,0 +1,83 @@ + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/manage/costOutput/costOutputDrawer.vue b/yanzhu-ui-vue3/src/views/manage/costOutput/costOutputDrawer.vue new file mode 100644 index 00000000..dd022979 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/costOutput/costOutputDrawer.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/manage/costOutput/costYear.vue b/yanzhu-ui-vue3/src/views/manage/costOutput/costYear.vue new file mode 100644 index 00000000..25322ca5 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/costOutput/costYear.vue @@ -0,0 +1,86 @@ + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/manage/costOutput/index.vue b/yanzhu-ui-vue3/src/views/manage/costOutput/index.vue index 63b40894..b3f8c941 100644 --- a/yanzhu-ui-vue3/src/views/manage/costOutput/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/costOutput/index.vue @@ -2,76 +2,35 @@
- + - + - + - + - + - + - - - + 鎼滅储 @@ -81,42 +40,20 @@ - 鏂板 + 鏂板 - 淇敼 + 淇敼 - 鍒犻櫎 + 鍒犻櫎 - 瀵煎嚭 + 瀵煎嚭 @@ -145,19 +82,16 @@ - - + + @@ -181,18 +115,12 @@ - - @@ -350,12 +278,12 @@ function submitForm() { /** 鍒犻櫎鎸夐挳鎿嶄綔 */ function handleDelete(row) { const _ids = row.id || ids.value; - proxy.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰鎴愭湰浜у肩紪鍙蜂负"' + _ids + '"鐨勬暟鎹」锛').then(function() { + proxy.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰鎴愭湰浜у肩紪鍙蜂负"' + _ids + '"鐨勬暟鎹」锛').then(function () { return delCostOutput(_ids); }).then(() => { getList(); proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); + }).catch(() => { }); } /** 瀵煎嚭鎸夐挳鎿嶄綔 */ diff --git a/yanzhu-ui-vue3/src/views/manage/greenCarbonData/index.vue b/yanzhu-ui-vue3/src/views/manage/greenCarbonData/index.vue index 840c4d0d..1389ff1c 100644 --- a/yanzhu-ui-vue3/src/views/manage/greenCarbonData/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/greenCarbonData/index.vue @@ -287,7 +287,7 @@ function handleAdd() { pageNum: 1, pageSize: 100, projectId: userStore.currentProId, - comIdL: userStore.currentComId, + comId: userStore.currentComId, carbonFactorType: data.selTab }).then(d => { data.itemList = d.rows || []; @@ -306,7 +306,7 @@ function handleUpdate(row) { pageNum: 1, pageSize: 100, projectId: userStore.currentProId, - comIdL: userStore.currentComId, + comId: userStore.currentComId, carbonFactorType: data.selTab }).then(d => { data.itemList = d.rows || []; diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue index e6eb61de..3612317a 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue @@ -53,7 +53,7 @@ @@ -101,25 +101,42 @@ - - +
@@ -371,6 +390,7 @@ import { deptTreeSelect } from "@/api/system/user"; import { listProProjectInfo, getProProjectInfo, delProProjectInfo, addProProjectInfo, updateProProjectInfo } from "@/api/manage/proProjectInfo"; import BaiduMap from "@/components/BaiduMap/Map.vue"; import useUserStore from '@/store/modules/user' +import costOutputDrawer from "../costOutput/costOutputDrawer.vue"; const { proxy } = getCurrentInstance(); const { pro_project_type, pro_project_schedule, pro_dept_type, sys_is_del } = proxy.useDict('pro_project_type', 'pro_project_schedule', 'pro_dept_type', 'sys_is_del'); @@ -387,10 +407,10 @@ const total = ref(0); const title = ref(""); const activeTags = ref('base') const addressInfos = ref(""); -const fitemPrjAddr=ref() +const fitemPrjAddr = ref() const projectDeptsList = ref([]); const checkedProjectDepts = ref([]); - +const coDrawer=ref(); const deptOptions = ref([]); const userStore = useUserStore() const data = reactive({ @@ -413,7 +433,7 @@ const data = reactive({ projectStatus: null, isDel: null, }, - rules: { + rules: { disDeptId: [{ required: true, message: "褰掑睘鍗曚綅涓嶈兘涓虹┖", trigger: "change" }], projectName: [{ required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }], simpleName: [{ required: false, message: "椤圭洰绠绉颁笉鑳戒负绌", trigger: "blur" }], @@ -432,25 +452,39 @@ const data = reactive({ actualOperatingTime: [{ required: true, message: "瀹為檯寮宸ユ椂闂翠笉鑳戒负绌", trigger: "blur" }], projectSummarize: [{ required: true, message: "椤圭洰姒傝堪涓嶈兘涓虹┖", trigger: "blur" }], }, - opt:'', - projectDeptsList:[] + opt: '', + projectDeptsList: [] }); const { queryParams, form, rules } = toRefs(data); /** 鍦板浘閫夋嫨 */ function mapDocom(pt, city) { - form.value.province=city.province - form.value.city=city.city - form.value.district=city.district - form.value.address=city.address; + form.value.province = city.province + form.value.city = city.city + form.value.district = city.district + form.value.address = city.address; form.value.projectAddress = city.address || ""; form.value.longitude = pt.lng.toFixed(5); form.value.latitude = pt.lat.toFixed(5); addressInfos.value = form.value.projectAddress + "," + form.value.longitude + "," + form.value.latitude; - fitemPrjAddr.value.clearValidate(); + fitemPrjAddr.value.clearValidate(); } +function menuCommand(e,row){ + if(e=="edit"){ + handleUpdate(row); + return; + } + if(e=="delete"){ + handleDelete(row); + return; + } + if(e=="outCost"){ + coDrawer.value.showDrawer(row); + return; + } +} /** 鏌ヨ椤圭洰淇℃伅鍒楄〃 */ function getList() { loading.value = true; @@ -469,7 +503,7 @@ function cancel() { // 琛ㄥ崟閲嶇疆 function reset() { - addressInfos.value=""; + addressInfos.value = ""; form.value = { id: null, deptId: null, @@ -513,7 +547,7 @@ function reset() { setting: {} }; proxy.resetForm("proProjectInfoRef"); - activeTags.value="base"; + activeTags.value = "base"; } /** 鎼滅储鎸夐挳鎿嶄綔 */ @@ -537,65 +571,64 @@ function handleSelectionChange(selection) { /** 鏂板鎸夐挳鎿嶄綔 */ function handleAdd() { - data.opt="add" + data.opt = "add" reset(); open.value = true; title.value = "娣诲姞椤圭洰"; } -function doAddPrjDept(it){ +function doAddPrjDept(it) { it.datas.push({ - deptType:it.header,deptName:'',leader:'',phone:'' + deptType: it.header, deptName: '', leader: '', phone: '' }); } -function doDeletPrjDept(it,item,index){ - if(item.deptName || item.leader || item.phone){ +function doDeletPrjDept(it, item, index) { + if (item.deptName || item.leader || item.phone) { proxy.$modal.confirm('鏄惁纭鍒犻櫎杩欎釜鏁版嵁锛').then(function () { - it.datas.splice(index,1) + it.datas.splice(index, 1) proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }).catch(() => { }); - }else{ - it.datas.splice(index,1) + } else { + it.datas.splice(index, 1) } } /** 淇敼鎸夐挳鎿嶄綔 */ function handleUpdate(row) { - data.opt="edit" + data.opt = "edit" reset(); const _id = row.id || ids.value - getProProjectInfo(_id).then(response => { - debugger + getProProjectInfo(_id).then(response => { form.value = response.data; - form.value.setting=response.data.setting||{ - orgName:'', - orgLogo:'', - orgPlane:'', - orgImage:[], - orgVideo:'' + form.value.setting = response.data.setting || { + orgName: '', + orgLogo: '', + orgPlane: '', + orgImage: [], + orgVideo: '' }; open.value = true; title.value = "淇敼椤圭洰淇℃伅"; - projectDeptsList.value=(response.data.projectDeptsList||[]).filter(d=>d.id); - if(projectDeptsList.value.length==0){ - projectDeptsList.value=[ - {deptType:'寤鸿鍗曚綅',deptName:'',leader:'',phone:''}, - {deptType:'鐩戠悊鍗曚綅',deptName:'',leader:'',phone:''}, - {deptType:'璁捐鍗曚綅',deptName:'',leader:'',phone:''}, - {deptType:'妫娴嬪崟浣',deptName:'',leader:'',phone:''}, - {deptType:'鍕樺療鍗曚綅',deptName:'',leader:'',phone:''}, + projectDeptsList.value = (response.data.projectDeptsList || []).filter(d => d.id); + if (projectDeptsList.value.length == 0) { + projectDeptsList.value = [ + { deptType: '寤鸿鍗曚綅', deptName: '', leader: '', phone: '' }, + { deptType: '鐩戠悊鍗曚綅', deptName: '', leader: '', phone: '' }, + { deptType: '璁捐鍗曚綅', deptName: '', leader: '', phone: '' }, + { deptType: '妫娴嬪崟浣', deptName: '', leader: '', phone: '' }, + { deptType: '鍕樺療鍗曚綅', deptName: '', leader: '', phone: '' }, ]; } - let headers="寤鸿鍗曚綅,鐩戠悊鍗曚綅,璁捐鍗曚綅,妫娴嬪崟浣,鍕樺療鍗曚綅".split(","); - data.projectDeptsList=[]; - headers.forEach(h=>{ + let headers = "寤鸿鍗曚綅,鐩戠悊鍗曚綅,璁捐鍗曚綅,妫娴嬪崟浣,鍕樺療鍗曚綅".split(","); + data.projectDeptsList = []; + headers.forEach(h => { data.projectDeptsList.push({ - header:h, - datas:projectDeptsList.value.filter(it=>it.deptType==h) + header: h, + datas: projectDeptsList.value.filter(it => it.deptType == h) }) - }); + }); addressInfos.value = form.value.projectAddress + "," + form.value.longitude + "," + form.value.latitude; - + }); } @@ -632,12 +665,12 @@ function handleDeptsSelectionChange(selection) { checkedProjectDepts.value = selection.map(item => item.index) } -function getProjectDeptsList(){ - let datas=[]; - data.projectDeptsList.forEach(d=>{ - if(d.datas){ - d.datas.forEach(it=>{ - if(it.deptName || it.leader || it.phone){ +function getProjectDeptsList() { + let datas = []; + data.projectDeptsList.forEach(d => { + if (d.datas) { + d.datas.forEach(it => { + if (it.deptName || it.leader || it.phone) { datas.push(it); } }) @@ -651,9 +684,9 @@ function submitForm() { proxy.$refs["proProjectInfoRef"].validate(valid => { if (valid) { form.value.projectDeptsList = getProjectDeptsList(); - let postData={ + let postData = { ...form.value - } + } if (form.value.id != null) { updateProProjectInfo(postData).then(response => { proxy.$modal.msgSuccess("淇敼鎴愬姛"); @@ -716,9 +749,9 @@ function getMapInfo() { /** 鍒濆鍖栭〉闈 */ function initPage() { let roles = userStore.roles; - if(roles.includes("admin") || roles.includes("gsAdmin")){ + if (roles.includes("admin") || roles.includes("gsAdmin")) { isAdmin.value = true; - }else{ + } else { isAdmin.value = false; } } @@ -728,52 +761,62 @@ getList(); getDeptTree(); \ No newline at end of file From d3cfe40087ec65b1739380bac2afe6933d18ccfa Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 28 Dec 2024 20:35:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/vue/v3/readme.txt | 2 +- yanzhu-modules/yanzhu-manage/pom.xml | 6 +- .../controller/ProVideoMonitorController.java | 41 +++ yanzhu-ui-vue3/src/App.vue | 3 + yanzhu-ui-vue3/src/api/manage/videoMonitor.js | 7 + .../src/assets/icons/svg/4screen.svg | 1 + .../src/assets/icons/svg/9screen.svg | 1 + yanzhu-ui-vue3/src/assets/icons/svg/video.svg | 1 + .../src/components/CurrentProject/index.vue | 8 +- .../src/components/flow/Role/index.vue | 2 +- yanzhu-ui-vue3/src/store/modules/user.js | 4 +- .../src/views/flowable/definition/index.vue | 4 +- .../views/flowable/task/finished/index.vue | 2 +- .../views/flowable/task/myProcess/index.vue | 2 +- .../src/views/flowable/task/todo/index.vue | 2 +- .../views/manage/attendanceUbiData/index.vue | 10 +- .../manage/attendanceUbiData/statistics.vue | 10 +- .../src/views/manage/attendance_cfg/index.vue | 14 +- .../manage/attendance_ubi_device/index.vue | 16 +- .../attendance_ubi_device/ubiDeviceDrawer.vue | 2 +- .../src/views/manage/basSignet/index.vue | 2 +- .../src/views/manage/basTemplate/index.vue | 6 +- .../src/views/manage/busExamInfo/index.vue | 6 +- .../views/manage/busExamQuestion/index.vue | 8 +- .../src/views/manage/busExamUser/index.vue | 2 +- .../views/manage/busTrainingVideo/index.vue | 6 +- .../manage/busTrainingVideoUser/index.vue | 2 +- .../views/manage/greenCarbonData/index.vue | 16 +- .../views/manage/greenCarbonItem/index.vue | 22 +- .../src/views/manage/milestone/index.vue | 10 +- .../src/views/manage/plan/index.vue | 2 +- .../manage/proProjectInfoSubdepts/index.vue | 6 +- .../proProjectInfoSubdeptsGroup/index.vue | 8 +- .../proProjectInfoSubdeptsUsers/index.vue | 6 +- .../src/views/manage/videoMonitor/index.vue | 98 +++---- .../src/views/manage/videoMonitor/list.vue | 249 ++++++++++++++++++ .../videoMonitor/videoMonitorDrawer.vue | 47 ++-- 37 files changed, 478 insertions(+), 156 deletions(-) create mode 100644 yanzhu-ui-vue3/src/assets/icons/svg/4screen.svg create mode 100644 yanzhu-ui-vue3/src/assets/icons/svg/9screen.svg create mode 100644 yanzhu-ui-vue3/src/assets/icons/svg/video.svg create mode 100644 yanzhu-ui-vue3/src/views/manage/videoMonitor/list.vue diff --git a/yanzhu-modules/yanzhu-gen/src/main/resources/vm/vue/v3/readme.txt b/yanzhu-modules/yanzhu-gen/src/main/resources/vm/vue/v3/readme.txt index 10362d62..cdb1c431 100644 --- a/yanzhu-modules/yanzhu-gen/src/main/resources/vm/vue/v3/readme.txt +++ b/yanzhu-modules/yanzhu-gen/src/main/resources/vm/vue/v3/readme.txt @@ -1 +1 @@ -如果使用的是RuoYi-Cloud-Vue3前端，那么需要覆盖一下此目录的模板index.vue.vm、index-tree.vue.vm文件到上级vue目录。 \ No newline at end of file +濡傛灉浣跨敤鐨勬槸RuoYi-Cloud-Vue3鍓嶇锛岄偅涔堥渶瑕佽鐩栦竴涓嬫鐩綍鐨勬ā鏉縤ndex.vue.vm銆乮ndex-tree.vue.vm鏂囦欢鍒颁笂绾ue鐩綍銆 \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/pom.xml b/yanzhu-modules/yanzhu-manage/pom.xml index 2b7ec9d3..d0127fc9 100644 --- a/yanzhu-modules/yanzhu-manage/pom.xml +++ b/yanzhu-modules/yanzhu-manage/pom.xml @@ -123,7 +123,7 @@ iTextAsian 1.0.0 system - ${pom.basedir}\libs\iTextAsian-1.0.0.jar + ${pom.basedir}/libs/iTextAsian-1.0.0.jar @@ -143,7 +143,7 @@ aspose-words 15.8.0 system - ${pom.basedir}\libs\aspose-words-15.8.0-jdk16.jar + ${pom.basedir}/libs/aspose-words-15.8.0-jdk16.jar @@ -166,7 +166,7 @@ aspose-tasks 24.10 system - ${pom.basedir}\libs\aspose-tasks-24.10-jdk17.jar + ${pom.basedir}/libs/aspose-tasks-24.10-jdk17.jar net.sf.mpxj diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProVideoMonitorController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProVideoMonitorController.java index a066468b..63027dd5 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProVideoMonitorController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProVideoMonitorController.java @@ -1,13 +1,18 @@ package com.yanzhu.manage.controller; import java.util.List; +import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson2.JSONObject; +import com.yanzhu.common.core.utils.http.HttpUtils; import com.yanzhu.common.core.utils.poi.ExcelUtil; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; import com.yanzhu.common.core.web.page.TableDataInfo; import com.yanzhu.common.log.annotation.Log; import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.redis.service.RedisService; import com.yanzhu.common.security.annotation.RequiresPermissions; import com.yanzhu.manage.domain.ProVideoMonitor; import com.yanzhu.manage.service.IProVideoMonitorService; @@ -100,4 +105,40 @@ public class ProVideoMonitorController extends BaseController { return toAjax(proVideoMonitorService.deleteProVideoMonitorByIds(ids)); } + + + @Autowired + private RedisService redisService; + + @RequiresPermissions("manage:videoMonitor:list") + @GetMapping("/getYsToken/{id}") + public AjaxResult getYsToken(@PathVariable Long id){ + ProVideoMonitor proVideoMonitor = proVideoMonitorService.selectProVideoMonitorById(id); + if(proVideoMonitor == null){ + return AjaxResult.error("鏃犳晥ID"); + } + String key="YS_Token__"+ proVideoMonitor.getAppkey()+"_"+proVideoMonitor.getSecret(); + JSONObject jo=redisService.getCacheObject(key); + String token=""; + if(jo!=null){ + long expireTime= jo.getLong("expireTime"); + if(expireTime> System.currentTimeMillis()+1000*60){ + token=jo.getString("accessToken"); + return AjaxResult.success(token); + } + } + String postData="appKey="+proVideoMonitor.getAppkey()+"&appSecret="+proVideoMonitor.getSecret(); + String url="https://open.ys7.com/api/lapp/token/get"; + String data= HttpUtils.sendPost(url,postData); + jo=JSONObject.parseObject(data); + if("200".equals(jo.getString("code"))){ + JSONObject jobj=jo.getJSONObject("data"); + token=jobj.getString("accessToken"); + long expireTime= jobj.getLong("expireTime"); + redisService.setCacheObject(key,jobj,expireTime-System.currentTimeMillis(), TimeUnit.MICROSECONDS); + } + return AjaxResult.success(token); + } + + } diff --git a/yanzhu-ui-vue3/src/App.vue b/yanzhu-ui-vue3/src/App.vue index 1ead6db3..276191f2 100644 --- a/yanzhu-ui-vue3/src/App.vue +++ b/yanzhu-ui-vue3/src/App.vue @@ -69,4 +69,7 @@ onMounted(() => { :focus-visible { outline: none !important; } +.command{ + cursor: pointer; +} \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/api/manage/videoMonitor.js b/yanzhu-ui-vue3/src/api/manage/videoMonitor.js index 465545e9..6f255082 100644 --- a/yanzhu-ui-vue3/src/api/manage/videoMonitor.js +++ b/yanzhu-ui-vue3/src/api/manage/videoMonitor.js @@ -42,3 +42,10 @@ export function delVideoMonitor(id) { method: 'delete' }) } + +export function getYsToken(id){ + return request({ + url: '/manage/videoMonitor/getYsToken/' + id, + method: 'get' + }) +} \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/assets/icons/svg/4screen.svg b/yanzhu-ui-vue3/src/assets/icons/svg/4screen.svg new file mode 100644 index 00000000..f85e93ce --- /dev/null +++ b/yanzhu-ui-vue3/src/assets/icons/svg/4screen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/assets/icons/svg/9screen.svg b/yanzhu-ui-vue3/src/assets/icons/svg/9screen.svg new file mode 100644 index 00000000..51747d7c --- /dev/null +++ b/yanzhu-ui-vue3/src/assets/icons/svg/9screen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/assets/icons/svg/video.svg b/yanzhu-ui-vue3/src/assets/icons/svg/video.svg new file mode 100644 index 00000000..396885fb --- /dev/null +++ b/yanzhu-ui-vue3/src/assets/icons/svg/video.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/components/CurrentProject/index.vue b/yanzhu-ui-vue3/src/components/CurrentProject/index.vue index 7d2af4a9..982437a5 100644 --- a/yanzhu-ui-vue3/src/components/CurrentProject/index.vue +++ b/yanzhu-ui-vue3/src/components/CurrentProject/index.vue @@ -1,6 +1,6 @@