From 2ebcd55ae9bba6e593a341de84580d097cf6005d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 14 九月 2022 11:07:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/TV.kanbanUI
---
HDEquipment.html | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/HDEquipment.html b/HDEquipment.html
index 3d41cc3..6cd82c6 100644
--- a/HDEquipment.html
+++ b/HDEquipment.html
@@ -309,9 +309,10 @@
var num = 0;
var num1 = 0;
var TLProgress = 0; //閫�鏂欑巼
- var CallData = []; //杩戞棩閰嶉�佹椂闂存暟缁�
- var CallPSQty = []; //杩戞棩閰嶉�佹�绘暟鏁扮粍
- var CAllQty = []; //浠婃棩鍙枡鎬绘暟鏁扮粍
+ var CallData = []; //楗煎浘缁撴灉鏁扮粍
+
+ var CAllDataX = []; //鏌辩姸鍥緓杞�
+ var CAllDataXval = []; //鏌辩姸鍥緔杞�
$(document).ready(function () {
// 鍒涘缓涓や釜鍙橀噺锛屼竴涓暟缁勪腑鐨勬湀鍜屾棩鐨勫悕绉�
var monthNames = ["1 鏈�", "2 鏈�", "3 鏈�", "4 鏈�", "5 鏈�", "6 鏈�", "7 鏈�", "8 鏈�", "9 鏈�", "10 鏈�", "11 鏈�", "12 鏈�"];
@@ -361,35 +362,36 @@
function Chart(mychart1, mychart2) {
- // $.ajax({
- // url: "http://localhost:12298/api/loaddata/CallData",
- // dataType: "JSON",
- // async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
- // type: "Get",
- // data: { "CallHouseCode": CallHouseCode },
- // success: function (data) {
- // TLProgress = parseFloat((data.data[1][1].qty / data.data[1][0].qty) * 100).toFixed(2);
- // if (isNaN(TLProgress)) {
- // TLProgress = 0;
- // }
- // //浠婃棩閰嶉�佺巼
- // $.each(data.data[0], function (index, val) {
- // CallData.push(val.hour);
- // CallPSQty.push(parseFloat(val.HSendQTY).toFixed(2));
- // CAllQty.push(parseFloat(val.HQty).toFixed(2));
- // });
- // },
- // error: function (data) {
+ $.ajax({
+ url: "http://localhost:12298/api/loaddata/SearchGetWorkStepBillPie",
+ dataType: "JSON",
+ async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
+ type: "Get",
+ data: { "CallHouseCode": CallHouseCode },
+ success: function (data) {
+ //楗煎浘
+ CallData.push(data.Table[0]["column3"]);
+ CallData.push(data.Table[0]["column4"]);
+ CallData.push(data.Table[0]["column5"]);
+ CallData.push(data.Table[0]["column6"]);
+ CallData.push(data.Table[0]["column7"]);
+ //鏌辩姸鍥�
+ $.each(data.Table1 ,function (index, val) {
+ CAllDataX.push(val.countDay);
+ CAllDataXval.push(val.HName);
+ });
+ },
+ error: function (data) {
- // }
- // })
+ }
+ })
const colorList = ['#91CC75 ', '#5470C6', '#73C0DE', '#EE6666', '#FAC858']
option1 = {
title: [
{
show: true,
- text: '璁惧绋煎姩鐜�',
+ text: '璁惧杩愯鐘舵��',
textStyle: {
color: '#00c6ff',
fontSize: '16',
@@ -409,24 +411,22 @@
{
name: '鍗犳瘮',
type: 'pie',
- radius: '60 %',//鎵撳皬
-
+ radius: '60 %',//澶у皬
itemStyle: {
borderWidth: 3,
borderColor: '#000000'
},
data: [
- { value: 12, name: '杩愯' },
- { value: 4, name: '鍋滄満' },
- { value: 2, name: '鏈紑鏈�' },
- { value: 1, name: '缁翠慨涓�' },
- { value: 1, name: '淇濆吇涓�' }
+ { value: CallData[0], name: '杩愯' },
+ { value: CallData[1], name: '鍋滄満' },
+ { value: CallData[2], name: '鏈紑鏈�' },
+ { value: CallData[3], name: '缁翠慨涓�' },
+ { value: CallData[4], name: '淇濆吇涓�' }
],
}
]
};
-
- CallData = ['08-28', '08-29', '08-30', '08-31', '09-01'];
+
option2 = {
title: {
text: '鎬讳骇鍊�',
@@ -461,7 +461,7 @@
xAxis: [
{
type: 'category',
- data: CallData,
+ data: CAllDataXval,
axisTick: {
alignWithLabel: true
},
@@ -507,7 +507,7 @@
],
series: [
{
- data: [120, 200, 150, 80, 70],
+ data: CAllDataX,
type: 'bar',
showBackground: true,
backgroundStyle: {
@@ -549,13 +549,13 @@
detailView: false, //鏄惁鏄剧ず鐖跺瓙琛�
columns: [
- { field: 'HICMOBillNO', title: '璁惧鏁伴噺', align: "left" },
- { field: 'HNUMBER', title: '寮�鏈虹巼', align: "left" },
- { field: 'HNAME', title: '杩愯', align: "left" },
- { field: 'HMODEL', title: '鍋滄満', align: "left" },
- { field: 'HQTY', title: '鏈紑鏈�', align: "left" },
- { field: 'HLEFT', title: '缁翠慨涓�', align: "left" },
- { field: 'HSTATUS', title: '淇濆吇涓�', align: "left" }
+ { field: 'column1', title: '璁惧鏁伴噺', align: "left" },
+ { field: 'column2', title: '寮�鏈虹巼', align: "left" },
+ { field: 'column3', title: '杩愯', align: "left" },
+ { field: 'column4', title: '鍋滄満', align: "left" },
+ { field: 'column5', title: '鏈紑鏈�', align: "left" },
+ { field: 'column6', title: '缁翠慨涓�', align: "left" },
+ { field: 'column7', title: '淇濆吇涓�', align: "left" }
],
onClickRow: function (row, $element) {
@@ -584,11 +584,11 @@
var html1 = '';
html1 += '<div class="col-sm-12 col-md-2" >';
if (i == 2 || i == 4 || i == 6)
- html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#91CC75" onclick="CheckBtom(this,' + (i + 1) + ')">';
+ html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#91CC75" >';
else if (i % 2 == 0)
- html1 += '<div class="cns" id="bs' + (i + 1) + '" style="" onclick="CheckBtom(this,' + (i + 1) + ')">';
+ html1 += '<div class="cns" id="bs' + (i + 1) + '" style="">';
else
- html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#EE6666; color:#FFF" onclick="CheckBtom(this,' + (i + 1) + ')">';
+ html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#EE6666; color:#FFF">';
html1 += '<dl>';
//html1 += '<img src="img/device.png">'
--
Gitblit v1.9.1