diff --git a/src/api/gate/index.js b/src/api/gate/index.js new file mode 100644 index 0000000..fce8ecb --- /dev/null +++ b/src/api/gate/index.js @@ -0,0 +1,33 @@ +import request from "@/utils/request"; + +export function getList(params){ + return request({ + url:'/api/admin/gate/visit-list', + method:'get', + params + }) +} + +// export function show(params){ +// return request({ +// method:'get', +// url:'/api/admin/visit_audit/show', +// params +// }) +// } + +// export function save(data){ +// return request({ +// method:'post', +// url:'/api/admin/visit_audit/save', +// data +// }) +// } + +// export function destroy(data){ +// return request({ +// method:'post', +// url:'/api/admin/visit_audit/destroy', +// data +// }) +// } diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 75183f7..39d8df5 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -202,7 +202,7 @@ export default { let topHeight = 50; //页面 头部 this.tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20 - 25; - // console.log(this.tableHeight) + this.$emit("tableHeight",this.tableHeight) }, getTableData(isRefresh = false){ if(isRefresh){ diff --git a/src/components/XyTinymce/EditorImage.vue b/src/components/XyTinymce/EditorImage.vue new file mode 100644 index 0000000..867f3bd --- /dev/null +++ b/src/components/XyTinymce/EditorImage.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/src/components/XyTinymce/index.vue b/src/components/XyTinymce/index.vue new file mode 100644 index 0000000..63f8c5f --- /dev/null +++ b/src/components/XyTinymce/index.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/permission.js b/src/permission.js index c5e41fa..065d4db 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/login'] // no redirect whitelist +const whiteList = ['/login','/gate/visitlist'] // no redirect whitelist router.beforeEach(async(to, from, next) => { // start progress bar diff --git a/src/router/index.js b/src/router/index.js index 727c48f..66f3d65 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -40,6 +40,11 @@ export const constantRoutes = [{ path: '/404', component: () => import('@/views/404'), hidden: true + }, + { + path: '/gate/visitlist', + component: () => import('@/views/gate/visitlist'), + hidden: true }, { diff --git a/src/views/gate/visitlist.vue b/src/views/gate/visitlist.vue new file mode 100644 index 0000000..eec9c3b --- /dev/null +++ b/src/views/gate/visitlist.vue @@ -0,0 +1,276 @@ + + + + diff --git a/src/views/parameter/component/addVisitor.vue b/src/views/parameter/component/addVisitor.vue index d93b5de..e6cda84 100644 --- a/src/views/parameter/component/addVisitor.vue +++ b/src/views/parameter/component/addVisitor.vue @@ -220,6 +220,8 @@ let that = this if (this.type === 'editor') { this.form.id = this.id + }else{ + this.form.id = "" } save({ ...that.form diff --git a/src/views/resource/component/addStudy.vue b/src/views/resource/component/addStudy.vue index e22d65e..0e399e5 100644 --- a/src/views/resource/component/addStudy.vue +++ b/src/views/resource/component/addStudy.vue @@ -51,7 +51,10 @@
学习内容: -
+
+
@@ -166,9 +169,13 @@ } from "@/api/resource/study.js" import { getparameter - } from "@/api/system/dictionary"; + } from "@/api/system/dictionary"; + +// import xyTinymce from "@/components/XyTinymce/index.vue"; export default { - components: {}, + components: { + // xyTinymce + }, data() { return { isShow: false, @@ -408,6 +415,8 @@ let that = this if (this.type === 'editor') { this.form.id = this.id + }else{ + this.form.id = "" } save({ ...that.form diff --git a/src/views/resource/component/addVisitTime.vue b/src/views/resource/component/addVisitTime.vue index 76ddff6..13b26a6 100644 --- a/src/views/resource/component/addVisitTime.vue +++ b/src/views/resource/component/addVisitTime.vue @@ -87,6 +87,8 @@ let that = this if (this.type === 'editor') { this.form.id = this.id + }else{ + this.form.id = "" } save({ ...that.form diff --git a/src/views/visit/check.vue b/src/views/visit/check.vue index 57fcdea..45bf052 100644 --- a/src/views/visit/check.vue +++ b/src/views/visit/check.vue @@ -71,9 +71,10 @@ - + + --> +
@@ -81,11 +82,13 @@ import { getList, destroy - } from '@/api/visit/check.js' - import checkRecord from '@/views/visit/component/checkRecord' + } from '@/api/visit/record.js' + import checkRecord from '@/views/visit/component/checkRecord' + import showVisit from '@/views/visit/component/showVisit' export default { components: { - checkRecord + checkRecord, + showVisit }, data() { return { @@ -94,7 +97,7 @@ page: 1, rows: 10, keyword: "", - audit_status: "", + audit_status: 0, myself_accept: 0, myself_audit: 0 }, @@ -243,8 +246,11 @@ }) }, checkRecords(row){ - this.$refs['checkRecord'].isShow = true - this.$refs['checkRecord'].id = row.id + this.$refs['showVisit'].form = row + this.$refs['showVisit'].formDataType='checkrecord' + this.$refs['showVisit'].isShow = true + // this.$refs['checkRecord'].id = row.id + // this.$refs['checkRecord'].isShow = true } }, } diff --git a/src/views/visit/component/addBlack.vue b/src/views/visit/component/addBlack.vue index 50bb4ae..d75d1a1 100644 --- a/src/views/visit/component/addBlack.vue +++ b/src/views/visit/component/addBlack.vue @@ -223,6 +223,8 @@ let that = this if (this.type === 'editor') { this.form.id = this.id + }else{ + this.form.id = "" } save({ ...that.form diff --git a/src/views/visit/component/addCommon.vue b/src/views/visit/component/addCommon.vue index 703e89c..2ca3650 100644 --- a/src/views/visit/component/addCommon.vue +++ b/src/views/visit/component/addCommon.vue @@ -49,7 +49,7 @@
- +
@@ -467,7 +467,7 @@ visit_time_id: res?.visit_time_id, visit_area_id: res?.visit_area_id, workRange: res.work_start_time?[res.work_start_time,res.work_end_time]:"", - reason: res?parseInt(res.reason):'', + reason: res?.reason, plate: res?.plate, remark: res?.remark, visitorinfo: "", @@ -512,6 +512,8 @@ let that = this if (this.type === 'editor') { this.form.id = this.id + }else{ + this.form.id = "" } console.log("that.form", that.form) // return diff --git a/src/views/visit/component/checkRecord.vue b/src/views/visit/component/checkRecord.vue index fea7d17..453ee42 100644 --- a/src/views/visit/component/checkRecord.vue +++ b/src/views/visit/component/checkRecord.vue @@ -1,8 +1,209 @@