增加工控报工代码

cnf

7 天以前 cdf962818d154302906fbaf0e5cf7f934a8e8a4a

增加工控报工代码

 App_Code/Utility.cs

@@ -41,7 +41,12 @@
            m.loginRightList = HttpUtility.UrlDecode(cookies.Values["loginRightList".ToUpper()]);
            return m;
        }
        

        public static string GetJsVersion()
        {
            return System.Configuration.ConfigurationManager.AppSettings["webVersion"].ToString();
        }

        /// <summary>
        /// http get 读取数据
        /// </summary>

 BaoGong/Scripts/config.js

@@ -1,4 +1,4 @@
var APIURL = "http://192.168.1.92:81/";
var APIURL = "http://192.168.1.187:81/";
/*var APIURL = "http://localhost:5263/";*/
//http://192.168.1.145:81/swagger/index.html
String.prototype.trim = function () {

 BaoGong/fjByPrd.aspx

@@ -41,9 +41,9 @@
    <div id="app"  v-cloak>
        <div ref="searchForm" id="searchForm">
         <van-nav-bar
          title="装配车间：1号注塑机"
          :title="fjInfor.title"
          left-text="返回"
          right-text="更多操作"
           :right-text="fjInfor.guid.length<=0?'':'更多操作'"
          left-arrow
           @click-left="onClickLeft"
           @click-right="showAction = true"
@@ -78,12 +78,12 @@
                 <tr>
                    <td><span class="font-remark">已入库数：</span>{{fjInfor.yrks}}</td>
                    <td><span class="font-remark">剩余数量：</span>{{fjInfor.sysl}}</td>
                    <td><span class="font-remark">巡检情况：</span> <van-tag :type="fjInfor.xj*1==1?'success':'danger'" round >{{fjInfor.xj*1==1?'合格':'未检'}}</van-tag></td>
                    <td><span class="font-remark">巡检情况：</span><van-tag :type="fjInfor.xj*1==1?'success':'danger'" round >{{fjInfor.xj*1==1?'合格':'未检'}}</van-tag></td>
                </tr>
                 <tr>
                <td><span class="font-remark">可打印数：</span>{{fjInfor.kdysl}}</td>
                 <td><span class="font-remark">已打数量：</span>{{fjInfor.ydsl}}</td>
                 <td><span class="font-remark">齐套标识：</span> <van-tag :type="fjInfor.qt*1==1?'success':'danger'" round >{{fjInfor.qt*1==1?'已齐套':'未齐套'}}</van-tag></td>
                 <td><span class="font-remark">齐套标识：</span><van-tag :type="fjInfor.qt*1==1?'success':'danger'" round >{{fjInfor.qt*1==1?'已齐套':'未齐套'}}</van-tag></td>
             </tr>
              <tr>
                  <td colspan="3">
@@ -111,7 +111,7 @@
                </van-field>
                </van-col>
            <van-col span="12">
              <van-button round block type="info" native-type="submit"  style="margin-top:5px;" >确定打码报工</van-button>
              <van-button round block type="info" native-type="submit"  style="margin-top:5px;">确定打码报工</van-button>
              <van-button  round block type="danger"  style="margin-top:5px;"  color="linear-gradient(to right, #ff6034, #ee0a24)">距离下一次报工时间还有20秒，如果你想紧急报工，请点击切换账号</van-button>
             </van-col>
            </van-row>
@@ -188,6 +188,6 @@
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" runat="server">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" runat="server">
    <script src="/Scripts/element-resize-detector.min.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
    <script src="/BaoGong/Scripts/element-resize-detector.min.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
    <script src="js/fjByPrd.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
</asp:Content>

 BaoGong/fjDefault.aspx

@@ -25,6 +25,6 @@
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" runat="Server">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" runat="Server">
   <script src="/Scripts/element-resize-detector.min.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
   <script src="/BaoGong/Scripts/element-resize-detector.min.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
   <script src="/BaoGong/js/fjDefault.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
</asp:Content>

 BaoGong/js/fjLogin.js

@@ -28,6 +28,11 @@
        },
        _userLogin() {
            var that = this;
            var cjId = that.Request("cjId");
            if (cjId.length<= 0) {
                that.$toast.fail("请先选择车间");
                return;
            }
            that.isLoading = true;
            that.AxiosHttp("post", 'User/UserLogin', {
                accountNo: that.formCustom.phone,
@@ -38,9 +43,7 @@
                    var json = res;
                    if (json.rtnCode * 1 > 0) {
                        Cookies.set('loginGuid', json.rtnData.loginGuid);
                        var cjId = "100100";
                        window.location.href = ("/BaoGong/fjDefault.aspx?math=" + Math.random() + "&cjId=" + cjId);
                        //  window.location.href = ("/BaoGong/fjDefault.aspx?math=" + Math.random() + "&cjId=" + that.Request("cjId"));
                    }
                    else {
                        that.$toast.fail(json.rtnMsg);

 Web.config

@@ -4,6 +4,11 @@
  http://go.microsoft.com/fwlink/?LinkId=169433
  -->
<configuration>
   <appSettings>
	
    <add key="webTitle" value="龙巍环境科技有限公司 | 报工系统"/>
    <add key="webVersion" value="516"/>
</appSettings>
  <!--
    有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。