diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index e39128ae..94fad474 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -41,10 +41,10 @@ if (process.env.NODE_ENV == 'development') {
// tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
- axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
+ // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
- // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
+ axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
// axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
diff --git a/src/store/index.js b/src/store/index.js
index f03d839a..ec69a772 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -45,8 +45,8 @@ export default new Vuex.Store({
// UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
// FILEURL:'http://10.0.1.43:6023/image/',//测试
BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
- UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
- FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+ // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
+ // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
// UPLOADURL: 'http://124.71.178.44:100/upload/image',
@@ -56,8 +56,8 @@ export default new Vuex.Store({
// UPLOADURL: 'http://182.90.224.237:7000/upload/image',
// FILEURL: 'http://182.90.224.237:7000/image/',
// 邱平毅的
- // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
- // FILEURL: 'http://192.168.34.216:6023/image/',
+ UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+ FILEURL: 'http://192.168.34.216:6023/image/',
// UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
// FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
diff --git a/src/views/companyAdmin/material/materialDictionary.vue b/src/views/companyAdmin/material/materialDictionary.vue
index cbdb25fe..100be90d 100644
--- a/src/views/companyAdmin/material/materialDictionary.vue
+++ b/src/views/companyAdmin/material/materialDictionary.vue
@@ -322,19 +322,19 @@
style="display: inline-block"
>
- ~
+ -
@@ -524,19 +524,19 @@
style="display: inline-block"
>
- ~
+ -
@@ -578,6 +578,7 @@
diff --git a/src/views/equipmentCenter/laborManage/devConfig.vue b/src/views/equipmentCenter/laborManage/devConfig.vue
index a5e5b872..a7a0e331 100644
--- a/src/views/equipmentCenter/laborManage/devConfig.vue
+++ b/src/views/equipmentCenter/laborManage/devConfig.vue
@@ -588,6 +588,7 @@
},
selectHousingList(){
selectHousingListApi({}).then((res) => {
+ console.log('=======',res)
this.housingList=res.result
});
},
diff --git a/src/views/projectFront/laborManage/EpidemicPrevention/index.vue b/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
index 042a1f10..99ac7190 100644
--- a/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
+++ b/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
@@ -544,6 +544,7 @@ export default {
this.title = title;
this.reset();
this.detailLoading = true;
+ // 核酸时间
if (title.includes('核酸')) {
workerNucleicAcidDetectionList({ workerId: row.id }).then(res => {
console.log('查询人员新冠核酸检测记录: ', res);
diff --git a/src/views/projectFront/materialManage/materialManage.vue b/src/views/projectFront/materialManage/materialManage.vue
index d7502968..bcb1fdb7 100644
--- a/src/views/projectFront/materialManage/materialManage.vue
+++ b/src/views/projectFront/materialManage/materialManage.vue
@@ -365,19 +365,19 @@
>
- ~
+ -
@@ -585,19 +585,19 @@
style="display: inline-block"
>
- ~
+ -
diff --git a/src/views/projectFront/personnelPosition/overview.vue b/src/views/projectFront/personnelPosition/overview.vue
index 85228f3f..6d060e06 100644
--- a/src/views/projectFront/personnelPosition/overview.vue
+++ b/src/views/projectFront/personnelPosition/overview.vue
@@ -347,7 +347,12 @@ export default {
this.getDate();
var a = new Array(this.$t("message.personnelPosition.overview.week")); //("日", "一", "二", "三", "四", "五", "六")
var week = new Date().getDay();
- var str = this.$t("message.personnelPosition.overview.today") + a[week];
+ let val = a[0].find((item,index)=>{
+ if(index == week){
+ return item
+ }
+ })
+ var str = this.$t("message.personnelPosition.overview.today") + val;
this.week = str;
},
mounted() {