diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
index 78faca44..6c5de1e8 100644
--- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
+++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
@@ -15,7 +15,7 @@
开工日期:{{ projectInfo.commencementDate }} |
开设工资专用账户时间:{{ projectInfo.payrollAccountTime }}
- {{ projectInfo.dedicatedAccountWarning }}
+ {{ projectInfo.dedicatedAccountWarning }}
{{ projectInfo.dedicatedAccountWarning }}
|
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
index 4dcc41f4..03c52687 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
@@ -413,7 +413,7 @@
-
+
{
if (response.code === 200) {
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
index 52c7d5f8..53cca25e 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
@@ -190,7 +190,7 @@
v-model="form.qualificationCategory"
placeholder="请选择资质类别"
style="width: 100%"
- disabled
+
>
+
+
+
+
+
-
-
-
-
{
this.totalData=res.data
+ console.log(this.totalData,'totalData')
this.totalLoading=false
})
},
diff --git a/jwtech-pc-page/config/index.js b/jwtech-pc-page/config/index.js
index bd60b3d5..a6fd2b99 100644
--- a/jwtech-pc-page/config/index.js
+++ b/jwtech-pc-page/config/index.js
@@ -33,7 +33,7 @@ module.exports = {
proxyTable: {
'/jgThinking/thinking': {
// target: 'http://127.0.0.1:18080/kms-pc-web',
- target: 'http://localhost:18080',
+ target: 'http://19.25.74.73:8096',
// target: 'http://192.168.2.100:18082/tianhui-admin-web',
changeOrigin: true,
pathRewrite: {
diff --git a/jwtech-pc-page/src/api/enterpriseInformation.js b/jwtech-pc-page/src/api/enterpriseInformation.js
index 6194b6f8..68bc7557 100644
--- a/jwtech-pc-page/src/api/enterpriseInformation.js
+++ b/jwtech-pc-page/src/api/enterpriseInformation.js
@@ -139,3 +139,11 @@ export function getInfoTotal(){
method: 'get'
})
}
+
+
+export function getZhxxById(id){
+ return request({
+ url: '/enterprise/zhxx/'+id,
+ method: 'get'
+ })
+}
diff --git a/jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue b/jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue
index 08ece585..9b7d546f 100644
--- a/jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue
+++ b/jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue
@@ -38,7 +38,9 @@ export default {
type: "like",
value: ""
},
- data: {},
+ data: {
+ textType:0
+ },
pageNum: 1,
pageSize: 10
},
diff --git a/jwtech-pc-page/src/views/home/components/statisticsRight.vue b/jwtech-pc-page/src/views/home/components/statisticsRight.vue
index 3128245b..c8fc9fcc 100644
--- a/jwtech-pc-page/src/views/home/components/statisticsRight.vue
+++ b/jwtech-pc-page/src/views/home/components/statisticsRight.vue
@@ -83,7 +83,7 @@ export default {
});
console.log(convertedData,2222)
// **异步加载本地 China.json**
- const guangdongJson = await fetch("/static/map/guangdong.json").then(res => res.json())
+ const guangdongJson = await fetch("./static/map/guangdong.json").then(res => res.json())
console.log("1111111111111111111111")
console.log(guangdongJson)
echarts.registerMap("guangdong", guangdongJson);
@@ -211,7 +211,6 @@ export default {
roam: true,
label: {
normal: {
- show: WebTransportDatagramDuplexStream,
textStyle: {
color: '#fff'
}
diff --git a/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue b/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
index 5abe5109..419cf704 100644
--- a/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
+++ b/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
@@ -41,7 +41,7 @@