diff --git a/web/App_Code/api/FollowerController.cs b/web/App_Code/api/FollowerController.cs
index 0237f1c..c754524 100644
--- a/web/App_Code/api/FollowerController.cs
+++ b/web/App_Code/api/FollowerController.cs
@@ -1287,12 +1287,19 @@ public class FollowerController : ApiController
if (q.num>0)
{//表示要更新
var qry = _db.followers_tablet_template.AsQueryable();
-
+ qry = qry.Where(x => x.num == q.num);
+ var d=qry.FirstOrDefault();
+ d.name = q.name;
+ d.style_id = q.style_id;
+ d.shuwen = q.shuwen;
+ d.tablet = q.tablet;
}
else
{
-
+ _db.followers_tablet_template.Add(q);
}
+ _db.SaveChanges();
+
return Ok();
}
}
diff --git a/web/App_Code/api/familyMembersController.cs b/web/App_Code/api/familyMembersController.cs
index c464721..ab92dd7 100644
--- a/web/App_Code/api/familyMembersController.cs
+++ b/web/App_Code/api/familyMembersController.cs
@@ -94,7 +94,8 @@ public class familyMembersController : ApiController
return Ok(familyMember);
}
- // GET api/familymembers/follower/5
+ // GET api/familymembers/follower/5
+ [HttpGet]
[Route("api/familymembers/follower/{followerId}")]
public IHttpActionResult GetByFollower(int followerId)
{
diff --git a/web/App_Code/api/shuwensController.cs b/web/App_Code/api/shuwensController.cs
index dd2921d..d677f32 100644
--- a/web/App_Code/api/shuwensController.cs
+++ b/web/App_Code/api/shuwensController.cs
@@ -37,7 +37,9 @@ public class shuwensController: BaseApiController
x.act_num,
x.shuwen_type,
x.shuwen_num,
- x.contents
+ x.contents,
+ x.paper_size,
+ x.direction
}).FirstOrDefault()
});
}
@@ -78,4 +80,55 @@ public class shuwensController: BaseApiController
}).ToList()
});
}
+
+ [HttpPost]
+ [Route("api/shuwens/SaveActShuwen")]
+ public IHttpActionResult SaveActShuwen([FromBody] Model.activity_shuwen s)
+ {
+ var qry = _db.activity_shuwen.AsQueryable();
+ qry=qry.Where(x => x.act_num == s.act_num && x.shuwen_type == s.shuwen_type);
+ var d=qry.FirstOrDefault();
+ if (d != null)
+ {
+ d.contents = s.contents;
+ d.direction = s.direction;
+ d.paper_size = s.paper_size;
+ d.reg_time=DateTime.Now;
+ }
+ else
+ {
+ s.reg_time = DateTime.Now;
+ _db.activity_shuwen.Add(s);
+ }
+
+ _db.SaveChanges();
+ return Ok();
+ }
+
+ [HttpPost]
+ [Route("api/shuwens/SaveAsShuwenTemplate")]
+ public IHttpActionResult SaveAsShuwenTemplate([FromBody] Model.shuwen_temp t)
+ {
+ if (t.num > 0)
+ {//跑更新
+ var qry=_db.shuwen_temp.AsQueryable();
+ qry = qry.Where(x => x.num == t.num);
+ var d=qry.FirstOrDefault();
+ if (d != null)
+ {
+ d.contents = t.contents;
+ d.name = t.name;
+ d.reg_time = DateTime.Now;
+ }
+ }
+ else
+ {
+ t.reg_time=DateTime.Now;
+ _db.shuwen_temp.Add(t);
+ }
+ _db.SaveChanges();
+
+ return Ok();
+ }
+
}
\ No newline at end of file
diff --git a/web/admin/activity/shuwen02.vue b/web/admin/activity/shuwen02.vue
index 47384fd..d27c222 100644
--- a/web/admin/activity/shuwen02.vue
+++ b/web/admin/activity/shuwen02.vue
@@ -51,7 +51,7 @@
max="80"
v-model.number="globalMargin"
@input="applyGlobalMargin" />
-
+
@@ -62,7 +62,10 @@
+