'update'
This commit is contained in:
		@@ -5,7 +5,7 @@
 | 
			
		||||
				{{ $t('pl.name') }}
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
			<el-form-item>
 | 
			
		||||
				<el-select v-model="dataForm.lineId" :placeholder="$t('pl.name')" clearable>
 | 
			
		||||
				<el-select v-model="dataForm.lineId" :placeholder="$t('pl.name')" clearable filterable>
 | 
			
		||||
					<el-option v-for="line in lineList" :key="line.code" :value="line.id" :label="line.name" />
 | 
			
		||||
				</el-select>
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
@@ -13,7 +13,7 @@
 | 
			
		||||
				{{ $t('eq.name') }}
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
			<el-form-item>
 | 
			
		||||
				<el-select v-model="dataForm.equipmentId" :placeholder="$t('eq.name')" clearable>
 | 
			
		||||
				<el-select v-model="dataForm.equipmentId" :placeholder="$t('eq.name')" clearable filterable>
 | 
			
		||||
					<el-option v-for="eq in eqList" :key="eq.code" :value="eq.id" :label="eq.name" />
 | 
			
		||||
				</el-select>
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
			<el-form-item>
 | 
			
		||||
				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
 | 
			
		||||
				<el-select v-model="dataForm.ftId" :placeholder="$t('factory.title')" @change="handleftIdChange" clearable>
 | 
			
		||||
				<el-select v-model="dataForm.ftId" :placeholder="$t('factory.title')" @change="handleftIdChange" clearable filterable>
 | 
			
		||||
					<el-option v-for="factory in factoryList" :key="factory.id" :value="factory.id" :label="factory.name" />
 | 
			
		||||
				</el-select>
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
@@ -17,7 +17,7 @@
 | 
			
		||||
				{{ $t('pl.title') }}
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
			<el-form-item>
 | 
			
		||||
				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable>
 | 
			
		||||
				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable filterable> 
 | 
			
		||||
					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
 | 
			
		||||
				</el-select>
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
 
 | 
			
		||||
@@ -14,7 +14,7 @@
 | 
			
		||||
				{{ $t('pl.title') }}
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
			<el-form-item>
 | 
			
		||||
				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable>
 | 
			
		||||
				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" multiple clearable filterable>
 | 
			
		||||
					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id" :label="productLine.name" />
 | 
			
		||||
				</el-select>
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
 
 | 
			
		||||
@@ -22,6 +22,7 @@
 | 
			
		||||
 | 
			
		||||
		<!-- <base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" /> -->
 | 
			
		||||
		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 | 
			
		||||
		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" />
 | 
			
		||||
	</div>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
@@ -56,7 +57,7 @@ export default {
 | 
			
		||||
	mouted() {
 | 
			
		||||
		this.getDataList()
 | 
			
		||||
	},
 | 
			
		||||
	created(){
 | 
			
		||||
	created() {
 | 
			
		||||
		// console.log('params',this.$route.params)
 | 
			
		||||
	},
 | 
			
		||||
	methods: {
 | 
			
		||||
@@ -73,7 +74,9 @@ export default {
 | 
			
		||||
				url: this.$http.adornUrl(`/monitoring/equipmentValueMonitor/runLog/${this.$route.params.id}`),
 | 
			
		||||
				method: 'get'
 | 
			
		||||
			}).then(({ data: res }) => {
 | 
			
		||||
				console.log('res',res)
 | 
			
		||||
				console.log('res', res)
 | 
			
		||||
				this.equipmentName = res.data[0].data[0].equName
 | 
			
		||||
				this.equipmentCode = res.data[0].data[0].equCode
 | 
			
		||||
				if (
 | 
			
		||||
					res &&
 | 
			
		||||
					res.code === 0 &&
 | 
			
		||||
@@ -84,9 +87,7 @@ export default {
 | 
			
		||||
					res.data[0].data &&
 | 
			
		||||
					res.data[0].data.length > 0
 | 
			
		||||
				) {
 | 
			
		||||
					this.equipmentName = res.data[0].data[0].equName
 | 
			
		||||
					this.equipmentCode = res.data[0].data[0].equCode
 | 
			
		||||
					console.log(this.equipmentName)
 | 
			
		||||
					// console.log(this.equipmentName)
 | 
			
		||||
					this.setTableProps(res.data[0].nameData)
 | 
			
		||||
					this.setTableData(res.data[0].data)
 | 
			
		||||
				} else {
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@
 | 
			
		||||
				{{ $t('pl.title') }}
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
			<el-form-item>
 | 
			
		||||
				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" @change="handleProductLineChange" clearable>
 | 
			
		||||
				<el-select v-model="dataForm.productlines" :placeholder="$t('pl.title')" @change="handleProductLineChange" clearable filterable>
 | 
			
		||||
					<el-option v-for="productLine in productLineList" :key="productLine.id" :value="productLine.id"
 | 
			
		||||
						:label="productLine.name" />
 | 
			
		||||
				</el-select>
 | 
			
		||||
@@ -18,7 +18,7 @@
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
			<el-form-item>
 | 
			
		||||
				<!-- <el-select v-model="dataForm.factoryId" :placeholder="$t('eq.name') + ' / ' + $t('eq.code')" clearable></el-select> -->
 | 
			
		||||
				<el-select v-model="dataForm.wsId" :placeholder="$t('pl.process')" clearable>
 | 
			
		||||
				<el-select v-model="dataForm.wsId" :placeholder="$t('pl.process')" clearable filterable>
 | 
			
		||||
					<el-option v-for="ws in wsList" :key="ws.id" :value="ws.id" :label="ws.name" />
 | 
			
		||||
				</el-select>
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
@@ -47,7 +47,7 @@
 | 
			
		||||
		</div>
 | 
			
		||||
 | 
			
		||||
		<el-dialog :visible.sync="dialogVisible" :title="$t('pl.add')" width="30%">
 | 
			
		||||
			<el-select v-model="eqId" style="width: 100%" :placeholder="$t('pl.choose')" clearable>
 | 
			
		||||
			<el-select v-model="eqId" style="width: 100%" :placeholder="$t('pl.choose')" clearable filterable>
 | 
			
		||||
				<el-option v-for="eq in dialogEqList" :key="eq.id" :label="eq.name" :value="eq.id" />
 | 
			
		||||
			</el-select>
 | 
			
		||||
			<div slot="footer">
 | 
			
		||||
 
 | 
			
		||||
@@ -20,7 +20,7 @@
 | 
			
		||||
				<el-row :gutter="20">
 | 
			
		||||
					<el-col :span="12"
 | 
			
		||||
						><el-form-item :label="$t('ws.belong')" prop="productionLineId">
 | 
			
		||||
							<el-select v-model="dataForm.productionLineId" :placeholder="$t('ws.belong')">
 | 
			
		||||
							<el-select v-model="dataForm.productionLineId" :placeholder="$t('ws.belong')" filterable>
 | 
			
		||||
								<el-option v-for="line in lineList" :key="line.id" :value="line.id" :label="line.name" />
 | 
			
		||||
							</el-select> </el-form-item
 | 
			
		||||
					></el-col>
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,7 @@
 | 
			
		||||
				<el-row :gutter="20">
 | 
			
		||||
					<el-col :span="12">
 | 
			
		||||
						<el-form-item :label="edit ? $t('ws.binded') : $t('ws.unbind')" prop="equipmentId">
 | 
			
		||||
							<el-select v-if="!edit" clearable v-model="dataForm.equipmentId" :placeholder="$t('ws.eqbindplaceholder')">
 | 
			
		||||
							<el-select v-if="!edit" clearable v-model="dataForm.equipmentId" :placeholder="$t('ws.eqbindplaceholder')" filterable>
 | 
			
		||||
								<el-option v-for="eq in eqList" :key="eq.id" :label="eq.name" :value="eq.id" />
 | 
			
		||||
							</el-select>
 | 
			
		||||
							<el-input v-else disabled v-model="bindedEquipmentName" /> </el-form-item
 | 
			
		||||
 
 | 
			
		||||
@@ -26,7 +26,7 @@
 | 
			
		||||
				<el-input v-model="dataForm.mobile" :placeholder="$t('user.mobile')"></el-input>
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
			<el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list">
 | 
			
		||||
				<el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')">
 | 
			
		||||
				<el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')" filterable>
 | 
			
		||||
					<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
 | 
			
		||||
				</el-select>
 | 
			
		||||
			</el-form-item>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user