src/api/model/hrm.js

@@ -301,39 +301,4 @@ 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}/`
-				);
-			}
-		},
-	},
 }

src/views/bigScreen/index_enm_bh.vue

@@ -4,7 +4,7 @@
 			<span class="top-line top-line-left"></span>
 			{{ bigScreenName }}
 			<span class="top-line top-line-right"></span>
-			<div class="backHomeBtn" style="right: 100px;" @click.prevent="backHome"></div>
+			<div class="backHomeBtn" style="right: 100px;" @click.prevent="backHome">退出大屏</div>
 		</header>
 		<div id="model" class="model">
 			<div class="top_block">
@@ -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 },
 			],
@@ -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 = generateQuery("3853763443714961408");
+			let query1 = generateQueryMgroup("3854338262768619520");
-			this.$API.enm.mpointstat.list.req(query1).then((response) => {
+			this.$API.enm.enstat.req(query1).then((response) => {
-				let maxId;	
+				//反转response数据
+				// response.reverse();
 				response.forEach((item) => {
-						let ind = item.day - 1;					
+						let ind = item.day_s - 1;
-						seriesData1[ind] = item.val || 0;
+						seriesData1[ind] = item.elec_consume || 0;
-						maxId = ind;
 				});
 				
 				// 第二个API查询
@@ -981,6 +981,7 @@ export default {
 				
 			}).then((response) => {
 				let maxId;	
+				console.log('----------res',response);
 				response.forEach((item) => {	
 						let ind = item.day - 1;					
 						seriesData3[ind] = item.val || 0;

src/views/hrm/transfer_form.vue

@@ -47,7 +47,7 @@
                 </el-col>
 
                 <el-col :span="6">
-                <el-form-item label="岗位">
+                <el-form-item label="职务">
                     <el-input v-model="formData.post_name" disabled style="width: 140px;"/>
                 </el-form-item>
                 </el-col>
@@ -123,16 +123,6 @@
                         <el-table-column label="名称" prop="name"></el-table-column>
                     </xtSelect>
                 </el-form-item>
-                <el-form-item label="调岗时间" required>
-                    <el-date-picker
-                    v-model="formData.transfer_date"
-                    type="date"
-                    placeholder="日期"
-                    value-format="YYYY-MM-DD"
-                    style="width: 230px;"
-                    :readonly="localMode === 'show'"
-                    />
-                </el-form-item>
                 <el-form-item label="个人工作内容">
                     <el-input v-model="formData.content" type="textarea" :rows="3" style="width: 300px;"/>
                 </el-form-item>
@@ -145,7 +135,7 @@
                         style="width: 200px;" 
                         :precision="2"
                         :step="0.01"
-                        :min="2000"
+                        :min="0"
                         v-if="formData.ticket_?.state_?.name !== '分管副总审批'"/>
                         <span style="margin-left:6px;">元</span>
                 </el-form-item>
@@ -155,7 +145,7 @@
                         style="width: 200px;" 
                         :precision="2"
                         :step="0.01"
-                        :min="2000"
+                        :min="0"
                         v-if="formData.ticket_?.state_?.name !== '分管副总审批'"/>
                         <span style="margin-left:6px;">元</span>
                 </el-form-item>
@@ -216,7 +206,6 @@ export default {
         return {
             formData: {
                 is_change: false,
-                is_promotion: false,
             },
             ticket_data: {},
             localMode: this.mode,
@@ -245,10 +234,6 @@ 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,
@@ -307,7 +292,6 @@ export default {
 			this.$refs.table.queryData(this.query);
 		},
         handleChange(obj) {
-            if (obj) {
             this.formData.employee_name = obj.name;
             this.formData.belong_dept_name = obj.belong_dept_name;
             this.formData.post_name = obj.post_name;
@@ -316,8 +300,6 @@ export default {
             this.formData.phone = obj.phone;
             this.formData.number = obj.number;
             this.formData.start_date = obj.start_date;
-            }
-            
         },
     
     }