diff --git a/.env.development b/.env.development index ce4ccb5..d72a9f3 100644 --- a/.env.development +++ b/.env.development @@ -2,11 +2,11 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) -VITE_API_URL = 'http://192.168.34.155:6688' +# VITE_API_URL = 'http://192.168.34.155:6688' # VITE_API_URL = 'http://183.63.230.59:6090' # VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296' VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081" -# VITE_API_URL = "http://jxjzw.zhgdyun.com:9013" +VITE_API_URL = "http://jxjzw.zhgdyun.com:9013" # VITE_API_URL = 'https://xmglcs.hyjgxt.cn:6090' # 上传 diff --git a/src/assets/images/xmgl/projectScreenBg.png b/src/assets/images/xmgl/projectScreenBg.png new file mode 100644 index 0000000..181e842 Binary files /dev/null and b/src/assets/images/xmgl/projectScreenBg.png differ diff --git a/src/assets/images/xmgl/projectScreenBg2.png b/src/assets/images/xmgl/projectScreenBg2.png new file mode 100644 index 0000000..40568ac Binary files /dev/null and b/src/assets/images/xmgl/projectScreenBg2.png differ diff --git a/src/assets/images/xmgl/projectScreenIcon.png b/src/assets/images/xmgl/projectScreenIcon.png new file mode 100644 index 0000000..879bf55 Binary files /dev/null and b/src/assets/images/xmgl/projectScreenIcon.png differ diff --git a/src/assets/images/xmgl/projectScreenIcon2.png b/src/assets/images/xmgl/projectScreenIcon2.png new file mode 100644 index 0000000..cfa82d3 Binary files /dev/null and b/src/assets/images/xmgl/projectScreenIcon2.png differ diff --git a/src/assets/images/xmgl/projectScreenIcon3.png b/src/assets/images/xmgl/projectScreenIcon3.png new file mode 100644 index 0000000..72cfe42 Binary files /dev/null and b/src/assets/images/xmgl/projectScreenIcon3.png differ diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/right.vue b/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/right.vue index 7d4cdc6..86a34ca 100644 --- a/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/right.vue +++ b/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/right.vue @@ -123,17 +123,19 @@ const threeDOption = (val: any[] | ResponseSame { - data.push({ name: item.name, value: 0 }); - }); + const colorList = ["#3c6fb6", "#53d5a3", "#f6bc05", "#EA4916"]; let temp = 0; val.forEach((item2: { dict_value: string; num: number }, index: number) => { temp += Number(item2.num); - data.forEach((item, index) => { - if (item.name == item2.dict_value) { - item.value = Number(item2.num); - } - }); + if (Number(item2.num) > 0) { + data.push({ + name: item2.dict_value, + value: Number(item2.num), + itemStyle: { + color: colorList[index % colorList.length] + } + }); + } }); allNumber = temp; console.log(allNumber, data, "777888"); @@ -318,29 +320,29 @@ const threeDOption = (val: any[] | ResponseSame
企业类型切换
- +
- + @@ -28,15 +36,25 @@
项目名称
得分
-
-
+
+
-
+
{{ index + 1 }}
- {{ item.enterpriseName }} + {{ item.enterpriseName }}
{{ item.enterpriseTypeName }}
- {{ item.engineeringName }} + {{ item.engineeringName }}
{{ item.score }}
@@ -120,17 +138,45 @@ import { Vue3SeamlessScroll } from "vue3-seamless-scroll"; import { getEnvironmentAlarmStat, getEnvironmentAlarm } from "@/api/modules/largeScreenTwo"; import { useRouter } from "vue-router"; import { getDicList } from "@/api/modules/jxjview"; +import { rankScoreList } from "@/api/modules/huizhou"; const router = useRouter(); const tableParams = ref({ searchvalue: null, - enterpriseName: "" + enterpriseName: "", + scoreSort: 1 }); -const rankList = ref([]); +const rankList = ref([ + { enterpriseName: "123", enterpriseTypeName: "123", engineeringName: "123", score: "123" }, + { enterpriseName: "123", enterpriseTypeName: "123", engineeringName: "123", score: "123" } +]); const DicMainList = ref([]); // import pinia from "@/store/index"; // import { useStore } from "@/store/module"; // const store = useStore(pinia); +// input输入切换 +const inputChange = () => { + getAllCountList(); +}; +// select切换 +const selectChange = () => { + getAllCountList(); +}; +// 排行榜数据 +const getAllCountList = async () => { + let requestData = { + enterpriseName: tableParams.value.enterpriseName, + enterpriseType: tableParams.value.searchvalue, + scoreSort: tableParams.value.scoreSort, + scoreType: 0 + }; + const res = await rankScoreList(requestData); + if (res && res.result && res.result.length > 0) { + rankList.value = res.result; + } else { + rankList.value = []; + } +}; // 企业类型 const getDicMainList = async () => { const { result } = await getDicList({ dictType: "enterprise_main" }); @@ -252,6 +298,7 @@ onMounted(() => { getEnvironmentAlarmStatFn(); getEnvironmentAlarmFn(); getDicMainList(); + getAllCountList(); }); const goDataManagement = val => { router.push("/goverment/huizhou/siteSupervision/environmentalMonitoring/index"); @@ -428,7 +475,6 @@ const settxa = (arr1, arr2) => { margin: 0 auto; margin-top: 45px; display: flex; - flex-wrap: wrap; flex-direction: column; .phb_content { display: flex; @@ -502,7 +548,7 @@ const settxa = (arr1, arr2) => { display: flex; background: #1b2557; color: #c5d0d4; - height: 35px; + height: 40px; justify-content: space-around; .table_header_title { font-size: 14px; @@ -539,6 +585,9 @@ const settxa = (arr1, arr2) => { border-right: none; } } + .table-content { + height: 72%; + } .phb_scroll { overflow: hidden; width: 100%; diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue index 9af7f1c..ff036b4 100644 --- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue +++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue @@ -4,6 +4,7 @@ v-model="active" :tabs="['项目名称', '工程名称']" :records="records" + :activeIndex="modelActive" @change-page="onCurChange" @search="onSearchInput" :pageable="pages" @@ -142,6 +143,7 @@ import { import { sendIframeMessage } from "@/utils/util"; import divDialogComponent from "@/components/divDialogComponent/index.vue"; const route = useRoute(); +const modelActive = ref(0); const detailsDialog = ref(false); const relativeId = ref(""); @@ -515,7 +517,17 @@ onMounted(async () => { searchSn.value = records.value[0].projectSn; searchName.value = records.value[0].projectName; searchId.value = records.value[0].id; - onSearch(records.value[0]); + if (route.query.projectName) { + let defaultActive = records.value.findIndex((item: any) => { + return route.query.projectName == item.engineeringName; + }); + if (defaultActive != -1) { + modelActive.value = defaultActive; + onSearch(records.value[defaultActive]); + } + } else { + onSearch(records.value[0]); + } await sendIframeMessage({ obj: { path: route.path } }, 2, undefined); }); diff --git a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue index 937ab89..bf24839 100644 --- a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue +++ b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue @@ -4,6 +4,7 @@ v-model="active" :tabs="['项目名称', '工程名称']" :records="records" + :activeIndex="modelActive" @change-page="onCurChange" @search="onSearchInput" :pageable="pages" @@ -73,6 +74,7 @@ import ProTable from "@/components/ProTable/index.vue"; import { ColumnProps } from "@/components/ProTable/interface"; import { getRealTimePage } from "@/api/modules/project"; import { sendIframeMessage } from "@/utils/util"; +const modelActive = ref(0); const proTable = ref(); const route = useRoute(); const pages = ref({ @@ -273,7 +275,17 @@ onMounted(async () => { await getEngPage(); searchSn.value = (records.value as ResAiProjectPage[])[0].engineeringSn; searchName.value = (records.value as ResAiProjectPage[])[0].engineeringSnName; - onSearch(records.value[0]); + if (route.query.projectName) { + let defaultActive = records.value.findIndex((item: any) => { + return route.query.projectName == item.engineeringName; + }); + if (defaultActive != -1) { + modelActive.value = defaultActive; + onSearch(records.value[defaultActive]); + } + } else { + onSearch(records.value[0]); + } await sendIframeMessage({ obj: { path: route.path } }, 2, undefined); }); diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/milestone copy.vue b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/milestone copy.vue new file mode 100644 index 0000000..d02d156 --- /dev/null +++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/milestone copy.vue @@ -0,0 +1,130 @@ + + + diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/milestone.vue b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/milestone.vue index d02d156..9744bad 100644 --- a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/milestone.vue +++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/milestone.vue @@ -1,21 +1,90 @@