diff --git a/pom.xml b/pom.xml index 07fa5247..977f5d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -147,10 +147,10 @@ - + template/ diff --git a/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java b/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java index 94ca4059..a9f292de 100644 --- a/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java +++ b/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java @@ -22,20 +22,26 @@ package net.mingsoft.cms.action; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import net.mingsoft.base.entity.ResultData; +import net.mingsoft.basic.action.BaseFileAction; import net.mingsoft.basic.bean.EUListBean; +import net.mingsoft.basic.bean.UploadConfigBean; import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.cms.biz.IPhoneContactsBiz; import net.mingsoft.cms.entity.DutyStandbyEntity; import net.mingsoft.cms.entity.PhoneContactsEntity; import net.mingsoft.cms.excel.PhoneContactsExcel; import net.mingsoft.excel.util.ExcelUtil; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; @@ -43,8 +49,10 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 分类管理控制层 @@ -55,7 +63,7 @@ import java.util.List; @Api(tags={"后端-通讯录接口"}) @Controller("phoneContactsAction") @RequestMapping("/${ms.manager.path}/cms/phoneContacts") -public class PhoneContactsAction extends BaseAction{ +public class PhoneContactsAction extends BaseFileAction { /** @@ -72,12 +80,11 @@ public class PhoneContactsAction extends BaseAction{ @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"), @ApiImplicitParam(name = "name", value = "姓名", required =false,paramType="query"), - @ApiImplicitParam(name = "phone", value = "手机号", required =false,paramType="query"), + @ApiImplicitParam(name = "mobilePhone", value = "移动电话", required =false,paramType="query"), }) @RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST}) @ResponseBody public ResultData list(@ModelAttribute @ApiIgnore PhoneContactsEntity entity) { - BasicUtil.startPage(); entity.setSqlWhere(""); List list = phoneContactsBiz.query(entity); return ResultData.build().success(new EUListBean(list,(int)BasicUtil.endPage(list).getTotal())); @@ -91,27 +98,56 @@ public class PhoneContactsAction extends BaseAction{ @ApiOperation(value = "导入接口") @PostMapping("/import") @ResponseBody - public ResultData importData(MultipartFile file){ - List excelList = ExcelUtil.read(file, PhoneContactsEntity.class); + @Transactional + public ResultData importData(@ApiIgnore UploadConfigBean bean) throws IOException { + List excelList = ExcelUtil.read(bean.getFile(), PhoneContactsExcel.class); if(excelList!=null){ - for(PhoneContactsEntity entity : excelList){ + //删除之前的通讯录 + List list = phoneContactsBiz.list(); + if(CollectionUtils.isNotEmpty(list)){ + String[] ids = list.stream().map(PhoneContactsEntity::getId).toArray(String[]::new); + phoneContactsBiz.delete(ids); + } + //导入新数据 + for(PhoneContactsExcel excel : excelList){ + PhoneContactsEntity entity = new PhoneContactsEntity(); + BeanUtils.copyProperties(excel,entity); entity.setCreateDate(new Date()); entity.setCreateBy(BasicUtil.getManager().getId()); phoneContactsBiz.save(entity); } } - return ResultData.build().success("导入成功！"); + UploadConfigBean config = new UploadConfigBean(bean.getUploadPath(),bean.getFile(),null,false,bean.isRename()); + return this.upload(config); } /** - * 导出模板 + * 导入模板 */ @GetMapping("importTmplate") @ApiOperation(value = "导入模板") public void importTmplate(HttpServletResponse response) throws IOException { - List list = new ArrayList<>(); - ExcelUtil.export(response, "通讯录导入模板", "通讯录", list, PhoneContactsExcel.class); + List list = new ArrayList<>(); + list = phoneContactsBiz.list(); + List excelList = new ArrayList<>(); + for(PhoneContactsEntity entity : list){ + PhoneContactsExcel excel = new PhoneContactsExcel(); + BeanUtils.copyProperties(entity,excel); + excelList.add(excel); + } + ExcelUtil.export(response, "通讯录导入模板", "通讯录", excelList, PhoneContactsExcel.class); + } + + /** + * 获取通讯录部门 + */ + @GetMapping("getDept") + @ApiOperation(value = "获取通讯录部门") + @ResponseBody + public ResultData getDept(HttpServletResponse response) throws IOException { + List list = phoneContactsBiz.getDept(); + return ResultData.build().success(list); } } diff --git a/src/main/java/net/mingsoft/cms/action/web/PhoneContactsAction.java b/src/main/java/net/mingsoft/cms/action/web/PhoneContactsAction.java index 5d6357b1..bf17360c 100644 --- a/src/main/java/net/mingsoft/cms/action/web/PhoneContactsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/PhoneContactsAction.java @@ -40,6 +40,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; /** @@ -76,23 +78,19 @@ public class PhoneContactsAction extends net.mingsoft.cms.action.BaseAction{ BasicUtil.startPage(); entity.setSqlWhere(""); List list = phoneContactsBiz.query(entity); - return ResultData.build().success(new EUListBean(list,(int)BasicUtil.endPage(list).getTotal())); + return ResultData.build().success(list); } /** - * 导入接口 - * @param + * 获取通讯录部门 */ - @ApiOperation(value = "导入接口") - @GetMapping("/import") + @GetMapping("getDept") + @ApiOperation(value = "获取通讯录部门") @ResponseBody - public ResultData get(MultipartFile file){ - List excelList = ExcelUtil.read(file, PhoneContactsEntity.class); - if(excelList!=null){ - - } - return ResultData.build().success("导入成功！"); + public ResultData getDept() { + List list = phoneContactsBiz.getDept(); + return ResultData.build().success(list); } } diff --git a/src/main/java/net/mingsoft/cms/biz/impl/PhoneContactsBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/PhoneContactsBizImpl.java index 8d38b4a4..25b065e1 100644 --- a/src/main/java/net/mingsoft/cms/biz/impl/PhoneContactsBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/PhoneContactsBizImpl.java @@ -70,5 +70,8 @@ public class PhoneContactsBizImpl extends BaseBizImpl getDept() { + return baseMapper.getDept(); + } } diff --git a/src/main/java/net/mingsoft/cms/entity/PhoneContactsEntity.java b/src/main/java/net/mingsoft/cms/entity/PhoneContactsEntity.java index 02fc9baa..77696f13 100644 --- a/src/main/java/net/mingsoft/cms/entity/PhoneContactsEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/PhoneContactsEntity.java @@ -47,6 +47,41 @@ private static final long serialVersionUID = 1574925152617L; private String id; + /** + * 姓名 + */ + private String name; + + /** + * 职务 + */ + private String postName; + + /** + * 办公电话 + */ + private String officePhone; + + /** + * 移动电话 + */ + private String mobilePhone; + + /** + * 房号 + */ + private String roomNum; + + /** + * 部门 + */ + private String deptName; + + /** + * 部门类型 + */ + private String deptType; + @Override public String getId() { return id; @@ -56,17 +91,6 @@ private static final long serialVersionUID = 1574925152617L; public void setId(String id) { this.id = id; } - /** - * 姓名 - */ - @ExcelProperty("姓名") - private String name; - - /** - * 手机号 - */ - @ExcelProperty("手机号") - private String phone; public String getName() { return name; @@ -76,11 +100,51 @@ private static final long serialVersionUID = 1574925152617L; this.name = name; } - public String getPhone() { - return phone; + public String getPostName() { + return postName; + } + + public void setPostName(String postName) { + this.postName = postName; + } + + public String getOfficePhone() { + return officePhone; + } + + public void setOfficePhone(String officePhone) { + this.officePhone = officePhone; + } + + public String getMobilePhone() { + return mobilePhone; + } + + public void setMobilePhone(String mobilePhone) { + this.mobilePhone = mobilePhone; + } + + public String getRoomNum() { + return roomNum; + } + + public void setRoomNum(String roomNum) { + this.roomNum = roomNum; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptType() { + return deptType; } - public void setPhone(String phone) { - this.phone = phone; + public void setDeptType(String deptType) { + this.deptType = deptType; } } diff --git a/src/main/java/net/mingsoft/cms/excel/PhoneContactsExcel.java b/src/main/java/net/mingsoft/cms/excel/PhoneContactsExcel.java index 6dbcd375..c944cf75 100644 --- a/src/main/java/net/mingsoft/cms/excel/PhoneContactsExcel.java +++ b/src/main/java/net/mingsoft/cms/excel/PhoneContactsExcel.java @@ -44,10 +44,34 @@ public class PhoneContactsExcel implements Serializable { private String name; /** - * 手机号 + * 职务 */ - @ExcelProperty("手机号") - private String phone; + @ExcelProperty("职务") + private String postName; + + /** + * 办公电话 + */ + @ExcelProperty("办公电话") + private String officePhone; + + /** + * 移动电话 + */ + @ExcelProperty("移动电话") + private String mobilePhone; + + /** + * 房号 + */ + @ExcelProperty("房号") + private String roomNum; + + /** + * 部门 + */ + @ExcelProperty("部门") + private String deptName; public String getName() { return name; @@ -57,11 +81,43 @@ public class PhoneContactsExcel implements Serializable { this.name = name; } - public String getPhone() { - return phone; + public String getPostName() { + return postName; + } + + public void setPostName(String postName) { + this.postName = postName; + } + + public String getOfficePhone() { + return officePhone; + } + + public void setOfficePhone(String officePhone) { + this.officePhone = officePhone; + } + + public String getMobilePhone() { + return mobilePhone; + } + + public void setMobilePhone(String mobilePhone) { + this.mobilePhone = mobilePhone; + } + + public String getRoomNum() { + return roomNum; + } + + public void setRoomNum(String roomNum) { + this.roomNum = roomNum; + } + + public String getDeptName() { + return deptName; } - public void setPhone(String phone) { - this.phone = phone; + public void setDeptName(String deptName) { + this.deptName = deptName; } } diff --git a/src/main/java/net/mingsoft/statistics/action/web/PublishListAction.java b/src/main/java/net/mingsoft/statistics/action/web/PublishListAction.java index 8d4e2a21..2b31b55d 100644 --- a/src/main/java/net/mingsoft/statistics/action/web/PublishListAction.java +++ b/src/main/java/net/mingsoft/statistics/action/web/PublishListAction.java @@ -51,7 +51,6 @@ public class PublishListAction extends BaseAction { @RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST}) @ResponseBody public ResultData list(@ModelAttribute @ApiIgnore PublishListEntity publishList,HttpServletResponse response, HttpServletRequest request, @ApiIgnore ModelMap model) { - BasicUtil.startPage(); List publishListList = publishListBiz.findList(publishList); return ResultData.build().success(new EUListBean(publishListList,(int)BasicUtil.endPage(publishListList).getTotal())); } diff --git a/src/main/java/net/mingsoft/statistics/job/PasZhTaskJob.java b/src/main/java/net/mingsoft/statistics/job/PasZhTaskJob.java index e507b26c..776da043 100644 --- a/src/main/java/net/mingsoft/statistics/job/PasZhTaskJob.java +++ b/src/main/java/net/mingsoft/statistics/job/PasZhTaskJob.java @@ -21,14 +21,13 @@ public class PasZhTaskJob { //@Scheduled(cron ="0 0/1 * * * ? ") @Scheduled(cron ="0 0 1 * * ? ") public void checkZh(){ - //查询结束时间是昨天的数据，修改置灰标识位 + //查询结束时间是当天的数据，修改置灰标识位 Date date = new Date(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PasZhEntity::getZhEndtime, DateFormatUtils.format(DateUtils.addDays(date,-1),"yyyy-MM-dd")); + wrapper.eq(PasZhEntity::getZhEndtime, DateFormatUtils.format(date,"yyyy-MM-dd")); wrapper.eq(PasZhEntity::getYjzh,"1"); List list = pasZhBiz.list(wrapper); if(CollectionUtils.isNotEmpty(list)){ - for(PasZhEntity entity : list){ entity.setYjzh("0"); entity.setUpdateDate(date); diff --git a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl index c062ef0a..38de739b 100644 --- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl @@ -310,8 +310,9 @@ that.form.categoryType = '1'; ms.http.post(ms.manager + "/cms/content/list.do", form.sqlWhere ? Object.assign({}, { categoryType: '1', - sqlWhere: form.sqlWhere - }, page) : Object.assign({}, form, page)).then(function (res) { + sqlWhere: form.sqlWhere, + contentDisplay:'0' + }, page) : Object.assign({}, {...form,contentDisplay:'0'}, page,)).then(function (res) { if (that.loadState) { that.loading = false; } else { @@ -504,6 +505,9 @@ } }, mounted: function () { + console.log(this,'thisthisthisthisthisthis') + console.log(window) + console.log(document) this.contentCategoryIdOptionsGet(); this.contentTypeOptionsGet(); this.form.categoryId = ms.util.getParameter("categoryId"); diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl new file mode 100644 index 00000000..d47d96e8 --- /dev/null +++ b/src/main/webapp/WEB-INF/manager/login.ftl @@ -0,0 +1,582 @@ + + + + ${app.appName} + <#include "/include/head-file.ftl"/> + + + + + +
+ +
+ + +
+ +
+ + + + +
+ + +
+ +
+ +
+
登录
+
+ + + +
+ + + + + + +
+ + +
+ + + + + + + +
+ + + + + + +
+
+ + + + {{loading?'登录中':'登录'}} + + + +
+ 记住我 + +
+ + +
+ +
+ +
+ +
+ +
+ + + + + + + diff --git a/src/main/webapp/static/images/login-banner.png b/src/main/webapp/static/images/login-banner.png index 73cf3f51..beb89c3f 100644 Binary files a/src/main/webapp/static/images/login-banner.png and b/src/main/webapp/static/images/login-banner.png differ diff --git a/src/main/webapp/static/plugins/platform/ms-store.umd.min.js b/src/main/webapp/static/plugins/platform/ms-store.umd.min.js index c5453611..150edc17 100644 --- a/src/main/webapp/static/plugins/platform/ms-store.umd.min.js +++ b/src/main/webapp/static/plugins/platform/ms-store.umd.min.js @@ -815,7 +815,7 @@ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { - eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../node_modules/css-loader/dist/runtime/api.js */ \"./node_modules/css-loader/dist/runtime/api.js\");\nexports = ___CSS_LOADER_API_IMPORT___(false);\n// Module\nexports.push([module.i, \"\\n.ms-admin-mstore-icon[data-v-2faa1eb3] {\\n min-width: 50px;\\n width: 50px;\\n height: 50px;\\n background-color: #0080FF;\\n display: flex;\\n justify-content: center;\\n align-items: center;\\n cursor: pointer;\\n}\\n.ms-admin-mstore-icon span[data-v-2faa1eb3] {\\n border-radius: 50%;\\n font-weight: initial;\\n font-size: 12px;\\n color: #fff;\\n background: #f00;\\n position: absolute;\\n width: 1.2em;\\n height: 1.2em;\\n display: flex;\\n align-items: center;\\n justify-content: center;\\n top: 0.6em;\\n right: 0.6em;\\n z-index: 2;\\n}\\n.ms-admin-mstore-icon .iconfont[data-v-2faa1eb3] {\\n color: #fff;\\n -webkit-animation: rubberBand-data-v-2faa1eb3 1.4s 1s both infinite;\\n animation: rubberBand-data-v-2faa1eb3 1.4s 1s both infinite;\\n font-size: 1.5em;\\n}\\n@-webkit-keyframes rubberBand-data-v-2faa1eb3 {\\n0 {\\n transform: scale3d(1, 1, 1);\\n}\\n10% {\\n transform: scale3d(1.25, 0.75, 1);\\n}\\n20% {\\n transform: scale3d(0.75, 1.25, 1);\\n}\\n30% {\\n transform: scale3d(1.15, 0.85, 1);\\n}\\n40% {\\n transform: scale3d(0.95, 1.05, 1);\\n}\\n50% {\\n transform: scale3d(1.05, 0.95, 1);\\n}\\n51% {\\n transform: scale3d(1, 1, 1);\\n}\\n}\\n@keyframes rubberBand-data-v-2faa1eb3 {\\n0 {\\n transform: scale3d(1, 1, 1);\\n}\\n10% {\\n transform: scale3d(1.25, 0.75, 1);\\n}\\n20% {\\n transform: scale3d(0.75, 1.25, 1);\\n}\\n30% {\\n transform: scale3d(1.15, 0.85, 1);\\n}\\n40% {\\n transform: scale3d(0.95, 1.05, 1);\\n}\\n50% {\\n transform: scale3d(1.05, 0.95, 1);\\n}\\n51% {\\n transform: scale3d(1, 1, 1);\\n}\\n}\\n\", \"\"]);\n// Exports\nmodule.exports = exports;\n\n\n//# sourceURL=webpack://ms-store/./src/components/store/Store.vue?./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); + eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../node_modules/css-loader/dist/runtime/api.js */ \"./node_modules/css-loader/dist/runtime/api.js\");\nexports = ___CSS_LOADER_API_IMPORT___(false);\n// Module\nexports.push([module.i, \"\\n.ms-admin-mstore-icon[data-v-2faa1eb3] {\\n min-width: 50px;\\n width: 50px;\\n height: 50px;\\n background-color: #0080FF;\\n display: none;\\n justify-content: center;\\n align-items: center;\\n cursor: pointer;\\n}\\n.ms-admin-mstore-icon span[data-v-2faa1eb3] {\\n border-radius: 50%;\\n font-weight: initial;\\n font-size: 12px;\\n color: #fff;\\n background: #f00;\\n position: absolute;\\n width: 1.2em;\\n height: 1.2em;\\n display: none;\\n align-items: center;\\n justify-content: center;\\n top: 0.6em;\\n right: 0.6em;\\n z-index: 2;\\n}\\n.ms-admin-mstore-icon .iconfont[data-v-2faa1eb3] {\\n color: #fff;\\n -webkit-animation: rubberBand-data-v-2faa1eb3 1.4s 1s both infinite;\\n animation: rubberBand-data-v-2faa1eb3 1.4s 1s both infinite;\\n font-size: 1.5em;\\n}\\n@-webkit-keyframes rubberBand-data-v-2faa1eb3 {\\n0 {\\n transform: scale3d(1, 1, 1);\\n}\\n10% {\\n transform: scale3d(1.25, 0.75, 1);\\n}\\n20% {\\n transform: scale3d(0.75, 1.25, 1);\\n}\\n30% {\\n transform: scale3d(1.15, 0.85, 1);\\n}\\n40% {\\n transform: scale3d(0.95, 1.05, 1);\\n}\\n50% {\\n transform: scale3d(1.05, 0.95, 1);\\n}\\n51% {\\n transform: scale3d(1, 1, 1);\\n}\\n}\\n@keyframes rubberBand-data-v-2faa1eb3 {\\n0 {\\n transform: scale3d(1, 1, 1);\\n}\\n10% {\\n transform: scale3d(1.25, 0.75, 1);\\n}\\n20% {\\n transform: scale3d(0.75, 1.25, 1);\\n}\\n30% {\\n transform: scale3d(1.15, 0.85, 1);\\n}\\n40% {\\n transform: scale3d(0.95, 1.05, 1);\\n}\\n50% {\\n transform: scale3d(1.05, 0.95, 1);\\n}\\n51% {\\n transform: scale3d(1, 1, 1);\\n}\\n}\\n\", \"\"]);\n// Exports\nmodule.exports = exports;\n\n\n//# sourceURL=webpack://ms-store/./src/components/store/Store.vue?./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), diff --git a/src/main/webapp/template/1/default/css/public.css b/src/main/webapp/template/1/default/css/public.css index ff141e9f..c180c55a 100644 --- a/src/main/webapp/template/1/default/css/public.css +++ b/src/main/webapp/template/1/default/css/public.css @@ -39,6 +39,12 @@ border-bottom: 4px solid #fff; background: rgba(255, 255, 255, 0.21); } + +.iscurrentPage { + border-bottom: 4px solid #fff!important; + background: rgba(255, 255, 255, 0.21); +} + .header-nav ul li:last-child{ border: 0 !important; background: none !important; @@ -101,7 +107,7 @@ -webkit-line-clamp: 2; } .index-contentbox { - width: 1400px; + width: 1440px; margin: 0 auto; } diff --git a/src/main/webapp/template/1/default/css/search.css b/src/main/webapp/template/1/default/css/search.css index 565d28b3..d13ab81c 100644 --- a/src/main/webapp/template/1/default/css/search.css +++ b/src/main/webapp/template/1/default/css/search.css @@ -12,6 +12,7 @@ width: 100%; margin-bottom: 50px; cursor: pointer; + display:inline-block } .searchli_t { diff --git a/src/main/webapp/template/1/default/css/style.css b/src/main/webapp/template/1/default/css/style.css index 96f3e24b..a1a0fab6 100644 --- a/src/main/webapp/template/1/default/css/style.css +++ b/src/main/webapp/template/1/default/css/style.css @@ -1447,8 +1447,13 @@ body .baidu_ditu { font-size:30px; } +.chuhuijiyao_title2{ + font-weight:normal +} + .chuhuijiyao_title2:hover{ - color:#126add; + color:#003F91; + font-weight:bold } .chuhuijiyao_li{ @@ -1475,6 +1480,7 @@ body .baidu_ditu { font-size:14px; text-align:center; margin-right:15px; + line-height:23px; } .chuhuijiyao_date{ @@ -1492,6 +1498,12 @@ body .baidu_ditu { margin:35px 0; } +.chuhuijiyao_line2{ + width:100%; + border:1px dashed #C8C8C8; + margin:35px 0; +} + .chuhuijiyao_nav{ font-size:20px; color:#999999; diff --git a/src/main/webapp/template/1/default/search.htm b/src/main/webapp/template/1/default/search.htm index b45712ee..c914be57 100644 --- a/src/main/webapp/template/1/default/search.htm +++ b/src/main/webapp/template/1/default/search.htm @@ -30,19 +30,20 @@
-
相关结果共 {ms:page.rcount/} 条
- +
相关结果共 {ms:page.rcount/} 条
{ms:arclist size=10 ispaging=true orderby="hit" order="desc"} -
+
${field.typetitle}
-
+
${field.title}
+ <#if field.litpic> +
${field.descrip} @@ -53,14 +54,36 @@
-
+ {/ms:arclist}
<#include "paginationSearch.htm" /> <#include "footer.htm" /> + diff --git a/src/main/webapp/template/1/default/tongxunlu.htm b/src/main/webapp/template/1/default/tongxunlu.htm index 78b1305d..02e69d69 100644 --- a/src/main/webapp/template/1/default/tongxunlu.htm +++ b/src/main/webapp/template/1/default/tongxunlu.htm @@ -23,71 +23,80 @@ +
<#include "header.htm" />

${field.typedescrip}

-
+
首页 - >通讯录 + >通讯录

通讯录

-
-
-
-
姓名
-
电话
-
-
-
-
贾金龙
-
156 1234 5678
-
-
-
贾金龙
-
156 1234 5678
-
-
-
贾金龙
-
156 1234 5678
-
-
-
贾金龙
-
156 1234 5678
-
-
+
+
+
+
市车管所
+
-
-
-
姓名
-
电话
-
-
-
-
贾金龙
-
156 1234 5678
-
-
-
贾金龙
-
156 1234 5678
-
-
-
贾金龙
-
156 1234 5678
-
-
-
贾金龙
-
156 1234 5678
-
-
+
+
{{item||'/'}}
+
+
+
+
+
姓名/单位
+
职务
+
办公电话
+
移动电话
+
房号
+
+
{{item.name||'/'}}
+
{{item.postName||'/'}}
+
{{item.officePhone||'/'}}
+
{{item.mobilePhone||'/'}}
+
{{item.roomNum||'/'}}
+
+
<#include "footer.htm" /> + +
\ No newline at end of file