diff --git a/main.js b/main.js
index 8ce64388..7fab58d5 100644
--- a/main.js
+++ b/main.js
@@ -55,7 +55,7 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
// Vue.prototype.url_config = 'http://192.168.34.221:28890/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地
- // Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地
+ Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.221:19112/' //郭圣雄本地
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
@@ -127,8 +127,8 @@ if (process.env.NODE_ENV === 'development') {
Vue.prototype.work_url = 'http://101.43.164.214:11137'// 新金湾地址 通用
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/'// 测试环境h5
- // Vue.prototype.url_config = 'https://192.168.1.2/'// 青海中水北方
- Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/'// 潮州项目h5
+ Vue.prototype.url_config = 'https://192.168.1.2/'// 青海中水北方
+ // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/'// 潮州项目h5
// Vue.prototype.url_config = 'http://222.80.185.228:6090/' // 木垒县新能源工程线上地址
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
diff --git a/pages/projectEnd/environment/menu.vue b/pages/projectEnd/environment/menu.vue
index 6d562270..51c5bfbf 100644
--- a/pages/projectEnd/environment/menu.vue
+++ b/pages/projectEnd/environment/menu.vue
@@ -116,6 +116,16 @@
+
+
+
+ {{realTimeData.evaporationRate || '--'}} mm
+
+
+ 蒸发量
+
+
+
diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue
index d36359bb..f47c0538 100644
--- a/pages/projectEnd/safeSame/addIssue.vue
+++ b/pages/projectEnd/safeSame/addIssue.vue
@@ -57,10 +57,10 @@
? item.displayFieldName
: item.originalFieldName}}：
-
+
请选择
- {{issueName}}
+ {{item.originalFieldName == '排查分类' ? issueName : form.problemDescription}}
@@ -70,7 +70,7 @@
? item.displayFieldName
: item.originalFieldName}}：
-
+
请输入
{{issueName}}
@@ -1124,11 +1124,16 @@
if (val[0].parents.length == 0) {
this.form.dangerTypeId = val[0].id;
this.issueName = val[0].dangerName;
+ this.form.problemDescription = val[0].dangerName;
} else {
this.form.dangerTypeId = val[0].parents[0].id;
- this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0]
- .dangerName;
- this.form.dangerName = val[0].dangerName
+ if(this.checkedTab=='type2') {
+ this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0].dangerName;
+ } else {
+ this.issueName = val[0].parents.map(item => item.dangerName).join('/');
+ }
+ //
+ this.form.problemDescription = val[0].dangerName;
}
const find = this.securityDangerFieldList.find(
(item) =>
diff --git a/pages/projectEnd/safeSame/editIssue.vue b/pages/projectEnd/safeSame/editIssue.vue
index 6ae01206..e976db3a 100644
--- a/pages/projectEnd/safeSame/editIssue.vue
+++ b/pages/projectEnd/safeSame/editIssue.vue
@@ -57,10 +57,10 @@
? item.displayFieldName
: item.originalFieldName}}：
-
+
请选择
- {{issueName}}
+ {{item.originalFieldName == '排查分类' ? issueName : form.problemDescription}}
@@ -70,7 +70,7 @@
? item.displayFieldName
: item.originalFieldName}}：
-
+
请输入
{{issueName}}
@@ -645,7 +645,7 @@
};
that.checkPointName = that.form.regionName;
that.issueName = that.form.dangerItemContent;
- that.form.dangerItemContent = that.form.problemDescription;
+ // that.form.dangerItemContent = that.form.problemDescription;
that.form.inspectTime = dateformat(new Date());
this.$nextTick(() => {
const resultList = this.getAllIds(this.checkPointList);
@@ -1211,13 +1211,17 @@
if (val[0].parents.length == 0) {
this.form.dangerTypeId = val[0].id;
this.issueName = val[0].dangerName;
+ this.form.problemDescription = val[0].dangerName;
} else {
this.form.dangerTypeId = val[0].parents[0].id;
// this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0]
// .dangerName;
- this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0]
- .dangerName;
- this.form.dangerName = val[0].dangerName
+ if(this.checkedTab=='type2') {
+ this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0].dangerName;
+ } else {
+ this.issueName = val[0].parents.map(item => item.dangerName).join('/');
+ }
+ this.form.problemDescription = val[0].dangerName;
}
const find = this.securityDangerList.find(
(item) =>
diff --git a/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue b/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue
index 542fc6dd..23c86281 100644
--- a/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue
+++ b/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue
@@ -58,11 +58,11 @@
: item.originalFieldName}}：
-
+
请选择
- {{issueName}}
+ {{form.problemDescription}}
@@ -72,7 +72,7 @@
? item.displayFieldName
: item.originalFieldName}}：
-
+
请输入
{{issueName}}
@@ -652,7 +652,8 @@
};
that.checkPointName = that.form.regionName;
that.issueName = that.form.dangerItemContent;
- that.form.dangerItemContent = that.form.problemDescription;
+ // that.form.dangerItemContent = that.form.dangerItemContent;
+
that.form.inspectTime = dateformat(new Date());
// this.$nextTick(() => {
// const resultList = this.getAllIds(this.checkPointList);
@@ -1193,13 +1194,16 @@
if (val[0].parents.length == 0) {
this.form.dangerTypeId = val[0].id;
this.issueName = val[0].dangerName;
+ this.form.problemDescription = val[0].dangerName
} else {
this.form.dangerTypeId = val[0].parents[0].id;
- // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0]
- // .dangerName;
- this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0]
- .dangerName;
- this.form.dangerName = val[0].dangerName
+ if(this.checkedTab=='type2') {
+ this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0].dangerName;
+ } else {
+ this.issueName = val[0].parents.map(item => item.dangerName).join('/');
+ }
+ // + '/' + val[0].dangerName;
+ this.form.problemDescription = val[0].dangerName
}
const find = this.securityDangerFieldList.find(
(item) =>
diff --git a/pages/projectEnd/safeSame/hiddenTroubleComponents/hiddenTroubleList.vue b/pages/projectEnd/safeSame/hiddenTroubleComponents/hiddenTroubleList.vue
index 618d37f3..2fa07442 100644
--- a/pages/projectEnd/safeSame/hiddenTroubleComponents/hiddenTroubleList.vue
+++ b/pages/projectEnd/safeSame/hiddenTroubleComponents/hiddenTroubleList.vue
@@ -1061,7 +1061,12 @@
>view:last-child {
flex: 1;
color: #4D4D4D;
- word-break: break-all;
+ // word-break: break-all;
+
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+
// display: -webkit-box;
// -webkit-box-orient: vertical;
// -webkit-line-clamp: 1;