From cdf962818d154302906fbaf0e5cf7f934a8e8a4a Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期二, 09 十二月 2025 15:16:29 +0800
Subject: [PATCH] 增加工控报工代码
---
BaoGong/js/fjLogin.js | 7 +++++--
BaoGong/Scripts/config.js | 2 +-
BaoGong/fjByPrd.aspx | 12 ++++++------
BaoGong/fjDefault.aspx | 2 +-
Web.config | 5 +++++
App_Code/Utility.cs | 7 ++++++-
6 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/App_Code/Utility.cs b/App_Code/Utility.cs
index 4d19bcd..716b0e7 100644
--- a/App_Code/Utility.cs
+++ b/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>
diff --git a/BaoGong/Scripts/config.js b/BaoGong/Scripts/config.js
index 3b7488e..0f023fd 100644
--- a/BaoGong/Scripts/config.js
+++ b/BaoGong/Scripts/config.js
@@ -1,4 +1,4 @@
-锘縱ar APIURL = "http://192.168.1.92:81/";
+锘縱ar 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 () {
diff --git a/BaoGong/fjByPrd.aspx b/BaoGong/fjByPrd.aspx
index 6c3ab54..7607665 100644
--- a/BaoGong/fjByPrd.aspx
+++ b/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>
\ No newline at end of file
diff --git a/BaoGong/fjDefault.aspx b/BaoGong/fjDefault.aspx
index 6997222..d954e29 100644
--- a/BaoGong/fjDefault.aspx
+++ b/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>
diff --git a/BaoGong/js/fjLogin.js b/BaoGong/js/fjLogin.js
index 5555b43..c00ccfc 100644
--- a/BaoGong/js/fjLogin.js
+++ b/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);
diff --git a/Web.config b/Web.config
index ae88e2d..fe7ae2a 100644
--- a/Web.config
+++ b/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銆�
--
Gitblit v1.9.3