diff --git a/.env.development b/.env.development index 44c8efd..6f76c3a 100644 --- a/.env.development +++ b/.env.development @@ -4,3 +4,4 @@ ENV = 'development' # base api #VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = 'http://app.rt.xianci.info/' +#VUE_APP_BASE_API = 'http://api.rt.myntv.cn/' diff --git a/.gitignore b/.gitignore index f76477e..e676a8e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ node_modules/ convenience-prod/ dist/ +convenience-prod/ npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/package.json b/package.json index 9f4cac6..ea87228 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "tui-editor": "1.3.3", "vue": "2.6.10", "vue-count-to": "1.0.13", + "vue-cropper": "^0.5.3", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", "vuedraggable": "2.20.0", diff --git a/public/index.html b/public/index.html index 0e2ad0c..c5049d0 100644 --- a/public/index.html +++ b/public/index.html @@ -12,6 +12,11 @@ <%= webpackConfig.name %> + + + + +
diff --git a/src/api/convenience.js b/src/api/convenience.js index 87f1d40..da8a4b0 100644 --- a/src/api/convenience.js +++ b/src/api/convenience.js @@ -2,7 +2,7 @@ import request from '@/utils/request' /** * 工单列表 - * @param {YW_Content_Code,YW_Type_Code} data + * @param {Object}} data * @returns */ export function list(data) { @@ -26,7 +26,7 @@ export function typeList() { /** * 发起办事 - * @param {residentInformation,eventTypeId,sponsor,remark,Attachment} data + * @param {Object} data * @returns */ export function add(data) { @@ -39,7 +39,7 @@ export function add(data) { /** * 工单详情 - * @param {工单id} id + * @param {String} id * @returns */ export function info(id) { @@ -52,7 +52,7 @@ export function info(id) { /** * 工单操作 - * @param {id,version,type,ids,remark,attachmentList,approve,evaluation} data + * @param {Object} data * @returns */ export function update(data) { @@ -65,7 +65,7 @@ export function update(data) { /** * 获取沟通人员列表 - * @param {id} data + * @param {String} data * @returns */ export function communicationList(data) { diff --git a/src/api/region.js b/src/api/region.js new file mode 100644 index 0000000..a7b988a --- /dev/null +++ b/src/api/region.js @@ -0,0 +1,14 @@ +import request from "@/utils/request"; + +/** + * 行政区域列表 + * @param {*} data + * @returns + */ +export function getRegions() { + return request({ + // /api/convenience/v2/region/list + url: "/api/convenience/v2/region/list", + method: "get" + }); +} diff --git a/src/api/residentInformation.js b/src/api/residentInformation.js new file mode 100644 index 0000000..dcd5fe4 --- /dev/null +++ b/src/api/residentInformation.js @@ -0,0 +1,54 @@ +import request from "@/utils/request"; + +/** + * 居民信息列表 + * @param {*} data + * @returns + */ +export function getResidentInfoList(data) { + return request({ + url: "/api/convenience/residentInformation/list", + method: "post", + data + }); +} + +/** + * 添加居民信息 + * @param {*} data + * @returns + */ +export function addResidentInfoList(data) { + return request({ + url: "/api/convenience/residentInformation/add", + method: "post", + data + }); +} + +/** + * 居民信息修改 + * @param {*} data + * @returns + */ +export function updateResidentInfo(data) { + return request({ + url: "/api/convenience/residentInformation", + method: "put", + data + }); +} + +/** + * 居民信息删除 + * @param {*} id + * @returns + */ +export function deleteResident(id) { + return request({ + url: "/api/convenience/residentInformation", + method: "delete", + params:id + }); +} + \ No newline at end of file diff --git a/src/api/staff.js b/src/api/staff.js index 011c87a..4c086fa 100644 --- a/src/api/staff.js +++ b/src/api/staff.js @@ -1,13 +1,21 @@ -import request from '@/utils/request' +import request from "@/utils/request"; /** * 通讯录 * @returns */ -export function staffList() { +// export function staffList() { +// return request({ +// url: "/api/convenience/v2/staff/list", +// method: "post", +// data: { category: "CONVENIENCE" } +// }); +// } +export function staffList(data) { return request({ url: '/api/convenience/v2/staff/list', - method: 'post' + method: 'post', + data }) } @@ -18,8 +26,8 @@ export function staffList() { */ export function info(data) { return request({ - url: '/api/convenience/v2/staff/info', - method: 'get', + url: "/api/convenience/v2/staff/info", + method: "get", params: data - }) + }); } diff --git a/src/api/workBook.js b/src/api/workBook.js index a416d91..0966b91 100644 --- a/src/api/workBook.js +++ b/src/api/workBook.js @@ -1,5 +1,10 @@ import request from '@/utils/request' +/** + * 工作手册列表 + * @param {Object}} data + * @returns + */ export function workBookList(data) { return request({ url: '/api/convenience/workBook/list', @@ -7,3 +12,16 @@ export function workBookList(data) { data }) } + +/** + * 工作手册详情 + * @param {String} id + * @returns + */ +export function getWorkBookInfo(id) { + return request({ + url: '/api/convenience/workBook/detail', + method: 'get', + params:id + }) +} \ No newline at end of file diff --git a/src/components/RegionSelect/index.vue b/src/components/RegionSelect/index.vue new file mode 100644 index 0000000..e4cbea1 --- /dev/null +++ b/src/components/RegionSelect/index.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/components/cutUploadImage/index.vue b/src/components/cutUploadImage/index.vue new file mode 100644 index 0000000..7bf557b --- /dev/null +++ b/src/components/cutUploadImage/index.vue @@ -0,0 +1,370 @@ + + + diff --git a/src/components/uploader/cropper.vue b/src/components/uploader/cropper.vue new file mode 100644 index 0000000..4d798e6 --- /dev/null +++ b/src/components/uploader/cropper.vue @@ -0,0 +1,596 @@ + + + + diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 67eddfa..8274b8d 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -1,24 +1,24 @@ diff --git a/src/views/workBook/detail.vue b/src/views/workBook/detail.vue new file mode 100644 index 0000000..4227f48 --- /dev/null +++ b/src/views/workBook/detail.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/views/workBook/list.vue b/src/views/workBook/list.vue index bd038e8..7dfdc4b 100644 --- a/src/views/workBook/list.vue +++ b/src/views/workBook/list.vue @@ -1,16 +1,16 @@