代码提交

master
zhangdi 1 year ago
parent 28432b948b
commit f59de1a1a9
  1. 6
      src/api/user.js
  2. 12
      src/assets/json/status.json
  3. 8
      src/store/modules/user.js
  4. 25
      src/views/businessManagement/inspection/repair.vue
  5. 101
      src/views/businessManagement/inspection/task.vue
  6. 8
      src/views/businessManagement/ordinary.vue
  7. 20
      src/views/customerFeedback/feedback.vue
  8. 27
      src/views/device/deviceSystem.vue
  9. 6
      src/views/feedback/list.vue
  10. 12
      src/views/goodsManagement/reciviceList.vue
  11. 8
      src/views/operation/hand.vue
  12. 1951
      src/views/system/user.vue
  13. 10
      src/views/systemRecords/editRecords.vue
  14. 13
      src/views/systemRecords/loginRecords.vue
  15. 10
      src/views/workbench/index.vue
  16. 9
      vue.config.js

@ -163,3 +163,9 @@ export const resetPwd = (data) => request({
method: 'post', method: 'post',
data data
}); });
// 记录登录日志接口
export const loginLog = () => request({
url: '/api/blade-auth/oauth/token2',
method: 'get'
});

@ -153,6 +153,12 @@
"color": "#67c23a", "color": "#67c23a",
"type": "success" "type": "success"
}, },
{
"name": "待接单",
"status": 205,
"color": "#67c23a",
"type": "success"
},
{ {
"name": "待维修", "name": "待维修",
"status": 201, "status": 201,
@ -463,6 +469,12 @@
"color": "#e6a23", "color": "#e6a23",
"type": "warning" "type": "warning"
}, },
{
"name": "维修中",
"status": 401,
"color": "#e6a23",
"type": "warning"
},
{ {
"name": "维修完成", "name": "维修完成",
"status": 405, "status": 405,

@ -13,7 +13,8 @@ import {
logout, logout,
refreshToken, refreshToken,
getButtons, getButtons,
registerUser registerUser,
loginLog
} from '@/api/user' } from '@/api/user'
import {getTopMenu, getRoutes} from '@/api/system/menu' import {getTopMenu, getRoutes} from '@/api/system/menu'
import {encrypt} from '@/util/sm2' import {encrypt} from '@/util/sm2'
@ -68,6 +69,11 @@ const user = {
type: 'error' type: 'error'
}) })
} else { } else {
// 登录
console.log('登陆成功')
loginLog().then(res=>{
console.log('记录成功')
})
commit('SET_TOKEN', data.access_token); commit('SET_TOKEN', data.access_token);
commit('SET_REFRESH_TOKEN', data.refresh_token); commit('SET_REFRESH_TOKEN', data.refresh_token);
commit('SET_TENANT_ID', data.tenant_id); commit('SET_TENANT_ID', data.tenant_id);

@ -11,7 +11,7 @@
</template> </template>
<template slot-scope="scope" slot="menuLeft"> <template slot-scope="scope" slot="menuLeft">
<el-button size="small" type="primary" @click="handleAdd">确认</el-button> <!-- <el-button size="small" type="primary" @click="handleAdd">确认</el-button> -->
<!-- <el-button size="small" @click="clickInvoice">开具发票</el-button> --> <!-- <el-button size="small" @click="clickInvoice">开具发票</el-button> -->
</template> </template>
<template slot-scope="{ row }" slot="menu"> <template slot-scope="{ row }" slot="menu">
@ -524,7 +524,6 @@ export default {
this.isClear = true this.isClear = true
}, },
confirmName() { confirmName() {
console.log('name===========>', this.nameImg)
if (this.isClear) { if (this.isClear) {
this.nameImg = '' this.nameImg = ''
} else { } else {
@ -537,10 +536,8 @@ export default {
this.assignVisible = true this.assignVisible = true
}, },
setMaterial(row) { setMaterial(row) {
console.log('物料配置按钮 row===============>', row)
this.materialId = row.id this.materialId = row.id
this.getProductLists() this.getProductLists()
// console.log('materialData=============>',this.materialData)
this.materialData = row.detailGoodsList this.materialData = row.detailGoodsList
this.materialVisible = true this.materialVisible = true
}, },
@ -550,7 +547,6 @@ export default {
this.materialData = arr this.materialData = arr
}, },
handleCloneSub() { handleCloneSub() {
console.log('选中物料列表 materialData=============>', this.materialData, this.materialId, this.errorForm.tableData)
let data = [] let data = []
this.materialData.forEach(item => { this.materialData.forEach(item => {
@ -607,8 +603,7 @@ export default {
} }
}, },
changeNumber(val, row) { changeNumber(val, row) {
console.log('val------------->', val)
console.log('row------------->', row)
// row.price = row.price * val // row.price = row.price * val
// row.price = row.unifiedQuotation * val // row.price = row.unifiedQuotation * val
if (row.unifiedQuotation) { if (row.unifiedQuotation) {
@ -619,7 +614,6 @@ export default {
}, },
loadmoreProduct() { loadmoreProduct() {
console.log('this.goodsCurrent0', this.productCurrent, this.productSize, this.productTotals)
if (this.productCurrent * this.productSize >= this.productTotals) return if (this.productCurrent * this.productSize >= this.productTotals) return
this.productCurrent++ this.productCurrent++
this.getProductLists('more') this.getProductLists('more')
@ -636,7 +630,6 @@ export default {
}) })
}, },
getSpanArr(data) { getSpanArr(data) {
console.log('data==========>', data)
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
if (i === 0) { if (i === 0) {
this.spanArr.push(1); this.spanArr.push(1);
@ -652,7 +645,6 @@ export default {
} }
} }
} }
console.log('spanArr==========>', this.spanArr)
}, },
errorSpanMethod({ row, column, rowIndex, columnIndex }) { errorSpanMethod({ row, column, rowIndex, columnIndex }) {
@ -730,7 +722,7 @@ export default {
} }
}) })
} }
this.errorForm.tableData=[]
this.errorForm.tableData = data this.errorForm.tableData = data
this.errorForm.tableData.map(item => { this.errorForm.tableData.map(item => {
item.price = item.price == -1 ? '' : item.price item.price = item.price == -1 ? '' : item.price
@ -770,7 +762,6 @@ export default {
// //
changeResult(val) { changeResult(val) {
this.isFinish = val this.isFinish = val
console.log(this.isFinish)
}, },
clickQualityYes() { clickQualityYes() {
if (this.viewType == 'evaluate') { if (this.viewType == 'evaluate') {
@ -817,7 +808,6 @@ export default {
this.errorForm = res.data.data this.errorForm = res.data.data
this.dialogerror = true this.dialogerror = true
let data = this.checkDeepData(res.data.data.details) let data = this.checkDeepData(res.data.data.details)
console.log('获取详情数据', data)
this.errorForm.tableData = data this.errorForm.tableData = data
this.errorForm.tableData.map(item => { this.errorForm.tableData.map(item => {
item.price = item.price == -1 ? '' : item.price item.price = item.price == -1 ? '' : item.price
@ -870,7 +860,6 @@ export default {
}, },
// //
handleConfirm() { handleConfirm() {
console.log('this.detailForm.approveResult1', this.errorForm.approveResult1)
if (this.errorForm.approveResult1 == 0) {// if (this.errorForm.approveResult1 == 0) {//
let query = { let query = {
id: this.errorForm.id, id: this.errorForm.id,
@ -891,7 +880,6 @@ export default {
const formData = new FormData(); const formData = new FormData();
formData.append('file', this.base64toFile(this.nameImg)); formData.append('file', this.base64toFile(this.nameImg));
addFile(formData).then(res => { addFile(formData).then(res => {
console.log('res----------->', res)
let query = { let query = {
id: this.errorForm.id, id: this.errorForm.id,
isOkValidity: this.errorForm.isOkValidity, isOkValidity: this.errorForm.isOkValidity,
@ -902,7 +890,6 @@ export default {
signatureTime: this.errorForm.signatureTime, signatureTime: this.errorForm.signatureTime,
} }
customerConfirmFinish(query).then(res => { customerConfirmFinish(query).then(res => {
console.log('res ========>', res)
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message.success('评价成功') this.$message.success('评价成功')
this.dialogerror = false this.dialogerror = false
@ -948,7 +935,6 @@ export default {
let file = new File([u8arr], `${filename}.${suffix}`, { let file = new File([u8arr], `${filename}.${suffix}`, {
type: mime type: mime
}) })
console.log(file)
return file return file
}, },
// //
@ -1038,7 +1024,6 @@ export default {
}, },
detailList: query detailList: query
} }
console.log('params==========>', params)
solutionSave(params).then(res => { solutionSave(params).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
solutionSubmit({ id: this.errorForm.id }).then(res => { solutionSubmit({ id: this.errorForm.id }).then(res => {
@ -1129,7 +1114,6 @@ export default {
} else if (this.viewType == 'evaluate') { } else if (this.viewType == 'evaluate') {
this.handleConfirm() this.handleConfirm()
} }
// console.log('errorForm--------------->',this.errorForm)
// this.$confirm('?', '', { // this.$confirm('?', '', {
// confirmButtonText: '', // confirmButtonText: '',
// cancelButtonText: '', // cancelButtonText: '',
@ -1143,8 +1127,7 @@ export default {
}) })
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
console.log('query',this.errorForm.deptName,params) getRepairPage({ current: this.page.currentPage, size: this.page.pageSize,deptName:params.deptName,taskStatus:4 }).then(res => {
getRepairPage({ current: this.page.currentPage, size: this.page.pageSize,deptName:params.deptName }).then(res => {
this.data = res.data.data.records this.data = res.data.data.records
this.page.total = res.data.data.total this.page.total = res.data.data.total
}) })

@ -1169,7 +1169,7 @@ export default {
let query = { let query = {
id: this.addForm.id, id: this.addForm.id,
servicemanId: this.addForm.servicemanId, servicemanId: this.addForm.servicemanId,
servicemanName: servicemanArr[0].name
} }
console.log('query=========>', query, this.addForm) console.log('query=========>', query, this.addForm)
taskSupervisorConfirm(query).then(res => { taskSupervisorConfirm(query).then(res => {
@ -1328,104 +1328,11 @@ export default {
} }
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
// this.data = [ console.log('deptName',params)
// {
// taskNo:'WX-20240820-01',
// deptName:'',
// inspectionName:'',
// projectAddr:'',
// inspectionFloor:'',
// inspectionDate:'2024-05-21',
// appointTime:'2024-07-21',
// inspectionContent:'1111',
// status:0,
// inspectionData:[
// {
// floorId:'001', //id
// roomArr:[
// {
// roomId:'001', //id
// data:[
// {
// majorName:'001', //
// content:'11111', //
// requirements:'001', //
// cycle:'001', //
// startTime:'2024-07-11' //
// },
// ]
// },
// {
// roomId:'002', //id
// data:[
// {
// majorName:'002', //
// content:'2222222', //
// requirements:'002', //
// cycle:'002', //
// startTime:'2024-07-12' //
// }
// ]
// }
// ]
// },
// {
// floorId:'002', //id
// roomArr:[
// {
// roomId:'001', //id
// data:[
// {
// majorName:'001', //
// content:'33333', //
// requirements:'001', //
// cycle:'001', //
// startTime:'2024-07-11' //
// },
// ]
// },
// {
// roomId:'002', //id
// data:[
// {
// majorName:'002', //
// content:'44444', //
// requirements:'002', //
// cycle:'002', //
// startTime:'2024-07-12' //
// }
// ]
// }
// ]
// }
// ]
// },
// {
// taskNo:'WX-20240820-01',
// deptName:'',
// inspectionName:'',
// projectAddr:'',
// inspectionFloor:'',
// inspectionDate:'2024-09-21',
// appointTime:'2024-12-21',
// status:2,
// inspectionContent:'2222',
// floorId:'001,002',
// tableData:[
// {floorId:'001',floorName:'',roomName:'1',majorName:'',inspectionContent:'1111',requirements:'1',status:0,imgs:[],userName:'',remark:''},
// {floorId:'001',floorName:'',roomName:'1',majorName:'',inspectionContent:'1111',requirements:'1',status:0,imgs:[],userName:'',remark:''},
// {floorId:'001',floorName:'',roomName:'1',majorName:'',inspectionContent:'1111',requirements:'1',status:0,imgs:[],userName:'',remark:''},
// {floorId:'002',floorName:'',roomName:'1',majorName:'',inspectionContent:'1111',requirements:'1',status:0,imgs:[],userName:'',remark:''},
// {floorId:'002',floorName:'',roomName:'1',majorName:'',inspectionContent:'1111',requirements:'1',status:0,imgs:[],userName:'',remark:''},
// ]
// },
// ];
// this.page.total = this.data.length
// this.loading = false;
let query = { let query = {
current: this.page.currentPage, current: this.page.currentPage,
size: this.page.pageSize size: this.page.pageSize,
deptName:params.deptName
} }
getTaskPage(query).then(res => { getTaskPage(query).then(res => {
console.log('res=======>', res) console.log('res=======>', res)

@ -623,7 +623,7 @@ import {
import { getGoodsList } from '@/api/goodsManagement/goods' import { getGoodsList } from '@/api/goodsManagement/goods'
import logDialog from '../../components/order/logDialog.vue' import logDialog from '../../components/order/logDialog.vue'
import workOrderDialog from '../../components/order/workOrderDialog.vue' import workOrderDialog from '../../components/order/workOrderDialog.vue'
import { exportBlob, exportBlob1 } from "@/api/common"; import { exportBlob, exportBlob1,zipDownload } from "@/api/common";
import { downloadXls } from "@/util/util"; import { downloadXls } from "@/util/util";
export default { export default {
components: { components: {
@ -829,7 +829,8 @@ export default {
infoDialog: false,// infoDialog: false,//
workOrderShow: false,// workOrderShow: false,//
workOrderId: '',//id workOrderId: '',//id
dataTypes:'' dataTypes:'',
} }
}, },
@ -1814,7 +1815,6 @@ export default {
this.selectList = selection this.selectList = selection
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
console.log(6666,this.dataTypes)
let query = { let query = {
current: this.page.currentPage, // current: this.page.currentPage, //
size: this.page.pageSize, // size: this.page.pageSize, //
@ -1822,7 +1822,7 @@ export default {
endTime: this.searchForm.timeRange && this.searchForm.timeRange.length != 0 ? this.searchForm.timeRange[1].toString() + ' 23:59:59' : '', // endTime: this.searchForm.timeRange && this.searchForm.timeRange.length != 0 ? this.searchForm.timeRange[1].toString() + ' 23:59:59' : '', //
faultType: this.searchForm.faultType ? this.searchForm.faultType : '', // faultType: this.searchForm.faultType ? this.searchForm.faultType : '', //
reportUnitName: this.searchForm.reportUnitName ? this.searchForm.reportUnitName : '', reportUnitName: this.searchForm.reportUnitName ? this.searchForm.reportUnitName : '',
dataType: this.dataTypes dataType:this.role_id=='1123598816738675201'?'': this.dataTypes
} }
getList(query).then(res => { getList(query).then(res => {
let data_ = res.data.data.records let data_ = res.data.data.records

@ -53,10 +53,10 @@
<el-option label="已完成" :value="1"></el-option> <el-option label="已完成" :value="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="反馈内容" prop="content" style="width: 95%;"> <el-form-item label="反馈内容" prop="content" style="width: 95%;" v-if="(receiveForm.status==0&&viewType !== 'view')||(viewType == 'view'&&receiveForm.status==1)">
<el-input type="textarea" :disabled="viewType == 'view'" v-model="receiveForm.content" placeholder="请输入反馈内容"></el-input> <el-input type="textarea" :disabled="viewType == 'view'" v-model="receiveForm.content" placeholder="请输入反馈内容"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="反馈附件" prop="file" style="width: 95%;"> <el-form-item label="反馈附件" prop="file" style="width: 95%;" v-if="(receiveForm.status==0&&viewType !== 'view')||(viewType == 'view'&&receiveForm.status==1)">
<el-upload <el-upload
action="/api/blade-resource/oss/endpoint/put-file" action="/api/blade-resource/oss/endpoint/put-file"
:limit="3" :limit="3"
@ -177,7 +177,7 @@ export default {
type: 'datetime', type: 'datetime',
format:'yyyy-MM-dd HH:mm:ss', format:'yyyy-MM-dd HH:mm:ss',
valueFormat:'yyyy-MM-dd HH:mm:ss', valueFormat:'yyyy-MM-dd HH:mm:ss',
prop: "createTime", prop: "createTime",
overHidden: true, overHidden: true,
}, },
{ {
@ -194,7 +194,7 @@ export default {
type: 'datetime', type: 'datetime',
format:'yyyy-MM-dd HH:mm:ss', format:'yyyy-MM-dd HH:mm:ss',
valueFormat:'yyyy-MM-dd HH:mm:ss', valueFormat:'yyyy-MM-dd HH:mm:ss',
prop: "finishTime", prop: "finishTime",
overHidden: true, overHidden: true,
}, },
], ],
@ -256,14 +256,12 @@ export default {
this.selectedList = list this.selectedList = list
}, },
handleSuccess(res){ handleSuccess(res){
console.log('res==============>',res)
this.filesList.push({ this.filesList.push({
attachUrl:res.data.link, attachUrl:res.data.link,
attachName:res.data.originalName attachName:res.data.originalName
}) })
}, },
handleRemove(file, fileList){ handleRemove(file, fileList){
console.log('file================>',file)
if(file.response){ if(file.response){
this.filesList = this.filesList.filter(item => item.attachUrl != file.response.data.link) this.filesList = this.filesList.filter(item => item.attachUrl != file.response.data.link)
} }
@ -281,9 +279,9 @@ export default {
this.receiveForm = res.data.data this.receiveForm = res.data.data
this.dialogReceive = true this.dialogReceive = true
}) })
} }
} }
}, },
closeDialog(){ closeDialog(){
@ -328,7 +326,6 @@ export default {
}, },
// //
handleSave() { handleSave() {
console.log('table---------->', this.tableData)
this.dialogVisible = false this.dialogVisible = false
}, },
// //
@ -349,7 +346,7 @@ export default {
}) })
} }
}) })
}, },
// //
rejectRceive() { rejectRceive() {
@ -388,7 +385,6 @@ export default {
size:this.page.pageSize, size:this.page.pageSize,
} }
getFeedList(query).then(res =>{ getFeedList(query).then(res =>{
console.log('res -------------->',res)
this.data = res.data.data.records this.data = res.data.data.records
this.page.total = res.data.data.total this.page.total = res.data.data.total
}) })
@ -424,4 +420,4 @@ export default {
.hide-upload-btn .el-upload--picture-card { .hide-upload-btn .el-upload--picture-card {
display: none; display: none;
} }
</style> </style>

@ -116,6 +116,10 @@
<el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入品牌" <el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入品牌"
v-model="addForm.brand"></el-input> v-model="addForm.brand"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="supplier">
<el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入单位"
v-model="addForm.unit"></el-input>
</el-form-item>
<el-form-item label="生产时间" prop="produceTime"> <el-form-item label="生产时间" prop="produceTime">
<el-date-picker :disabled="viewType == 'view'" style="width:98%;" v-model="addForm.produceTime" <el-date-picker :disabled="viewType == 'view'" style="width:98%;" v-model="addForm.produceTime"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择生产时间"> format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择生产时间">
@ -406,6 +410,13 @@ export default {
overHidden: true, overHidden: true,
search: true, search: true,
}, },
{
label: "单位",
labelWidth: 120,
prop: "unit",
overHidden: true,
search: true,
},
{ {
label: "生产时间", label: "生产时间",
labelWidth: 120, labelWidth: 120,
@ -459,6 +470,7 @@ export default {
dialogVisible: false, dialogVisible: false,
addForm: { addForm: {
type: '', type: '',
unit:'',
position: { node: undefined, data: {} } position: { node: undefined, data: {} }
}, },
addRules: { addRules: {
@ -559,7 +571,6 @@ export default {
}) })
// //
getChildList(1, 100, '1869925082102702082').then(res => { getChildList(1, 100, '1869925082102702082').then(res => {
console.log(111111,res.data.data)
this.repairTypeList = res.data.data this.repairTypeList = res.data.data
this.repairTypeList.forEach(item=>{ this.repairTypeList.forEach(item=>{
item.dictKey=Number(item.dictKey) item.dictKey=Number(item.dictKey)
@ -581,7 +592,6 @@ export default {
} }
getWorkOrderList(query).then(res => { getWorkOrderList(query).then(res => {
this.workOrderList = res.data.data this.workOrderList = res.data.data
console.log('维修工单列表', this.workOrderList)
}) })
}, },
// //
@ -591,7 +601,6 @@ export default {
} }
getMaintenanceList(query).then(res => { getMaintenanceList(query).then(res => {
this.maintenanceList = res.data.data this.maintenanceList = res.data.data
console.log('巡检任务列表', this.maintenanceList)
}) })
}, },
// //
@ -873,7 +882,6 @@ export default {
if (this.fileList.length == 0) { if (this.fileList.length == 0) {
this.$message.error('请至少上传一个附件') this.$message.error('请至少上传一个附件')
} else { } else {
console.log('111111111111111', this.addForm)
let query = { let query = {
name: this.addForm.name, name: this.addForm.name,
model: this.addForm.model, model: this.addForm.model,
@ -883,10 +891,10 @@ export default {
produceTime: this.addForm.produceTime, produceTime: this.addForm.produceTime,
attachName: this.addForm.attachName, attachName: this.addForm.attachName,
runStatus: 1, runStatus: 1,
attaches: this.fileList attaches: this.fileList,
unit:this.addForm.unit,
} }
addDevice(query).then(res => { addDevice(query).then(res => {
console.log('res==============>', res)
}) })
// this.dialogVisible = false // this.dialogVisible = false
} }
@ -911,16 +919,16 @@ export default {
supplier: this.addForm.supplier ? this.addForm.supplier : null, supplier: this.addForm.supplier ? this.addForm.supplier : null,
produceTime: this.addForm.produceTime ? this.addForm.produceTime.length <= 10 ? this.addForm.produceTime + ' 00:00:00' : this.addForm.produceTime : null, produceTime: this.addForm.produceTime ? this.addForm.produceTime.length <= 10 ? this.addForm.produceTime + ' 00:00:00' : this.addForm.produceTime : null,
attachName: this.addForm.attachName ? this.addForm.attachName : null, attachName: this.addForm.attachName ? this.addForm.attachName : null,
runStatus: 1, runStatus: this.addForm.runStatus,
attaches: arr, attaches: arr,
maintenances: this.tableData, maintenances: this.tableData,
limsId: this.addForm.lab[0], //id limsId: this.addForm.lab[0], //id
floorId: this.addForm.lab[1], //id floorId: this.addForm.lab[1], //id
roomId: this.addForm.lab[2], //id roomId: this.addForm.lab[2], //id
brand: this.addForm.brand,// brand: this.addForm.brand,//
isWarran: this.addForm.isWarran ? 0 : 1 isWarran: this.addForm.isWarran ? 0 : 1,
unit:this.addForm.unit,
} }
console.log('query----------------->', query)
if (this.viewType == 'add') { if (this.viewType == 'add') {
addDevice(query).then(res => { addDevice(query).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
@ -955,7 +963,6 @@ export default {
}) })
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
console.log(1111111111, this.searchForm)
let query = { let query = {
name: this.searchForm.name ? this.searchForm.name : '', name: this.searchForm.name ? this.searchForm.name : '',
position: this.searchForm.position ? this.searchForm.position : '', position: this.searchForm.position ? this.searchForm.position : '',

@ -106,7 +106,7 @@ export default {
searchMenuSpan: 6, searchMenuSpan: 6,
border: true, border: true,
index: true, index: true,
selection: true, selection: false,
addBtn: false, addBtn: false,
viewBtn: false, viewBtn: false,
editBtn: false, editBtn: false,
@ -278,7 +278,6 @@ export default {
}, },
// //
handleSave() { handleSave() {
console.log('table---------->', this.tableData)
this.dialogVisible = false this.dialogVisible = false
}, },
// //
@ -339,7 +338,6 @@ export default {
size: this.page.pageSize, size: this.page.pageSize,
} }
getFeedList(query).then(res => { getFeedList(query).then(res => {
console.log('res -------------->', res)
this.data = res.data.data.records this.data = res.data.data.records
this.page.total = res.data.data.total this.page.total = res.data.data.total
}) })
@ -370,4 +368,4 @@ export default {
justify-content: center; justify-content: center;
} }
} }
</style> </style>

@ -365,7 +365,7 @@ export default {
brand: item.brand, // brand: item.brand, //
model: item.model, // model: item.model, //
parameter: '', // parameter: '', //
count: 0, // count: 0, //
goodsNumber: item.goodsNumber, // goodsNumber: item.goodsNumber, //
returnTime: '' // returnTime: '' //
}) })
@ -399,7 +399,7 @@ export default {
this.receiveForm.tableData = res.data.data.details this.receiveForm.tableData = res.data.data.details
this.dialogReceive = true this.dialogReceive = true
}) })
}, },
// //
handleReturn(row){ handleReturn(row){
@ -511,7 +511,7 @@ export default {
}) })
} }
} }
} }
}) })
@ -529,11 +529,11 @@ export default {
// ] // ]
console.log('searchForm-------->',this.searchFrom) console.log('searchForm-------->',this.searchFrom)
let query= { let query= {
current:this.page.currentPage, current:this.page.currentPage,
size:this.page.pageSize, size:this.page.pageSize,
startTime:this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[0] : null, startTime:this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[0] : null,
endTime:this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[1] : null, endTime:this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[1] : null,
idReturn:this.searchFrom.isReturn ? this.searchFrom.isReturn : null isReturn:this.searchFrom.isReturn ? this.searchFrom.isReturn : null
} }
getReciviceList(query).then(res =>{ getReciviceList(query).then(res =>{
this.data = res.data.data.records this.data = res.data.data.records
@ -566,4 +566,4 @@ export default {
justify-content: center; justify-content: center;
} }
} }
</style> </style>

@ -152,7 +152,7 @@
<el-input type="textarea" v-model="detailForm.closeReason" disabled style="width:98%;"></el-input> <el-input type="textarea" v-model="detailForm.closeReason" disabled style="width:98%;"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div v-show="rowStatus != 101 && rowStatus != 100 && rowStatus != 202 && detailForm.closeReason == ''"> <div v-show="(rowStatus != 101 && rowStatus != 100 && rowStatus != 202 &&rowStatus != 205)&& detailForm.closeReason == ''">
<div style=" <div style="
color: #101010; color: #101010;
font-size: 20px; font-size: 20px;
@ -171,8 +171,8 @@
</el-form-item> </el-form-item>
</div> </div>
<div <div
v-show="rowStatus != 100 && rowStatus != 202 && rowStatus != 101 && rowStatus != 401 && rowStatus != 402 && detailForm.closeReason == ''"> v-show="rowStatus != 205 &&rowStatus != 100 && rowStatus != 202 && rowStatus != 101 && rowStatus != 401 && rowStatus != 402 && detailForm.closeReason == ''">
<div style=" <div style="z
color: #101010; color: #101010;
font-size: 20px; font-size: 20px;
font-weight: 550; font-weight: 550;
@ -1214,7 +1214,7 @@ export default {
endTime: this.searchForm.timeRange && this.searchForm.timeRange.length != 0 ? this.searchForm.timeRange[1].toString() + ' 23:59:59' : '', // endTime: this.searchForm.timeRange && this.searchForm.timeRange.length != 0 ? this.searchForm.timeRange[1].toString() + ' 23:59:59' : '', //
faultLocation: this.searchForm.faultLocation ? this.searchForm.faultLocation : '', // faultLocation: this.searchForm.faultLocation ? this.searchForm.faultLocation : '', //
faultType: this.searchForm.faultType ? this.searchForm.faultType : '', // faultType: this.searchForm.faultType ? this.searchForm.faultType : '', //
dataType: 1, dataType: this.role_id=='1123598816738675201'?'':1,
requirementCode: this.searchForm.requirementCode requirementCode: this.searchForm.requirementCode
} }
console.log('query--------->', query) console.log('query--------->', query)

File diff suppressed because it is too large Load Diff

@ -12,6 +12,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd"
:clearable="false"> :clearable="false">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -25,8 +26,8 @@
</el-col> --> </el-col> -->
<el-col :span="6" v-show="role_id == '1123598816738675201'"> <el-col :span="6" v-show="role_id == '1123598816738675201'">
<el-form-item label="人员:"> <el-form-item label="人员:">
<el-select style="width: 220px;" size="small" placeholder="请选择人员" v-model="form.person" v-loadmore="loadmore"> <el-select style="width: 220px;" size="small" placeholder="请选择人员" v-model="form.person" v-loadmore="loadmore" clearable >
<el-option v-for="item in personList" :key="item.name" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in personList" :key="item.name" :label="item.name" :value="item.account"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -75,7 +76,7 @@ export default {
recordList:[], recordList:[],
role_id:'', role_id:'',
userCurrent:1, userCurrent:1,
userSize:10, userSize:10000,
userTotal:0 userTotal:0
} }
}, },
@ -114,6 +115,7 @@ export default {
}, },
onReset(){ onReset(){
this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')] this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
this.form.person = ''
this.getList() this.getList()
}, },
getList(){ getList(){
@ -121,7 +123,7 @@ export default {
logType:2, // 1 2 logType:2, // 1 2
startTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[0] : null, // yyyy-MM-dd startTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[0] : null, // yyyy-MM-dd
endTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[1] : null, // yyyy-MM-dd endTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[1] : null, // yyyy-MM-dd
userId:this.role_id != '1123598816738675201' ? this.userInfo.user_id : this.form.person ? this.form.person : '' userName:this.role_id != '1123598816738675201' ? this.userInfo.account : this.form.person ? this.form.person : ''
// userId:this.form.person ? this.form.person : this.role_id == '1846419477876510721' ? this.userInfo.user_id : '' // id // userId:this.form.person ? this.form.person : this.role_id == '1846419477876510721' ? this.userInfo.user_id : '' // id
} }
console.log('quwey------------>',query) console.log('quwey------------>',query)

@ -12,6 +12,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd"
:clearable="false"> :clearable="false">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -25,8 +26,8 @@
</el-col> --> </el-col> -->
<el-col :span="6" v-show="role_id == '1123598816738675201'"> <el-col :span="6" v-show="role_id == '1123598816738675201'">
<el-form-item label="人员:"> <el-form-item label="人员:">
<el-select size="small" style="width: 220px;" placeholder="请选择人员" v-model="form.person" v-loadmore="loadmore"> <el-select size="small" style="width: 220px;" placeholder="请选择人员" v-model="form.person" v-loadmore="loadmore" clearable >
<el-option v-for="item in personList" :key="item.name" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in personList" :key="item.name" :label="item.name" :value="item.account"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -75,7 +76,7 @@ export default {
recordList:[], recordList:[],
role_id:'', role_id:'',
userCurrent:1, userCurrent:1,
userSize:10, userSize:1000,
userTotal:0 userTotal:0
} }
}, },
@ -85,7 +86,6 @@ export default {
mounted(){ mounted(){
this.role_id = this.userInfo.role_id this.role_id = this.userInfo.role_id
this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')] this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
console.log('this.role_id',this.role_id)
this.getList() this.getList()
if(this.role_id == '1123598816738675201'){ if(this.role_id == '1123598816738675201'){
this.getUserList() this.getUserList()
@ -115,6 +115,7 @@ export default {
}, },
onReset(){ onReset(){
this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')] this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
this.form.person = ''
this.getList() this.getList()
}, },
getList(){ getList(){
@ -123,11 +124,9 @@ export default {
startTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[0] : null, // yyyy-MM-dd startTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[0] : null, // yyyy-MM-dd
endTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[1] : null, // yyyy-MM-dd endTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[1] : null, // yyyy-MM-dd
// userId:this.form.person ? this.form.person : this.role_id == '1846419477876510721' ? this.userInfo.user_id : '' // id // userId:this.form.person ? this.form.person : this.role_id == '1846419477876510721' ? this.userInfo.user_id : '' // id
userId:this.role_id != '1123598816738675201' ? this.userInfo.user_id : this.form.person ? this.form.person : '' userName:this.role_id != '1123598816738675201' ? this.userInfo.account : this.form.person ? this.form.person : ''
} }
console.log('quwey------------>',query)
getlogList(query).then(res=>{ getlogList(query).then(res=>{
console.log('res-------------->',res)
this.recordList = res.data.data this.recordList = res.data.data
}) })
} }

@ -489,12 +489,10 @@ export default {
methods: { methods: {
// //
alarmFn(){ alarmFn(){
console.log(44444444444)
this.dialogImgVisible = true this.dialogImgVisible = true
}, },
getPeopleNum(){ getPeopleNum(){
maintenancePersonnel({id:this.userInfo.user_id}).then(res =>{ maintenancePersonnel({id:this.userInfo.user_id}).then(res =>{
console.log('res ==============>',res)
this.peopleXdata = res.data.data.xData this.peopleXdata = res.data.data.xData
this.peopleNum = res.data.data.repairNum this.peopleNum = res.data.data.repairNum
this.peoplePercent = res.data.data.percent this.peoplePercent = res.data.data.percent
@ -504,7 +502,6 @@ export default {
}) })
}, },
clickReqiure(item){ clickReqiure(item){
console.log('item----------->',item)
this.$router.push({ this.$router.push({
path:'/operation/hand', path:'/operation/hand',
query:item query:item
@ -630,7 +627,6 @@ export default {
perType: this.role_id == '1839536982874193922' ? 0 : 1 // 0- 1- perType: this.role_id == '1839536982874193922' ? 0 : 1 // 0- 1-
} }
faultRatio(query).then(res => { faultRatio(query).then(res => {
console.log('res ===================>', res)
this.problemData = res.data.data.fault this.problemData = res.data.data.fault
this.rateData = res.data.data.rate this.rateData = res.data.data.rate
@ -784,12 +780,13 @@ export default {
right: '5%', right: '5%',
bottom: '10%' bottom: '10%'
}, },
yAxis: {}, yAxis: {
},
series: [ series: [
{ {
name: '数量', name: '数量',
type: 'bar', type: 'bar',
barWidth:this.numData == 1 ? 50 : null, barWidth:this.numData == 1 ? 30 : 30,
data: this.numData, data: this.numData,
itemStyle: { itemStyle: {
color: '#2478f2' color: '#2478f2'
@ -812,7 +809,6 @@ export default {
trigger: 'axis', trigger: 'axis',
transitionDuration: 0,// transitionDuration: 0,//
formatter: params => { formatter: params => {
console.log('params',params)
let rander = params.map(item => `<div>${item.marker}${item.seriesName}: ${item.seriesType !== "line" ? item.value : item.value != '' ? item.value + "%" : '-'}</div>` ).join('') let rander = params.map(item => `<div>${item.marker}${item.seriesName}: ${item.seriesType !== "line" ? item.value : item.value != '' ? item.value + "%" : '-'}</div>` ).join('')
return ` return `
<div>${params[0].axisValue}</div> <div>${params[0].axisValue}</div>

@ -27,10 +27,13 @@ module.exports = {
'/api': { '/api': {
//本地服务接口地址 //本地服务接口地址
// target: 'http://localhost', // target: 'http://localhost',
// target:'http://124.221.142.15:8088/lab', // target:'http://192.168.0.111:80',
target:'http://192.168.0.111:80', // target:'http://192.168.1.12:10001',
target:'http://192.168.0.108:10001',
// target:'http://192.168.0.116:80',
// target:'http://192.168.0.108:80',
//远程演示服务地址,可用于直接启动项目 //远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.cn/api', // target: 'http://124.221.142.15:8088/api',
ws: true, ws: true,
pathRewrite: { pathRewrite: {
'^/api': '/' '^/api': '/'

Loading…
Cancel
Save