-
- 资产总数：{{ this.InstrumentCount+ this.FurnitureCount}}
-
-
-
-
- 总资产价值量：{{ this.InstrumentAmount+this.FurnitureAmount }}
+ 仪器总价：{{ this.InstrumentAmount }}
- 资产总数：{{ this.InstrumentCount+ this.FurnitureCount }}
+ 家具总价{{ this.FurnitureAmount }}
-
- 总资产价值量：{{ this.InstrumentAmount+this.FurnitureAmount }}
+
+ 无形资产总价：{{ this.IntangibleAmount }}
+
+
+
+
+ 总资产价值量：{{ this.InstrumentAmount + this.FurnitureAmount
+ + this.IntangibleAmount }}
@@ -57,11 +46,14 @@ export default {
loading: true,
PieChartData: [],
ChartData: [],
+ LocationName: [],
ChartDataSum: 0,
InstrumentCount: 0,
FurnitureCount: 0,
+ IntangibleCount: 0,
InstrumentAmount: 0,
FurnitureAmount: 0,
+ IntangibleAmount: 0,
}
},
methods: {
@@ -77,14 +69,29 @@ export default {
this.drawPie();
})
},
+ getLocationName() {
+ getAction("/rms/rmsDepart/getLocationName").then(res => {
+ this.LocationName = res;
+ console.log("位置:" + this.LocationName)
+ })
+ },
getInstrumentCount() {
getAction('/rms/rmsDepart/getInstrumentCount').then(res => {
this.InstrumentCount = res;
+ console.log("仪器总数" + this.InstrumentCount)
})
},
getFurnitureCount() {
getAction('/rms/rmsDepart/getFurnitureCount').then(res => {
this.FurnitureCount = res;
+ console.log("家具总数:" + this.FurnitureCount)
+
+ })
+ },
+ getIntangibleCount(){
+ getAction('/rms/rmsDepart/getIntangibleCount').then(res => {
+ this.IntangibleCount = res;
+ console.log("无形资产总数:" + this.IntangibleCount)
})
},
getInstrumentAmount() {
@@ -97,8 +104,13 @@ export default {
this.FurnitureAmount = res;
})
},
-
-
+ getIntangibleAmount(){
+ getAction('/rms/rmsDepart/getIntangibleAmount').then(res => {
+ this.IntangibleAmount = res;
+ })
+ },
+
+
drawChart() {
// 基于准备好的dom，初始化echarts实例 这个和上面的main对应
let myChart = this.$echarts.init(document.getElementById("main"));
@@ -112,7 +124,11 @@ export default {
data: ["资产数量"],
},
xAxis: {
- data: ["理工一号楼", "行知楼", "体育楼", "崇师楼", "新实验楼", "社科楼"],
+ data: this.LocationName,
+ axisLabel: {
+ interval: 0,
+ rotate: 30
+ }
},
yAxis: {},
series: [
@@ -184,11 +200,13 @@ export default {
created() {
this.getPieChart();
this.getChart();
+ this.getLocationName();
this.getInstrumentCount();
this.getFurnitureCount();
+ this.getIntangibleCount();
this.getInstrumentAmount();
this.getFurnitureAmount();
- // this.getSum();
+ this.getIntangibleAmount();
},
}
@@ -196,10 +214,7 @@ export default {
\ No newline at end of file
diff --git a/src/views/rms/InstrumentList/RmsInstrumentList.vue b/src/views/rms/InstrumentList/RmsInstrumentList.vue
index 7420186..a73b074 100644
--- a/src/views/rms/InstrumentList/RmsInstrumentList.vue
+++ b/src/views/rms/InstrumentList/RmsInstrumentList.vue
@@ -10,7 +10,7 @@
-
@@ -25,11 +25,30 @@
新增
+
导出
导入
+
历史数据
+
+
+
+
+
删除
@@ -211,8 +230,11 @@ export default {
exportXlsUrl: "/rms/rmsInstrument/exportXls",
importExcelUrl: "rms/rmsInstrument/importExcel",
userUrl: "/sys/user/queryUserComponentData?column=createTime&order=desc&field=id,,username,realname,sex,phone,orgCodeTxt&pageNo=1&pageSize=100",
+ timestampUrl: "/rms/rmsInstrument/getTimestamp",
},
UserList: {},
+ historyModalVisible: false, // 控制历史数据模态框的显示与隐藏
+ historyData: [] // 历史数据数组，用于存储所有历史数据
}
},
created() {
@@ -224,6 +246,53 @@ export default {
},
},
methods: {
+ // ExportInstrumentData(fileName, TimestampData) {
+ // console.log(TimestampData)
+ // if (!fileName || typeof fileName != "string") {
+ // fileName = "导出文件"
+ // }
+ // let param = this.getQueryParams();
+ // if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+ // param['selections'] = this.selectedRowKeys.join(",")
+ // }
+ // param['timestamp'] = TimestampData.timestamp
+ // console.log("导出参数", param)
+ // downFile(this.url.exportXlsUrl, param).then((data) => {
+ // if (!data) {
+ // this.$message.warning("文件下载失败")
+ // return
+ // }
+ // if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ // window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
+ // } else {
+ // let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+ // let link = document.createElement('a')
+ // link.style.display = 'none'
+ // link.href = url
+ // link.setAttribute('download', fileName + '.xls')
+ // document.body.appendChild(link)
+ // link.click()
+ // document.body.removeChild(link); //下载完成移除元素
+ // window.URL.revokeObjectURL(url); //释放掉blob对象
+ // }
+ // })
+ // },
+ showHistoryModal() {
+ getAction(this.url.timestampUrl).then(res => {
+ console.log(res)
+ this.historyData = res;
+ })
+
+ this.historyModalVisible = true; // 显示历史数据模态框
+ },
+ closeHistoryModal() {
+ this.historyModalVisible = false; // 关闭历史数据模态框
+ },
+ // AddDataInstrument() {
+ // getAction("/rms/rmsIntangible/addDataInstrument").then(res => {
+ // console.log(res)
+ // })
+ // },
//获取用户信息
getUserInfo() {
getAction(this.url.userUrl).then(res => {
@@ -250,4 +319,20 @@ export default {
\ No newline at end of file
diff --git a/src/views/rms/IntangibleList/RmsIntangibleList.vue b/src/views/rms/IntangibleList/RmsIntangibleList.vue
index 7c16370..ddda297 100644
--- a/src/views/rms/IntangibleList/RmsIntangibleList.vue
+++ b/src/views/rms/IntangibleList/RmsIntangibleList.vue
@@ -10,7 +10,7 @@
-
@@ -34,9 +34,23 @@
@change="handleImportExcel">
导入
+ 历史数据
+
+
+
-
+
删除
@@ -267,9 +281,12 @@ export default {
exportXlsUrl: "/rms/rmsIntangible/exportXls",
importExcelUrl: "rms/rmsIntangible/importExcel",
userUrl: "/sys/user/queryUserComponentData?column=createTime&order=desc&field=id,,username,realname,sex,phone,orgCodeTxt&pageNo=1&pageSize=100",
+ timestampUrl: "/rms/rmsIntangible/getTimestamp",
},
UserList: {},
+ historyModalVisible: false, // 控制历史数据模态框的显示与隐藏
+ historyData: [] // 历史数据数组，用于存储所有历史数据
}
},
created() {
@@ -286,6 +303,16 @@ export default {
// console.log(res)
// });
// },
+ showHistoryModal() {
+ getAction(this.url.timestampUrl).then(res => {
+ console.log(res)
+ this.historyData = res;
+ })
+ this.historyModalVisible = true; // 显示历史数据模态框
+ },
+ closeHistoryModal() {
+ this.historyModalVisible = false; // 关闭历史数据模态框
+ },
//获取用户信息
getUserInfo() {
getAction(this.url.userUrl).then(res => {
@@ -316,4 +343,23 @@ export default {
\ No newline at end of file
+
+.modal-content {
+ max-height: 400px;
+ /* 设置最大高度，根据需要进行调整 */
+ overflow-y: auto;
+ /* 添加垂直滚动条 */
+}
+
+.container {
+ display: flex;
+ align-items: center;
+}
+
+.left {
+ flex: 1;
+}
+
+.right {
+ margin-left: 10px;
+}
\ No newline at end of file
diff --git a/src/views/rms/LocationList/RmsLocationList.vue b/src/views/rms/LocationList/RmsLocationList.vue
index d366167..e64152b 100644
--- a/src/views/rms/LocationList/RmsLocationList.vue
+++ b/src/views/rms/LocationList/RmsLocationList.vue
@@ -4,7 +4,7 @@
-
+
@@ -70,7 +70,8 @@ export default {
{
title: '排序号',
align: "center",
- dataIndex: 'sortNumber'
+ dataIndex: 'sortNumber',
+ sorter: true
},
{
title: '操作',
@@ -81,6 +82,10 @@ export default {
scopedSlots: { customRender: 'action' }
}
],
+ isorter: {
+ column: 'sortNumber',
+ order: 'asc'
+ },
url: {
list: "/rms/rmsLocation/list",
delete: "/rms/rmsLocation/delete",
@@ -99,6 +104,24 @@ export default {
},
},
methods: {
+ // 重写底层JeecgListMixin.js的方法
+ // 如果有自定义默认排序必须重写此方法，才能解决重置排序的问题
+ handleTableChange(pagination, filters, sorter) {
+ //分页、排序、筛选变化时触发
+ console.log(pagination)
+ if (Object.keys(sorter).length > 0) {
+ this.isorter.column = sorter.field;
+ this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+ // update-begin--Author:ciei Date:20230504 for：重置排序
+ if (sorter.order === undefined) {
+ this.isorter.column = 'sortNumber';
+ this.isorter.order = 'asc';
+ }
+ // update-end--Author:ciei Date:20230504 for：重置排序
+ }
+ this.ipagination = pagination;
+ this.loadData();
+ },
onSelect(selectedRowKeys) {
//将其切分为字符串
selectedRowKeys = selectedRowKeys.join(',')
+ 我的待办【{{ dataSource1.length }}】
+ 
+ 我的在办【{{ dataSource2.length }}】
+ 
+ 我的挂账【{{ dataSource4.length }}】
+ 
+ 我的督办【{{ dataSource3.length }}】
+