| .env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .env.production | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/utils/filter.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/coalMine/cJobRegistration/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/coalMine/cPeopleManage/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/coalMine/cViolationRegistration/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/notCoalMine/nBatchManage/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/notCoalMine/nJobRegistration/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/notCoalMine/nPeopleManage/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/notCoalMine/nViolationRegistration/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.development
@@ -6,10 +6,10 @@ # 若依管理系统/开发环境 #黄镇 #VUE_APP_BASE_API = 'http://192.168.0.47:8085' #VUE_APP_BASE_API = 'http://192.168.0.47:8085/api' #张凤 VUE_APP_BASE_API = 'http://192.168.0.70:8085' VUE_APP_BASE_API = 'http://192.168.0.70:8085/api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true .env.production
@@ -5,4 +5,4 @@ ENV = 'production' # 若依管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/api' src/utils/filter.js
@@ -32,11 +32,10 @@ const month = String(date.getMonth() + 1).padStart(2, "0"); const day = String(date.getDate()).padStart(2, "0"); const hours = String(date.getHours()).padStart(2, "0"); const minutes = String(date.getMinutes()).padStart(2, "0"); const seconds = String(date.getSeconds()).padStart(2, "0"); const minutes = String(date.getMinutes()).padStart(2, "0") // 构建所需格式的字符串 const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}`; return formattedDate; }) src/views/coalMine/cJobRegistration/index.vue
@@ -54,7 +54,11 @@ <el-table v-loading="loading" :data="dataList"> <el-table-column label="发生时间" align="center" prop="workTime" /> <el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="身份证号" align="center" prop="idCard" /> <el-table-column label="身份证号" align="center" prop="idCard"> <template #default="scope"> {{scope.row.idCard | peridcardtm}} </template> </el-table-column> <el-table-column label="IC卡编号" align="center" prop="icNum"/> <el-table-column label="电子证编号" align="center" prop="electNum"/> <el-table-column label="所属单位" align="center" prop="dept"/> src/views/coalMine/cPeopleManage/index.vue
@@ -44,7 +44,11 @@ {{ scope.row.sex == 0?'男':'女' }} </template> </el-table-column> <el-table-column label="身份证号" align="center" prop="code" /> <el-table-column label="身份证号" align="center" prop="code"> <template #default="scope"> {{scope.row.code | peridcardtm}} </template> </el-table-column> <el-table-column label="电话" align="center" prop="mobilePhone"/> <el-table-column label="民族" align="center" prop="nationCode"> <template #default="scope"> @@ -224,15 +228,23 @@ this.getPage() }, viewFile(file){ const t = this axios.get(process.env.VUE_APP_BASE_API + file.fileUrl,{headers:{'Content-Type': 'application/json','Authorization': "Bearer " + getToken()},responseType: 'blob'}).then(res=>{ if (res) { if (res && res.data) { const link = document.createElement('a') let blob = new Blob([res.data],{type: res.data.type}) link.style.display = "none"; link.href = URL.createObjectURL(blob); // 创建URL window.open(link.href) } else { this.$message.error('获取文件失败') t.$message.error('获取文件失败') } }).catch(function(err){ if(err == 'Error: Network Error'){ t.$message.error('获取文件失败，请重新上传') } if(err == 'Error: Request failed with status code 404'){ t.$message.error('获取文件失败，请重新上传') } }) }, src/views/coalMine/cViolationRegistration/index.vue
@@ -54,7 +54,11 @@ <el-table v-loading="loading" :data="dataList"> <el-table-column label="发生时间" align="center" prop="violationTime" /> <el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="身份证号" align="center" prop="idCard" /> <el-table-column label="身份证号" align="center" prop="idCard"> <template #default="scope"> {{scope.row.idCard | peridcardtm}} </template> </el-table-column> <el-table-column label="IC卡编号" align="center" prop="icNum"/> <el-table-column label="电子证编号" align="center" prop="electNum"/> <el-table-column label="所属单位" align="center" prop="dept"/> src/views/login.vue
@@ -72,8 +72,8 @@ return { codeUrl: "", loginForm: { username: "admin", password: "admin123", username: "", password: "", rememberMe: false, code: "", uuid: "" src/views/notCoalMine/nBatchManage/index.vue
@@ -9,24 +9,24 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="开始日期"> <el-date-picker v-model="queryParams.startTime" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="开始日期"> </el-date-picker> </el-form-item> <el-form-item label="结束日期"> <el-date-picker v-model="queryParams.endTime" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="结束日期"> </el-date-picker> </el-form-item> <!-- <el-form-item label="开始日期">--> <!-- <el-date-picker--> <!-- v-model="queryParams.startTime"--> <!-- type="date"--> <!-- format="yyyy-MM-dd"--> <!-- value-format="yyyy-MM-dd"--> <!-- placeholder="开始日期">--> <!-- </el-date-picker>--> <!-- </el-form-item>--> <!-- <el-form-item label="结束日期">--> <!-- <el-date-picker--> <!-- v-model="queryParams.endTime"--> <!-- type="date"--> <!-- format="yyyy-MM-dd"--> <!-- value-format="yyyy-MM-dd"--> <!-- placeholder="结束日期">--> <!-- </el-date-picker>--> <!-- </el-form-item>--> <!-- <el-form-item label="资格类型">--> <!-- <el-select v-model="value" placeholder="请选择">--> <!-- <el-option--> @@ -152,12 +152,12 @@ </el-table-column> <el-table-column label="理论考试时间" align="center"> <template #default="scope"> {{scope.row.theoryExamStartTime | formatDate }}~{{ scope.row.theoryExamEndTime | formatDate }} {{scope.row.theoryExamStartTime | formatDate }} 至 {{ scope.row.theoryExamEndTime | formatDate }} </template> </el-table-column> <el-table-column label="理论补考时间" align="center"> <template #default="scope"> {{scope.row.theoryExamMakeupStartTime | formatDate }}~{{ scope.row.theoryExamMakeupEndTime | formatDate }} {{scope.row.theoryExamMakeupStartTime | formatDate }} 至 {{ scope.row.theoryExamMakeupEndTime | formatDate }} </template> </el-table-column> <el-table-column label="实操考点" align="center" prop="practicalExamPlaceName" /> @@ -168,12 +168,12 @@ </el-table-column> <el-table-column label="实操考试时间" align="center"> <template #default="scope"> {{scope.row.practicalExamStartTime | formatDate }}~{{ scope.row.practicalExamEndTime | formatDate }} {{scope.row.practicalExamStartTime | formatDate }} 至 {{ scope.row.practicalExamEndTime | formatDate }} </template> </el-table-column> <el-table-column label="实操补考时间" align="center"> <template #default="scope"> {{scope.row.practicalExamMakeupStartTime | formatDate }}~{{ scope.row.practicalExamMakeupEndTime | formatDate }} {{scope.row.practicalExamMakeupStartTime | formatDate }} 至 {{ scope.row.practicalExamMakeupEndTime | formatDate }} </template> </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> src/views/notCoalMine/nJobRegistration/index.vue
@@ -54,7 +54,11 @@ <el-table v-loading="loading" :data="dataList"> <el-table-column label="发生时间" align="center" prop="workTime" /> <el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="身份证号" align="center" prop="idCard" /> <el-table-column label="身份证号" align="center" prop="idCard"> <template #default="scope"> {{scope.row.idCard | peridcardtm}} </template> </el-table-column> <el-table-column label="IC卡编号" align="center" prop="icNum"/> <el-table-column label="电子证编号" align="center" prop="electNum"/> <el-table-column label="所属单位" align="center" prop="dept"/> src/views/notCoalMine/nPeopleManage/index.vue
@@ -44,7 +44,11 @@ {{ scope.row.sex == 0?'男':'女' }} </template> </el-table-column> <el-table-column label="身份证号" align="center" prop="idCardNum" /> <el-table-column label="身份证号" align="center" prop="idCardNum"> <template #default="scope"> {{scope.row.idCardNum | peridcardtm}} </template> </el-table-column> <el-table-column label="电话" align="center" prop="phone"/> <el-table-column label="民族" align="center" prop="nationCode"> <template #default="scope"> @@ -173,6 +177,7 @@ }, viewFile(file){ const t = this axios.get(process.env.VUE_APP_BASE_API + file,{headers:{'Content-Type': 'application/json','Authorization': "Bearer " + getToken()},responseType: 'blob'}).then(res=>{ if (res) { const link = document.createElement('a') @@ -181,7 +186,14 @@ link.href = URL.createObjectURL(blob); // 创建URL window.open(link.href) } else { this.$message.error('获取文件失败') t.$message.error('获取文件失败') } }).catch(function(err){ if(err == 'Error: Network Error'){ t.$message.error('获取文件失败') } if(err == 'Error: Request failed with status code 404'){ t.$message.error('获取文件失败') } }) } src/views/notCoalMine/nViolationRegistration/index.vue
@@ -54,7 +54,11 @@ <el-table v-loading="loading" :data="dataList"> <el-table-column label="发生时间" align="center" prop="violationTime" /> <el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="身份证号" align="center" prop="idCard" /> <el-table-column label="身份证号" align="center" prop="idCard"> <template #default="scope"> {{scope.row.idCard | peridcardtm}} </template> </el-table-column> <el-table-column label="IC卡编号" align="center" prop="icNum"/> <el-table-column label="电子证编号" align="center" prop="electNum"/> <el-table-column label="所属单位" align="center" prop="dept"/>
