Merge branch 'master' of http://101.37.171.70:10101/r/TV.kanbanUI

yangle

2022-09-14 75bc98ff981323d6d4de86868a68f701acc19dee

Merge branch 'master' of http://101.37.171.70:10101/r/TV.kanbanUI

 HDEquipment.html

@@ -18,6 +18,7 @@
    <script src="js/jquery.SuperSlide.2.1.3.js"></script>
    <script src='js/template.js'></script>
    <script src="js/jquery.qrcode.min.js"></script>
    <script src="js/webConfig.js"></script>
    <style>
        .clock {
            font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
@@ -28,14 +29,11 @@
            margin-top: -75px;
            margin-right: 5px;
            color: #09d1ea;

        }

        .clock #Date {
            text-align: center;
            text-shadow: 0 0 0px #00c6ff;


        }

        .clock ul {
@@ -62,7 +60,6 @@
        }

        .title {

            font-size: 44px;
            font-family: PingFangSC;
            font-weight: 500;
@@ -180,7 +177,6 @@
            display: inline-block;
            height: 100%;
            /*文字居中*/

            /*文字竖排*/
            writing-mode: vertical-lr;
            /*从左向右 从右向左是 writing-mode: vertical-rl;*/
@@ -215,7 +211,6 @@
        .table>thead:first-child>tr:first-child>th {
            background-color: #000;
            color: #3bff72;

        }

        .fixed-table-container tbody td .th-inner,
@@ -310,7 +305,6 @@
        var num1 = 0;
        var TLProgress = 0;  //退料率
        var CallData = [];  //饼图结果数组

        var CAllDataX = [];  //柱状图x轴
        var CAllDataXval = [];  //柱状图y轴
        $(document).ready(function () {
@@ -343,27 +337,22 @@
            interval = setInterval(function () {
                $("#tb_order").bootstrapTable('refresh');
            }, 10000);
            // interval1 = setInterval(function () {
            //     $("#tb_order1").bootstrapTable('refresh');
            // }, 10000);
            // interval2 = setInterval(function () {
            //     TLProgress = 0;
            //     CallData = [];
            //     CallPSQty = [];
            //     CAllQty = [];
            //     Chart(mychart1, mychart2);
            // }, 20000);
            interval2 = setInterval(function () {
                CallData = [];
                CAllDataX = [];
                CAllDataXval = [];
                Chart(mychart1, mychart2);
            }, 20000);
            //根据窗口的大小变动图表 --- 重点
            // window.onresize = function () {
            //     myChart1.resize();
            //     myChart2.resize();
            // }
            window.onresize = function () {
                mychart1.resize();
                mychart2.resize();
            }
        })


        function Chart(mychart1, mychart2) {
             $.ajax({
                 url: "http://localhost:12298/api/loaddata/SearchGetWorkStepBillPie",
                url: GetWEBURL() + "/loaddata/SearchGetWorkStepBillPie",
                 dataType: "JSON",
                 async: false,//使用同步的方式,true为异步方式
                 type: "Get",
@@ -417,11 +406,11 @@
                            borderColor: '#000000'
                        },
                        data: [
                            { value: CallData[0], name: '运行' },
                            { value: CallData[1], name: '停机' },
                            { value: CallData[2], name: '未开机' },
                            { value: CallData[3], name: '维修中' },
                            { value: CallData[4], name: '保养中' }
                            { value: CallData[0], name: '工作' },
                            { value: CallData[1], name: '待机' },
                            { value: CallData[2], name: '离线' },
                            { value: CallData[3], name: '报警' },
                            { value: CallData[4], name: '维修' }
                        ],
                    }
                ]
@@ -443,10 +432,9 @@

                },
                grid: {
                    left: '3%',
                    right: '4%',
                    bottom: '10%',
                    containLabel: true
                    left: "20%",//grid 组件离容器左侧的距离。
                    right: "30px",
                    bottom: "20%" //
                },
                legend: {
                    left: 'right',
@@ -465,7 +453,6 @@
                        axisTick: {
                            alignWithLabel: true
                        },

                        axisLine: {
                            show: true,
                            lineStyle: {
@@ -476,6 +463,8 @@
                        },
                        axisLabel: {
                            show: true,
                            interval: 0, //控制X轴刻度全部显示
                            rotate: 45, //倾斜角度
                            textStyle: {
                                color: '#00c6ff', //坐标值得具体的颜色
                                fontSize: '16'
@@ -528,7 +517,7 @@
        }
        function TopData() {
            $('#tb_order').bootstrapTable({
                url: 'http://localhost:12298/api/loaddata/EquipMentData',
                url: GetWEBURL() + '/loaddata/EquipMentData',
                //data: dataJson,
                method: 'get',                      //请求方式（*）
                dataType: "json",
@@ -551,11 +540,12 @@
                columns: [
                    { 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" }
                    { 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" }
                    //{ field: 'column7', title: '保养', align: "left" }
                ],
                onClickRow: function (row, $element) {

@@ -574,7 +564,7 @@
        }
        function BottomData() {
             $.ajax({
                 url: "http://localhost:12298/api/loaddata/SearchGetWorkStepBillList",
                url: GetWEBURL() + "/loaddata/SearchGetWorkStepBillList",
                 dataType: "JSON",
                 async: false,//使用同步的方式,true为异步方式
                 type: "Get",
@@ -582,23 +572,26 @@
                 success: function (data) {
                     for (var i = 0; i < data.Table.length; i++) {
                         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" >';
                         else if (i % 2 == 0)
                             html1 += '<div class="cns" id="bs' + (i + 1) + '" style="">';
                         else
                             html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#EE6666; color:#FFF">';
                        if (data.Table[i]["设备状态"] == '离线')
                            html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#9A9999">';
                        else if (data.Table[i]["设备状态"] == '工作')
                            html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#259D27">';
                        else if (data.Table[i]["设备状态"] == '待机')
                            html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#199687">';
                        else if (data.Table[i]["设备状态"] == '报警')
                            html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#FC522A">';

                         html1 += '<dl>';
                         //html1 += '<img src="img/device.png">'
                         html1 += '<dd class="tcenter">';
                         html1 += '<h1><span>设备名称：</span><span id="ptn' + (i + 1) + '">' + data.Table[i]["设备名称"] + '</span></h1>';
                        html1 += '<h1><span></span><span id="ptn' + (i + 1) + '">' + data.Table[i]["设备名称"] + '</span></h1>';
                         html1 += '<h1><span>工单：' + data.Table[i]["工单"] + '</span></h1>';
                         html1 += '<h1><span>产品名称：' + data.Table[i]["产品名称"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
                         html1 += '<h1><span>产品规格型号：' + data.Table[i]["产品规格型号"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
                        html1 += '<h1><span>' + data.Table[i]["产品编码"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
                        html1 += '<h1><span>' + data.Table[i]["产品名称"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
                         html1 += '<h1><span>计划数量：</span><span>' + data.Table[i]["计划数量"] + '</span><span style="margin-left:20px;">汇报总数：</span><span>' + data.Table[i]["汇报总数"] + '</span></h1>';
                         html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span>';
                        html1 += '<h1><span>设备状态：' + data.Table[i]["设备状态"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
                         html1 += '</div > ';
                         html1 += '</div>';
                         html1 += '</dd>';

 KB_ProductionEquipmentOutputAnalysis.html

@@ -17,6 +17,7 @@
    <script src="js/jquery.SuperSlide.2.1.3.js"></script>
    <script src='js/template.js'></script>
    <script src="js/jquery.qrcode.min.js"></script>
    <script src="js/webConfig.js"></script>
    <style>
        .clock0 {
            font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
@@ -381,32 +382,32 @@
            interval = setInterval(function () {
                hours = [];
                hoursqty = [];
                CloseProgress = 0;  //完工率
                LineName = [];  //流水线数组
                LineOrderQty = [];  //流水线当天订单总任务数量数组
                LineOrderCloseQty = [];  //流水线当天订单总完成数量数组
                Week = 0;  //本周分析
                Month = 0; //本月分析
                closeprogress = 0;  //完工率
                linename = [];  //流水线数组
                lineorderqty = [];  //流水线当天订单总任务数量数组
                lineordercloseqty = [];  //流水线当天订单总完成数量数组
                week = 0;  //本周分析
                month = 0; //本月分析
                Chart(mychart1, mychart2, mychart3, mychart4, mychart5);
            }, 20000);
            setInterval(function () {
                //num+=1;
                //$("#tb_order").bootstrapTable('refreshOptions',{offset:num});  // pageNumber:1, 指定页码为第1页
                $("#tb_order").bootstrapTable('refresh');
                //$("#tb_order").bootstraptable('refreshoptions',{offset:num});  // pagenumber:1, 指定页码为第1页
                $("#tb_order").bootstraptable('refresh');
            }, 10000);
            //根据窗口的大小变动图表 --- 重点
            window.onresize = function () {
                myChart1.resize();
                myChart2.resize();
                myChart3.resize();
                myChart4.resize();
                myChart5.resize();
                mychart1.resize();
                mychart2.resize();
                mychart3.resize();
                mychart4.resize();
                mychart5.resize();
            }
        })

        function Chart(mychart1, mychart2, mychart3, mychart4, mychart5) {
            $.ajax({
                url: "http://localhost:12298/api/loaddata/KB_ProductData",
                url: GetWEBURL() + "/loaddata/KB_ProductData",
                dataType: "JSON",
                async: false,//使用同步的方式,true为异步方式
                type: "Get",
@@ -840,7 +841,7 @@

        function DataTable() {
            $('#tb_order').bootstrapTable({
                url: 'http://localhost:12298/api/loaddata/KB_ProductTableData',
                url: GetWEBURL() + '/loaddata/KB_ProductTableData',
                //data: dataJson,
                method: 'get',                      //请求方式（*）
                dataType: "json",
@@ -934,13 +935,13 @@
        }
        function showHospitalCode() {
            $.ajax({
                url: "http://localhost:12298/api/loaddata/Gy_Source",//跳转到控制器HospitalController
                url: GetWEBURL() + "/loaddata/Gy_Source",//跳转到控制器HospitalController
                type: "get",
                success: function (Data) {
                    var hospitals = JSON.parse(Data);//反序列化
                    var content = '';
                    $.each(hospitals.data, function (i, n) {
                        content += "<option value='" + n.HNumber + "'>" + n.HName + "</option>";
                        content += "<option value='" + n.HNumber + "'>" + n.HNumber + '-' + n.HName + "</option>";
                    });
                    $("#hospitalCodeSelect").append(content);//append 添加进去并展示
                    $("#hospitalCodeSelect").find("option[value='" + hospitals.data[0].HNumber + "']").attr("selected", true);

 js/webConfig.js

New file
@@ -0,0 +1,5 @@
function GetWEBURL() {
    //var WEBURL = "http://183.129.128.86:9090/KanBanApi/";    //凯贝奈特服务器地址
    var WEBURL = "http://192.168.1.253:12298/Api/";
    return WEBURL
}