Selaa lähdekoodia

update 生成的文件名

pull/1/head
lb 2 vuotta sitten
vanhempi
commit
ee27a93181
43 muutettua tiedostoa jossa 37 lisäystä ja 37 poistoa
  1. +1
    -0
      src/router/index.js
  2. +0
    -1
      src/views/modules/monitoring/equipment.vue
  3. +0
    -0
      src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue
  4. +1
    -1
      src/views/modules/monitoring/equipmentAlarmLog.vue
  5. +0
    -0
      src/views/modules/monitoring/equipmentAttr-add-or-update.vue
  6. +0
    -0
      src/views/modules/monitoring/equipmentFile-add-or-update.vue
  7. +1
    -1
      src/views/modules/monitoring/equipmentFile.vue
  8. +0
    -0
      src/views/modules/monitoring/equipmentGroup-add-or-update.vue
  9. +1
    -1
      src/views/modules/monitoring/equipmentGroup.vue
  10. +0
    -0
      src/views/modules/monitoring/equipmentGroupAlarm-add-or-update.vue
  11. +1
    -1
      src/views/modules/monitoring/equipmentGroupAlarm.vue
  12. +0
    -0
      src/views/modules/monitoring/equipmentPlc-add-or-update.vue
  13. +1
    -1
      src/views/modules/monitoring/equipmentPlc.vue
  14. +0
    -0
      src/views/modules/monitoring/equipmentPlcConnect-add-or-update.vue
  15. +1
    -1
      src/views/modules/monitoring/equipmentPlcConnect.vue
  16. +0
    -0
      src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue
  17. +1
    -1
      src/views/modules/monitoring/equipmentPlcParam.vue
  18. +0
    -0
      src/views/modules/monitoring/equipmentQuantity-add-or-update.vue
  19. +3
    -3
      src/views/modules/monitoring/equipmentQuantity.vue
  20. +0
    -0
      src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue
  21. +3
    -3
      src/views/modules/monitoring/equipmentStatusLog.vue
  22. +0
    -0
      src/views/modules/monitoring/equipmentType-add-or-update.vue
  23. +1
    -1
      src/views/modules/monitoring/equipmentType.vue
  24. +0
    -0
      src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue
  25. +1
    -1
      src/views/modules/monitoring/equipmentTypeFile.vue
  26. +1
    -1
      src/views/modules/monitoring/equipmentattr.vue
  27. +0
    -0
      src/views/modules/monitoring/productArrt-add-or-update.vue
  28. +1
    -1
      src/views/modules/monitoring/productArrt.vue
  29. +1
    -1
      src/views/modules/monitoring/productionLine.vue
  30. +1
    -1
      src/views/modules/monitoring/productionLineRecSch.vue
  31. +1
    -1
      src/views/modules/monitoring/qualityInspectionDet.vue
  32. +1
    -1
      src/views/modules/monitoring/qualityInspectionRecord.vue
  33. +1
    -1
      src/views/modules/monitoring/qualityInspectionType.vue
  34. +0
    -0
      src/views/modules/monitoring/reportSheet-add-or-update.vue
  35. +1
    -1
      src/views/modules/monitoring/reportSheet.vue
  36. +0
    -0
      src/views/modules/monitoring/reportSheetCategory-add-or-update.vue
  37. +1
    -1
      src/views/modules/monitoring/reportSheetCategory.vue
  38. +1
    -1
      src/views/modules/monitoring/sysfile.vue
  39. +1
    -1
      src/views/modules/monitoring/sysfileType.vue
  40. +3
    -3
      src/views/modules/monitoring/workShopSection.vue
  41. +3
    -3
      src/views/modules/monitoring/workShopSectionEquipment.vue
  42. +2
    -2
      src/views/modules/monitoring/workshopsection-add-or-update.vue
  43. +2
    -2
      src/views/modules/monitoring/workshopsectionequipment-add-or-update.vue

+ 1
- 0
src/router/index.js Näytä tiedosto

@@ -106,6 +106,7 @@ router.beforeEach((to, from, next) => {
Vue.prototype.$message.error(res.msg)
return next({ name: 'login' })
}
console.log('menulist: ', res.data)
window.SITE_CONFIG['menuList'] = res.data
fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList'])
next({ ...to, replace: true })


+ 0
- 1
src/views/modules/monitoring/equipment.vue Näytä tiedosto

@@ -102,7 +102,6 @@ export default {
key: this.dataForm.key
})
}).then(({ data }) => {
console.log('===', data)
if (data && data.code === 0) {
this.dataList = data.data.list
this.totalPage = data.data.total


src/views/modules/monitoring/equipmenalarmlog-add-or-update.vue → src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/equipmentAlarmLog.vue Näytä tiedosto

@@ -49,7 +49,7 @@
</template>

<script>
import AddOrUpdate from './equipmenalarmlog-add-or-update'
import AddOrUpdate from './equipmentAlarmLog-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/equipmenattr-add-or-update.vue → src/views/modules/monitoring/equipmentAttr-add-or-update.vue Näytä tiedosto


src/views/modules/monitoring/equipmenfile-add-or-update.vue → src/views/modules/monitoring/equipmentFile-add-or-update.vue Näytä tiedosto


src/views/modules/monitoring/equipmenFile.vue → src/views/modules/monitoring/equipmentFile.vue Näytä tiedosto

@@ -52,7 +52,7 @@
</template>

<script>
import AddOrUpdate from './equipmenfile-add-or-update'
import AddOrUpdate from './equipmentFile-add-or-update'
export default {
data() {
return {

src/views/modules/monitoring/equipmengroup-add-or-update.vue → src/views/modules/monitoring/equipmentGroup-add-or-update.vue Näytä tiedosto


src/views/modules/monitoring/equipmenGroup.vue → src/views/modules/monitoring/equipmentGroup.vue Näytä tiedosto

@@ -49,7 +49,7 @@
</template>

<script>
import AddOrUpdate from './equipmengroup-add-or-update'
import AddOrUpdate from './equipmentGroup-add-or-update'
export default {
data() {
return {

src/views/modules/monitoring/equipmengroupalarm-add-or-update.vue → src/views/modules/monitoring/equipmentGroupAlarm-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/equipmentGroupAlarm.vue Näytä tiedosto

@@ -55,7 +55,7 @@
</template>

<script>
import AddOrUpdate from './equipmengroupalarm-add-or-update'
import AddOrUpdate from './equipmentGroupAlarm-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/equipmenplc-add-or-update.vue → src/views/modules/monitoring/equipmentPlc-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/equipmentPlc.vue Näytä tiedosto

@@ -57,7 +57,7 @@
</template>

<script>
import AddOrUpdate from './equipmenplc-add-or-update'
import AddOrUpdate from './equipmentPlc-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/equipmenplcconnect-add-or-update.vue → src/views/modules/monitoring/equipmentPlcConnect-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/equipmentPlcConnect.vue Näytä tiedosto

@@ -50,7 +50,7 @@
</template>

<script>
import AddOrUpdate from './equipmenplcconnect-add-or-update'
import AddOrUpdate from './equipmentPlcConnect-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/equipmenplcparam-add-or-update.vue → src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/equipmentPlcParam.vue Näytä tiedosto

@@ -62,7 +62,7 @@
</template>

<script>
import AddOrUpdate from './equipmenplcparam-add-or-update'
import AddOrUpdate from './equipmentPlcParam-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/equipmenquantity-add-or-update.vue → src/views/modules/monitoring/equipmentQuantity-add-or-update.vue Näytä tiedosto


+ 3
- 3
src/views/modules/monitoring/equipmentQuantity.vue Näytä tiedosto

@@ -53,7 +53,7 @@
</template>

<script>
import AddOrUpdate from './equipmenquantity-add-or-update'
import AddOrUpdate from './equipmentQuantity-add-or-update'
export default {
data() {
return {
@@ -80,7 +80,7 @@ export default {
getDataList() {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/monitoring/equipmentQuanity/page'),
url: this.$http.adornUrl('/monitoring/equipmentQuantity/page'),
method: 'get',
params: this.$http.adornParams({
page: this.pageIndex,
@@ -133,7 +133,7 @@ export default {
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/monitoring/equipmentQuanity'),
url: this.$http.adornUrl('/monitoring/equipmentQuantity'),
method: 'delete',
data: this.$http.adornData(ids, false)
}).then(({ data }) => {


src/views/modules/monitoring/equipmenstatuslog-add-or-update.vue → src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue Näytä tiedosto


+ 3
- 3
src/views/modules/monitoring/equipmentStatusLog.vue Näytä tiedosto

@@ -54,7 +54,7 @@
</template>

<script>
import AddOrUpdate from './equipmenstatuslog-add-or-update'
import AddOrUpdate from './equipmentStatusLog-add-or-update'
export default {
data() {
return {
@@ -81,7 +81,7 @@ export default {
getDataList() {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/monitoring/equipmenStatusLog/page'),
url: this.$http.adornUrl('/monitoring/equipmentStatusLog/page'),
method: 'get',
params: this.$http.adornParams({
page: this.pageIndex,
@@ -134,7 +134,7 @@ export default {
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/monitoring/equipmenStatusLog'),
url: this.$http.adornUrl('/monitoring/equipmentStatusLog'),
method: 'delete',
data: this.$http.adornData(ids, false)
}).then(({ data }) => {


src/views/modules/monitoring/equipmentype-add-or-update.vue → src/views/modules/monitoring/equipmentType-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/equipmentType.vue Näytä tiedosto

@@ -51,7 +51,7 @@
</template>

<script>
import AddOrUpdate from './equipmentype-add-or-update'
import AddOrUpdate from './equipmentType-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/equipmentypefile-add-or-update.vue → src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/equipmentTypeFile.vue Näytä tiedosto

@@ -52,7 +52,7 @@
</template>

<script>
import AddOrUpdate from './equipmentypefile-add-or-update'
import AddOrUpdate from './equipmentTypeFile-add-or-update'
export default {
data() {
return {


+ 1
- 1
src/views/modules/monitoring/equipmentattr.vue Näytä tiedosto

@@ -48,7 +48,7 @@
</template>

<script>
import AddOrUpdate from './equipmenattr-add-or-update'
import AddOrUpdate from './equipmentAttr-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/producarrt-add-or-update.vue → src/views/modules/monitoring/productArrt-add-or-update.vue Näytä tiedosto


src/views/modules/monitoring/producArrt.vue → src/views/modules/monitoring/productArrt.vue Näytä tiedosto

@@ -52,7 +52,7 @@
</template>

<script>
import AddOrUpdate from './producarrt-add-or-update'
import AddOrUpdate from './productArrt-add-or-update'
export default {
data() {
return {

+ 1
- 1
src/views/modules/monitoring/productionLine.vue Näytä tiedosto

@@ -53,7 +53,7 @@
</template>

<script>
import AddOrUpdate from './productionline-add-or-update'
import AddOrUpdate from './productionLine-add-or-update'
export default {
data() {
return {


+ 1
- 1
src/views/modules/monitoring/productionLineRecSch.vue Näytä tiedosto

@@ -45,7 +45,7 @@
</template>

<script>
import AddOrUpdate from './productionlinerecsch-add-or-update'
import AddOrUpdate from './productionLineRecSch-add-or-update'
export default {
data() {
return {


+ 1
- 1
src/views/modules/monitoring/qualityInspectionDet.vue Näytä tiedosto

@@ -50,7 +50,7 @@
</template>

<script>
import AddOrUpdate from './qualityinspectiondet-add-or-update'
import AddOrUpdate from './qualityInspectionDet-add-or-update'
export default {
data() {
return {


+ 1
- 1
src/views/modules/monitoring/qualityInspectionRecord.vue Näytä tiedosto

@@ -55,7 +55,7 @@
</template>

<script>
import AddOrUpdate from './qualityinspectionrecord-add-or-update'
import AddOrUpdate from './qualityInspectionRecord-add-or-update'
export default {
data() {
return {


+ 1
- 1
src/views/modules/monitoring/qualityInspectionType.vue Näytä tiedosto

@@ -49,7 +49,7 @@
</template>

<script>
import AddOrUpdate from './qualityinspectiontype-add-or-update'
import AddOrUpdate from './qualityInspectionType-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/reporsheet-add-or-update.vue → src/views/modules/monitoring/reportSheet-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/reportSheet.vue Näytä tiedosto

@@ -53,7 +53,7 @@
</template>

<script>
import AddOrUpdate from './reporsheet-add-or-update'
import AddOrUpdate from './reportSheet-add-or-update'
export default {
data() {
return {


src/views/modules/monitoring/reporsheecategory-add-or-update.vue → src/views/modules/monitoring/reportSheetCategory-add-or-update.vue Näytä tiedosto


+ 1
- 1
src/views/modules/monitoring/reportSheetCategory.vue Näytä tiedosto

@@ -52,7 +52,7 @@
</template>

<script>
import AddOrUpdate from './reporsheecategory-add-or-update'
import AddOrUpdate from './reportSheetCategory-add-or-update'
export default {
data() {
return {


+ 1
- 1
src/views/modules/monitoring/sysfile.vue Näytä tiedosto

@@ -49,7 +49,7 @@
</template>

<script>
import AddOrUpdate from './sysfile-add-or-update'
import AddOrUpdate from './sysFile-add-or-update'
export default {
data() {
return {


+ 1
- 1
src/views/modules/monitoring/sysfileType.vue Näytä tiedosto

@@ -47,7 +47,7 @@
</template>

<script>
import AddOrUpdate from './sysfiletype-add-or-update'
import AddOrUpdate from './sysFileType-add-or-update'
export default {
data() {
return {


+ 3
- 3
src/views/modules/monitoring/workShopSection.vue Näytä tiedosto

@@ -52,7 +52,7 @@
</template>

<script>
import AddOrUpdate from './workshopsection-add-or-update'
import AddOrUpdate from './workshopSection-add-or-update'
export default {
data() {
return {
@@ -79,7 +79,7 @@ export default {
getDataList() {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/monitoring/workShopSection/page'),
url: this.$http.adornUrl('/monitoring/workshopSection/page'),
method: 'get',
params: this.$http.adornParams({
page: this.pageIndex,
@@ -132,7 +132,7 @@ export default {
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/monitoring/workShopSection'),
url: this.$http.adornUrl('/monitoring/workshopSection'),
method: 'delete',
data: this.$http.adornData(ids, false)
}).then(({ data }) => {


+ 3
- 3
src/views/modules/monitoring/workShopSectionEquipment.vue Näytä tiedosto

@@ -50,7 +50,7 @@
</template>

<script>
import AddOrUpdate from './workshopsectionequipment-add-or-update'
import AddOrUpdate from './workshopSectionEquipment-add-or-update'
export default {
data() {
return {
@@ -77,7 +77,7 @@ export default {
getDataList() {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/monitoring/workShopSectionEquipment/page'),
url: this.$http.adornUrl('/monitoring/workshopSectionEquipment/page'),
method: 'get',
params: this.$http.adornParams({
page: this.pageIndex,
@@ -130,7 +130,7 @@ export default {
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/monitoring/workShopSectionEquipment'),
url: this.$http.adornUrl('/monitoring/workshopSectionEquipment'),
method: 'delete',
data: this.$http.adornData(ids, false)
}).then(({ data }) => {


+ 2
- 2
src/views/modules/monitoring/workshopsection-add-or-update.vue Näytä tiedosto

@@ -109,7 +109,7 @@ export default {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/monitoring/workShopSection/${this.dataForm.id}`),
url: this.$http.adornUrl(`/monitoring/workshopSection/${this.dataForm.id}`),
method: 'get',
params: this.$http.adornParams()
}).then(({ data }) => {
@@ -140,7 +140,7 @@ export default {
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.$http({
url: this.$http.adornUrl(`/monitoring/workShopSection/${!this.dataForm.id ? '' : this.dataForm.id}`),
url: this.$http.adornUrl(`/monitoring/workshopSection/${!this.dataForm.id ? '' : this.dataForm.id}`),
method: this.dataForm.id ? 'put' : 'post',
data: this.$http.adornData({
id: this.dataForm.id || undefined,


+ 2
- 2
src/views/modules/monitoring/workshopsectionequipment-add-or-update.vue Näytä tiedosto

@@ -89,7 +89,7 @@ export default {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/monitoring/workShopSectionEquipment/${this.dataForm.id}`),
url: this.$http.adornUrl(`/monitoring/workshopSectionEquipment/${this.dataForm.id}`),
method: 'get',
params: this.$http.adornParams()
}).then(({ data }) => {
@@ -116,7 +116,7 @@ export default {
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.$http({
url: this.$http.adornUrl(`/monitoring/workShopSectionEquipment/${!this.dataForm.id ? '' : this.dataForm.id}`),
url: this.$http.adornUrl(`/monitoring/workshopSectionEquipment/${!this.dataForm.id ? '' : this.dataForm.id}`),
method: this.dataForm.id ? 'put' : 'post',
data: this.$http.adornData({
id: this.dataForm.id || undefined,


Ladataan…
Peruuta
Tallenna