From ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 07 八月 2025 10:30:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 102 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index cb93b44..d22bb6d 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -57,12 +57,12 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="杞﹂棿鍒嗛厤" v-show="!productionDisabled"
- ref="selectedProduction" prop="selectedProduction">
+ <a-form-model-item label="杞﹂棿鍒嗛厤" v-show="!factoryDisabled"
+ ref="selectedFactory" prop="selectedFactory">
<!--<j-select-equipment-production v-decorator="['selectedProduction',{rules:[{required:true,message:'璇烽�夋嫨杞﹂棿!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->
- <j-select-equipment-production :disabled="disableSubmit" v-model="model.selectedProduction" :multi="false"
- @back="backProductionInfo" :backProduction="true"
- :treeProductOpera="true"></j-select-equipment-production>
+ <j-select-equipment-factory :disabled="disableSubmit" v-model="model.selectedFactory" :multi="false"
+ @back="backFactoryInfo" :backFactory="true"
+ :treeProductOpera="true"></j-select-equipment-factory>
</a-form-model-item>
</a-col>
@@ -124,13 +124,13 @@
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-model-item label="绯荤粺绫诲瀷">
- <j-dict-select-tag placeholder="璇烽�夋嫨绯荤粺绫诲瀷" :triggerChange="true" dictCode="system_type"
- :disabled="disableSubmit"
- v-model="model.systemType" allow-clear/>
- </a-form-model-item>
- </a-col>
+<!-- <a-col :span="12">-->
+<!-- <a-form-model-item label="绯荤粺绫诲瀷">-->
+<!-- <j-dict-select-tag placeholder="璇烽�夋嫨绯荤粺绫诲瀷" :triggerChange="true" dictCode="system_type"-->
+<!-- :disabled="true"-->
+<!-- v-model="model.systemType" allow-clear/>-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
<a-col :span="12">
<a-form-model-item label="鎺掑簭">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇疯緭鍏ユ帓搴�"
@@ -139,22 +139,22 @@
</a-col>
</a-row>
- <a-row :gutter="24">
- <a-col :span='12' v-if="systemType">
- <a-form-model-item label="绯荤粺绫诲瀷">
- <a-radio-group name="radioGroup" v-model="systemValue" :disabled="disableSubmit">
- <a-radio value="1">DNC</a-radio>
- <a-radio value="2">MDC</a-radio>
- <a-radio value="3">閫氱敤</a-radio>
- </a-radio-group>
- </a-form-model-item>
- </a-col>
- <a-col :span='12'>
- <a-form-model-item label="瀹夎浣嶇疆">
- <a-input v-model="model.equipmentAddress" allow-clear placeholder="璇疯緭鍏ュ畨瑁呬綅缃�" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- </a-row>
+<!-- <a-row :gutter="24">-->
+<!-- <a-col :span='12' v-if="systemType">-->
+<!-- <a-form-model-item label="绯荤粺绫诲瀷">-->
+<!-- <a-radio-group name="radioGroup" v-model="systemValue" :disabled="disableSubmit">-->
+<!-- <a-radio value="1">DNC</a-radio>-->
+<!-- <a-radio value="2">MDC</a-radio>-->
+<!-- <a-radio value="3">閫氱敤</a-radio>-->
+<!-- </a-radio-group>-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
+<!-- <a-col :span='12'>-->
+<!-- <a-form-model-item label="瀹夎浣嶇疆">-->
+<!-- <a-input v-model="model.equipmentAddress" allow-clear placeholder="璇疯緭鍏ュ畨瑁呬綅缃�" :disabled="disableSubmit"/>-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
+<!-- </a-row>-->
<a-row :gutter="24">
@@ -198,8 +198,8 @@
import { addEquipment, editEquipment } from '@/api/api'
import { disabledAuthFilter } from '@/utils/authFilter'
import { duplicateCheck } from '@/api/api'
- import JSelectEquipmentProduction from '../../../../../components/jeecgbiz/JSelectEquipmentProduction'
- import JSelectProduction from '../../../../../components/jeecgbiz/JSelectProduction'
+ import JSelectEquipmentFactory from '../../../../../components/jeecgbiz/JSelectEquipmentFactory'
+ import JSelectFactory from '../../../../../components/jeecgbiz/JSelectFactory'
import DeviceListModel from './DeviceListModal'
import JSelectEquipmentDepart from '../../../../../components/jeecgbiz/JSelectEquipmentDepart'
import { mapActions } from 'vuex'
@@ -207,15 +207,15 @@
export default {
name: 'UserModal',
components: {
- JSelectProduction,
+ JSelectFactory,
JSelectEquipmentDepart,
- JSelectEquipmentProduction,
+ JSelectEquipmentFactory,
DeviceListModel
},
data() {
return {
departDisabled: false, //鏄惁鏄垜鐨勯儴闂ㄨ皟鐢ㄨ椤甸潰
- productionDisabled: false, //鏄惁鏄垜鐨勮溅闂磋皟鐢ㄨ椤甸潰
+ factoryDisabled: false, //鏄惁鏄垜鐨勮溅闂磋皟鐢ㄨ椤甸潰
roleDisabled: false, //鏄惁鏄鑹茬淮鎶よ皟鐢ㄨ椤甸潰
modalWidth: 800,
drawerWidth: 700,
@@ -240,7 +240,7 @@
],
// trigger: 'blur' // 瑙﹀彂鏂瑰紡
- selectedProduction:
+ selectedFactory:
[
{
required: true, message: '璇烽�夋嫨杞﹂棿锛�'
@@ -289,7 +289,7 @@
fileUpload: window._CONFIG['domianURL'] + '/sys/common/upload',
userWithDepart: '/mdc/mdcEquipment/equipmentDepartList', // 寮曞叆涓烘寚瀹氱敤鎴锋煡鐪嬮儴闂ㄤ俊鎭渶瑕佺殑url
//寮曞叆涓烘寚瀹氱敤鎴锋煡鐪嬭溅闂翠俊鎭渶瑕佺殑url
- userProductionList: '/mdc/mdcEquipment/equipmentProductionList',
+ equipmentFactoryList: '/mdc/mdcEquipment/equipmentFactoryList',
userId: '/sys/user/generateUserId', // 寮曞叆鐢熸垚娣诲姞鐢ㄦ埛鎯呭喌涓嬬殑url
syncUserByUserName: '/act/process/extActProcess/doSyncUserByUserName',//鍚屾鐢ㄦ埛鍒板伐浣滄祦
queryTenantList: '/sys/tenant/queryList',
@@ -309,7 +309,7 @@
this.headers = { 'X-Access-Token': token }
this.queryGroup()
this.queryTreeData()
- this.getAppPlatformName()
+ // this.getAppPlatformName()
// this.initRoleList()
// this.initTenantList()
},
@@ -334,13 +334,13 @@
}).finally(() => {
})
},
- getAppPlatformName() {
- getAction(`/system/sysParams/query/by/settingKey?settingKey=system_type`).then(res => {
- if (res.success) {
- this.systemType = res.result.settingValue === '0'
- }
- })
- },
+ // getAppPlatformName() {
+ // getAction(`/system/sysParams/query/by/settingKey?settingKey=system_type`).then(res => {
+ // if (res.success) {
+ // this.systemType = res.result.settingValue === '0'
+ // }
+ // })
+ // },
queryGroup() {
getAction(this.url.queryEquipmentType).then(res => {
if (res.success) {
@@ -412,7 +412,7 @@
// this.model = Object.assign({}, record)
this.$nextTick(() => {
- this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
+ this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedFactory', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue', 'equipmentAddress'))
})
if (record.hasOwnProperty('id')) {
@@ -467,24 +467,24 @@
}
})
- getAction(that.url.userProductionList, { equipmentId: userid }).then((res) => {
+ getAction(that.url.equipmentFactoryList, { equipmentId: userid }).then((res) => {
if (res.success) {
// console.log(res.result)
- let ProductionOptions = []
+ let factoryOptions = []
let selectProductKeys = []
// console.log(res.result)
for (let i = 0; i < res.result.length; i++) {
selectProductKeys.push(res.result[i].key)
//鏂板璐熻矗閮ㄩ棬閫夋嫨涓嬫媺妗�
- ProductionOptions.push({
+ factoryOptions.push({
value: res.result[i].key,
label: res.result[i].title
})
}
- that.model.selectedProduction = selectProductKeys.join(',')
+ that.model.selectedFactory = selectProductKeys.join(',')
- that.nextProductionOptions = ProductionOptions
+ that.nextProductionOptions = factoryOptions
// console.log('that.nextProductionOptions=',that.nextProductionOptions)
}
})
@@ -498,9 +498,9 @@
return c
})
},
- backProductionInfo(info) {
+ backFactoryInfo(info) {
// console.log(info)
- this.model.productionIds = this.model.selectedProduction
+ this.model.productionIds = this.model.selectedFactory
this.nextProductionOptions = info.map((item, index, arr) => {
let c = { label: item.text, value: item.value + '' }
return c
--
Gitblit v1.9.3