diff --git a/src/api/humanResource/personnel/index.ts b/src/api/humanResource/personnel/index.ts
index a2b7464..adbc7c6 100644
--- a/src/api/humanResource/personnel/index.ts
+++ b/src/api/humanResource/personnel/index.ts
@@ -5,6 +5,7 @@ export function listApi(config : object) {
return http({
url: '/cxc_rlzy.zb/cxcRlzyZb/list',
method: 'GET',
+ timeout: 5000,
data: config
})
}
diff --git a/src/api/production/index.ts b/src/api/production/index.ts
index 6eb4093..5159a3d 100644
--- a/src/api/production/index.ts
+++ b/src/api/production/index.ts
@@ -56,4 +56,12 @@ export function queryJldDataByJldID(params : object) { // 获取计量点五分
method: 'GET',
data: params
})
+}
+
+export function queryJldRbDataByJldID(params : object) { // 获取计量点日报数据
+ return http({
+ url: 'http://10.75.166.6:9999/Gyk/jldls/cxcSssjLssjJldls/getLssjByJldId',
+ method: 'GET',
+ data: params
+ })
}
\ No newline at end of file
diff --git a/src/pages-humanResource/personnel/standingbook.vue b/src/pages-humanResource/personnel/standingbook.vue
index 888f3e7..040b96b 100644
--- a/src/pages-humanResource/personnel/standingbook.vue
+++ b/src/pages-humanResource/personnel/standingbook.vue
@@ -1,6 +1,6 @@
-
+
@@ -16,11 +16,12 @@
-
+
-
+
diff --git a/src/pages-production/shishishuju/chart/lssjChart.vue b/src/pages-production/shishishuju/chart/lssjChart.vue
index 3b58067..48a128f 100644
--- a/src/pages-production/shishishuju/chart/lssjChart.vue
+++ b/src/pages-production/shishishuju/chart/lssjChart.vue
@@ -9,499 +9,192 @@
-
-
-
-
-
-
-
-
-
-
-
- 序号
- 日期时间
- 温度(℃)
- 压力(MPa)
- 压差(kPa)
- 瞬时量(Nm³/d)
- 今日量(m³)
- 今日时间(分)
- 仪表状态
-
-
- {{ index + 1 }}
- {{ formatTableTime(item.createTime) }}
- {{ item.wd }}
- {{ item.yl }}
- {{ item.yc }}
- {{ item.ssll }}
- {{ item.jrl }}
- {{ item.jrsj }}
- {{ item.zt }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 前一天
+ 后一天
+ 查询数据
+ 生成曲线
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages-production/shishishuju/chart/sssjChart.vue b/src/pages-production/shishishuju/chart/sssjChart.vue
index 46e9fcd..f14d010 100644
--- a/src/pages-production/shishishuju/chart/sssjChart.vue
+++ b/src/pages-production/shishishuju/chart/sssjChart.vue
@@ -42,8 +42,8 @@
-
+
diff --git a/src/pages-production/shishishuju/trqSssj.vue b/src/pages-production/shishishuju/trqSssj.vue
index 534f863..755cdbc 100644
--- a/src/pages-production/shishishuju/trqSssj.vue
+++ b/src/pages-production/shishishuju/trqSssj.vue
@@ -86,13 +86,13 @@
-
-
-
+
-
+
+
+
\ No newline at end of file