diff --git a/.env.development b/.env.development index dd6806d..775429d 100644 --- a/.env.development +++ b/.env.development @@ -15,6 +15,8 @@ VITE_SCREEN = /prod-api # 访问服务器文件地址 VITE_UPLOAD_IMG_URL = /dev-img-api # Cross-domain proxy, you can configure multiple -VITE_PROXY = [ ["/prod-api", "http://192.168.110.10:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ] ] +# VITE_PROXY = [ ["/prod-api", "http://42.193.40.239:6111" ],["/dev-img-api", "http://42.193.40.239:8017" ] ] +VITE_PROXY = [ ["/prod-api", "http://192.168.2.179:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ] ] +# VITE_PROXY = [ ["/prod-api", "http://42.193.40.239:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ] ] VITE_UPLOAD_URL = http://42.193.40.239:8888/ # VITE_PROXY = [ ["/prod-api", "http://42.193.40.239:8017" ] ] diff --git a/src/api/account.ts b/src/api/account.ts index 2cef525..ad02543 100644 --- a/src/api/account.ts +++ b/src/api/account.ts @@ -9,10 +9,10 @@ export function areaTree() { method: "GET", }); } - /** - *风险列表分页 - */ - export function riskTypeList() { +/** +*风险列表分页 +*/ +export function riskTypeList() { return request({ url: `/admin/risk/riskTypeList`, method: "GET", @@ -21,7 +21,7 @@ export function areaTree() { /** *查询所有应急上报事件类型 */ - export function emerEventType() { +export function emerEventType() { return request({ url: `/admin/emerEvent/emerEventType`, method: "GET", @@ -31,9 +31,20 @@ export function areaTree() { /** *获取用户信息 */ - export function sysUserInfo() { +export function sysUserInfo() { return request({ url: `/screen/index/getSysUserInfo`, method: "GET", }); +} +/** +*文件查询 +*/ +export function getFile(otcid: string, otctype: string) { + + return request({ + url: `/common/upload/getFile`, + method: "GET", + params: { otcid, otctype } + }); } \ No newline at end of file diff --git a/src/api/homePage.ts b/src/api/homePage.ts index ff00ed6..b2b8662 100644 --- a/src/api/homePage.ts +++ b/src/api/homePage.ts @@ -22,8 +22,9 @@ export function wkTypes(params) { //工作动态分类型开展情况-前五条 export function workProgress(params) { return request({ - url: `/screen/index/workProgress/${params.typeId}`, + url: `/screen/index/workProgress`, method: "GET", + params: params }); } /** diff --git a/src/assets/images/null.png b/src/assets/images/null.png new file mode 100644 index 0000000..3fa1af0 Binary files /dev/null and b/src/assets/images/null.png differ diff --git a/src/components/global-register/map/Mars3D.vue b/src/components/global-register/map/Mars3D.vue index ca58c83..15e9bde 100644 --- a/src/components/global-register/map/Mars3D.vue +++ b/src/components/global-register/map/Mars3D.vue @@ -426,7 +426,7 @@ const datatext4 = ref("xxxxxxx地址"); */ const loadAreaChild = (attrTemp: any) => { graphicLayer.value.bindPopup((event: any) => { - console.log(event.graphic, "event====>"); + console.log(event.graphic.objectsToExclude?.item, "event====>"); let attr = event.graphic.attr || {}; let title = "点位"; let item = event.graphic.objectsToExclude?.item @@ -471,8 +471,19 @@ const loadAreaChild = (attrTemp: any) => { break; case 5: title = "户籍信息"; - attr["上报标题："] = item.name; + attr["姓名："] = item.name; + attr["性别："] = item.sex == 1 ? "男" : "女"; attr["所属地区："] = item.areaName; + + attr["婚姻状态："] = item.marriageState == 1 ? '已婚': item.marriageState == 2 ?'未婚' : item.marriageState == 3 ?'离婚' : item.marriageState == 4 ?'丧偶' : '单亲'; + attr["是否脱贫户："] = item.poorState == 1 ? '是': '否'; + attr["出生日期："] = item.birthday; + attr["现居地址："] = item.address; + attr["跳转："] = ``; break; default: diff --git a/src/store/index.ts b/src/store/index.ts index 4d09c7f..229f4dd 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -6,6 +6,8 @@ export const useModelStore = defineStore("model", { model: true, layerType: {},//图层显示 checkednum: [],//选中图层 + tanchuang: false,//弹窗 + tandetails: {},//弹窗详情 }), getters: { @@ -18,6 +20,12 @@ export const useModelStore = defineStore("model", { getcheckednum(): any { return this.checkednum }, + gettanchuang(): boolean { + return this.tanchuang + }, + gettandetails(): object { + return this.tandetails + } }, actions: { @@ -30,6 +38,12 @@ export const useModelStore = defineStore("model", { setcheckednum(value: any) { this.checkednum = value; }, + settanchuang(value: any) { + this.tanchuang = value; + }, + settandetails(value: any) { + this.tandetails = value; + } }, }); diff --git a/src/views/bottom-menu/index.vue b/src/views/bottom-menu/index.vue index 120c054..b7e33ea 100644 --- a/src/views/bottom-menu/index.vue +++ b/src/views/bottom-menu/index.vue @@ -11,7 +11,7 @@ diff --git a/src/views/home-page/left-side/components/basicInformation.vue b/src/views/home-page/left-side/components/basicInformation.vue index 6c3f98d..7f617b0 100644 --- a/src/views/home-page/left-side/components/basicInformation.vue +++ b/src/views/home-page/left-side/components/basicInformation.vue @@ -21,7 +21,8 @@
{{ item.lable }}
-
{{ item.value }}
+
{{ item.value }}(人)
+
{{ item.houseNum }}(户)
@@ -72,6 +73,7 @@ const setData = () => { { value: populationList.value[index].value, name: populationList.value[index].lable, + houseNum: populationList.value[index].houseNum, }, { value: "0", @@ -91,10 +93,12 @@ const getPersonnelTypeStatistic = () => { populationList.value.push({ lable: item.typeName, value: item.typeNum, + houseNum:item.houseNum, color: color(), }); - population.value += item.typeNum; + // population.value += item.typeNum; }); + population.value = res.data[0].peopleNum setData(); }); }; @@ -184,7 +188,7 @@ onMounted(() => { display: flex; align-items: center; height: 27px; - width: 45%; + width: 100%; > div:nth-child(1) { width: 8px; height: 8px; @@ -196,11 +200,12 @@ onMounted(() => { font-family: Source Han Sans CN, Source Han Sans CN; font-weight: 400; color: #a4a6ab; - flex: 1; + // flex: 1; + width: 130px; } > div:nth-child(3) { border-top: 1px #707070 dashed; - width: 50px; + width: 100px; margin-right: 5px; } > div:nth-child(4) { @@ -210,5 +215,14 @@ onMounted(() => { font-weight: 500; color: #ffc97a; } + > div:nth-child(5) { + width: 50px; + margin-left: 10px; + font-size: 14px; + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 500; + color: #ffc97a; + flex: 1; + } } \ No newline at end of file diff --git a/src/views/home-page/left-side/components/workSituation.vue b/src/views/home-page/left-side/components/workSituation.vue index 9150871..3adc7c8 100644 --- a/src/views/home-page/left-side/components/workSituation.vue +++ b/src/views/home-page/left-side/components/workSituation.vue @@ -4,40 +4,25 @@
-
+ "> {{ item.typeName }}
-
- - - -
{{ item.title }}
+
+ + + + +
+
{{ item.title }}
+
{{ item.detail }}
+
@@ -46,12 +31,7 @@
- + @@ -70,6 +50,8 @@ export default defineComponent({