430/vue_mdc_430_new.git

			@@ -22,8 +22,8 @@

			<a-col :md="6" :sm="8">
			<a-form-item label="车间名称">
			<!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
			<a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>
			<!--<a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>-->
			<a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="请选择车间" tree-default-expand-all></a-tree-select>
			</a-form-item>
			</a-col>

			@@ -38,6 +38,7 @@
			<!-- 操作按钮区域 -->
			<div class="table-operator" style="border-top: 5px">
			<a-button @click="handleAdd" type="primary" icon="plus" >添加设备</a-button>
			<a-button type="primary" icon="download" @click="handleExportXls('设备信息')">导出</a-button>
			<a-dropdown v-if="selectedRowKeys.length > 0">
			<a-menu slot="overlay" @click="handleMenuClick">
			<a-menu-item key="1">
			@@ -64,6 +65,7 @@
			bordered
			size="middle"
			rowKey="id"
			:scroll="{x:'max-content',y:465}"
			:columns="columns"
			:dataSource="dataSource"
			:pagination="ipagination"
			@@ -146,6 +148,7 @@
			import UserRecycleBinModal from './modules/EquipmentList/UserRecycleBinModal'
			import JSuperQuery from '@/components/jeecg/JSuperQuery'
			import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
			import { queryProductionTreeList } from '@/api/api'
			import {mapActions} from 'vuex'

			export default {
			@@ -180,25 +183,25 @@
			title: '设备编号',
			align: "center",
			dataIndex: 'equipmentId',
			width: 120,
			width: 200,
			// sorter: true
			},
			{
			title: '设备名称',
			align: "center",
			width: 150,
			width: 200,
			dataIndex: 'equipmentName',
			},
			{
			title: '车间',
			align: "center",
			width: 180,
			width: 200,
			dataIndex: 'productionName'
			},
			{
			title: '设备类型',
			align: "center",
			width: 120,
			width: 200,
			dataIndex: 'equipmentType',
			// scopedSlots: {customRender: "avatarslot"}
			},
			@@ -206,33 +209,33 @@
			{
			title: '驱动类型',
			align: "center",
			width: 80,
			width: 200,
			dataIndex: 'driveType',
			// sorter: true
			},
			{
			title: '机床IP',
			align: "center",
			width: 100,
			width: 200,
			dataIndex: 'equipmentIp'
			},
			{
			title: '设备功率',
			align: "center",
			width: 100,
			width: 200,
			dataIndex: 'devicePower'
			},
			{
			title: '部门',
			align: "center",
			width: 180,
			width: 200,
			dataIndex: 'orgCodeTxt'
			},

			{
			title: '系统版本',
			align: "center",
			width: 80,
			width: 200,
			dataIndex: 'systemVersion'
			},
			{
			@@ -240,7 +243,8 @@
			dataIndex: 'action',
			scopedSlots: {customRender: 'action'},
			align: "center",
			width: 120
			width: 150,
			fixed:'right'
			}

			],
			@@ -254,10 +258,11 @@
			list: "/mdc/mdcEquipment/list",
			delete: "/mdc/mdcEquipment/delete",
			deleteBatch: "/mdc/mdcEquipment/deleteBatch",
			// exportXlsUrl: "/sys/user/exportXls",
			exportXlsUrl: "/mdc/mdcEquipment/exportXls",
			// importExcelUrl: "sys/user/importExcel",
			},
			isDepartType:''
			isDepartType:'',
			workshopTreeData:[]
			}
			},
			computed: {
			@@ -267,6 +272,7 @@
			},
			created() {
			this.queryTreeData()
			this.getWorkshopListByApi()
			},
			methods: {
			...mapActions(['QueryDepartTree']),
			@@ -290,25 +296,25 @@
			title: '设备编号',
			align: "center",
			dataIndex: 'equipmentId',
			width: 120,
			width: 200,
			// sorter: true
			},
			{
			title: '设备名称',
			align: "center",
			width: 150,
			width: 200,
			dataIndex: 'equipmentName',
			},
			{
			title: '车间',
			align: "center",
			width: 180,
			width: 200,
			dataIndex: 'productionName'
			},
			{
			title: '设备类型',
			align: "center",
			width: 120,
			width: 200,
			dataIndex: 'equipmentType',
			// scopedSlots: {customRender: "avatarslot"}
			},
			@@ -316,33 +322,33 @@
			{
			title: '驱动类型',
			align: "center",
			width: 80,
			width: 200,
			dataIndex: 'driveType',
			// sorter: true
			},
			{
			title: '机床IP',
			align: "center",
			width: 100,
			width: 200,
			dataIndex: 'equipmentIp'
			},
			{
			title: '设备功率',
			align: "center",
			width: 100,
			width: 200,
			dataIndex: 'devicePower'
			},
			// {
			// title: '部门',
			// align: "center",
			// width: 180,
			// width: 200,
			// dataIndex: 'orgCodeTxt'
			// },

			{
			title: '系统版本',
			align: "center",
			width: 80,
			width: 200,
			dataIndex: 'systemVersion'
			},
			{
			@@ -350,7 +356,8 @@
			dataIndex: 'action',
			scopedSlots: {customRender: 'action'},
			align: "center",
			width: 120
			width: 150,
			fixed:'right'
			}

			]
			@@ -370,25 +377,25 @@
			title: '设备编号',
			align: "center",
			dataIndex: 'equipmentId',
			width: 120,
			width: 200,
			// sorter: true
			},
			{
			title: '设备名称',
			align: "center",
			width: 150,
			width: 200,
			dataIndex: 'equipmentName',
			},
			{
			title: '车间',
			align: "center",
			width: 180,
			width: 200,
			dataIndex: 'productionName'
			},
			{
			title: '设备类型',
			align: "center",
			width: 120,
			width: 200,
			dataIndex: 'equipmentType',
			// scopedSlots: {customRender: "avatarslot"}
			},
			@@ -396,33 +403,33 @@
			{
			title: '驱动类型',
			align: "center",
			width: 80,
			width: 200,
			dataIndex: 'driveType',
			// sorter: true
			},
			{
			title: '机床IP',
			align: "center",
			width: 100,
			width: 200,
			dataIndex: 'equipmentIp'
			},
			{
			title: '设备功率',
			align: "center",
			width: 100,
			width: 200,
			dataIndex: 'devicePower'
			},
			{
			title: '部门',
			align: "center",
			width: 180,
			width: 200,
			dataIndex: 'orgCodeTxt'
			},

			{
			title: '系统版本',
			align: "center",
			width: 80,
			width: 200,
			dataIndex: 'systemVersion'
			},
			{
			@@ -430,7 +437,8 @@
			dataIndex: 'action',
			scopedSlots: {customRender: 'action'},
			align: "center",
			width: 120
			width: 150,
			fixed:'right'
			}

			]
			@@ -550,6 +558,12 @@
			this.loadData()
			}
			},

			getWorkshopListByApi(){
			queryProductionTreeList().then(res=>{
			if(res.success) this.workshopTreeData=res.result
			})
			}
			}

			}