智慧粮库APP，版本号V6
上一版本: ce85e6d0 | 补丁 | 提交 | 忽略空白
YYC
2023-06-13 c7ba1ce89a2a552eee9b5edadc9a302d8aafb05b 
细节修改
已修改10个文件
109 ■■■■■ 文件已修改
igds-app/es-real-electric.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/grain-history.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/index.html 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/js/admin/basic-depot.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/js/admin/device-temp.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/js/admin/es-read-meter.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/js/admin/es-real-electric.js 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/js/admin/grain-history.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/js/admin/my.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-app/js/admin/security-patrol.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 igds-app/es-real-electric.html


@@ -23,7 +23,7 @@


                <div class="g-in-sl">


                    <div class="m-pow-dist">


                        <ul class="ul-listpd1" id="recordList">


                            <li>


                            <!-- <li>


                                <div class="con">


                                    <div class="tit">


                                        <div class="t1">


@@ -143,6 +143,7 @@


                                    </div>


                                </div>


                            </li>


                         -->


                        </ul>


                    </div>


                </div>




 igds-app/grain-history.html


@@ -31,7 +31,7 @@


                <div class="wp">


                    <div class="m-search-ene">


                        <div class="mui-input-row mui-search" onclick="chooseDepot();">


                            <input id="depot" type="search" value="0" readonly class="mui-input-clear" placeholder="请选择仓库">


                            <input id="depot" type="search" value="0" readonly  placeholder="请选择仓库">


                        </div>


                        <button type="button" class="mui-btn" onclick="getHistoryList()">查询</button>


                    </div>


@@ -41,7 +41,7 @@


                <div class="m-hist">


                    <div class="m-pow-dist m-sslq">


                        <ul class="ul-listpd1 ul-listslq" id="hisList">


                            <li>


                        <!--    <li>


                                <div class="con">


                                    <div class="tit">检测时间: 暂无检测数据


                                        <a href="" class="more"></a>


@@ -90,7 +90,7 @@


                                    </div>


                                </div>


                            </li>


                            <!-- <li>


                             <li>


                                <div class="con">


                                    <div class="tit">检测时间: 2022-04-15 12:00


                                        <a href="" class="more"></a>




 igds-app/index.html


@@ -6,11 +6,11 @@


            content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />


        <title>首页</title>


        <!-- MUI样式 -->


        <link rel="stylesheet" href="./css/mui.min.css"/>


        <link rel="stylesheet" href="./css/mui.min.css" />


        <!-- 公共css -->


        <link rel="stylesheet" href="./css/admin/public.css"/>


        <link rel="stylesheet" href="./css/admin/public.css" />


        <!-- 页面css -->


        <link rel="stylesheet" href="./css/admin/index.css"/>


        <link rel="stylesheet" href="./css/admin/index.css" />


    </head>


    <body>


        <!-- 侧滑导航根容器 -->


@@ -49,7 +49,7 @@


                            </div>


                        </div>


                        <div class="right" id="deptButton">


                            <button type="button" class="mui-btn choose-btn" >选择库区</button>


                            <button type="button" class="mui-btn choose-btn">选择库区</button>


                        </div>


                    </div>


                    <div class="mui-scroll-wrapper index-box">


@@ -61,13 +61,22 @@


                                </div>


                                <div class="right">


                                    <div class="mui-slider">


                                        <div class="mui-slider-group">


                                            <!--第一个内容区容器-->


                                        <div class="mui-slider-group mui-slider-loop">


                                            <!--支持循环，需要重复的节点-->


                                            <div class="mui-slider-item mui-slider-item-duplicate">


                                                <div class="txt">此处是一条通知公告根据前后差别...</div>


                                            </div>


                                            <div class="mui-slider-item">


                                                <div class="txt">1此处是一条通知公告根据前后差别...</div>


                                            </div>


                                            <div class="mui-slider-item">


                                                <div class="txt">2此处是一条通知公告根据前后差别...</div>


                                            </div>


                                            <div class="mui-slider-item">


                                                <div class="txt">此处是一条通知公告根据前后差别...</div>


                                            </div>


                                            <!--第二个内容区-->


                                            <div class="mui-slider-item">


                                             <!--支持循环，需要重复的节点-->


                                            <div class="mui-slider-item mui-slider-item-duplicate">


                                                <div class="txt">1此处是一条通知公告根据前后差别...</div>


                                            </div>


                                        </div>


@@ -186,21 +195,26 @@


    <script type="text/javascript" charset="utf-8">


        //mui初始化


        mui.init();


		




        mui.plusReady(function() {


            var user = JSON.parse(localStorage.getItem('user'));


            data.tokenAuth = user.tokenAuth;


            url = user.url + "/api-phone/gateway";


			




            $("#cname").html(user.cname);


            if(user.companyId == user.deptId){


            if (user.companyId == user.deptId) {


                data.data.companyId = user.companyId;


                getListDept();


            }else{


            } else {


                $("#deptName").html("所在库区：" + user.deptName);


                $("#deptButton").css('display', 'none');


                localStorage.setItem('selectDeptId', JSON.stringify(user.deptId));


            }


            //获得slider插件对象


            var gallery = mui('.mui-slider');


            gallery.slider({


                interval: 2600, //自动轮播周期，若为0则不自动播放，默认为0；


            });


        })


    </script>


</html>




 igds-app/js/admin/basic-depot.js


@@ -33,6 +33,7 @@


        success: function(result) {


            if (result.code == "0000") {


                depotList = result.data;


                console.log(JSON.stringify(depotList))


                renderDepotList();


            } else {


                mui.alert(result.msg, '提示', ["确定"], function() {}, "div");


@@ -50,7 +51,7 @@


    if(depotList && depotList.length > 0){


        $.each(depotList, function(index, item) {


            html += '<li><div class="con">';


            html += '<div class="tit">仓库名称：<span>' + (item.depotName == null?"--":item.depotName) + '</span></div>';


            html += '<div class="tit">仓库名称：<span>' + (item.name == null?"--":item.name) + '</span></div>';


            html += '<div class="txt">';


            html += '<div class="box"><div class="group type"><div class="desc">';


            html += (item.depotTypeName == null?"--":item.depotTypeName) + '</div><div class="ort">仓库类型</div></div></div>';




 igds-app/js/admin/device-temp.js


@@ -234,14 +234,14 @@


    var html = '';


    if (targetStatus == 'OPEN') {


        document.getElementById("vibrationSwitch").classList.add('mui-active');


        $('.mui-switch-handle').css("-webkit-transform" , "translate3d(16px, 0, 0)");


        $('.mui-switch-handle').css("-webkit-transform", "translate3d(16px, 0, 0)");


        console.log("开")


    } else if (targetStatus == 'CLOSE') {


        document.getElementById("vibrationSwitch").classList.remove('mui-active');


        $('.mui-switch-handle').css("-webkit-transform" , "translate3d(0, 0, 0)");


        $('.mui-switch-handle').css("-webkit-transform", "translate3d(0, 0, 0)");


        console.log("关")


    }


	




    var passCode = this.getAttribute("passCode");


    var serId = this.getAttribute("serId");


    var name = this.getAttribute("name");


@@ -281,6 +281,10 @@


    data.data.targetTemp = targetTemp


    setTemp();


    closePop();


    document.getElementById("range").value = 17


    $('.subbar').css({


        width: ((17 - 9) / 16) * 100 + '%'


    })


});


//关闭弹窗


function closePop() {




 igds-app/js/admin/es-read-meter.js


@@ -150,7 +150,7 @@


            html += '</ul></div></div>';


        })


    } else {


        html += '<div class="m-ck-cont"><div class="g-titck1">暂无信息 <span class="right">更新时间: 2023-01-01 00:00:00</span></div>';


        html += '<div class="m-ck-cont"><div class="g-titck1">暂无信息 <span class="right">更新时间: ' + dateTime + '</span></div>';


        html += '<div class="m-energy2"><ul class="ul-txtliste1"><li><div class="con">';


        html += '<div class="num">0<span> KWh</span></div><div class="desc">有功电能</div></div></li>';


        html += '<li><div class="con"><div class="num">0<span> KWh</span></div>'




 igds-app/js/admin/es-real-electric.js


@@ -1,5 +1,6 @@


var url;


var electricList;


var dateTime;


var data = {


    "interfaceId": "5501",


    "outId": "10501",


@@ -16,7 +17,25 @@


    url = user.url + "/api-phone/v35/gateway";


    data.tokenAuth = user.tokenAuth;


    data.data.deptId = selectDeptId;


    dateTime = getDate(new Date());


    getElectric();


}




//日期格式化yyyy-MM-dd


function getDate(date) {


    var year = date.getFullYear();


    var month, day,hour,minute;


    month = date.getMonth() + 1;


    if (month > 0 && month <= 9) {


        month = "0" + month;


    }


    day = date.getDate()


    if (day > 0 && day <= 9) {


        day = "0" + day


    }


    hour = date.getHours();


    minute = date.getMinutes();


    return year + "-" + month + "-" + day + " "+ hour + ":" + minute


}




function getElectric() {


@@ -138,7 +157,7 @@


        html += '<li><div class="con"><div class="tit"><div class="t1">';


        html += '<span class="bg" style="background-image: url(images/d1.png);"></span>';


        html += '<span>暂无配电数据</span></div></div>';


        html += '<div class="inner"><div class="info">更新时间: <span style="font-size:15px"></span></div>';


        html += '<div class="inner"><div class="info">更新时间: <span style="font-size:15px">' + dateTime + '</span></div>';


        html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">A相电压</div></div>';


        html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">B相电压</div></div>';


        html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">B相电压</div></div>';




 igds-app/js/admin/grain-history.js


@@ -202,7 +202,7 @@


        depotName = items[0].text;




        $("#depot").val(depotName);


        mui.toast(depotId + "-" + dateTime);


        // mui.toast(depotId + "-" + dateTime);


    });


}






 igds-app/js/admin/my.js


@@ -31,6 +31,7 @@


    localStorage.removeItem("user");


    localStorage.removeItem("selectDeptId");


    mui.toast("缓存清除成功!");


    loginOut();


}




//退出登录


@@ -39,10 +40,7 @@


}


//修改信息


function update() {


    mui.openWindow({


        url: "edit.html",


        id: "edit"


    })


    mui.alert("手机端不允许修改信息，请登录PC端修改","提示",["确定"], function() {}, "div")


}




//关于




 igds-app/js/admin/security-patrol.js


@@ -95,7 +95,7 @@


    dtpicker.show(function(e) {


        dateTime = e.value;


        document.getElementById("date").value = e.value


        if(time != dateTime){


        if (time != dateTime) {


            getPatrolList();


        }


    })


@@ -104,7 +104,7 @@


function getPatrolList() {


    //赋值参数的日期


    data.data.dataTime = dateTime;


    console.log(JSON.stringify(data.data),"电子巡更记录","security-patrol")


    console.log(JSON.stringify(data.data), "电子巡更记录", "security-patrol")


    mui.ajax(url, {


        type: "POST",


        dataType: "json",


@@ -160,12 +160,15 @@


            html += '<div class="cards"><div class="cd"><div class="con user">'


            html += '<div class="tit">打卡人</div><div class="txt">' + item.userName + '</div></div></div>';


            html += '<div class="cd"><div class="con loc"><div class="tit">坐标</div>'


            html += '<div class="txt">' + item.longitude + ', ' + item.latitude +


                '</div></div></div></div></div></li>'


            html += '<div class="txt">' + item.longitude + ', ' + item.latitude + '</div></div></div></div></div></li>'


        })


    } else {


        html +=


            '<li><div class="item" style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">暂无巡更信息</div></li>';


        html += '<li><div class="item"><div class="top">'


        html += '<div class="date">暂无巡更记录</div><div class="r-btn" id = "0">查看照片</div></div>';


        html += '<div class="cards"><div class="cd"><div class="con user">'


        html += '<div class="tit">打卡人</div><div class="txt">--</div></div></div>';


        html += '<div class="cd"><div class="con loc"><div class="tit">坐标</div>'


        html += '<div class="txt">0, 0</div></div></div></div></div></li>'


    }


    $("#recordList").html(html)


}


@@ -282,7 +285,8 @@


        data: JSON.stringify(data1),


        success: function(result) {


            if (result.code == "0000") {


                mui.toast(result.msg);


                // mui.toast(result.msg);


                setInterval(getPatrolList(), 500)


            } else {


                mui.toast(result.msg);


            }