@@ -558,6 +576,9 @@ export default {
teamListData: [],
departmentListData: [],
safeData: {},
+ searchForm: {
+ enterpriseId: "",
+ },
};
},
mounted() {
@@ -728,7 +749,7 @@ export default {
// end: 50, // 数据窗口范围的结束百分比
height: 10, // 滑动条组件高度
startValue: xData.length - 1,
- endValue: xData.length - 9,
+ endValue: xData.length - 9,
bottom: 5, // 距离图表区域下边的距离
showDetail: false, // 拖拽时是否显示详情
showDataShadow: false, // 是否在组件中显示数据阴影
@@ -899,11 +920,14 @@ export default {
that.safeWorkList = res.result.list || [];
});
},
+ searchFormChange(){
+ this.selectPersonTypeAndEduStatistics();
+ },
//查询人员类型和教育统计
selectPersonTypeAndEduStatistics() {
getPersonTypeAndEduStatisticsApi({
projectSn: this.$store.state.projectSn,
- userEnterpriseId: this.$store.state.userInfo.userEnterpriseId,
+ userEnterpriseId: this.searchForm.enterpriseId ? this.searchForm.enterpriseId : this.$store.state.userInfo.userEnterpriseId,
}).then((res) => {
console.log(res);
this.totalPersonNum = res.result.personType.toaltPerson.totalPerson; //总人数
@@ -1587,6 +1611,9 @@ export default {
display: flex;
align-items: center;
}
+.headSelect {
+ margin-left: 20px;
+}
.personnelOverview {
width: 100%;
height: 100%;
@@ -1682,6 +1709,9 @@ export default {
width: 100%;
height: calc(100% - 50px);
}
+ .headSelectEcharts {
+ height: calc(100% - 80px);
+ }
.scroll {
width: 100%;
padding: 15px 0 0;
From 283d6ba2717cd90114b498f6c491fa4932246ce3 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Fri, 15 Nov 2024 15:11:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?flx:=E4=BF=AE=E5=A4=8D=E8=A7=86=E9=A2=91?=
=?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=B4=AF=E5=8A=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/js/config.js | 4 ++--
src/store/index.js | 9 ++++++---
src/views/equipmentCenter/videoManage/videoConfig.vue | 1 +
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/public/js/config.js b/public/js/config.js
index 21c506cc..84f2320b 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,5 +1,5 @@
//-------项目配置标识-------
-// var COMPANY = ""; //通用
+var COMPANY = ""; //通用
// var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
// var COMPANY='hezhan'; //合展-宿迁
// var COMPANY='nanchang'; //南昌地铁、衢州
@@ -18,7 +18,7 @@
// COMPANY = 'jlw'//金林湾
// COMPANY = 'shzj' //上海张江
// COMPANY = 'shjg'//上海优益（上海建工）
-COMPANY = "agjt"; //鞍钢集团
+// COMPANY = "agjt"; //鞍钢集团
// COMPANY = 'zkax' //中科安信
// COMPANY = 'hfqc' //乌丹站舍(合肥启程)
// COMPANY = 'mulei' //木垒
diff --git a/src/store/index.js b/src/store/index.js
index 8e1a26a6..a2611686 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -46,6 +46,9 @@ export default new Vuex.Store({
state: {
PAGESIZRS: [10, 20, 30, 50],
+ UPLOADURL: 'http://192.168.0.12:9809/upload/image/', // 国维科技
+ FILEURL: ' http://192.168.0.12:9809/image/', // 国维科技
+ WORKFLOWURL: 'http://192.168.0.12:19998/#/workspace/forms', //国维科技工作流地址
// UPLOADURL: "http://121.37.106.37:9809/upload/image/", // 新能源智慧基建
// FILEURL: "http://121.37.106.37:9809/image/", //新能源智慧基建
// WORKFLOWURL: 'http://121.37.106.37:19998/#/workspace/forms', //鞍钢平台工作流地址
@@ -65,12 +68,12 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
- UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
- FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
+ // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
+ // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
// WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", //jiayu工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
- WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
+ // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.129:5174/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地)
CONTRACTORURL2: process.env.NODE_ENV == "development" ? "http://192.168.34.175:88/#/workspace/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/workspace/contractorApply`, //罗峰承包商入场地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue
index 12c1801c..e3a52b2e 100644
--- a/src/views/equipmentCenter/videoManage/videoConfig.vue
+++ b/src/views/equipmentCenter/videoManage/videoConfig.vue
@@ -1510,6 +1510,7 @@ export default {
// 树形控件点击
treeClick(data) {
this.selectVal = data.groupName;
+ delete data.parentObj;
this.selectTreeData = data;
this.addGroupForm.parentId = data.id;
},