diff --git a/scripts/cmp-en.js b/scripts/cmp-en.js index 86dc944..6d44d8a 100644 --- a/scripts/cmp-en.js +++ b/scripts/cmp-en.js @@ -24,7 +24,7 @@ diff --git a/scripts/dev-en.js b/scripts/dev-en.js index c91fa5c..d63e572 100644 --- a/scripts/dev-en.js +++ b/scripts/dev-en.js @@ -140,6 +140,16 @@ var devcomponent_en = { :width="150" :show-overflow-tooltip="true"> + + + + - + - + 搜索 @@ -138,14 +138,24 @@ var devcomponent = { :width="150" :show-overflow-tooltip="true"> + + + + + label="仪器本次使用时长(h)" + width="160"> + label="仪器出厂累计时长(h)" + width="160"> diff --git a/scripts/mh-en.js b/scripts/mh-en.js index 5d216d3..b4d4dd8 100644 --- a/scripts/mh-en.js +++ b/scripts/mh-en.js @@ -83,7 +83,7 @@ diff --git a/scripts/nb.js b/scripts/nb.js index 4ac2a12..dbfc82a 100644 --- a/scripts/nb.js +++ b/scripts/nb.js @@ -614,7 +614,9 @@ series_id: "", num: "", index: this.$data.currentPage, - count: this.$data.pagesize + count: this.$data.pagesize, + opuser:localStorage.getItem("online_user"), + opuser_uuid:localStorage.getItem("uuid") }) .then(function (response) { console.log(response.data); @@ -1012,7 +1014,9 @@ series_id: _this.$data.series_id_v, num: _this.$data.num_v, index: this.$data.currentPage, - count: this.$data.pagesize + count: this.$data.pagesize, + opuser:localStorage.getItem("online_user"), + opuser_uuid:localStorage.getItem("uuid") }) .then(function (response) { console.log(response.data); @@ -1038,7 +1042,9 @@ series_id: _this.$data.series_id_v, num: _this.$data.num_v, index: this.$data.currentPage, - count: this.$data.pagesize + count: this.$data.pagesize, + opuser:localStorage.getItem("online_user"), + opuser_uuid:localStorage.getItem("uuid") }) .then(function (response) { console.log(response.data); @@ -1062,7 +1068,9 @@ series_id: _this.$data.series_id_v, num: _this.$data.num_v, index: this.$data.currentPage, - count: this.$data.pagesize + count: this.$data.pagesize, + opuser:localStorage.getItem("online_user"), + opuser_uuid:localStorage.getItem("uuid") }) .then(function (response) { console.log(response.data); diff --git a/scripts/nbs.js b/scripts/nbs.js index 15a9de3..4b45510 100644 --- a/scripts/nbs.js +++ b/scripts/nbs.js @@ -542,7 +542,9 @@ axios.post('/deescloud/get_b_life', { b_code:this.$data.b_code_v_1, index: this.$data.currentPage1, - count: this.$data.pagesize1 + count: this.$data.pagesize1, + opuser:localStorage.getItem("online_user"), + opuser_uuid:localStorage.getItem("uuid") }) .then(function (response) { console.log(response.data); @@ -744,7 +746,9 @@ b_id: this.$data.b_id_v, b_code:this.$data.b_code_v, index: this.$data.currentPage, - count: this.$data.pagesize + count: this.$data.pagesize, + opuser:localStorage.getItem("online_user"), + opuser_uuid:localStorage.getItem("uuid") }) .then(function (response) { console.log(response.data); diff --git a/scripts/srr_en.js b/scripts/srr_en.js index d551e78..703f05b 100644 --- a/scripts/srr_en.js +++ b/scripts/srr_en.js @@ -22,7 +22,7 @@ diff --git a/scripts/tools-en.js b/scripts/tools-en.js index db2886f..43ee63c 100644 --- a/scripts/tools-en.js +++ b/scripts/tools-en.js @@ -23,7 +23,7 @@ diff --git a/scripts/welldata-en.js b/scripts/welldata-en.js index 1eece21..f0cff33 100644 --- a/scripts/welldata-en.js +++ b/scripts/welldata-en.js @@ -50,7 +50,7 @@ diff --git a/scripts/wellhistory-en.js b/scripts/wellhistory-en.js index 3786bae..e4e1e64 100644 --- a/scripts/wellhistory-en.js +++ b/scripts/wellhistory-en.js @@ -85,7 +85,7 @@ diff --git a/scripts/welltype-en.js b/scripts/welltype-en.js index b33f1fd..6d4b86c 100644 --- a/scripts/welltype-en.js +++ b/scripts/welltype-en.js @@ -77,7 +77,7 @@