From db60ffb91f61408cfe9af1215c0bbdabafbba87e Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期四, 15 八月 2024 16:22:37 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj.user | 2
WebTM/views/home/console.html | 6 +-
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_TechnologyParameterType.html | 10 ++--
WebTM/layuiadmin/modules/console.js | 60 ++++++++++++++++++++++++++---
WebTM/layuiadmin/Scripts/webConfig.js | 2
5 files changed, 63 insertions(+), 17 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8158be3..46be55b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7401622..9df68e1 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -11,7 +11,7 @@
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; *//*//寮犵憺骞挎湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
diff --git a/WebTM/layuiadmin/modules/console.js b/WebTM/layuiadmin/modules/console.js
index 72762a9..c0b33b5 100644
--- a/WebTM/layuiadmin/modules/console.js
+++ b/WebTM/layuiadmin/modules/console.js
@@ -8,7 +8,8 @@
*/
-layui.define(function(exports){
+layui.define(function (exports) {
+
/*
涓嬮潰閫氳繃 layui.use 鍒嗘鍔犺浇涓嶅悓鐨勬ā鍧楋紝瀹炵幇涓嶅悓鍖哄煙鐨勫悓鏃舵覆鏌擄紝浠庤�屼繚璇佽鍥剧殑蹇�熷憟鐜�
@@ -41,13 +42,24 @@
});
+
+
+
+
//鏁版嵁姒傝
layui.use(['admin', 'carousel', 'echarts'], function(){
var $ = layui.$
,admin = layui.admin
,carousel = layui.carousel
,echarts = layui.echarts;
-
+
+ //姹囨姤鍗曟暟閲�
+ var quantity = [];
+ //姹囨姤鏃堕棿杈栧尯
+ var time = [];
+
+ get_Display();
+
var echartsApp = [], options = [
//浠婃棩浜ч噺瓒嬪娍
{
@@ -67,7 +79,7 @@
xAxis : [{
type : 'category',
boundaryGap : false,
- data: ['06:00','06:30','07:00','07:30','08:00','08:30','09:00','09:30','10:00','11:30','12:00','12:30','13:00','13:30','14:00','14:30','15:00','15:30','16:00','16:30','17:00','17:30','18:00','18:30','19:00','19:30','20:00','20:30','21:00','21:30','22:00','22:30','23:00','23:30']
+ data: time
}],
yAxis : [{
type : 'value'
@@ -76,14 +88,14 @@
name:'PV',
type:'line',
smooth:true,
- itemStyle: {normal: {areaStyle: {type: 'default'}}},
- data: [111,222,333,444,555,666,3333,33333,55555,66666,33333,3333,6666,11888,26666,38888,56666,42222,39999,28888,17777,9666,6555,5555,3333,2222,3111,6999,5888,2777,1666,999,888,777]
+ itemStyle: { normal: { areaStyle: { type: 'default' } } },
+ data: quantity
},{
name:'UV',
type:'line',
smooth:true,
- itemStyle: {normal: {areaStyle: {type: 'default'}}},
- data: [11,22,33,44,55,66,333,3333,5555,12666,3333,333,666,1188,2666,3888,6666,4222,3999,2888,1777,966,655,555,333,222,311,699,588,277,166,99,88,77]
+ itemStyle: { normal: { areaStyle: { type: 'default' } } },
+ data: quantity
}]
},
@@ -181,6 +193,40 @@
layui.admin.on('hash(tab)', function(){
layui.router().path.join('') || renderDataView(carouselIndex);
});
+
+
+
+ //鏌ヨ
+ function get_Display() {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Web/GetICMOBillWorkQtyStatus_Tmp',
+ type: "GET",
+ async: false,
+ data: {},
+ success: function (data1) {
+ if (data1.count == 1) {
+ quantity = [];
+ time = [];
+
+ for (var i = 0; i < data1.data.length; i++) {
+ time.push(data1.data[i].date);
+ quantity.push(data1.data[i].quantity);
+ }
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
});
//鏈�鏂拌鍗�
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index d5a2b93..a0cefb8 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -355,7 +355,7 @@
//#region 椤甸潰鍒濆鍖栨柟娉�
function set_ClearBill() {
-
+
get_Display();
}
//#endregion
@@ -391,9 +391,9 @@
liStr += '<li class="layui-col-xs3">';
if (data[i]["HPicNum"] == null || data[i]["HPicNum"] == "") {
- liStr += '<i id="' + data[i]["HSubFuncID"] +'" class="layui-icon layui-icon-add-circle"></i>';
+ liStr += '<i id="' + data[i]["HSubFuncID"] + '" class="layui-icon layui-icon-add-circle"></i>';
} else {
- liStr += '<i id="' + data[i]["HSubFuncID"] +'" class="' + data[i]["HPicNum"] + '"></i>';
+ liStr += '<i id="' + data[i]["HSubFuncID"] + '" class="' + data[i]["HPicNum"] + '"></i>';
}
liStr += '<a lay-href="' + data[i]["Hurl"] + '">';
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_TechnologyParameterType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_TechnologyParameterType.html"
index 00d68a8..e7e22e3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_TechnologyParameterType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_TechnologyParameterType.html"
@@ -219,20 +219,20 @@
function set_EditForm(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "GetGy_CusTypeDetail",
+ url: GetWEBURL() + "GetGy_TechnologyTypeDetail",
type: "GET",
data: {
"HID": linterid
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Gy_CusType[0];
+ var data = result.data.h_v_Gy_Technology[0];
$("#HItemID").val(data.HItemID);//浠ｇ爜ID
- $("#HNumber").val(data.瀹㈡埛鍒嗙被浠ｇ爜);//浠ｇ爜
- $("#HName").val(data.瀹㈡埛鍒嗙被鍚嶇О);//鍚嶇О
+ $("#HNumber").val(data.宸ヨ壓鍙傛暟鍒嗙被浠ｇ爜);//浠ｇ爜
+ $("#HName").val(data.宸ヨ壓鍙傛暟鍒嗙被鍚嶇О);//鍚嶇О
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
/* $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐*/
- $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+ $("#HUseFlag").val(data.浣跨敤鏍囪);//浣跨敤鐘舵��
$("#HRemark").val(data.澶囨敞);//澶囨敞
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
--
Gitblit v1.9.1