Browse Source

增加默认跳转任务池

master
feng 3 years ago
parent
commit
9da54071c9
  1. 4
      客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
  2. 7
      客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs
  3. 4
      客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js
  4. 7
      客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
  5. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
  6. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map

4
客户端/齐越慧眼/齐越慧眼/ApiHelper.cs

@ -12,8 +12,8 @@ namespace 齐越慧眼
{ {
public class ApiHelper public class ApiHelper
{ {
//public static string ApiBase { get; set; } = "http://localhost:5000"; public static string ApiBase { get; set; } = "http://111.230.132.27:8033";
public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; // public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";
public static UserInfo LoginSystemUser { get; set; } public static UserInfo LoginSystemUser { get; set; }

7
客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs

@ -83,7 +83,14 @@ namespace 齐越慧眼.UserControls
Newtonsoft.Json.JsonConvert.SerializeObject(new { token= ApiHelper.JwtToken }) Newtonsoft.Json.JsonConvert.SerializeObject(new { token= ApiHelper.JwtToken })
); );
if (App.IsPriceTaskUser)
{
web.ExecuteScriptAsyncWhenPageLoaded(@$"window.getDatas(4);");
}
else
{
web.ExecuteScriptAsyncWhenPageLoaded(@$"window.getDatas(0);"); web.ExecuteScriptAsyncWhenPageLoaded(@$"window.getDatas(0);");
}
}); });
isInit = true; isInit = true;
} }

4
客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js

@ -11,7 +11,7 @@ let $httpVue = null, currentToken = '';
if (process.env.NODE_ENV == 'development') { if (process.env.NODE_ENV == 'development') {
axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA' currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA'
// currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY4MzM0NDg3Nn0.6AsD6DK9Or05w8HPhjb9tQY8RJAT4zo4ouH9sasl_Rk' currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY4MzM0NDg3Nn0.6AsD6DK9Or05w8HPhjb9tQY8RJAT4zo4ouH9sasl_Rk'
} }
else if (process.env.NODE_ENV == 'production') { else if (process.env.NODE_ENV == 'production') {
axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
@ -19,8 +19,8 @@ else if (process.env.NODE_ENV == 'production') {
let ipAddress = axios.defaults.baseURL; let ipAddress = axios.defaults.baseURL;
//axios.defaults.baseURL = 'http://localhost:5000/';
axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
axios.defaults.baseURL = 'http://111.230.132.27:8033/';
axios.interceptors.request.use((config) => { axios.interceptors.request.use((config) => {
//axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken(); //axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken();

7
客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue

@ -434,6 +434,7 @@
<a-button <a-button
v-if="currentTab==4" v-if="currentTab==4"
style="margin-left: 10px" style="margin-left: 10px"
:loading="isPushing"
type="primary" type="primary"
@click="acceptTask(item.Id)" @click="acceptTask(item.Id)"
>加入待比价 >加入待比价
@ -524,6 +525,7 @@ export default {
data() { data() {
return { return {
datas: [], datas: [],
isPushing:false,
pagination: { pagination: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
@ -551,7 +553,7 @@ export default {
}, },
mounted() { mounted() {
window.getDatas = this.getDatas; window.getDatas = this.getDatas;
this.getDatas(0); this.getDatas(4);
this.getTabCount(); this.getTabCount();
}, },
activated() { activated() {
@ -746,6 +748,7 @@ export default {
} }
}, },
acceptTask(teamItemId){ acceptTask(teamItemId){
this.isPushing=true
this.http.post(`/HuiYan/pricetasklog/AcceptTask?teamItemId=${teamItemId}`).then((res) => { this.http.post(`/HuiYan/pricetasklog/AcceptTask?teamItemId=${teamItemId}`).then((res) => {
if (res.Success) { if (res.Success) {
this.$message.success("操作成功!"); this.$message.success("操作成功!");
@ -754,6 +757,8 @@ export default {
this.$message.error(res.Msg); this.$message.error(res.Msg);
this.getDatas(this.currentTab); this.getDatas(this.currentTab);
} }
this.isPushing=false
}); });
}, },
sendPriceTask(id) { sendPriceTask(id) {

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save