Skip to content

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

1

parent 61b62c94
Hide whitespace changes
Inline Side-by-side
Showing with 587 additions and 204 deletions
FTT.Board.VueUI/src/config/comboxstore.js
View file @ 197665bf
...@@ -51,6 +51,6 @@ export default { ...@@ -51,6 +51,6 @@ export default {
RefreshTypeCombox: [ RefreshTypeCombox: [
{ ID: 1, Text: "换页" }, { ID: 1, Text: "换页" },
{ ID: 2, Text: "换行" }, { ID: 2, Text: "换行" },
{ ID: 3, Text: "滚动" }, // { ID: 3, Text: "滚动" },
] ]
} }
\ No newline at end of file
FTT.Board.VueUI/src/views/board/boardlist/index.vue
View file @ 197665bf
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
:Loading="Loading" :Loading="Loading"
:OperationShow="true" :OperationShow="true"
> >
<!-- <el-button :slot-scope="data">{{data}}</el-button> --> <!-- <el-button :slot-scope="data">{{data}}</el-button> -->
</page-table> </page-table>
<detail <detail
v-if="entrance" v-if="entrance"
...@@ -58,6 +58,13 @@ ...@@ -58,6 +58,13 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="边框颜色" prop="BorderColor">
<el-input v-model="ruleForm.BorderColor">
<template slot="append">
<el-color-picker size="mini" v-model="ruleForm.BorderColor"></el-color-picker>
</template>
</el-input>
</el-form-item>
<el-form-item label="刷新频率" prop="RefreshTime"> <el-form-item label="刷新频率" prop="RefreshTime">
<el-input-number v-model="ruleForm.RefreshTime"></el-input-number> <el-input-number v-model="ruleForm.RefreshTime"></el-input-number>
</el-form-item> </el-form-item>
...@@ -75,17 +82,14 @@ ...@@ -75,17 +82,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="翻页时间" label="翻页时间"
:rules="[ { required: true, message: '请输入看板翻页时间', trigger: 'blur' },]" :rules="[ { required: true, message: '请输入看板翻页时间', trigger: 'blur' },]"
> >
<el-input-number :min="1" v-model="ruleForm.PageRefreshTime"></el-input-number> <el-input-number :min="1" v-model="ruleForm.PageRefreshTime"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="连接字符串" style="display: list-item;text-align: left;">
label="连接字符串"
style="display: list-item;text-align: left;"
>
<!-- <el-input v-model="ruleForm.ConnectionString"></el-input> --> <!-- <el-input v-model="ruleForm.ConnectionString"></el-input> -->
<el-input <el-input
class="textareaclass" class="textareaclass"
...@@ -102,8 +106,6 @@ ...@@ -102,8 +106,6 @@
</el-form> </el-form>
</div> </div>
</el-dialog> </el-dialog>
</el-card> </el-card>
</div> </div>
</template> </template>
...@@ -124,6 +126,7 @@ export default { ...@@ -124,6 +126,7 @@ export default {
{ value: "BoardCode", label: "物料编码" }, { value: "BoardCode", label: "物料编码" },
{ value: "BoardName", label: "物料名称" }, { value: "BoardName", label: "物料名称" },
{ value: "BackgroundColor", label: "背景色" }, { value: "BackgroundColor", label: "背景色" },
{ value: "BorderColor", label: "边框颜色" },
{ value: "RefreshTime", label: "刷新时间", width: 50 }, { value: "RefreshTime", label: "刷新时间", width: 50 },
{ value: "ProcName", label: "存储过程名称" }, { value: "ProcName", label: "存储过程名称" },
{ {
...@@ -131,13 +134,18 @@ export default { ...@@ -131,13 +134,18 @@ export default {
label: "布局ID", label: "布局ID",
formatter: val => { formatter: val => {
return ( return (
this.comboxstore.LayoutComBox.GetFirstElement("ID", val.LayoutID).Text || val.LayoutID this.comboxstore.LayoutComBox.GetFirstElement("ID", val.LayoutID)
.Text || val.LayoutID
); );
} }
}, },
{ value: "PageRefreshTime", label: "翻页时间", width: 50 }, { value: "PageRefreshTime", label: "翻页时间", width: 50 },
{ value: "ConnectionString", label: "连接字符串",show_overflow_tooltip:true, } {
value: "ConnectionString",
label: "连接字符串",
show_overflow_tooltip: true
}
], ],
DataList: [], DataList: [],
totalCount: 0, totalCount: 0,
...@@ -160,8 +168,9 @@ export default { ...@@ -160,8 +168,9 @@ export default {
ProcName: "", ProcName: "",
ConnectionString: "", ConnectionString: "",
RefreshTime: "5", RefreshTime: "5",
PageRefreshTime:0, PageRefreshTime: 0,
LayoutID: "" LayoutID: "",
BorderColor: ""
}, },
rules: { rules: {
BackgroundColor: [ BackgroundColor: [
...@@ -190,9 +199,7 @@ export default { ...@@ -190,9 +199,7 @@ export default {
Loading: false Loading: false
}; };
}, },
watch: { watch: {},
},
methods: { methods: {
backMasterClick() { backMasterClick() {
this.entrance = false; this.entrance = false;
...@@ -349,13 +356,13 @@ export default { ...@@ -349,13 +356,13 @@ export default {
ConnectionString: "", ConnectionString: "",
RefreshTime: "5", RefreshTime: "5",
PageRefreshTime: 0, PageRefreshTime: 0,
LayoutID: "" LayoutID: "",BorderColor:"",
}; };
}, },
PreviewClick(index, row) { PreviewClick(index, row) {
this.$router.push({ this.$router.push({
name: "board", name: "board",
query: { BoardID: row.ID} query: { BoardID: row.ID, PageIndex: 0 }
}); });
} }
}, },
......
FTT.Board.VueUI/src/views/board/index.vue
View file @ 197665bf
...@@ -10,40 +10,52 @@ ...@@ -10,40 +10,52 @@
:style="setHeadOrFoot('head')" :style="setHeadOrFoot('head')"
v-if="GetChartStore('head')!=null" v-if="GetChartStore('head')!=null"
> >
<com-head :boardstore="ruleForm" :chart="GetChartStore('head')" :Api="Api.charapi"></com-head> <com-head :boardstore="ruleForm" :chart="GetChartStore('head')" :Api="Api.charapi"></com-head>
</el-header> </el-header>
<el-main style="padding: 0"> <el-main style="padding: 0">
<el-carousel <el-carousel
indicator-position="none" indicator-position="none"
:interval="ruleForm.PageRefreshTime*1000"
style="height:100%;width:100%" style="height:100%;width:100%"
class="carouselclass"
:autoplay="false"
arrow="never"
ref="carousel"
:initial-index='pageindex==0?0:pageindex-1'
> >
<el-carousel-item v-for="(item,index) in GetLayout()" :key="index"> <template>
<template v-if="item.length>0"> <el-carousel-item
<div v-for="(item,index) in GetLayout().TagData"
v-for="(rows,index1) in item" :key="index"
:key="rows+'row'" class="test"
:style="{height:getRowHeight(item,index1)+'%'}" :name="'page'+index"
>
<template v-if="item.length>0"> >
<template v-for="(column,index2) in rows"> <template v-if="item.length>0">
<div <div
:key="index2+'column'" v-for="(rows,index1) in item"
class="columndiv" :key="rows+'row'"
:style="{width:getChartWidth(GetChartStore(column),rows),height:100+'%'}" :style="{height:getRowHeight(item,index1)+'%'}"
> >
<component <template v-if="item.length>0">
v-bind:is="GetChart(column)" <template v-for="(column,index2) in rows">
:boardstore="ruleForm" <div
:chart="GetChartStore(column)" :key="index2+'column'"
:Api="Api.charapi" class="columndiv"
></component> :style="{width:getChartWidth(GetChartStore(column),rows),height:100+'%',borderColor:ruleForm.BorderColor==null?'red':ruleForm.BorderColor}"
</div> >
<component
v-bind:is="GetChart(column)"
:boardstore="ruleForm"
:chart="GetChartStore(column)"
:Api="Api.charapi"
></component>
</div>
</template>
</template> </template>
</template> </div>
</div> </template>
</template> </el-carousel-item>
</el-carousel-item> </template>
</el-carousel> </el-carousel>
</el-main> </el-main>
<el-footer <el-footer
...@@ -51,7 +63,7 @@ ...@@ -51,7 +63,7 @@
:style="setHeadOrFoot('foot')" :style="setHeadOrFoot('foot')"
v-if="GetChartStore('foot')!=null" v-if="GetChartStore('foot')!=null"
> >
<com-foot :boardstore="ruleForm" :chart="GetChartStore('foot')" :Api="Api.charapi"></com-foot> <com-foot :boardstore="ruleForm" :chart="GetChartStore('foot')" :Api="Api.charapi"></com-foot>
</el-footer> </el-footer>
</el-container> </el-container>
</div> </div>
...@@ -84,20 +96,52 @@ export default { ...@@ -84,20 +96,52 @@ export default {
}, },
loading: false, loading: false,
comboxstore: comBox, comboxstore: comBox,
ruleForm: null ruleForm: null,
timer1: null,
pageindex: 0
}; };
}, },
watch: {
"ruleForm.PageRefreshTime": function(val, oldval) {
if (this.pageindex >0) {
// this._goIndex(this.pageindex);
return;
}
if (val != 0) {
if (val != oldval && oldval != null) {
clearInterval(this.timer1);
this.timer1 == null;
this._nexPage(val);
} else {
if (this.timer1 == null) {
this._nexPage(val);
}
}
}
}
},
mounted() {
var id = this.$route.query.BoardID;
var me = this; //声明一个变量指向vue实例this,保证作用域一致
this.timer = setInterval(function() {
me.Load(id); //修改数据date
}, 3000);
// this.$nextTick(() => {
// setInterval(() => {
// console.log("下一页");
// me.setActiveItem("page1");
// }, me.time);
// });
},
methods: { methods: {
Load(id) { Load(id) {
var me = this; var me = this;
me.loading = true;
Axios({ Axios({
method: "get", method: "get",
url: me.Api.get.url, url: me.Api.get.url,
params: { MID: id } params: { MID: id }
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
me.loading = false;
me.ruleForm = res.rows[0]; me.ruleForm = res.rows[0];
} else { } else {
me.$message.error(res.message); me.$message.error(res.message);
...@@ -110,8 +154,7 @@ export default { ...@@ -110,8 +154,7 @@ export default {
"ID", "ID",
this.ruleForm.LayoutID this.ruleForm.LayoutID
); );
console.log(layout.Text); return layout;
return layout.TagData;
}, },
GetChartStore(item) { GetChartStore(item) {
var chart = null; var chart = null;
...@@ -167,7 +210,7 @@ export default { ...@@ -167,7 +210,7 @@ export default {
"PositionIndex", "PositionIndex",
cloumn cloumn
); );
if (cha != null) { if (cha != null) {
countwidth += cha.Width; countwidth += cha.Width;
if (cha.Width == 0) { if (cha.Width == 0) {
...@@ -194,7 +237,12 @@ export default { ...@@ -194,7 +237,12 @@ export default {
"PositionIndex", "PositionIndex",
element element
); );
if (cha != null && cha.Height != 0 && cha.Height > maxheight&& cha.IsShow) { if (
cha != null &&
cha.Height != 0 &&
cha.Height > maxheight &&
cha.IsShow
) {
maxheight = cha.Height; maxheight = cha.Height;
} }
} }
...@@ -217,22 +265,50 @@ export default { ...@@ -217,22 +265,50 @@ export default {
} else { } else {
return heightavg; return heightavg;
} }
},
_nexPage(nexPagetime) {
console.log("下一页")
var me = this;
if (this.ruleForm != null) {
this.timer1 = setInterval(() => {
me.$refs.carousel.next();
}, nexPagetime * 1000);
}
},
// _goIndex(index) {
// var me = this;
// this.$nextTick(() => {
// let pagename = "page" + (index - 1);
// debugger;
// // me.$refs.carousel.setActiveItem("page1");
// // me.$refs.carousel.next();
// me.$refs.carousel.activeIndex=index;
// });
// }
},
beforeDestroy() {
if (this.timer) {
clearInterval(this.timer); //在vue实例销毁钱，清除我们的定时器
}
if (this.timer1) {
clearInterval(this.timer1); //在vue实例销毁钱，清除我们的定时器
} }
}, },
created() { created() {
var boardid = this.$route.query.BoardID; var boardid = this.$route.query.BoardID;
this.pageindex = this.$route.query.PageIndex;
this.Load(boardid); this.Load(boardid);
} }
}; };
</script> </script>
<style> <style>
.el-carousel__container { .carouselclass div {
width: 100%;
height: 100%; height: 100%;
width: 100%;
} }
.columndiv { .columndiv {
box-sizing: border-box; box-sizing: border-box;
border: 1px red solid; border: 1px solid;
float: left; float: left;
} }
</style> </style>
......
FTT.Board.VueUI/src/views/chart/Table12.vue 0 → 100644
View file @ 197665bf
<template>
<div
style="height:100%;font-size:30px"
:style="{color:chart.FontColor,background:chart.BackgroundColor}"
>
<div style="height:100%">
<div style="width:100%;height:5%">
<ul>
<li>
<template v-for="(item,index) in titlestore">
<span
class="seamspan"
:key="index"
:style="{color:item.Color,width:item.Width+'%'}"
>{{item.Key}}</span>
</template>
</li>
</ul>
</div>
<template v-if="chart.RefreshType==1">
<div>
<ul class="item">
<li v-for="(item,index) in bodystore" :key="index" :style="{color:getfontcolor(item)}">
<template v-for="(obj,index1) in item">
<span
:key="index1"
class="seamspan"
:style="{width:getwidth(obj)+'%'}"
v-if="obj.Key.indexOf('_')>0"
>{{obj.Value}}</span>
</template>
</li>
</ul>
</div>
</template>
<template v-else>
<vue-seamless-scroll :data="bodystore" class="seamless-warp" :class-option="optionset" @ScrollEnd="ScrollEnd">
<ul class="item">
<li v-for="(item,index) in bodystore" :key="index" :style="{color:getfontcolor(item)}">
<template v-for="(obj,index1) in item">
<span
:key="index1"
class="seamspan"
:style="{width:getwidth(obj)+'%'}"
v-if="obj.Key.indexOf('_')>0"
>{{obj.Value}}</span>
</template>
</li>
</ul>
</vue-seamless-scroll>
</template>
</div>
</div>
</template>
<script>
import Axios from "@/function/axios.js";
import qs from "qs";
export default {
name: "charttable1",
data() {
return {
store: null,
titlestore: [],
bodystore: [],
marqueewidth: 0,
pageindex: 1,
timer: null
};
},
props: ["boardstore", "chart", "Api"],
computed: {
optionset() {
//文字滚动https://chenxuan0000.github.io/component-document/index_prod.html#/component/seamless-default
if (this.chart) {
if (this.chart.RefreshType == 2) {
//换行
return {
singleHeight: 47,//单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
hoverStop: false,//是否启用鼠标hover控制
waitTime: 2500,//单步停止等待时间(默认值1000ms)
limitMoveNum: 1,//
openWatch: false,
openTouch: false//移动端开启touch滑动
};
} else if (this.chart.RefreshType == 3) {
//滚动
return {
step: 3,//数值越大速度滚动越快
hoverStop: false,//是否启用鼠标hover控制
limitMoveNum: 1,
openWatch: false,
openTouch: false//移动端开启touch滑动
};
}
}
// return {
// hoverStop: false,
// singleHeight: 47
// };
}
},
mounted() {
var tdodywidth = document.getElementById("tdodywidth");
if (tdodywidth) {
this.marqueewidth = tdodywidth.offsetWidth;
}
var time =
(this.chart.RefreshTime != 0
? this.chart.RefreshTime
: this.boardstore.RefreshTime) * 1000;
var _this = this; //声明一个变量指向vue实例this,保证作用域一致
this.timer = setInterval(function() {
_this.loadData(1, 2);
}, time);
},
methods: {
loadData() {
var me = this;
if (!this.chart.IsShow) {
return;
}
var url = me.Api.url;
var data = {
ProcName: me.boardstore.ProcName,
PageSize: me.chart.PageSize,
PageIndex: me.pageindex,
Flag: me.chart.Flag,
WorkTeamID: me.chart.WorkTeamID,
CharTypeID: me.chart.ChartType,
ConnStr: me.boardstore.ConnectionString
};
Axios({
method: "post",
url: url,
transformRequest: [
function(data) {
return qs.stringify(data);
}
],
data: data
}).then(res => {
if (res.success) {
var titlename = new Array();
for (var name in res.rows[0]) {
if (name.indexOf("_") > 0) {
var arr = name.split("_");
var titleobj = { Key: arr[0], Width: arr[1], Color: "red" };
titlename.push(titleobj);
} else {
for (var item in titlename) {
if (name.indexOf("_Color") == 0) {
titlename[item].Color = name.split("_")[2];
}
}
}
}
me.titlestore = titlename;
var data = me.changedata(res.rows);
// me.bodystore = res.rows;
if (res.rows.length < me.chart.PageSize) {
me.pageindex = 1;
me.bodystore = data;
} else {
me.pageindex++;
if (this.chart.RefreshType == 1) {
me.bodystore = data;
} else {
let arr1 = [];
me.bodystore.forEach(item => {
arr1.push(item);
});
for (let index = 0; index < data.length; index++) {
const element = data[index];
arr1.push(element);
}
me.bodystore = arr1;
}
}
} else {
console.log(res.message);
}
});
},
changedata(data) {
var arr = [];
if (data.length == 0) return arr;
data.forEach(elem => {
var itemarr = [];
for (var item in elem) {
var obj = new Object();
obj.Key = item;
obj.Value = elem[item];
itemarr.push(obj);
}
arr.push(itemarr);
});
return arr;
},
getfontcolor(data) {
var color = "red";
data.forEach(item => {
if (item.Key.indexOf("_Color") >= 0) {
color = item.Value;
}
});
return color;
},
getwidth(obj) {
for (let index = 0; index < this.titlestore.length; index++) {
const element = this.titlestore[index];
if (obj.Key.indexOf(element.Key) >= 0) {
return element.Width;
}
}
},
ScrollEnd(item){
console.log("滚动完毕")
console.log(item);
}
},
beforeDestroy() {
if (this.timer) {
clearInterval(this.timer); //在vue实例销毁钱，清除我们的定时器
}
},
created() {
this.loadData();
}
};
</script>
<style >
.seamless-warp {
height: 95%;
overflow: hidden;
}
li {
width: 100%;
}
.seamspan {
text-align: center;
/* border:1px solid blue; */
width: 200px;
display: inline-block;
/* 不换行 */
word-break: keep-all;
/* 不换行 */
white-space: nowrap;
/* 内容超出宽度时隐藏超出部分的内容 */
overflow: hidden;
/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/
text-overflow: ellipsis;
}
@keyframes rowup {
0% {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
100% {
-webkit-transform: translate3d(0, -307px, 0);
transform: translate3d(0, -307px, 0);
}
}
.rollBox {
-webkit-animation: 10s rowup linear infinite normal;
animation: 10s rowup linear infinite normal;
position: relative;
}
.el-carousel__container button {
display: none;
}
/* .seamless-warp {
width: 100%;
overflow: hidden;
color: red;
} */
</style>
FTT.Board.VueUI/src/views/chart/foot.vue
View file @ 197665bf
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
> >
<font <font
:color="(chart.FontColor1!=null)?(chart.FontColor1):'red'" :color="(chart.FontColor1!=null)?(chart.FontColor1):'red'"
:style="{fontSize:chart.FontSize1!=0?chart.FontSize1: '40px'}" :style="{fontSize:chart.FontSize1!=0?chart.FontSize1+'px': '40px'}"
>{{text}}</font> >{{text}}</font>
</marquee> </marquee>
</div> </div>
......
FTT.Board.VueUI/src/views/chart/head.vue
View file @ 197665bf
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<div class="headerclass" :style="{background:chart.BackgroundColor}"> <div class="headerclass" :style="{background:chart.BackgroundColor}">
<font <font
:color="(chart.FontColor1!=null)?(chart.FontColor1):'red'" :color="(chart.FontColor1!=null)?(chart.FontColor1):'red'"
:style="{fontSize:chart.FontSize1!=0?chart.FontSize1: '35px'}" :style="{fontSize:chart.FontSize1!=0?chart.FontSize1+'px': '35px'}"
> >
<span>{{text}}</span>&nbsp;&nbsp;&nbsp; <span>{{text}}</span>&nbsp;&nbsp;&nbsp;
<span v-if="chart.IsTimeShow">{{ date }}</span> <span v-if="chart.IsTimeShow" :style="{fontSize:chart.FontSize2!=0?chart.FontSize2+'px': '35px',color:chart.FontColor2!=null?chart.FontColor2: 'red'}">{{ date }}</span>
</font> </font>
</div> </div>
</template> </template>
......
FTT.Board.VueUI/src/views/home/index.vue
View file @ 197665bf
...@@ -10,16 +10,19 @@ ...@@ -10,16 +10,19 @@
<router-view></router-view> <router-view></router-view>
</el-main> </el-main>
<!-- <el-footer>Footer</el-footer> --> <!-- <el-footer>Footer</el-footer> -->
<!-- <test-table></test-table> -->
</el-container> </el-container>
</el-container> </el-container>
</div> </div>
</template> </template>
<script> <script>
import MenuTree from "./menutree.vue" import MenuTree from "./menutree.vue"
// import testTable from "@/views/chart/testTable.vue"
export default { export default {
name:"home", name:"home",
components:{ components:{
MenuTree, MenuTree,
// testTable
}, },
}; };
</script> </script>
......
FTT.Board.VueUI/src/views/home/menutree.vue
View file @ 197665bf
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<span>{{child.text}}</span> <span>{{child.text}}</span>
</el-menu-item> </el-menu-item>
</el-menu-item-group> </el-menu-item-group>
<!-- <el-menu-item-group>
<span slot="title">分组一</span>
<el-menu-item index="1-1">选项1</el-menu-item>
<el-menu-item index="1-2">选项2</el-menu-item>
</el-menu-item-group>-->
</el-submenu> </el-submenu>
</el-menu> </el-menu>
</div> </div>
...@@ -51,11 +46,11 @@ export default { ...@@ -51,11 +46,11 @@ export default {
name: "boardlist", name: "boardlist",
path: "boardlist" path: "boardlist"
}, },
{ // {
text: "看板", // text: "看板",
name: "board", // name: "board",
path: "board" // path: "board"
}, // },
] ]
} }
] ]
......
FTT.Board/FTT.Board.Api/Controllers/API/CFG/CFG_BoardController.cs
View file @ 197665bf
...@@ -45,7 +45,7 @@ namespace FTT.Board.Controllers.API.CFG ...@@ -45,7 +45,7 @@ namespace FTT.Board.Controllers.API.CFG
using (var db = MsSqlDbContextWraper.NewContext()) using (var db = MsSqlDbContextWraper.NewContext())
{ {
int rowid = db.Update("CFG_Board", entity) int rowid = db.Update("CFG_Board", entity)
.AutoMap(x=>x.ID,x=>x.CFG_BoardDetail) .AutoMap(x => x.ID, x => x.CFG_BoardDetail)
.Where("ID", entity.ID) .Where("ID", entity.ID)
.Execute(); .Execute();
} }
...@@ -56,10 +56,18 @@ namespace FTT.Board.Controllers.API.CFG ...@@ -56,10 +56,18 @@ namespace FTT.Board.Controllers.API.CFG
var jh = new ReturnInfo(); var jh = new ReturnInfo();
using (var db = MsSqlDbContextWraper.NewContext()) using (var db = MsSqlDbContextWraper.NewContext())
{ {
int rowid = db.Insert("CFG_Board", entity) var boarddetial = db.Sql("select * from CFG_BoardDetail where boardid=@boardid").Parameter("boardid", entity.ID).QueryMany<CFG_BoardDetail>();
db.UseTransaction(true);
var id = db.Insert("CFG_Board", entity)
.AutoMap(x => x.ID, x => x.CFG_BoardDetail) .AutoMap(x => x.ID, x => x.CFG_BoardDetail)
.Execute(); .ExecuteReturnLastId<int>();
foreach (var item in boarddetial)
{
item.BoardID = id;
var detialid = db.Insert("CFG_BoardDetail", item)
.AutoMap(x => x.ID).ExecuteReturnLastId<int>();
}
db.Commit();
} }
return jh.Result(); return jh.Result();
} }
......
FTT.Board/FTT.Board.Api/Properties/PublishProfiles/FolderProfile.pubxml.user
View file @ 197665bf
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<publishTime>04/17/2019 16:25:52</publishTime> <publishTime>04/17/2019 16:25:52</publishTime>
</File> </File>
<File Include="bin/FTT.Board.dll"> <File Include="bin/FTT.Board.dll">
<publishTime>04/23/2019 12:36:16</publishTime> <publishTime>04/24/2019 14:59:04</publishTime>
</File> </File>
<File Include="bin/FTT.Board.EF.dll"> <File Include="bin/FTT.Board.EF.dll">
<publishTime>04/23/2019 12:36:14</publishTime> <publishTime>04/23/2019 12:36:14</publishTime>
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
<publishTime>04/23/2019 09:29:27</publishTime> <publishTime>04/23/2019 09:29:27</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>04/23/2019 12:36:17</publishTime> <publishTime>04/24/2019 14:59:04</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
FTT.Board/Ftt.Board.EF/BoardModel.Designer.cs
View file @ 197665bf
// 为模型“C:\Users\Administrator\Desktop\Board\FTT.Board\Ftt.Board.EF\BoardModel.edmx”启用了 T4 代码生成。 // 为模型“D:\git\FTT_Board\FTT.Board\Ftt.Board.EF\BoardModel.edmx”启用了 T4 代码生成。
// 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值
// 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在
// “属性”窗口中。 // “属性”窗口中。
......
FTT.Board/Ftt.Board.EF/BoardModel.edmx
View file @ 197665bf
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<Property Name="RefreshTime" Type="int" Nullable="false" /> <Property Name="RefreshTime" Type="int" Nullable="false" />
<Property Name="PageRefreshTime" Type="int" Nullable="true" /> <Property Name="PageRefreshTime" Type="int" Nullable="true" />
<Property Name="LayoutID" Type="int" Nullable="false" /> <Property Name="LayoutID" Type="int" Nullable="false" />
<Property Name="BorderColor" Type="nvarchar(max)" Nullable="true" />
</EntityType> </EntityType>
<EntityType Name="CFG_BoardDetail"> <EntityType Name="CFG_BoardDetail">
<Key> <Key>
...@@ -119,6 +120,11 @@ ...@@ -119,6 +120,11 @@
</Property> </Property>
<Property Name="LayoutID" Type="Int32" Nullable="false" /> <Property Name="LayoutID" Type="Int32" Nullable="false" />
<NavigationProperty Name="CFG_BoardDetail" Relationship="BoardModel.CFG_BoardCFG_BoardDetail" FromRole="CFG_Board" ToRole="CFG_BoardDetail" /> <NavigationProperty Name="CFG_BoardDetail" Relationship="BoardModel.CFG_BoardCFG_BoardDetail" FromRole="CFG_Board" ToRole="CFG_BoardDetail" />
<Property Name="BorderColor" Type="String" Nullable="true" >
<Documentation>
<Summary>边框颜色</Summary>
</Documentation>
</Property>
</EntityType> </EntityType>
<EnumType Name="BoardTypeEnums" cg:ExternalTypeName="FTT.Board.EF.Enums.BoardTypeEnums" /> <EnumType Name="BoardTypeEnums" cg:ExternalTypeName="FTT.Board.EF.Enums.BoardTypeEnums" />
<EntityType Name="CFG_BoardDetail"> <EntityType Name="CFG_BoardDetail">
...@@ -231,6 +237,7 @@ ...@@ -231,6 +237,7 @@
<ScalarProperty Name="RefreshTime" ColumnName="RefreshTime" /> <ScalarProperty Name="RefreshTime" ColumnName="RefreshTime" />
<ScalarProperty Name="PageRefreshTime" ColumnName="PageRefreshTime" /> <ScalarProperty Name="PageRefreshTime" ColumnName="PageRefreshTime" />
<ScalarProperty Name="LayoutID" ColumnName="LayoutID" /> <ScalarProperty Name="LayoutID" ColumnName="LayoutID" />
<ScalarProperty Name="BorderColor" ColumnName="BorderColor" />
</MappingFragment> </MappingFragment>
</EntityTypeMapping> </EntityTypeMapping>
</EntitySetMapping> </EntitySetMapping>
......
FTT.Board/Ftt.Board.EF/BoardModel.edmx.sql
View file @ 197665bf
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
-- -------------------------------------------------- -- --------------------------------------------------
-- Entity Designer DDL Script for SQL Server 2005, 2008, 2012 and Azure -- Entity Designer DDL Script for SQL Server 2005, 2008, 2012 and Azure
-- -------------------------------------------------- -- --------------------------------------------------
-- Date Created: 04/22/2019 17:30:23 -- Date Created: 04/24/2019 15:46:56
-- Generated from EDMX file: C:\Users\Administrator\Desktop\Board\FTT.Board\Ftt.Board.EF\BoardModel.edmx -- Generated from EDMX file: D:\git\FTT_Board\FTT.Board\Ftt.Board.EF\BoardModel.edmx
-- -------------------------------------------------- -- --------------------------------------------------
SET QUOTED_IDENTIFIER OFF; SET QUOTED_IDENTIFIER OFF;
...@@ -46,7 +46,8 @@ CREATE TABLE [dbo].[CFG_Board] ( ...@@ -46,7 +46,8 @@ CREATE TABLE [dbo].[CFG_Board] (
[ConnectionString] nvarchar(max) NULL, [ConnectionString] nvarchar(max) NULL,
[RefreshTime] int NOT NULL, [RefreshTime] int NOT NULL,
[PageRefreshTime] int NULL, [PageRefreshTime] int NULL,
[LayoutID] int NOT NULL [LayoutID] int NOT NULL,
[BorderColor] nvarchar(max) NULL
); );
GO GO
......
FTT.Board/Ftt.Board.EF/BoardModel.tt
View file @ 197665bf
...@@ -87,7 +87,7 @@ using System.Runtime.Serialization; ...@@ -87,7 +87,7 @@ using System.Runtime.Serialization;
summary=""; summary="";
} }
#> #>
/// <summary> /// <summary>
/// <#=summary#> /// <#=summary#>
/// </summary> /// </summary>
[DataMember] [DataMember]
......
FTT.Board/Ftt.Board.EF/CFG_Board.cs
View file @ 197665bf
...@@ -13,11 +13,11 @@ namespace FTT.Board.EF ...@@ -13,11 +13,11 @@ namespace FTT.Board.EF
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
/// <summary> /// <summary>
/// CFG_Board /// CFG_Board
/// </summary> /// </summary>
[Serializable] [Serializable]
[DataContract] [DataContract]
public partial class CFG_Board public partial class CFG_Board
{ {
public CFG_Board() public CFG_Board()
...@@ -25,51 +25,56 @@ namespace FTT.Board.EF ...@@ -25,51 +25,56 @@ namespace FTT.Board.EF
this.CFG_BoardDetail = new HashSet<CFG_BoardDetail>(); this.CFG_BoardDetail = new HashSet<CFG_BoardDetail>();
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember] [DataMember]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// 看板背景色 /// 看板背景色
/// </summary> /// </summary>
[DataMember] [DataMember]
public string BackgroundColor { get; set; } public string BackgroundColor { get; set; }
/// <summary> /// <summary>
/// 看板编码 /// 看板编码
/// </summary> /// </summary>
[DataMember] [DataMember]
public string BoardCode { get; set; } public string BoardCode { get; set; }
/// <summary> /// <summary>
/// 看板名称 /// 看板名称
/// </summary> /// </summary>
[DataMember] [DataMember]
public string BoardName { get; set; } public string BoardName { get; set; }
/// <summary> /// <summary>
/// 存储过程名称 /// 存储过程名称
/// </summary> /// </summary>
[DataMember] [DataMember]
public string ProcName { get; set; } public string ProcName { get; set; }
/// <summary> /// <summary>
/// 数据库连接字符串 /// 数据库连接字符串
/// </summary> /// </summary>
[DataMember] [DataMember]
public string ConnectionString { get; set; } public string ConnectionString { get; set; }
/// <summary> /// <summary>
/// 刷新频率(秒) /// 刷新频率(秒)
/// </summary> /// </summary>
[DataMember] [DataMember]
public int RefreshTime { get; set; } public int RefreshTime { get; set; }
/// <summary> /// <summary>
/// 看板翻页时间 /// 看板翻页时间
/// </summary> /// </summary>
[DataMember] [DataMember]
public Nullable<int> PageRefreshTime { get; set; } public Nullable<int> PageRefreshTime { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember] [DataMember]
public int LayoutID { get; set; } public int LayoutID { get; set; }
/// <summary>
/// 边框颜色
/// </summary>
[DataMember]
public string BorderColor { get; set; }
public virtual ICollection<CFG_BoardDetail> CFG_BoardDetail { get; set; } public virtual ICollection<CFG_BoardDetail> CFG_BoardDetail { get; set; }
} }
......
FTT.Board/Ftt.Board.EF/CFG_BoardDetail.cs
View file @ 197665bf
...@@ -13,107 +13,107 @@ namespace FTT.Board.EF ...@@ -13,107 +13,107 @@ namespace FTT.Board.EF
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
/// <summary> /// <summary>
/// CFG_BoardDetail /// CFG_BoardDetail
/// </summary> /// </summary>
[Serializable] [Serializable]
[DataContract] [DataContract]
public partial class CFG_BoardDetail public partial class CFG_BoardDetail
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember] [DataMember]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember] [DataMember]
public int BoardID { get; set; } public int BoardID { get; set; }
/// <summary> /// <summary>
/// 高度（百分比） /// 高度（百分比）
/// </summary> /// </summary>
[DataMember] [DataMember]
public decimal Height { get; set; } public decimal Height { get; set; }
/// <summary> /// <summary>
/// 宽度（百分比） /// 宽度（百分比）
/// </summary> /// </summary>
[DataMember] [DataMember]
public decimal Width { get; set; } public decimal Width { get; set; }
/// <summary> /// <summary>
/// 背景色 /// 背景色
/// </summary> /// </summary>
[DataMember] [DataMember]
public string BackgroundColor { get; set; } public string BackgroundColor { get; set; }
/// <summary> /// <summary>
/// 字体1颜色 /// 字体1颜色
/// </summary> /// </summary>
[DataMember] [DataMember]
public string FontColor1 { get; set; } public string FontColor1 { get; set; }
/// <summary> /// <summary>
/// 字体1大小 /// 字体1大小
/// </summary> /// </summary>
[DataMember] [DataMember]
public Nullable<int> FontSize1 { get; set; } public Nullable<int> FontSize1 { get; set; }
/// <summary> /// <summary>
/// 字体二颜色 /// 字体二颜色
/// </summary> /// </summary>
[DataMember] [DataMember]
public string FontColor2 { get; set; } public string FontColor2 { get; set; }
/// <summary> /// <summary>
/// 字体2大小 /// 字体2大小
/// </summary> /// </summary>
[DataMember] [DataMember]
public Nullable<int> FontSize2 { get; set; } public Nullable<int> FontSize2 { get; set; }
/// <summary> /// <summary>
/// 是否显示 /// 是否显示
/// </summary> /// </summary>
[DataMember] [DataMember]
public bool IsShow { get; set; } public bool IsShow { get; set; }
/// <summary> /// <summary>
/// 是否显示时间 /// 是否显示时间
/// </summary> /// </summary>
[DataMember] [DataMember]
public Nullable<bool> IsTimeShow { get; set; } public Nullable<bool> IsTimeShow { get; set; }
/// <summary> /// <summary>
/// 1头2低3panle4table /// 1头2低3panle4table
/// </summary> /// </summary>
[DataMember] [DataMember]
public FTT.Board.EF.Enums.ChartTypeEnums ChartType { get; set; } public FTT.Board.EF.Enums.ChartTypeEnums ChartType { get; set; }
/// <summary> /// <summary>
/// 刷新频率 /// 刷新频率
/// </summary> /// </summary>
[DataMember] [DataMember]
public int RefreshTime { get; set; } public int RefreshTime { get; set; }
/// <summary> /// <summary>
/// 数据刷新类型 /// 数据刷新类型
/// </summary> /// </summary>
[DataMember] [DataMember]
public Nullable<FTT.Board.EF.Enums.RefreshTypeEnums> RefreshType { get; set; } public Nullable<FTT.Board.EF.Enums.RefreshTypeEnums> RefreshType { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember] [DataMember]
public int WorkTeamID { get; set; } public int WorkTeamID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember] [DataMember]
public int Flag { get; set; } public int Flag { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember] [DataMember]
public int PageSize { get; set; } public int PageSize { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember] [DataMember]
public int PageIndex { get; set; } public int PageIndex { get; set; }
/// <summary> /// <summary>
/// 看板位置 /// 看板位置
/// </summary> /// </summary>
[DataMember] [DataMember]
public int PositionIndex { get; set; } public int PositionIndex { get; set; }
} }
} }
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