diff --git a/.env.development b/.env.development index cb3bc29..fbc4b89 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.155:19111' -# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' @@ -24,7 +24,7 @@ NODE_ENV = 'development' # VITE_API_URL = 'http://182.90.224.237:15551' # agjt # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 -VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 +# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信/重庆市南岸区 # VITE_API_URL = 'http://101.43.164.214:11111' diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue index c1beaa2..0f45312 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue @@ -5,12 +5,18 @@
{{ item.dangerItemContent }}
-
- 整改结果: - {{ - item.status ? statusNameFilter(item.status).name : "" - }} - 已逾期 +
+
+ 整改结果: + {{ + item.status ? statusNameFilter(item.status).name : "" + }} +
+
+ 责任单位: + {{ item.enterpriseName || "" }} +
+ 已逾期
@@ -118,14 +124,15 @@ onMounted(async () => { border-radius: 0px 0px 0px 0px; border: 1px solid; // opacity: 0.7; - opacity: 0.9; + // opacity: 0.9; border-image: linear-gradient(359deg, rgba(17, 141, 255, 1), rgba(17, 141, 255, 0)) 1 1; padding: 9px 13px; margin-bottom: 10px; + position: relative; > div:nth-child(1) { font-family: ABeeZee, ABeeZee; font-weight: 400; - font-size: 16px; + font-size: 14px; color: #ffffff; line-height: 16px; font-style: normal; @@ -135,7 +142,7 @@ onMounted(async () => { > div:nth-child(2) { font-family: ABeeZee, ABeeZee; font-weight: 400; - font-size: 13px; + font-size: 11px; color: #ffffff; font-style: normal; text-transform: none; @@ -144,12 +151,15 @@ onMounted(async () => { > div:nth-child(3) { display: flex; align-items: center; - justify-content: space-between; + // justify-content: space-between; margin-bottom: 2px; + > div:not(:last-child) { + width: 30%; + } > div:nth-child(1) { font-family: ABeeZee, ABeeZee; font-weight: 400; - font-size: 13px; + font-size: 11px; color: #ffffff; font-style: normal; text-transform: none; @@ -160,7 +170,7 @@ onMounted(async () => { > div:not(:nth-child(1)) { font-family: ABeeZee, ABeeZee; font-weight: 400; - font-size: 13px; + font-size: 11px; color: #8893a1; font-style: normal; text-transform: none; @@ -188,4 +198,19 @@ onMounted(async () => { ::v-deep .h-card .content { height: 80%; } + +.text-ellipsis { + color: #fff; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} +.period { + color: #e25f64; + margin-left: 6px; + position: absolute; + top: 8px; + right: 10px; +} diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue index 533cd5c..de7294b 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue @@ -75,7 +75,8 @@ const getEnterpriseInfoList = async (showLoading: boolean) => { projectSn: store.sn, enterpriseName: "", enterpriseTypeId: "", - userEnterpriseId: "" + userEnterpriseId: "", + isCountMainEnterprise: 1 }, showLoading ); diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index 3e0c460..f374e39 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -223,9 +223,9 @@ const openDialogData = async () => { res.result.forEach((item: any, index: number) => { resultList.push({ id: `list${index}`, - radius: "70%", + radius: "60%", isLegend: "top", - radarCenter: ["50%", "60%"], + radarCenter: ["50%", "55%"], dataList: [ { value: [item.security, item.safe, item.levelRisk, item.limitTime], diff --git a/src/views/overviewScreen/commandCenter/rightAll.vue b/src/views/overviewScreen/commandCenter/rightAll.vue index 725bd33..01c5ee7 100644 --- a/src/views/overviewScreen/commandCenter/rightAll.vue +++ b/src/views/overviewScreen/commandCenter/rightAll.vue @@ -889,7 +889,8 @@ const getEnterpriseInfoList = async (showLoading: boolean) => { projectSn: store.sn, enterpriseName: "", enterpriseTypeId: "", - userEnterpriseId: "" + userEnterpriseId: "", + isCountMainEnterprise: 1 }, showLoading );