1

pzy

2024-08-15 db60ffb91f61408cfe9af1215c0bbdabafbba87e

1

 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 />

 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/";   //余思杰本地配置

 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);
      }
  });

  //最新订单

 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"] + '">';

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/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();//实时渲染选中和不选中的样式,最好添加这句话