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

一些bug的修复

Browse Source
This commit is contained in:
骆乐 2022-09-22 18:24:21 +08:00
parent 244e976f0a
commit 6116521c41
7 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -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/';

8
src/store/index.js
View File

@ -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/',//正式

13
src/views/companyAdmin/material/materialDictionary.vue
View File

@ -322,19 +322,19 @@
style="display: inline-block"
>
<el-input
style="width: 150px !important"
style="width: 145px !important"
v-model="dialogdata.adjustStartValue"
placeholder="请输入数值"
></el-input>
</el-form-item>
~
-
<el-form-item
label=""
prop="adjustEndValue"
style="display: inline-block"
>
<el-input
style="width: 150px !important"
style="width: 145px !important"
v-model="dialogdata.adjustEndValue"
placeholder="请输入数值"
></el-input>
@ -524,19 +524,19 @@
style="display: inline-block"
>
<el-input
style="width: 150px !important"
style="width: 145px !important"
v-model="dialogdata.adjustStartValue"
placeholder="请输入数值"
></el-input>
</el-form-item>
~
-
<el-form-item
label=""
prop="adjustEndValue"
style="display: inline-block"
>
<el-input
style="width: 150px !important"
style="width: 145px !important"
v-model="dialogdata.adjustEndValue"
placeholder="请输入数值"
></el-input>
@ -578,6 +578,7 @@
<el-table height="552px" :data="conversionUnitData" class="tables">
<el-table-column
type="index"
width="100"
label="序号"
align="center"
></el-table-column>

1
src/views/equipmentCenter/laborManage/devConfig.vue
View File

@ -588,6 +588,7 @@
},
selectHousingList(){
selectHousingListApi({}).then((res) => {
console.log('=======',res)
this.housingList=res.result
});
},

1
src/views/projectFront/laborManage/EpidemicPrevention/index.vue
View File

@ -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);

12
src/views/projectFront/materialManage/materialManage.vue
View File

@ -365,19 +365,19 @@
>
<!-- 请输入数值 -->
<el-input
style="width: 150px !important"
style="width: 145px !important"
v-model="dialogdata.adjustStartValue"
:placeholder="$t('message.energyManage.material.placeholder')+$t('message.energyManage.material.number')"
></el-input>
</el-form-item>
~
-
<el-form-item
label=""
prop="adjustEndValue"
style="display: inline-block"
>
<el-input
style="width: 150px !important"
style="width: 145px !important"
v-model="dialogdata.adjustEndValue"
:placeholder="$t('message.energyManage.material.placeholder')+$t('message.energyManage.material.number')"
></el-input>
@ -585,19 +585,19 @@
style="display: inline-block"
>
<el-input
style="width: 150px !important"
style="width: 145px !important"
v-model="dialogdata.adjustStartValue"
:placeholder="$t('message.energyManage.material.placeholder')+$t('message.energyManage.material.number')"
></el-input>
</el-form-item>
~
-
<el-form-item
label=""
prop="adjustEndValue"
style="display: inline-block"
>
<el-input
style="width: 150px !important"
style="width: 145px !important"
v-model="dialogdata.adjustEndValue"
:placeholder="$t('message.energyManage.material.placeholder')+$t('message.energyManage.material.number')"
></el-input>

7
src/views/projectFront/personnelPosition/overview.vue
View File

@ -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() {