Browse Source

加入任务统计页面

master
feng 3 years ago
parent
commit
7169996d78
  1. 6
      客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
  2. 4
      客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
  3. 13
      客户端/齐越慧眼/齐越慧眼/UserControls/InfoControl.xaml
  4. 86
      客户端/齐越慧眼/齐越慧眼/UserControls/InfoControl.xaml.cs
  5. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js
  6. 23
      客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/info/Index.vue
  7. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.css
  8. 1
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.fe8cfd8e.css
  9. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/index.html
  10. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
  11. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
  12. 2
      客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

6
客户端/齐越慧眼/齐越慧眼/MainWindow.xaml

@ -29,6 +29,12 @@
<hc:TabItem Header="浏览器">
<uc:BrowerTabPanelControl x:Name="brower"></uc:BrowerTabPanelControl>
</hc:TabItem>
<hc:TabItem Header="任务统计">
<Grid x:Name="gridInfo">
</Grid>
</hc:TabItem>
</hc:TabControl>
</Border>
</hc:GlowWindow>

4
客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs

@ -74,6 +74,10 @@ namespace 齐越慧眼
UserControls.ItemControl itemControl = new UserControls.ItemControl();
gridItem.Children.Add(itemControl);
UserControls.InfoControl infoControl = new UserControls.InfoControl();
gridInfo.Children.Add(infoControl);
this.Title += $" { ApiHelper.LoginSystemUser.DepartmentName}({ApiHelper.LoginSystemUser.UserName})";
}

13
客户端/齐越慧眼/齐越慧眼/UserControls/InfoControl.xaml

@ -0,0 +1,13 @@
<UserControl x:Class="齐越慧眼.UserControls.InfoControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:齐越慧眼.UserControls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid x:Name="grid" DockPanel.Dock="Bottom">
</Grid>
</UserControl>

86
客户端/齐越慧眼/齐越慧眼/UserControls/InfoControl.xaml.cs

@ -0,0 +1,86 @@
using CefSharp;
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using .cefhelper;
namespace .UserControls
{
/// <summary>
/// InfoControl.xaml 的交互逻辑
/// </summary>
public partial class InfoControl : UserControl
{
ExtChromiumBrowser web;
public InfoControl()
{
InitializeComponent();
web = new ExtChromiumBrowser("nacollector://home/info" )
{
BrowserSettings =
{
DefaultEncoding = "UTF-8",
Plugins= CefState.Enabled,
//关于跨域限制
//WebSecurity = CefState.Disabled
},
};
web.JavascriptObjectRepository.Settings.LegacyBindingEnabled = true;
web.JavascriptObjectRepository.Register("hyCoreModel", new ItemsAsyncJS(), BindingOptions.DefaultBinder);
grid.Children.Add(web);
// web.ExecuteScriptAsyncWhenPageLoaded(@$"localStorage.setItem('user', '{{""token"":""{ApiHelper.JwtToken}""}}');window.getDatas(0);");
web.FrameLoadStart += Web_FrameLoadStart;
web.StartNewWindow += Web_StartNewWindow;
grid.KeyDown += grid_KeyDown;
}
private void Web_StartNewWindow(object sender, NewWindowEventArgs e)
{
// WpfNoticeMsg.NoticeMessage.Show(e.Url);
BrowerHelper.OpenUrl(e.Url);
}
bool isInit = false;
private void grid_KeyDown(object sender, KeyEventArgs e)
{
if (e.Key == Key.F12)
{
web.ShowDevTools();
}
}
private void Web_FrameLoadStart(object sender, FrameLoadStartEventArgs e)
{
if (isInit)
return;
Application.Current.Dispatcher.Invoke(() =>
{
web.WebBrowser.GetDevToolsClient().DOMStorage.SetDOMStorageItemAsync(new CefSharp.DevTools.DOMStorage.StorageId()
{
SecurityOrigin = "nacollector://home",
IsLocalStorage = true
}, "user",
Newtonsoft.Json.JsonConvert.SerializeObject(new { token = ApiHelper.JwtToken })
);
web.ExecuteScriptAsyncWhenPageLoaded(@$"window.getInfoData();");
});
isInit = true;
}
}
}

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

@ -19,7 +19,7 @@ else if (process.env.NODE_ENV == 'production') {
let ipAddress = axios.defaults.baseURL;
axios.defaults.baseURL = 'http://localhost:5000/';
//axios.defaults.baseURL = 'http://localhost:5000/';
//axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
axios.interceptors.request.use((config) => {

23
客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/info/Index.vue

@ -14,6 +14,18 @@
<div style="margin-top:10px">
<a-tag @click="changeDate(item.value)" style="width:73px;text-align: center;" color="#02A7F0" v-for="item in timeTypes" :key="item.value">{{item.name}}</a-tag>
</div>
<div style="margin-top:20px">
<div class="info" v-if="isPriceTaskUser">待审核任务量: {{infoData.AuditCount}}</div>
<div class="info" v-if="!isPriceTaskUser">发布任务量: {{infoData.PublishCount}}</div>
<div class="info">完成任务量: {{infoData.OverCount}}</div>
<div class="info">标准合格量: {{infoData.PassCount}}</div>
<div class="info" v-if="isPriceTaskUser">标准合格率: {{infoData.PassRate}}%</div>
</div>
</a-card>
</template>
@ -33,10 +45,11 @@ export default {
}
},
mounted() {
this.changeDate(0)
if(hyCoreModel){
hyCoreModel.getType().then(type=>{
this.isPriceTaskUser=type
console.log(this.isPriceTaskUser,'this.isPriceTaskUser')
this.getInfoData()
})
}
},
@ -50,9 +63,17 @@ export default {
var start=this.startDate.format('YYYY-MM-DD')
var end=this.endDate.format('YYYY-MM-DD')
this.http.get(`/HuiYan/teamitems/GetMyTaskInfo?type=${this.isPriceTaskUser?1:0}&start=${start}&end=${end}`).then(res=>{
this.infoData=res.Data
console.log(res)
})
}
}
}
</script>
<style>
.info{
margin-top: 10px;
}
</style>

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

File diff suppressed because one or more lines are too long

1
客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.fe8cfd8e.css

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/index.html

@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>client</title><link href="/css/app.030d4c2f.css" rel="preload" as="style"><link href="/css/app.css" rel="preload" as="style"><link href="/css/chunk-vendors.09af4a6b.css" rel="preload" as="style"><link href="/css/chunk-vendors.css" rel="preload" as="style"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/css/chunk-vendors.09af4a6b.css" rel="stylesheet"><link href="/css/chunk-vendors.css" rel="stylesheet"><link href="/css/app.030d4c2f.css" rel="stylesheet"><link href="/css/app.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/app.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>client</title><link href="/css/app.css" rel="preload" as="style"><link href="/css/app.fe8cfd8e.css" rel="preload" as="style"><link href="/css/chunk-vendors.09af4a6b.css" rel="preload" as="style"><link href="/css/chunk-vendors.css" rel="preload" as="style"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/css/chunk-vendors.09af4a6b.css" rel="stylesheet"><link href="/css/chunk-vendors.css" rel="stylesheet"><link href="/css/app.fe8cfd8e.css" rel="stylesheet"><link href="/css/app.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/app.js"></script></body></html>

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

2
客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

@ -46,6 +46,7 @@
<None Remove="vuepage\dist\css\app.030d4c2f.css" />
<None Remove="vuepage\dist\css\app.b0aefef5.css" />
<None Remove="vuepage\dist\css\app.css" />
<None Remove="vuepage\dist\css\app.fe8cfd8e.css" />
<None Remove="vuepage\dist\css\chunk-vendors.09af4a6b.css" />
<None Remove="vuepage\dist\css\chunk-vendors.css" />
<None Remove="vuepage\dist\img\close.png" />
@ -82,6 +83,7 @@
</EmbeddedResource>
<EmbeddedResource Include="vuepage\dist\css\app.030d4c2f.css" />
<EmbeddedResource Include="vuepage\dist\css\app.css" />
<EmbeddedResource Include="vuepage\dist\css\app.fe8cfd8e.css" />
<EmbeddedResource Include="vuepage\dist\css\chunk-vendors.09af4a6b.css" />
<EmbeddedResource Include="vuepage\dist\css\chunk-vendors.css" />
<EmbeddedResource Include="vuepage\dist\img\close.png">

Loading…
Cancel
Save