Skip to content

F
FTT_Board
Commit fde2bf54 authored by zhangboyang's avatar zhangboyang
Browse files
Options

优化

parent f24d55d3
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 210 deletions
FTT.Board.VueUI/package-lock.json
View file @ fde2bf54
......@@ -3488,12 +3488,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -3508,17 +3510,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -3635,7 +3640,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -3647,6 +3653,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -3661,6 +3668,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -3668,12 +3676,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -3692,6 +3702,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -3772,7 +3783,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -3784,6 +3796,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -3905,6 +3918,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......
FTT.Board.VueUI/src/views/board/boardlist/detail.vue
View file @ fde2bf54
......@@ -25,7 +25,7 @@
<el-dialog
:title="getDialogTitle()"
:visible.sync="dialogVisible"
width="60%"
width="35%"
:before-close="handleClose"
>
<div>
......@@ -38,99 +38,120 @@
label-width="100px"
class="demo-ruleForm"
>
<el-form-item label="看板ID">
<span style="color:red">{{ruleForm.BoardID}}</span>
</el-form-item>
<el-form-item label="是否显示">
<el-switch v-model="ruleForm.IsShow"></el-switch>
</el-form-item>
<el-form-item label="是否显示时间">
<el-switch v-model="ruleForm.IsTimeShow"></el-switch>
</el-form-item>
<el-form-item label="背景色">
<el-input v-model="ruleForm.BackgroundColor">
<template slot="append">
<el-color-picker size="mini" v-model="ruleForm.BackgroundColor"></el-color-picker>
</template>
</el-input>
</el-form-item>
<el-form-item label="字号1颜色">
<el-input v-model="ruleForm.FontColor1">
<template slot="append">
<el-color-picker size="mini" v-model="ruleForm.FontColor1"></el-color-picker>
</template>
</el-input>
</el-form-item>
<el-form-item label="字号2颜色">
<el-input v-model="ruleForm.FontColor2">
<template slot="append">
<el-color-picker size="mini" v-model="ruleForm.FontColor2"></el-color-picker>
</template>
</el-input>
</el-form-item>
<el-form-item label="高度">
<el-input-number v-model="ruleForm.Height" :min="0" :precision="1" :step="1"></el-input-number>
</el-form-item>
<el-form-item label="宽度">
<el-input-number v-model="ruleForm.Width" :min="0" :precision="1" :step="1"></el-input-number>
</el-form-item>
<el-form-item label="字号1大小">
<el-input-number v-model="ruleForm.FontSize1" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="字号2大小">
<el-input-number v-model="ruleForm.FontSize2" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="刷新频率">
<el-input-number v-model="ruleForm.RefreshTime" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="区域" prop="PositionIndex">
<el-select v-model="ruleForm.PositionIndex" placeholder="请选择区域">
<el-option key="0" label="区域0" value="0"></el-option>
<el-option
v-for="item in getPositions()"
:key="item"
:label="'区域'+item"
:value="item"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="容器类型" prop="ChartType">
<el-select v-model="ruleForm.ChartType" placeholder="请选择容器类型">
<el-option
v-for="item in comboxstore.ChartTypeCombox"
:key="item.ID"
:label="item.Text"
:value="item.ID"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="刷新类别">
<el-select v-model="ruleForm.RefreshType" placeholder="请选择容器刷新类别">
<el-option
v-for="item in comboxstore.RefreshTypeCombox"
:key="item.ID"
:label="item.Text"
:value="item.ID"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="WorkTeamID" prop="WorkTeamID">
<el-input type="number" v-model="ruleForm.WorkTeamID"></el-input>
</el-form-item>
<el-form-item label="Flag" prop="Flag">
<el-input type="number" v-model="ruleForm.Flag"></el-input>
</el-form-item>
<el-form-item label="PageSize" prop="PageSize">
<el-input type="number" v-model="ruleForm.PageSize"></el-input>
</el-form-item>
<el-form-item label="PageIndex">
<el-input type="number" v-model="ruleForm.PageIndex"></el-input>
</el-form-item>
<el-row>
<el-form-item label="看板ID">
<span style="color:red">{{ruleForm.BoardID}}</span>
</el-form-item>
<el-form-item label="容器类型" prop="ChartType">
<el-select v-model="ruleForm.ChartType" placeholder="请选择容器类型">
<el-popover width="160" placement="right-end" trigger="hover" v-for="item in comboxstore.ChartTypeCombox" :key="item.ID">
<p>这是一段内容这是一段内容确定删除吗？{{item.ID}}</p>
<el-option
:key="item.ID"
:label="item.Text"
:value="item.ID"
slot="reference"
></el-option>
</el-popover>
</el-select>
</el-form-item>
<el-form-item label="是否显示">
<el-switch v-model="ruleForm.IsShow"></el-switch>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="区域" prop="PositionIndex">
<el-select v-model="ruleForm.PositionIndex" placeholder="请选择区域">
<el-option
key="0"
label="区域0"
value="0"
v-if="ruleForm.ChartType==1||ruleForm.ChartType==2"
></el-option>
<el-option
v-else
v-for="item in getPositions()"
:key="item"
:label="'区域'+item"
:value="item"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否显示时间" v-if="ruleForm.ChartType==1">
<el-switch v-model="ruleForm.IsTimeShow"></el-switch>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="背景色">
<el-input v-model="ruleForm.BackgroundColor">
<template slot="append">
<el-color-picker size="mini" v-model="ruleForm.BackgroundColor"></el-color-picker>
</template>
</el-input>
</el-form-item>
<el-form-item label="刷新频率">
<el-input-number v-model="ruleForm.RefreshTime" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="刷新类别" v-if="ruleForm.ChartType==5">
<el-select v-model="ruleForm.RefreshType" placeholder="请选择容器刷新类别">
<el-option
v-for="item in comboxstore.RefreshTypeCombox"
:key="item.ID"
:label="item.Text"
:value="item.ID"
></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="字号1颜色">
<el-input v-model="ruleForm.FontColor1">
<template slot="append">
<el-color-picker size="mini" v-model="ruleForm.FontColor1"></el-color-picker>
</template>
</el-input>
</el-form-item>
<el-form-item label="字号1大小">
<el-input-number v-model="ruleForm.FontSize1" :min="0"></el-input-number>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="字号2颜色">
<el-input v-model="ruleForm.FontColor2">
<template slot="append">
<el-color-picker size="mini" v-model="ruleForm.FontColor2"></el-color-picker>
</template>
</el-input>
</el-form-item>
<el-form-item label="字号2大小">
<el-input-number v-model="ruleForm.FontSize2" :min="0"></el-input-number>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="高度">
<el-input-number v-model="ruleForm.Height" :min="0" :precision="1" :step="1"></el-input-number>
</el-form-item>
<el-form-item label="宽度">
<el-input-number v-model="ruleForm.Width" :min="0" :precision="1" :step="1"></el-input-number>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="WorkTeamID" prop="WorkTeamID">
<el-input type="number" v-model="ruleForm.WorkTeamID"></el-input>
</el-form-item>
<el-form-item label="Flag" prop="Flag">
<el-input type="number" v-model="ruleForm.Flag"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="PageSize" prop="PageSize">
<el-input type="number" v-model="ruleForm.PageSize"></el-input>
</el-form-item>
<el-form-item label="PageIndex">
<el-input type="number" v-model="ruleForm.PageIndex"></el-input>
</el-form-item>
</el-row>
<el-form-item style="display: list-item;text-align: center;">
<el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
<el-button @click="resetForm('ruleForm')">重置</el-button>
......@@ -161,8 +182,8 @@ export default {
comboxstore: comBox,
columns: [
{ value: "ID", label: "ID", width: 50 },
{ value: "BoardCode", label: "看板编码", },
{ value: "BoardName", label: "看板名称", },
{ value: "BoardCode", label: "看板编码" },
{ value: "BoardName", label: "看板名称" },
{
value: "LayoutID",
label: "布局",
......@@ -180,10 +201,10 @@ export default {
label: "区域",
width: 70,
formatter: val => {
return '区域'+val.PositionIndex;
return "区域" + val.PositionIndex;
}
},
{
value: "IsShow",
label: "是否显示",
......@@ -214,9 +235,9 @@ export default {
},
{ value: "BackgroundColor", label: "背景色" },
{ value: "FontColor1", label: "1号字体颜色" },
{ value: "FontSize1", label: "1号字体大小" , width: 50},
{ value: "FontSize1", label: "1号字体大小", width: 50 },
{ value: "FontColor2", label: "2号字体颜色" },
{ value: "FontSize2", label: "2号字体大小" , width: 50},
{ value: "FontSize2", label: "2号字体大小", width: 50 },
{ value: "RefreshTime", label: "刷新频率", width: 50 },
{
......@@ -241,10 +262,10 @@ export default {
return text;
}
},
{ value: "WorkTeamID", label: "WorkTeamID" , width: 50},
{ value: "WorkTeamID", label: "WorkTeamID", width: 50 },
{ value: "Flag", label: "Flag", width: 50 },
{ value: "PageSize", label: "PageSize" , width: 50},
{ value: "PageIndex", label: "PageIndex" , width: 50}
{ value: "PageSize", label: "PageSize", width: 50 },
{ value: "PageIndex", label: "PageIndex", width: 50 }
],
DataList: [],
......@@ -279,14 +300,13 @@ export default {
Flag: "",
PageSize: "",
PageIndex: "",
PositionIndex: "",
PositionIndex: ""
},
rules: {
PositionIndex: [
{ required: true, message: "请选择位置", trigger: "blur" }
],
WorkTeamID: [
{ required: true, message: "请输入WorkTeamID", trigger: "blur" }
],
......@@ -303,9 +323,7 @@ export default {
Loading: false
};
},
watch:{
},
watch: {},
methods: {
getDialogTitle() {
var name = "";
......@@ -451,7 +469,7 @@ export default {
}).then(res => {
if (res.success) {
me.totalCount = res.total;
me.DataList = res.rows;
me.DataList = res.rows;
}
me.Loading = false;
});
......@@ -477,8 +495,7 @@ export default {
Flag: "",
PageSize: "",
PageIndex: "",
PositionIndex: "",
PositionIndex: ""
};
},
getPositions() {
......
FTT.Board.VueUI/src/views/chart/Table1.vue
View file @ fde2bf54
......@@ -136,6 +136,7 @@ export default {
}).then(res => {
if (res.success) {
var titlename = new Array();
for (var name in res.rows[0]) {
if (name.indexOf("_") > 0) {
var arr = name.split("_");
......
FTT.Board.VueUI/src/views/chart/foot.vue
View file @ fde2bf54
......@@ -4,7 +4,12 @@
class="footerclass"
:style="{backgroundColor: boardstore.FooterBackgroundColor,fontSize:boardstore.FooterFontSize+'px'}"
>
<marquee :style="{lineHeight:boardstore.FotterHeight+'px'}" scrollamount="5" direction="left" class="footerclass">
<marquee
:style="{lineHeight:boardstore.FotterHeight+'px'}"
scrollamount="5"
direction="left"
class="footerclass"
>
<font
:color="(chart.FontColor1!=null)?(chart.FontColor1):'red'"
:style="{fontSize:chart.FontSize1!=0?chart.FontSize1: '40px'}"
......@@ -59,8 +64,12 @@ export default {
},
methods: {
loadData() {
if (!this.chart.IsShow) {
return;
}
var me = this;
var url = me.Api.url;
var url = me.Api.url;
var data = {
ProcName: me.boardstore.ProcName,
PageSize: me.chart.PageSize,
......@@ -89,7 +98,7 @@ export default {
}
},
created() {
this.loadData();
this.loadData();
}
};
</script>
......
FTT.Board.VueUI/src/views/chart/head.vue
View file @ fde2bf54
......@@ -46,8 +46,12 @@ export default {
return moment(new Date()).format("YYYY-MM-DD HH:mm:ss");
},
loadData() {
if (!this.chart.IsShow) {
return;
}
var me = this;
var url = me.Api.url;
var data = {
ProcName: me.boardstore.ProcName,
PageSize: me.chart.PageSize,
......@@ -71,7 +75,7 @@ export default {
var title = res.rows[0];
this.text = title.Title || title;
} else {
console.log(res.message);
console.log(res.message);
}
});
}
......
FTT.Board/.vs/config/applicationhost.config
View file @ fde2bf54
......@@ -165,7 +165,7 @@
<virtualDirectory path="/" physicalPath="C:\Users\Administrator\Documents\My Web Sites\FTT.Board-Site1" />
</application>
<application path="/FTT.Board" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\GIT\FTT.Board\FTT.Board\FTT.Board.Api" />
<virtualDirectory path="/" physicalPath="D:\git\FTT_Board\FTT.Board\FTT.Board.Api" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:80:localhost" />
......
FTT.Board/FTT.Board.Api/Controllers/API/CFG/CFG_BoardController.cs
View file @ fde2bf54
......@@ -24,14 +24,7 @@ namespace FTT.Board.Controllers.API.CFG
using (var db = MsSqlDbContextWraper.NewContext())
{
int rowid = db.Insert("CFG_Board", entity)
.Column("BoardCode", entity.BoardCode)
.Column("BackgroundColor", entity.BackgroundColor)
.Column("BoardName", entity.BoardName)
.Column("ConnectionString", entity.ConnectionString)
.Column("LayoutID", entity.LayoutID)
.Column("PageRefreshTime", entity.PageRefreshTime)
.Column("ProcName", entity.ProcName)
.Column("RefreshTime", entity.RefreshTime)
.AutoMap(x => x.ID, x => x.CFG_BoardDetail)
.Execute();
}
......@@ -52,19 +45,9 @@ namespace FTT.Board.Controllers.API.CFG
using (var db = MsSqlDbContextWraper.NewContext())
{
int rowid = db.Update("CFG_Board", entity)
//.Column("BoardCode", entity.BoardCode)
//.Column("BackgroundColor", entity.BackgroundColor)
//.Column("BoardName", entity.BoardName)
//.Column("ConnectionString", entity.ConnectionString)
//.Column("LayoutID", entity.LayoutID)
//.Column("PageRefreshTime", entity.PageRefreshTime)
//.Column("ProcName", entity.ProcName)
//.Column("RefreshTime", entity.RefreshTime)
.AutoMap(x=>x.ID,x=>x.CFG_BoardDetail)
.Where("ID", entity.ID)
.Execute();
// db.Update("CFG_Board", entity).AutoMap(x => x.ID).Where(x => x.ID).Execute();
}
return jh.Result();
}
......@@ -73,17 +56,8 @@ namespace FTT.Board.Controllers.API.CFG
var jh = new ReturnInfo();
using (var db = MsSqlDbContextWraper.NewContext())
{
//int rowid = db.Insert("CFG_Board", entity).Execute();
int rowid = db.Insert("CFG_Board", entity)
.Column("BoardCode", entity.BoardCode)
.Column("BackgroundColor", entity.BackgroundColor)
.Column("BoardName", entity.BoardName)
.Column("ConnectionString", entity.ConnectionString)
.Column("LayoutID", entity.LayoutID)
.Column("PageRefreshTime", entity.PageRefreshTime)
.Column("ProcName", entity.ProcName)
.Column("RefreshTime", entity.RefreshTime)
.AutoMap(x => x.ID, x => x.CFG_BoardDetail)
.Execute();
}
......
FTT.Board/FTT.Board.Api/Controllers/API/CFG/CFG_BoardDetailController.cs
View file @ fde2bf54
......@@ -28,26 +28,9 @@ namespace FTT.Board.Controllers.API.CFG
var jh = new ReturnInfo();
using (var db = MsSqlDbContextWraper.NewContext())
{
int rowid = db.Insert("CFG_BoardDetail", entity)
.Column("BackgroundColor", entity.BackgroundColor)
.Column("BoardID", entity.BoardID)
.Column("ChartType", entity.ChartType)
.Column("Flag", entity.Flag)
.Column("FontColor1", entity.FontColor1)
.Column("FontColor2", entity.FontColor2)
.Column("FontSize1", entity.FontSize1)
.Column("FontSize2", entity.FontSize2)
.Column("Height", entity.Height)
.Column("IsShow", entity.IsShow)
.Column("IsTimeShow", entity.IsTimeShow)
.Column("PageIndex", entity.PageIndex)
.Column("PageSize", entity.PageSize)
.Column("PositionIndex", entity.PositionIndex)
.Column("RefreshTime", entity.RefreshTime)
.Column("RefreshType", entity.RefreshType)
.Column("Width", entity.Width)
.Column("WorkTeamID", entity.WorkTeamID)
.AutoMap(x => x.ID)
.Execute();
}
return jh.Result();
......@@ -57,7 +40,7 @@ namespace FTT.Board.Controllers.API.CFG
var jh = new ReturnInfo();
using (var db = MsSqlDbContextWraper.NewContext())
{
int rowid = db.Delete("CFG_BoardDetail", entity).Where("ID",entity.ID).Execute();
int rowid = db.Delete("CFG_BoardDetail", entity).Where("ID", entity.ID).Execute();
}
return jh.Result();
}
......@@ -67,24 +50,7 @@ namespace FTT.Board.Controllers.API.CFG
using (var db = MsSqlDbContextWraper.NewContext())
{
int rowid = db.Update("CFG_BoardDetail", entity)
.Column("BackgroundColor", entity.BackgroundColor)
.Column("BoardID", entity.BoardID)
.Column("ChartType", entity.ChartType)
.Column("Flag", entity.Flag)
.Column("FontColor1", entity.FontColor1)
.Column("FontColor2", entity.FontColor2)
.Column("FontSize1", entity.FontSize1)
.Column("FontSize2", entity.FontSize2)
.Column("Height", entity.Height)
.Column("IsShow", entity.IsShow)
.Column("IsTimeShow", entity.IsTimeShow)
.Column("PageIndex", entity.PageIndex)
.Column("PageSize", entity.PageSize)
.Column("PositionIndex", entity.PositionIndex)
.Column("RefreshTime", entity.RefreshTime)
.Column("RefreshType", entity.RefreshType)
.Column("Width", entity.Width)
.Column("WorkTeamID", entity.WorkTeamID)
.AutoMap(x => x.ID)
.Where("ID", entity.ID)
.Execute();
}
......@@ -95,26 +61,8 @@ namespace FTT.Board.Controllers.API.CFG
var jh = new ReturnInfo();
using (var db = MsSqlDbContextWraper.NewContext())
{
//var index = entity.ChartType != ChartTypeEnums.Header && entity.ChartType != ChartTypeEnums.Footer ? entity.PositionIndex++ : 0;
int rowid = db.Insert("CFG_BoardDetail", entity)
.Column("BackgroundColor", entity.BackgroundColor)
.Column("BoardID", entity.BoardID)
.Column("ChartType", entity.ChartType)
.Column("Flag", entity.Flag)
.Column("FontColor1", entity.FontColor1)
.Column("FontColor2", entity.FontColor2)
.Column("FontSize1", entity.FontSize1)
.Column("FontSize2", entity.FontSize2)
.Column("Height", entity.Height)
.Column("IsShow", entity.IsShow)
.Column("IsTimeShow", entity.IsTimeShow)
.Column("PageIndex", entity.PageIndex)
.Column("PageSize", entity.PageSize)
.Column("PositionIndex", entity.PositionIndex)
.Column("RefreshTime", entity.RefreshTime)
.Column("RefreshType", entity.RefreshType)
.Column("Width", entity.Width)
.Column("WorkTeamID", entity.WorkTeamID)
.AutoMap(x => x.ID)
.Execute();
}
return jh.Result();
......
FTT.Board/FTT.Board.Api/Controllers/ChartController.cs
View file @ fde2bf54
......@@ -25,7 +25,10 @@ namespace FTT.Board.Controllers
jh._rows.Add(getString(dto));
break;
case EF.Enums.ChartTypeEnums.TableGrid:
jh._rows.Add(getTable(dto));
foreach (var item in getTable(dto))
{
jh._rows.Add(item);
}
break;
case EF.Enums.ChartTypeEnums.Panle1:
case EF.Enums.ChartTypeEnums.Panle2:
......
FTT.Board/FTT.Board.Api/FTT.Board.csproj.user
View file @ fde2bf54
......@@ -18,7 +18,7 @@
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment