admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 解决冲突

Browse Source
This commit is contained in:
kun 2024-03-15 09:31:19 +08:00
commit ea0d34aaa6
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -3,7 +3,7 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地 # 后端本地
VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:9111'
# VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://192.168.34.221:28888'
# VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://121.196.214.246/api'
# VITE_API_URL = 'http://jxj.zhgdyun.com:100' # VITE_API_URL = 'http://jxj.zhgdyun.com:100'

5
src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue
View File

@ -68,7 +68,8 @@
import Card from "@/components/card.vue"; import Card from "@/components/card.vue";
import { ref, watch, onMounted } from "vue"; import { ref, watch, onMounted } from "vue";
import { getStageOption } from "@/api/modules/projectOverview"; import { getStageOption } from "@/api/modules/projectOverview";
import { GlobalStore } from "@/stores";
const store = GlobalStore();
const progressList = ref([ const progressList = ref([
// { // {
// name: "施工证获取", // name: "施工证获取",
@ -127,7 +128,7 @@ watch(
//获取里程碑option //获取里程碑option
const getProgressOption = async () => { const getProgressOption = async () => {
const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage" }); const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage", projectSn: store.sn });
if (res.result.length > 0) { if (res.result.length > 0) {
let newArray = res.result.map((item: any) => { let newArray = res.result.map((item: any) => {
return { return {

14
src/views/sevenLargeScreen/headNoise/centerTop.vue
View File

@ -16,13 +16,13 @@
<div class="gifImg"> <div class="gifImg">
<img src="@/assets/images/dustNoise/centerGif.gif" alt="" /> <img src="@/assets/images/dustNoise/centerGif.gif" alt="" />
</div> </div>
<div class="menListWd menu">温度:{{ plantCap.temperature ? plantCap.temperature : "--" }}℃</div> <div class="menListWd menu">温度:{{ plantCap.temperature || plantCap.temperature == '0' ? plantCap.temperature : "--" }}℃</div>
<div class="menListSd menu">湿度:{{ plantCap.humidity ? plantCap.humidity : "--" }}%RH</div> <div class="menListSd menu">湿度:{{ plantCap.humidity || plantCap.humidity == '0' ? plantCap.humidity : "--" }}%RH</div>
<div class="menListPm2 menu">PM2.5:{{ plantCap.pm25 ? plantCap.pm25 : "--" }}ug/m³</div> <div class="menListPm2 menu">PM2.5:{{ plantCap.pm25 || plantCap.pm25 == '0' ? plantCap.pm25 : "--" }}ug/m³</div>
<div class="menListTs menu">TSP:{{ plantCap.tsp ? plantCap.tsp : "--" }}ug/m³</div> <div class="menListTs menu">TSP:{{ plantCap.tsp || plantCap.tsp == '0' ? plantCap.tsp : "--" }}ug/m³</div>
<div class="menListPm10 menu">PM10:{{ plantCap.pm10 ? plantCap.pm10 : "--" }}ug/m³</div> <div class="menListPm10 menu">PM10:{{ plantCap.pm10 || plantCap.pm10 == '0' ? plantCap.pm10 : "--" }}ug/m³</div>
<div class="menListZs menu">噪声:{{ plantCap.noise ? plantCap.noise : "--" }}dB</div> <div class="menListZs menu">噪声:{{ plantCap.noise || plantCap.noise == '0' ? plantCap.noise : "--" }}dB</div>
<div class="menListFs menu">风速:{{ plantCap.windspeed ? plantCap.windspeed : "--" }}m/s</div> <div class="menListFs menu">风速:{{ plantCap.windspeed || plantCap.windspeed == '0' ? plantCap.windspeed : "--" }}m/s</div>
</div> </div>
</div> </div>
</template> </template>

2
src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue
View File

@ -201,7 +201,7 @@ function initOption() {
params[0].seriesName + params[0].seriesName +
":" + ":" +
params[0].value[1] + params[0].value[1] +
"mm" "kN"
); );
} }
}, },

2
src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue
View File

@ -199,7 +199,7 @@ function initOption() {
params[0].seriesName + params[0].seriesName +
":" + ":" +
params[0].value[1] + params[0].value[1] +
"mm" "kN"
); );
} }
}, },

4
src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue
View File

@ -83,8 +83,8 @@ const BASEURL = import.meta.env.VITE_API_URL;
let currentIndex = ref(1 as any); let currentIndex = ref(1 as any);
// let showDialog = ref(false as any); // let showDialog = ref(false as any);
function openDialog(item: any) { function openDialog(item: any) {
currentIndex.value = item.id; // currentIndex.value = item.id;
showDialog.value = true; // showDialog.value = true;
} }
function closeDialog() { function closeDialog() {
showDialog.value = false; showDialog.value = false;