Compare commits

..

No commits in common. "8d74e922bc9cf5ac89d541035b3648a68ffcc584" and "88decef409086a9b6ffceb6f94c684a6d49a6c6a" have entirely different histories.

4 changed files with 12 additions and 40 deletions

View File

@ -1,41 +1,23 @@
import { getToDoNum } from '@/api/system/notice';
//0 测试 1生产
let fileType=1;
import { getToDoNum } from '@/api/system/notice'
export function lookFile() {
if(fileType===0){
return 'http://192.168.0.14:1999/file/statics' //14服务器
}else{
return 'http://218.21.27.6:1999/file/statics' //生产服务器
}
// return 'http://112.29.103.165:14413/file/statics' //1.6演示服务器
// return 'http://218.21.27.6:1999/file/statics' //生产服务器
}
export function lookFaceFile() {
if(fileType===0){
return 'http://192.168.0.14:1999/file/statics/' //14服务器
}else{
return 'http://218.21.27.6:1999/file/statics/' //生产服务器
}
return 'http://192.168.0.14:1999/file/statics/' //14服务器
//return 'http://112.29.103.165:14413/file/statics/' //1.6演示服务器
// return 'http://218.21.27.6:1999/file/statics/' //生产服务器
// return 'http://218.21.27.6:1999/file/statics/' //生产服务器
}
export function filePreview() {
if(fileType===0){
return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器
}else{
return 'http://218.21.27.6:18013/onlinePreview?url=' //生产服务器
}
//
// return 'http://112.29.103.165:8012/onlinePreview?url=' //1.6演示服务器
return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器
// return 'http://112.29.103.165:8012/onlinePreview?url=' //1.6演示服务器
// return 'http://218.21.27.6:18013/onlinePreview?url='
}
export function lookMioIoFile() {
if(fileType===0){
return 'http://192.168.0.14:9090/nxdt-courseware-1' //14服务器
}else{
return 'http://218.21.27.6:19090/nxdt-courseware' //生产服务器
}
// return 'http://192.168.0.14:9090/nxdt-courseware-1' //14服务器
// return 'http://218.21.27.6:19090/nxdt-courseware' //生产服务器
return 'http://192.168.0.14:9090/nxdt-courseware-1' //14服务器
}
// lookFile: 'http://218.21.27.6:1999/nxnyback/statics',

View File

@ -434,7 +434,7 @@
</template>
<script>
import { getFileData,getParams,hideSensitiveInfo, indexContinuous, lookFaceFile } from '@/utils/bonus'
import { getParams, hideSensitiveInfo, indexContinuous, lookFaceFile } from '@/utils/bonus'
import { dictTableOption, downloadFile, getTemplateLink, selectFile } from '@/api/tool/select'
import { listAdmissionRequest, submitApproval } from '@/api/pro/admissionRequest'
import store from '../../../store'
@ -561,7 +561,6 @@ export default {
lookFaceFile,
indexContinuous,
hideSensitiveInfo,
getFileData,
getParams,
store() {
return store
@ -1017,8 +1016,6 @@ export default {
},
submitFileForm() {
this.$refs['form'].validate(valid => {
console.log("--->")
console.log(valid)
if (valid) {
if (!this.formFile.fileList[0].name.toLowerCase().endsWith('.zip')) {
this.$message.error('请上传zip文件')

View File

@ -82,12 +82,6 @@
<el-option label="离场" value="0" />
</el-select>
</el-form-item>
<el-form-item label="是否上传文件" prop="fileIsActive" label-width="140px">
<el-select v-model="personQueryParams.fileIsActive" placeholder="请选择" clearable>
<el-option label="已上传" value="1" />
<el-option label="未上传" value="0" />
</el-select>
</el-form-item>
<el-form-item label="人员进场时间范围" label-width="150px">
<el-date-picker
v-model="timeRange"
@ -1189,7 +1183,6 @@ export default {
status: undefined,
startDate: undefined,
endDate: undefined,
fileIsActive:undefined,
},
equipQueryParams: {
pageNum: 1,

View File

@ -156,7 +156,7 @@ export default {
created() {
const userType = this.$store.state.user.userType
if (userType !== '00') {
this.hideOrNot = false
this.hideOrNot = true
this.getProOption()
}
this.getList()
@ -191,7 +191,7 @@ export default {
/** 查询承包商入场资质列表 */
getList() {
this.loading = false
this.queryParams.proId = this.$store.state.user.thisIds.proId;
// this.queryParams.proId = this.$store.state.user.thisIds.proId;
this.queryParams.supUuid = this.$store.state.user.thisIds.supUuid
this.queryParams.userType = this.$store.state.user.userType
getConsEntranceList(this.queryParams).then(response => {