From 871116838e49779bad8c28d0126f08f0323e4011 Mon Sep 17 00:00:00 2001 From: jr719 <41290808+jr719@users.noreply.github.com> Date: Mon, 24 May 2021 13:26:59 +0800 Subject: [PATCH] V524 (#3) * v524 * v524 --- .env.development | 5 + .env.production | 2 + .env.staging | 2 + .gitignore | 2 +- package.json | 1 + src/api/convenience.js | 26 + src/api/residentInformation.js | 29 +- src/router/index.js | 4 +- src/views/convenience/detail.vue | 44 +- src/views/convenience/list.vue | 540 +++++++++++++----- .../dashboard/admin/components/PanelGroup.vue | 536 ++++++++++++++--- src/views/login/index.vue | 4 +- src/views/residentInformation/list.vue | 53 +- src/views/workBook/detail.vue | 19 +- src/views/workBook/list.vue | 12 +- vue.config.js | 128 ++--- 16 files changed, 1050 insertions(+), 357 deletions(-) diff --git a/.env.development b/.env.development index 6f76c3a..103c85d 100644 --- a/.env.development +++ b/.env.development @@ -5,3 +5,8 @@ ENV = 'development' #VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = 'http://app.rt.xianci.info/' #VUE_APP_BASE_API = 'http://api.rt.myntv.cn/' + +# base url +VUE_APP_BASE_URL = 'http://admin.rt.xianci.info' + + diff --git a/.env.production b/.env.production index 3658d9f..3196f15 100644 --- a/.env.production +++ b/.env.production @@ -4,3 +4,5 @@ ENV = 'production' # base api VUE_APP_BASE_API = 'http://api.rt.myntv.cn/' +# base url +VUE_APP_BASE_URL = 'http://new.rtmedia.myntv.cn/' \ No newline at end of file diff --git a/.env.staging b/.env.staging index 31bd9e0..ec7e5cb 100644 --- a/.env.staging +++ b/.env.staging @@ -6,3 +6,5 @@ ENV = 'staging' # base api VUE_APP_BASE_API = 'http://app.rt.xianci.info/' +# base url +VUE_APP_BASE_URL = 'http://admin.rt.xianci.info' diff --git a/.gitignore b/.gitignore index e676a8e..eb93276 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .DS_Store node_modules/ -convenience-prod/ +convenience-dev/ dist/ convenience-prod/ npm-debug.log* diff --git a/package.json b/package.json index ea87228..709aa9d 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "dev": "vue-cli-service serve", "lint": "eslint --ext .js,.vue src", "build:prod": "vue-cli-service build", + "build:dev": "vue-cli-service build --mode development", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", "new": "plop", diff --git a/src/api/convenience.js b/src/api/convenience.js index da8a4b0..a7b92e1 100644 --- a/src/api/convenience.js +++ b/src/api/convenience.js @@ -75,3 +75,29 @@ export function communicationList(data) { data }) } +/** + * 监察工单列表 + * @param {*} data + * @returns + */ +export function listOnlyLook(data) { + return request({ + url: '/api/convenience/v2/services/listOnlyLook', + method: 'post', + data + }) +} + +// /convenience/v2/services/listForData +/** + * 统计数据工单列表筛选 + * @param {*} data + * @returns + */ +export function listForData(data) { + return request({ + url: '/api/convenience/v2/services/listForData', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/api/residentInformation.js b/src/api/residentInformation.js index dcd5fe4..f9309bb 100644 --- a/src/api/residentInformation.js +++ b/src/api/residentInformation.js @@ -15,8 +15,8 @@ export function getResidentInfoList(data) { /** * 添加居民信息 - * @param {*} data - * @returns + * @param {*} data + * @returns */ export function addResidentInfoList(data) { return request({ @@ -27,10 +27,22 @@ export function addResidentInfoList(data) { } /** - * 居民信息修改 - * @param {*} data + * 居民信息详情 + * @param {*} id * @returns */ +export function residentInfo(id) { + return request({ + url: "/api/convenience/residentInformation", + method: "get", + params: id + }); +} +/** + * 居民信息修改 + * @param {*} data + * @returns + */ export function updateResidentInfo(data) { return request({ url: "/api/convenience/residentInformation", @@ -38,17 +50,16 @@ export function updateResidentInfo(data) { data }); } - + /** * 居民信息删除 - * @param {*} id - * @returns + * @param {*} id + * @returns */ export function deleteResident(id) { return request({ url: "/api/convenience/residentInformation", method: "delete", - params:id + params: id }); } - \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 38a1ece..37d334e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -140,7 +140,7 @@ export const constantRoutes = [ name: "WorkBook", redirect: "/workBook/list", meta: { - title: "工作手册管理", + title: "工作手册", icon: "list" }, hidden: false, @@ -153,7 +153,7 @@ export const constantRoutes = [ title: "工作手册列表", icon: "workBook", affix: true, - parentTitle: "工作手册管理" + parentTitle: "工作手册" } }, { diff --git a/src/views/convenience/detail.vue b/src/views/convenience/detail.vue index 6cf8b0a..8cb161a 100644 --- a/src/views/convenience/detail.vue +++ b/src/views/convenience/detail.vue @@ -41,6 +41,8 @@
@@ -219,7 +230,7 @@
办事评价： @@ -419,7 +430,9 @@
- + - 该行政区域下无工作人员
-

申办人：{{ item.residentInformation.name }}

+ 申办人：{{ + item.residentInformation !== null + ? item.residentInformation.name + : "" + }} +

+ +

状态：{{ item.statusList[0].status | statusFilter }} -

@@ -85,28 +91,15 @@
-
{{ (timers && timeFormat(timers[index].time)) || "00:00:00" }}
+ - - 通过 @@ -207,7 +184,7 @@ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ac23bd3..c246843 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -128,8 +128,8 @@ export default { loginForm: { username: "", //18882564006 captcha: "", - //username: "18882564006", //18882564006 - //captcha: "111111", + // username: "18882564006", //18882564006 + // captcha: "111111", appVersion: "1.0.0", system: "IOS", device: navigator.userAgent, diff --git a/src/views/residentInformation/list.vue b/src/views/residentInformation/list.vue index fe7ca84..d0553a3 100644 --- a/src/views/residentInformation/list.vue +++ b/src/views/residentInformation/list.vue @@ -309,7 +309,8 @@ import { getResidentInfoList, addResidentInfoList, updateResidentInfo, - deleteResident + deleteResident, + residentInfo } from "@/api/residentInformation"; import RegionSelect from "@/components/RegionSelect"; import { getRegions } from "@/api/region"; @@ -491,8 +492,8 @@ export default { this.$notify.success("创建成功"); this.dialogAddVisible = false; this.getList(); - }else{ - this.$notify.error(res.m) + } else { + this.$notify.error(res.m); } }); } @@ -509,32 +510,32 @@ export default { this.$notify.success("修改成功"); this.dialogAddVisible = false; this.getList(); - }else{ - this.$notify.error(res.m) + } else { + this.$notify.error(res.m); } }); } }); }, handleEdit(row) { - // this.$nextTick(() => { + residentInfo({ id: row.id }).then(res => { + // console.log(res); + this.residentInfo = Object.assign({}, res.d); + let arr = []; + if (this.residentInfo.permanentResidenceRegion) { + arr.push(this.residentInfo.permanentResidenceRegion); + } + if (this.residentInfo.permanentResidenceTown) { + arr.push(this.residentInfo.permanentResidenceTown); + } + if (this.residentInfo.permanentResidenceTownShip) { + arr.push(this.residentInfo.permanentResidenceTownShip); + } + this.residentInfo.regionIds = arr; - this.residentInfo = Object.assign({}, row); - let arr = []; - if (this.residentInfo.permanentResidenceRegion) { - arr.push(this.residentInfo.permanentResidenceRegion); - } - if (this.residentInfo.permanentResidenceTown) { - arr.push(this.residentInfo.permanentResidenceTown); - } - if (this.residentInfo.permanentResidenceTownShip) { - arr.push(this.residentInfo.permanentResidenceTownShip); - } - this.residentInfo.regionIds = arr; - - this.dialogStatus = "update"; - this.dialogAddVisible = true; - // },100); + this.dialogStatus = "update"; + this.dialogAddVisible = true; + }); }, handleDelete(row) { this.residentInfo = Object.assign({}, row); @@ -547,9 +548,9 @@ export default { this.$notify.success("删除成功"); this.dialogDeleteConfirm = false; this.getList(); - }else{ - this.$notify.error(res.m) - } + } else { + this.$notify.error(res.m); + } }); }, handleIsStaff(val) { @@ -582,7 +583,7 @@ export default { this.dialogExcelImport = false; this.getList(); } else { - this.$notify.error(res.m) + this.$notify.error(res.m); setTimeout(() => { this.excelUploading = false; }, 3000); diff --git a/src/views/workBook/detail.vue b/src/views/workBook/detail.vue index 4227f48..5f8d16d 100644 --- a/src/views/workBook/detail.vue +++ b/src/views/workBook/detail.vue @@ -1,20 +1,23 @@ diff --git a/src/views/workBook/list.vue b/src/views/workBook/list.vue index fa8307b..9d8e736 100644 --- a/src/views/workBook/list.vue +++ b/src/views/workBook/list.vue @@ -18,13 +18,13 @@ highlight-current-row style="width: 100%;" > - + - + @@ -36,7 +36,7 @@ --> - + @@ -48,11 +48,11 @@ --> - +