diff --git a/.env.development b/.env.development index 7a14a2f..3306c41 100644 --- a/.env.development +++ b/.env.development @@ -16,10 +16,10 @@ VITE_PROXY_API = /dev-api # VITE_PROXY = [ ["/dev-api", "http://42.193.40.239:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] # VITE_UPLOAD_URL = http://42.193.40.239:8888 # 东哥 -# VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]] +VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]] # VITE_UPLOAD_URL = http://192.168.110.186 # 陈游 -VITE_PROXY = [ ["/dev-api", "http://192.168.110.10:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]] +# VITE_PROXY = [ ["/dev-api", "http://192.168.110.10:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]] VITE_UPLOAD_URL = http://42.193.40.239:8888/ # VITE_UPLOAD_URL = https://city.sczysoft.com/dffile/ # diff --git a/src/api/Sys.ts b/src/api/Sys.ts index a3c0a0d..d6b0040 100644 --- a/src/api/Sys.ts +++ b/src/api/Sys.ts @@ -377,7 +377,7 @@ export function saveUser(data) { }); } /** - *工作管理-分类型分页查看 + *工作发布-分类型分页查看 */ export function getWorkTypePage(params) { return request({ @@ -387,7 +387,7 @@ export function saveUser(data) { }); } /** - *工作管理-分类型新增-修改 + *工作发布-分类型新增-修改 */ export function saveWorkType(params) { return request({ @@ -397,7 +397,7 @@ export function saveUser(data) { }); } /** - *工作管理-分类型删除 + *工作发布-分类型删除 */ export function delWorkType(params) { return request({ diff --git a/src/api/Work.ts b/src/api/Work.ts index 586c688..aa38d92 100644 --- a/src/api/Work.ts +++ b/src/api/Work.ts @@ -1,5 +1,5 @@ import request from "@/utils/request"; -//工作管理 +//工作发布 /** *工作类型列表 */ diff --git a/src/api/base.ts b/src/api/base.ts index 0c4a8ba..ab068cc 100644 --- a/src/api/base.ts +++ b/src/api/base.ts @@ -91,6 +91,35 @@ export function domicilePeoplePageList(params) { }); } /** +*户籍管理-证件信息列表 +*/ +export function papersPage(params) { + return request({ + url: `/admin/people/papersPage`, + method: "GET", + params:params, + }); +} +/** +*户籍管理-证件新增 +*/ +export function papersAdd(params) { + return request({ + url: `/admin/people/papersAdd`, + method: "POST", + data:params, + }); +} +/** +*证件删除 +*/ +export function papersDel(params) { + return request({ + url: `/admin/people/papersDel/${params.papersId}`, + method: "POST", + }); +} +/** *人员类型 */ export function crTypeList(params) { diff --git a/src/api/emergency.ts b/src/api/emergency.ts index fd341b0..eb4fb50 100644 --- a/src/api/emergency.ts +++ b/src/api/emergency.ts @@ -195,6 +195,7 @@ export function deleteEquip(data) { return request({ url: `/admin/emerEvent/emerEventPage`, method: "GET", + params: params }); } /** diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 89e6c34..fc8a305 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -116,6 +116,9 @@ width: 100%; } } +.el-select { + width: 200px; +} /** .el-input-group__append */ .search-input { diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 6cf0ae3..8a797b2 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -71,7 +71,7 @@ export default { meta: { auth: 'system.data.work', icon: 'point', - title: '工作管理', + title: '工作发布', breadcrumb: true, } }, diff --git a/src/router/modules/work-manage.js b/src/router/modules/work-manage.js index 0d83e6c..8e1e890 100644 --- a/src/router/modules/work-manage.js +++ b/src/router/modules/work-manage.js @@ -7,7 +7,7 @@ export default { redirect: '/work/w-index', meta: { auth: "daily", - title: '工作管理', + title: '工作发布', icon: 'icon-work', }, children: [ @@ -18,7 +18,7 @@ export default { meta: { auth: "daily.index", icon: 'point', - title: '工作管理', + title: '工作发布', sidebar: false }, children: [ diff --git a/src/router/routes.js b/src/router/routes.js index a6d78a9..ae09457 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -324,12 +324,12 @@ export { // ] // }, // { -// title:'工作管理', +// title:'工作发布', // auth:'daily', // sort:6, // children:[ // { -// title:'工作管理', +// title:'工作发布', // auth:'daily.index', // sort:1, // children:[ @@ -385,7 +385,7 @@ export { // sort:4, // }, // { -// title:'工作管理', +// title:'工作发布', // auth:'system.data.work', // sort:5, // }, diff --git a/src/utils/common.ts b/src/utils/common.ts index d607dae..1fad65d 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -25,8 +25,8 @@ export enum FileType { enterpriseAfterImg = "enterpriseAfterImg", //企业自查-整改后 //道孚 - workManagement = 'workManagement',//工作管理 - workDynamics = 'workDynamics',//工作管理 + workManagement = 'workManagement',//工作发布 + workDynamics = 'workDynamics',//工作发布 message = 'message',//消息管理富文本 messageCover = 'messageCover',//消息管理封面 system = 'system',//系统设置Logo @@ -39,6 +39,7 @@ export enum FileType { demands = 'demands',//群众诉求处置 eventAcs = 'eventAcs',//应急统计 resumptionAcs = 'WorkFile', // 工作动态/履职附件 + WorkFile = 'WorkFile' } // 文件接口类型 export enum ApiFile { diff --git a/src/views/acceptWork/components/add.vue b/src/views/acceptWork/components/add.vue index 95c55f4..e46cb6c 100644 --- a/src/views/acceptWork/components/add.vue +++ b/src/views/acceptWork/components/add.vue @@ -102,7 +102,7 @@ - Preview Image + Preview Image @@ -290,19 +290,19 @@ const completehandleUploadAfter = (file: any) => { newFile.append("file", file.file); uploadFile( userId.value, - completeform.value.workId || uuid.value, - FileType.workManagement, + form.value.wkUserId, + FileType.WorkFile, newFile ).then((res) => { if (res) { ElMessage.success("上传成功！"); - completegetCheckDangers(completeform.value.workId || uuid.value); + completegetCheckDangers(form.value.wkUserId); } }); }; //文件显示getCheckDangers const completegetCheckDangers = (id) => { - getFile(id, FileType.workManagement).then((res: any) => { + getFile(id, FileType.WorkFile).then((res: any) => { completeafterList.value = res.data.map((item) => { let arr = item; let index = item.filepath.indexOf("."); //获取第一个"_"的位置 @@ -334,7 +334,7 @@ const completehandleRemove = (file) => { if (res) { ElMessage.success("删除成功！"); } - completegetCheckDangers(completeform.value.workId || uuid.value); + completegetCheckDangers(completeform.value.workId); }); }; //下载附件 @@ -513,7 +513,8 @@ const handleRemove = (file) => { if (res) { ElMessage.success("删除成功！"); } - getCheckDangers(form.value.workId || uuid.value); + // getCheckDangers(form.value.workId || uuid.value); + completegetCheckDangers(form.value.wkUserId); }); }; //下载附件 @@ -571,6 +572,7 @@ const getReceiveWorkDetail = (id) =>{ receiveWorkDetail(params).then((res: any) => { console.log(res,'res====>'); completeform.value = res.data; + completegetCheckDangers(completeform.value.wkUserId); }); } @@ -586,11 +588,10 @@ watch( form.value.listperformid = props.form.listPerformId; form.value.time = [form.value.startTime, form.value.endTime]; getCheckDangers(form.value.workId || uuid.value); - completegetCheckDangers(completeform.value.workId || uuid.value); + completegetCheckDangers(form.value.wkUserId); console.log(props.type,'props.type===>'); if (props.type == 2) { - console.log(11111); getReceiveWorkDetail(props.form.wkUserId); } diff --git a/src/views/base-manage/residence/detail.vue b/src/views/base-manage/residence/detail.vue index fcab252..8f9c13d 100644 --- a/src/views/base-manage/residence/detail.vue +++ b/src/views/base-manage/residence/detail.vue @@ -9,11 +9,7 @@ 刷新 -
+
编辑
@@ -29,123 +25,56 @@
- + - + - + 男 女 - + - + 已婚 未婚 离婚 - + - + - + - + - + - + - - + +
@@ -159,174 +88,143 @@ 刷新
- - 导出 -
-
+ + 导出 +
+
新建
- - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + - + + + - - \ No newline at end of file diff --git a/src/views/base-manage/residence/dialog/detail-addPersonnel.vue b/src/views/base-manage/residence/dialog/detail-addPersonnel.vue index c7c572b..eb0335e 100644 --- a/src/views/base-manage/residence/dialog/detail-addPersonnel.vue +++ b/src/views/base-manage/residence/dialog/detail-addPersonnel.vue @@ -43,21 +43,6 @@ 女 - - - - - - { const ruleForm = reactive({ name: [{ required: true, message: "请输入姓名", trigger: "blur" }], phoneNumber: [{ required: true, message: "请输入电话", trigger: "blur" }], - areaCode: [{ required: true, message: "请选择地区", trigger: "blur" }], idCard: [ { required: true, message: "请输入身份证号", trigger: "blur" }, { validator: isCardId, trigger: "blur" }, ], - createTime: [{ required: true, message: "请选择创建时间", trigger: "blur" }], sex: [{ required: true, message: "请选择性别", trigger: "blur" }], nowAddress: [{ required: true, message: "请输入地址", trigger: "blur" }], peopleTag: [{ required: true, message: "请选择人员标签", trigger: "blur" }], @@ -252,16 +224,9 @@ const handleSubmit = () => { } else { let params = { ...formData.value, - areaCode: "", peopleId: formData.value.peopleId ? formData.value.peopleId : null, domicileId:props.id }; - if (formData.value.areaCode instanceof Array) { - params.areaCode = - formData.value.areaCode[formData.value.areaCode.length - 1]; - } else { - params.areaCode = formData.value.areaCode; - } peopleAdd(params).then((res: any) => { if (res.code == 1) { ElMessage.success({ @@ -281,13 +246,6 @@ const handleSubmit = () => { return false; }); }; -//获取地区 -const orgList = ref([]); -const getareaTree = () => { - areaTree(userId.value).then((res: any) => { - orgList.value = res.data; - }); -}; //获取类型 const typeList = ref([]); const getCrTypeList = () => { @@ -331,7 +289,6 @@ const getPeopleIdCard = () =>{ }); } onMounted(() => { - getareaTree(); getCrTypeList(); getCrRelationList(); }); diff --git a/src/views/base-manage/residence/dialog/detail-addcertificate.vue b/src/views/base-manage/residence/dialog/detail-addcertificate.vue new file mode 100644 index 0000000..60df0b9 --- /dev/null +++ b/src/views/base-manage/residence/dialog/detail-addcertificate.vue @@ -0,0 +1,170 @@ + + + \ No newline at end of file diff --git a/src/views/emergency/danger-points/dialog/add-dynamic.vue b/src/views/emergency/danger-points/dialog/add-dynamic.vue index 31cea27..8d777b0 100644 --- a/src/views/emergency/danger-points/dialog/add-dynamic.vue +++ b/src/views/emergency/danger-points/dialog/add-dynamic.vue @@ -110,7 +110,7 @@ - Preview Image + Preview Image diff --git a/src/views/emergency/danger-points/index.vue b/src/views/emergency/danger-points/index.vue index 0b31c61..799eacb 100644 --- a/src/views/emergency/danger-points/index.vue +++ b/src/views/emergency/danger-points/index.vue @@ -33,6 +33,22 @@ +
+ + +
@@ -170,6 +186,7 @@ import { onMounted, reactive, ref } from "vue"; import { ElMessage, ElMessageBox } from "element-plus"; import { riskPoolPage, riskTypeList, riskPoolDel } from "@/api/emergency"; +import { areaTree } from "@/api/account"; import AddEdit from "./dialog/add-edit.vue"; import Adddynamic from "./dialog/add-dynamic.vue"; @@ -182,6 +199,7 @@ const types = ref([]); const type = ref(""); const search = ref(""); +const areaCode = ref([]) const tableData = ref([]); const currentPage = ref(1); const pageSize = ref(10); @@ -204,6 +222,7 @@ const getList = () => { userId: userId.value, limit: pageSize.value, page: currentPage.value, + areaCode: areaCode.value?areaCode.value[areaCode.value.length - 1]:'', }; riskPoolPage(params).then((res: any) => { tableData.value = res.data.list; @@ -257,9 +276,17 @@ const adddynamic = (id:any) => { dialogdynamic.value = true; dynamicid.value = id; } +//获取地区 +const orgList = ref([]); +const getareaTree = () => { + areaTree(userId.value).then((res: any) => { + orgList.value = res.data; + }); +}; onMounted(() => { getList(); getRiskTypeList(); + getareaTree(); }); diff --git a/src/views/emergency/duty-people/dialog/add-edit.vue b/src/views/emergency/duty-people/dialog/add-edit.vue index 3cc2f6f..88bc607 100644 --- a/src/views/emergency/duty-people/dialog/add-edit.vue +++ b/src/views/emergency/duty-people/dialog/add-edit.vue @@ -45,7 +45,7 @@ > - - + --> +
-
+
刷新
+
+ + +
@@ -138,6 +154,7 @@ import { onMounted, reactive, ref } from "vue"; import { ElMessage, ElMessageBox } from "element-plus"; import { getOtheWareHousePage, delOtheWareHouse } from "@/api/Othteam"; +import { areaTree } from "@/api/account"; import AddDetails from "./dialog/add-house-dialog.vue"; import useUserStore from "@/store/modules/user"; @@ -148,6 +165,7 @@ const userStore = useUserStore(); const user = ref(JSON.parse(userStore.userInfo)); const userId = ref(user.value.userId); const search = ref([]); +const areaCode = ref([]) const tableData = ref([]); const currentPage = ref(1); const pageSize = ref(10); @@ -165,6 +183,7 @@ const getList = () => { houseName: search.value, limit: pageSize.value, page: currentPage.value, + areaCode: areaCode.value?areaCode.value[areaCode.value.length - 1]:'', }; getOtheWareHousePage(params).then((res: any) => { tableData.value = res.data.list; @@ -212,8 +231,16 @@ const toDetail = (id) => { query: { id: id }, }); }; +//获取地区 +const orgList = ref([]); +const getareaTree = () => { + areaTree(userId.value).then((res: any) => { + orgList.value = res.data; + }); +}; onMounted(() => { getList(); + getareaTree(); });