From 033ef98f861148ffbff692a39ad0825f1e320326 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 07 二月 2025 10:09:13 +0800
Subject: [PATCH] 1.来料检验 重新加载项目 初步 1
---
Scripts/config.js | 13 ++++++++++---
H5/Js/LLJ/Add.js | 20 ++++++++++++++++++++
Mst.master | 2 +-
H5/LLJ/Add.aspx | 4 ++--
4 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/H5/Js/LLJ/Add.js b/H5/Js/LLJ/Add.js
index 193e949..a67c2d0 100644
--- a/H5/Js/LLJ/Add.js
+++ b/H5/Js/LLJ/Add.js
@@ -108,6 +108,26 @@
},
removeXJ() {
+ var that = this;
+
+ that.ttrre = true;
+
+ that.AxiosHttp("post", 'MesQaItemsDetect01Manager/ReloadModel5', {
+ guid: "158f4324-955e-4a3b-aafa-09babf3c3368"
+ }, true, 1).then(function (res1) {
+ if (res1.status == 1) {
+ that.$toast.fail(res1.message);
+ } else {
+ that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
+ that.init();
+ }
+ that.ttrre = false
+ }).catch(function (error) {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.ttrre = false
+ console.log(error);
+ });
+
},
GetBack1() {
window.history.back();
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index 8a02caf..1855fce 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -35,7 +35,7 @@
</van-cell-group>
</div>
<van-button :loading="ttrre" type="info" loading-text="鍔犺浇涓�..." v-if="!isShowTable && formData.fsubmit == 0" @click="submit">妫�楠屾彁浜�</van-button>
-<%-- <van-button type="danger" v-if="!formData.fcheckResu && !isShowTable" @click="removeXJ">鍒犻櫎鍗曟嵁</van-button>--%>
+ <van-button type="danger" v-if="!formData.fcheckResu && !isShowTable" @click="removeXJ">閲嶆柊鍔犺浇椤圭洰</van-button>
<van-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;">
<van-tab title="妫�楠岄」鐩�" class="mySolid font">
<van-row type="flex" justify="center">
@@ -74,5 +74,5 @@
<comback ></comback>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/Add.js?<%=1124 %>"></script>
+ <script src="../Js/LLJ/Add.js?<%=1124321 %>"></script>
</asp:Content>
diff --git a/Mst.master b/Mst.master
index 29f80cb..5897c9b 100644
--- a/Mst.master
+++ b/Mst.master
@@ -11,7 +11,7 @@
<script src="/Scripts/vue.min.js"></script>
<script src="/Scripts/js.cookie.min.js"></script>
<script src="/scripts/axios0.25.0.js"></script>
- <script src="/scripts/config.js?<%=345 %>"></script>
+ <script src="/scripts/config.js?<%=3475 %>"></script>
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
<link href="/Images/Style.css?<%=1 %>" rel="stylesheet" />
diff --git a/Scripts/config.js b/Scripts/config.js
index b1dbf79..0d1d932 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -71,12 +71,19 @@
* @param锛歿string} params 璇锋眰鍙傛暟,闈炲繀濉�
* @param锛歿string} variation 璇锋眰澶�,闈炲繀濉�
**/
-Vue.prototype.AxiosHttp = (method, url, params = {}, isToken = true) => {
- url = (APIURL + url);
+Vue.prototype.AxiosHttp = (method, url, params = {}, isToken = true, isPC =0) => {
+ if (isPC == 0)
+ {
+ url = (APIURL + url);
+ }
+ else{
+ url = (APIURL_PC + url);
+ }
let headers = { 'Content-Type': 'application/json', }
if (isToken) {
var timestamp = (new Date()).getTime();
- var token = "BasicAuth " + timestamp + "_" + Cookies.get('loginGuid');
+ /*var token = "BasicAuth " + timestamp + "_" + Cookies.get('loginGuid');*/
+ var token = "token " + "aa649c62-a6ec-4b75-a97d-b0966485104c~969adcd4-457f-43db-9faf-5fb03ed95765";
headers['Authorization'] = token;
}
if (method == 'get') {
--
Gitblit v1.9.3