mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 核心模块-厂务-设备

Browse Source
This commit is contained in:
lb
2023-10-17 15:22:17 +08:00
parent 9be57ad750
commit fe7821cbd8
16 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/base/equipmentBindGroup/index.vue
View File

@@ -219,7 +219,7 @@ export default {
{
select: true,
label: '设备',
url: '/base/equipment/page?pageNo=1&pageSize=100',
url: '/base/core-equipment/page?pageNo=1&pageSize=100',
prop: 'equipmentId',
bind: {
filterable: true,
@@ -278,7 +278,7 @@ export default {
input: true,
label: '设备分组编码',
prop: 'code',
// url: '/base/equipment/getCode',
// url: '/base/core-equipment/getCode',
},
],
],

2
src/views/base/equipmentBindSection/dialogForm.vue
View File

@@ -191,7 +191,7 @@ export default {
// 获取设备列表
async getEquipmentList() {
const response = await this.$axios(
'/base/equipment/page?pageNo=1&pageSize=100'
'/base/core-equipment/page?pageNo=1&pageSize=100'
);
this.equipmentList = response.data.list.map((item) => ({
label: item.name,

2
src/views/base/equipmentBindSection/index.vue
View File

@@ -192,7 +192,7 @@ export default {
{
select: true,
label: '设备',
url: '/base/equipment/page?pageNo=1&pageSize=100',
url: '/base/core-equipment/page?pageNo=1&pageSize=100',
prop: 'equipmentId',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},

2
src/views/base/equipmentGroup/index.vue
View File

@@ -192,7 +192,7 @@ export default {
input: true,
label: '设备分组编码',
prop: 'code',
// url: '/base/equipment/getCode',
// url: '/base/core-equipment/getCode',
}
]
],

6
src/views/base/equipmentPlcConnect/index.vue
View File

@@ -247,7 +247,7 @@ export default {
select: true,
label: '设备',
prop: 'equipmentId',
url: '/base/equipment/page?pageNo=1&pageSize=99',
url: '/base/core-equipment/page?pageNo=1&pageSize=99',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
bind: {
filterable: true,
@@ -283,7 +283,7 @@ export default {
input: true,
label: '关联表名',
prop: 'plcTableName',
// url: '/base/equipment/getCode',
// url: '/base/core-equipment/getCode',
},
],
],
@@ -320,7 +320,7 @@ export default {
methods: {
async getEquipmentOptions() {
const res = await this.$axios({
url: '/base/equipment/listAll',
url: '/base/core-equipment/listAll',
method: 'get',
});
return res.data;

2
src/views/core/base/equipment/components/EquipmentInfoForm.vue
View File

@@ -283,7 +283,7 @@ export default {
async getEqTypeList() {
this.formLoading = true;
const { code, data } = await this.$axios(
'/base/equipment-type/page?pageNo=1&pageSize=100'
'/base/core-equipment-type/page?pageNo=1&pageSize=100'
);
// debugger;
if (code == 0) {

13
src/views/core/base/equipment/index.vue
View File

@@ -60,9 +60,9 @@
name: '基本信息',
key: 'base',
rows: computedRows,
url: '/base/equipment/get',
urlUpdate: '/base/equipment/update',
urlCreate: '/base/equipment/create',
url: '/base/core-equipment/get',
urlUpdate: '/base/core-equipment/update',
urlCreate: '/base/core-equipment/create',
queryParams: { id: form.id },
},
{
@@ -105,9 +105,6 @@
<script>
import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { getAccessToken } from '@/utils/auth';
import EquipmentPics from './components/EquipmentPics';
import EquipmentAssets from './components/EquipmentAssets';
import EquipmentDrawer from './components/EquipmentDrawer';
import {
@@ -242,7 +239,7 @@ export default {
input: true,
label: '设备编码',
prop: 'code',
url: '/base/equipment/getCode',
url: '/base/core-equipment/getCode',
},
{
input: true,
@@ -269,7 +266,7 @@ export default {
select: true,
label: '设备类型',
prop: 'equipmentTypeId',
url: '/base/equipment-type/page?pageNo=1&pageSize=100',
url: '/base/core-equipment-type/page?pageNo=1&pageSize=100',
bind: {
filterable: true,
},

4
src/views/core/base/equipmentType/index.vue
View File

@@ -139,7 +139,7 @@ export default {
input: true,
label: '设备类型编码',
prop: 'code',
url: '/base/equipment-type/getCode',
url: '/base/core-equipment-type/getCode',
},
],
[
@@ -147,7 +147,7 @@ export default {
select: true,
label: '父类',
prop: 'parentId',
url: '/base/equipment-type/page?pageNo=1&pageSize=100',
url: '/base/core-equipment-type/page?pageNo=1&pageSize=100',
},
{},
],

2
src/views/equipment/timing-diagram/output/index.vue
View File

@@ -416,7 +416,7 @@ export default {
/** 准备设备数据 */
async initEquipment() {
const { code, data } = await this.$axios({
url: '/base/equipment/listAll',
url: '/base/core-equipment/listAll',
method: 'get',
});
if (code == 0) {

2
src/views/equipment/timing-diagram/status/index.vue
View File

@@ -223,7 +223,7 @@ export default {
/** 准备设备数据 */
async initEquipment() {
const { code, data } = await this.$axios({
url: '/base/equipment/listAll',
url: '/base/core-equipment/listAll',
method: 'get',
});
if (code == 0) {

2
src/views/monitoring/equipmentStatusAndParams/index.vue
View File

@@ -215,7 +215,7 @@ export default {
/** 根据产线获取设备 */
async getEquipmentList(id) {
const { data } = await this.$axios({
url: '/base/equipment/listByLine',
url: '/base/core-equipment/listByLine',
method: 'get',
params: { id },
});