diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 6a67b1ef..c1cd53a9 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -267,7 +267,7 @@ export default {
},
},
leave: {
- list: {
+ list: {
name: "人员请假",
req: async function(data){
return await http.get(
@@ -276,22 +276,22 @@ export default {
);
}
},
- item: {
- name: "人员请假申请",
- req: async function(id){
- return await http.get(
- `${config.API_URL}/hrm/leave/${id}/`,
- );
- }
- },
- create: {
- name: "人员请假新增",
- req: async function(data){
- return await http.post(
- `${config.API_URL}/hrm/leave/`,
- data);
- }
- },
+ item: {
+ name: "人员请假申请",
+ req: async function(id){
+ return await http.get(
+ `${config.API_URL}/hrm/leave/${id}/`,
+ );
+ }
+ },
+ create: {
+ name: "人员请假新增",
+ req: async function(data){
+ return await http.post(
+ `${config.API_URL}/hrm/leave/`,
+ data);
+ }
+ },
delete: {
name: "人员请假删除",
req: async function(id){
@@ -301,4 +301,39 @@ export default {
}
},
},
+ transfer: {
+ list: {
+ name: "人员调岗",
+ req: async function(data){
+ return await http.get(
+ `${config.API_URL}/hrm/transfer/`,
+ data
+ );
+ }
+ },
+ item: {
+ name: "人员调岗申请",
+ req: async function(id){
+ return await http.get(
+ `${config.API_URL}/hrm/transfer/${id}/`,
+ );
+ }
+ },
+ create: {
+ name: "人员调岗新增",
+ req: async function(data){
+ return await http.post(
+ `${config.API_URL}/hrm/transfer/`,
+ data);
+ }
+ },
+ delete: {
+ name: "人员调岗删除",
+ req: async function(id){
+ return await http.delete(
+ `${config.API_URL}/hrm/transfer/${id}/`
+ );
+ }
+ },
+ },
}
diff --git a/src/views/bigScreen/index_enm_bh.vue b/src/views/bigScreen/index_enm_bh.vue
index 46be6c1c..bae5b3f5 100644
--- a/src/views/bigScreen/index_enm_bh.vue
+++ b/src/views/bigScreen/index_enm_bh.vue
@@ -4,7 +4,7 @@
{{ bigScreenName }}
-
退出大屏
+
@@ -417,8 +417,8 @@ export default {
out_cement: 0,
},
rateData: [
- { name: "煤磨", value: 0, rate:0 },
- { name: "回转窑", value: 0, rate:0 },
+ { name: "回转窑", value: 0, rate:0 },
+ { name: "煤磨", value: 0, rate:0 },
// { name: "原料磨", value: 0, rate:0 },
// { name: "水泥磨", value: 0 , rate:0 },
],
@@ -426,7 +426,7 @@ export default {
// { name: "电石渣工序", value: 0 },
// { name: "生料辅料工序", value: 0 },
{ name: "废气系统", value: 0 },
- { name: "磨球主电机", value: 0 },
+ { name: "煤磨主电机", value: 0 },
{ name: "窑尾高温风机", value: 0 },
// { name: "水泥包装工序", value: 0 },
],
@@ -531,7 +531,7 @@ export default {
radar: {
indicator: [
{ name: "高温风机" },
- { name: "磨球" },
+ { name: "煤磨" },
// { name: "电石渣工序" },
// { name: "生料辅料工序" },
{ name: "窑尾高温风机" },
@@ -966,13 +966,13 @@ export default {
};
}
// 第一个API查询
- let query1 = generateQueryMgroup("3854338262768619520");
- this.$API.enm.enstat.req(query1).then((response) => {
- //反转response数据
- // response.reverse();
- response.forEach((item) => {
- let ind = item.day_s - 1;
- seriesData1[ind] = item.elec_consume || 0;
+ let query1 = generateQuery("3853763443714961408");
+ this.$API.enm.mpointstat.list.req(query1).then((response) => {
+ let maxId;
+ response.forEach((item) => {
+ let ind = item.day - 1;
+ seriesData1[ind] = item.val || 0;
+ maxId = ind;
});
// 第二个API查询
@@ -981,7 +981,6 @@ export default {
}).then((response) => {
let maxId;
- console.log('----------res',response);
response.forEach((item) => {
let ind = item.day - 1;
seriesData3[ind] = item.val || 0;
diff --git a/src/views/hrm/transfer_form.vue b/src/views/hrm/transfer_form.vue
index 0b93af9e..da034f1c 100644
--- a/src/views/hrm/transfer_form.vue
+++ b/src/views/hrm/transfer_form.vue
@@ -41,13 +41,13 @@
-
+
-
+
@@ -123,6 +123,16 @@
+
+
+
@@ -135,7 +145,7 @@
style="width: 200px;"
:precision="2"
:step="0.01"
- :min="0"
+ :min="2000"
v-if="formData.ticket_?.state_?.name !== '分管副总审批'"/>
元
@@ -145,7 +155,7 @@
style="width: 200px;"
:precision="2"
:step="0.01"
- :min="0"
+ :min="2000"
v-if="formData.ticket_?.state_?.name !== '分管副总审批'"/>
元
@@ -206,6 +216,7 @@ export default {
return {
formData: {
is_change: false,
+ is_promotion: false,
},
ticket_data: {},
localMode: this.mode,
@@ -234,6 +245,10 @@ export default {
Object.assign(this.ticket_data,{
original_slary: val.original_slary,
new_slary: val.new_slary,
+ original_post: val.original_post,
+ new_post: val.new_post,
+ is_change: val.is_change,
+ is_promotion: val.is_promotion
})
},
deep: true,
@@ -292,14 +307,17 @@ export default {
this.$refs.table.queryData(this.query);
},
handleChange(obj) {
- this.formData.employee_name = obj.name;
- this.formData.belong_dept_name = obj.belong_dept_name;
- this.formData.post_name = obj.post_name;
- this.formData.gender = obj.gender;
- this.formData.id_number = obj.id_number;
- this.formData.phone = obj.phone;
- this.formData.number = obj.number;
- this.formData.start_date = obj.start_date;
+ if (obj) {
+ this.formData.employee_name = obj.name;
+ this.formData.belong_dept_name = obj.belong_dept_name;
+ this.formData.post_name = obj.post_name;
+ this.formData.gender = obj.gender;
+ this.formData.id_number = obj.id_number;
+ this.formData.phone = obj.phone;
+ this.formData.number = obj.number;
+ this.formData.start_date = obj.start_date;
+ }
+
},
}