diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index d62c475..3d45d89 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -268,7 +268,7 @@ method: "POST", url: app.globalData.httpsUrl + "appDeviceLog/listPage", data: { - project: app.globalData.selectProjectName, + project: that.data.params.project || app.globalData.selectProjectName, devcode: that.data.params.devcode, devtype: that.data.params.devtype, installtimeFmt: that.data.params.installtimeFmt, diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index d62c475..3d45d89 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -268,7 +268,7 @@ method: "POST", url: app.globalData.httpsUrl + "appDeviceLog/listPage", data: { - project: app.globalData.selectProjectName, + project: that.data.params.project || app.globalData.selectProjectName, devcode: that.data.params.devcode, devtype: that.data.params.devtype, installtimeFmt: that.data.params.installtimeFmt, diff --git a/miniprogram/pages/searchLog/searchLog.js b/miniprogram/pages/searchLog/searchLog.js index cacf06c..8ace5e6 100644 --- a/miniprogram/pages/searchLog/searchLog.js +++ b/miniprogram/pages/searchLog/searchLog.js @@ -20,9 +20,9 @@ project: '', devtype: '', installPerson: '', - projectvalue:'', minDate: new Date(2018, 0, 1).getTime(), // maxDate: new Date(2018, 0, 31).getTime(), + showSelectProject: false, }, onDisplay() { this.setData({ @@ -70,6 +70,17 @@ installtimeFmt: `${this.formatDate(start)}~${this.formatDate(end)}`, }); }, + // 点击清空按钮 + clean: function() { + this.setData({ + devcode:'', + devtype:'', + installPerson:'', + installtimeFmt:'', + project: this.data.showSelectProject === false ? this.data.project : '', + }) + + }, /** * 生命周期函数--监听页面加载 @@ -78,6 +89,7 @@ // await this.setData({ // timeShow:true, // }) + const {devcode,devtype,installPerson,installtimeFmt,project} = JSON.parse(options.params) this.setData({ devcode:devcode || '', @@ -85,11 +97,20 @@ installPerson:installPerson || '', installtimeFmt:installtimeFmt || '', project:project || '', - projectvalue:project || '', - }) var _this = this + + if(app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') { + _this.setData({ + 'showSelectProject': true, + }) + } else { + _this.setData({ + 'showSelectProject': false, + 'project': app.globalData.selectProjectName + }) + } /** * 获取所属项目下拉列表 */ @@ -249,6 +270,7 @@ that.setData({ project: event.detail }) + console.log('this.data', this.data.project); }, //设置设备类型 diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index d62c475..3d45d89 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -268,7 +268,7 @@ method: "POST", url: app.globalData.httpsUrl + "appDeviceLog/listPage", data: { - project: app.globalData.selectProjectName, + project: that.data.params.project || app.globalData.selectProjectName, devcode: that.data.params.devcode, devtype: that.data.params.devtype, installtimeFmt: that.data.params.installtimeFmt, diff --git a/miniprogram/pages/searchLog/searchLog.js b/miniprogram/pages/searchLog/searchLog.js index cacf06c..8ace5e6 100644 --- a/miniprogram/pages/searchLog/searchLog.js +++ b/miniprogram/pages/searchLog/searchLog.js @@ -20,9 +20,9 @@ project: '', devtype: '', installPerson: '', - projectvalue:'', minDate: new Date(2018, 0, 1).getTime(), // maxDate: new Date(2018, 0, 31).getTime(), + showSelectProject: false, }, onDisplay() { this.setData({ @@ -70,6 +70,17 @@ installtimeFmt: `${this.formatDate(start)}~${this.formatDate(end)}`, }); }, + // 点击清空按钮 + clean: function() { + this.setData({ + devcode:'', + devtype:'', + installPerson:'', + installtimeFmt:'', + project: this.data.showSelectProject === false ? this.data.project : '', + }) + + }, /** * 生命周期函数--监听页面加载 @@ -78,6 +89,7 @@ // await this.setData({ // timeShow:true, // }) + const {devcode,devtype,installPerson,installtimeFmt,project} = JSON.parse(options.params) this.setData({ devcode:devcode || '', @@ -85,11 +97,20 @@ installPerson:installPerson || '', installtimeFmt:installtimeFmt || '', project:project || '', - projectvalue:project || '', - }) var _this = this + + if(app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') { + _this.setData({ + 'showSelectProject': true, + }) + } else { + _this.setData({ + 'showSelectProject': false, + 'project': app.globalData.selectProjectName + }) + } /** * 获取所属项目下拉列表 */ @@ -249,6 +270,7 @@ that.setData({ project: event.detail }) + console.log('this.data', this.data.project); }, //设置设备类型 diff --git a/miniprogram/pages/searchLog/searchLog.wxml b/miniprogram/pages/searchLog/searchLog.wxml index daf06bc..61d5a64 100644 --- a/miniprogram/pages/searchLog/searchLog.wxml +++ b/miniprogram/pages/searchLog/searchLog.wxml @@ -25,22 +25,27 @@ - + - + + - 查询 + + 查询 + 清空 + + \ No newline at end of file