update 工段设备关联

.prettierrc

@@ -2,8 +2,9 @@
 	"singleQuote": true,
 	"tabWidth": 2,
 	"bracketSameLine": true,
+	"jsxBracketSameLine": true,
 	"embeddedLanguageFormatting": "auto",
-	"printWidth": 180,
+	"printWidth": 80,
 	"quoteProps": "consistent",
 	"trailingComma": "none",
 	"semi": false,

src/views/modules/monitoring/equipment.vue

@@ -2,7 +2,7 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="设备名称/设备编码" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>

src/views/modules/monitoring/equipmentGroup.vue

@@ -2,36 +2,14 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="分组编码/分组名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:equipmentgroup:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="分组编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="分组名字"> </el-table-column>
-			<el-table-column prop="typeId" header-align="center" align="center" label="设备类型id"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"

src/views/modules/monitoring/equipmentPlc.vue

@@ -2,7 +2,7 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="名称/编码" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>

src/views/modules/monitoring/equipmentPlcConnect.vue

@@ -2,7 +2,7 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="设备名称/设备编码" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>

src/views/modules/monitoring/equipmentPlcParam.vue

@@ -9,42 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:equipmenplcparam:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="plcConId" header-align="center" align="center" label="plc连接表ID"> </el-table-column>
-			<el-table-column prop="type" header-align="center" align="center" label="类型：status、data、constant"> </el-table-column>
-			<el-table-column prop="paramCode" header-align="center" align="center" label="参数编码"> </el-table-column>
-			<el-table-column prop="paramName" header-align="center" align="center" label="参数名称"> </el-table-column>
-			<el-table-column prop="paramAddress" header-align="center" align="center" label="参数地址，对应实时数据库表的列名"> </el-table-column>
-			<el-table-column prop="valueType" header-align="center" align="center" label="参数值类型：int、long、boolean、string、list 暂不使用"> </el-table-column>
-			<el-table-column prop="unitDictValue" header-align="center" align="center" label="单位 关联数据字典表label_value"> </el-table-column>
-			<el-table-column prop="minValue" header-align="center" align="center" label="最小值"> </el-table-column>
-			<el-table-column prop="maxValue" header-align="center" align="center" label="最大值"> </el-table-column>
-			<el-table-column prop="defaultValue" header-align="center" align="center" label="参数设定标准值"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column prop="collection" header-align="center" align="center" label="0 代表不采集, 1 代表采集"> </el-table-column>
-			<el-table-column prop="collectionCycle" header-align="center" align="center" label="采集周期（s） 暂不使用"> </el-table-column>
-			<el-table-column prop="reportingCycle" header-align="center" align="center" label="上报周期（s） 暂不使用"> </el-table-column>
-			<el-table-column prop="reportingMethod" header-align="center" align="center" label="上报方式 暂不使用"> </el-table-column>
-			<el-table-column prop="reportingCode" header-align="center" align="center" label="上报编码 暂不使用"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -64,8 +29,11 @@
 <script>
 import AddOrUpdate from './equipmentPlcParam-add-or-update'
 import BaseTable from '@/components/base-table'
-import TableOperateComponent from '@/components/base-table/components/operationComponent'
+// import TableOperateComponent from '@/components/base-table/components/operationComponent'
-import TableTextComponent from '@/components/base-table/components/detailComponent'
+// import TableTextComponent from '@/components/base-table/components/detailComponent'
+import { dictFilter } from '@/utils/filters'
+
+const UnitDictTypeId = '1557173812109242370'
 
 const tableConfigs = [
 	{ type: 'index', name: '序号' },
@@ -73,20 +41,21 @@ const tableConfigs = [
 	{ prop: 'paramCode', name: '参数编码' },
 	{ prop: 'paramName', name: '参数名称' },
 	{ prop: 'paramAddress', name: '参数地址' },
-	{ prop: 'unitDictValue', name: '单位' },
+	{ prop: 'unitDictValue', name: '单位', filter: dictFilter(UnitDictTypeId) },
 	{ prop: 'minValue', name: '最小值' },
 	{ prop: 'maxValue', name: '最大值' },
 	{ prop: 'defaultValue', name: '参数设定标准值' },
 	{ prop: 'description', name: '描述' },
-	{ prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
+	{ prop: 'enabled', name: '启用状态', filter: val => ['停用', '启用'][+val] },
+	// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
 	{ prop: 'remark', name: '备注' },
 	// { prop: 'createTime', name: '添加时间' },
-	{ prop: 'collection', name: '0 代表不采集, 1 代表采集' },
+	{ prop: 'collection', name: '是否采集', filter: val => ['不采集', '采集'][+val] }
 	// { prop: 'collectionCycle', name: '采集周期（s） 暂不使用' },
 	// { prop: 'reportingCycle', name: '上报周期（s） 暂不使用' },
 	// { prop: 'reportingMethod', name: '上报方式 暂不使用' },
 	// { prop: 'reportingCode', name: '上报编码 暂不使用' },
-	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	// { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 export default {

src/views/modules/monitoring/equipmentType.vue

@@ -2,38 +2,14 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="设备类型" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:equipmenttype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
-			<el-table-column prop="parentId" header-align="center" align="center" label="父类ID"> </el-table-column>
-			<el-table-column prop="parentName" header-align="center" align="center" label="父类名称"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -85,9 +61,10 @@ const addOrUpdateConfigs = {
 			fieldType: 'array',
 			label: '上传资料',
 			component: () => import('@/components/base-upload'),
-			props: { // 上传组件需要的 props
+			props: {
-				url: "/monitoring/attachment/uploadFileFormData",
+				// 上传组件需要的 props
-				extraParams: { typeCode: "EquipmentTypeFile" },
+				url: '/monitoring/attachment/uploadFileFormData',
+				extraParams: { typeCode: 'EquipmentTypeFile' },
 				buttonContent: '点击上传',
 				tip: '上传文件大小不要超过 2mb (2048kb)'
 			}

src/views/modules/monitoring/factory.vue

@@ -2,7 +2,7 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="工厂编码/工厂名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>

src/views/modules/monitoring/product.vue

@@ -2,7 +2,7 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="产品编号/产品名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>

src/views/modules/monitoring/productionLine.vue

@@ -2,40 +2,14 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="产线名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:productionline:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
-			<el-table-column prop="factoryId" header-align="center" align="center" label="工厂表ID"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="status" header-align="center" align="center" label="产线状态"> </el-table-column>
-			<el-table-column prop="tvalue" header-align="center" align="center" label="每小时下片数量"> </el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="外部系统编码"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"

src/views/modules/monitoring/qualityInspectionDet.vue

@@ -2,35 +2,14 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="检测内容" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:qualityinspectiondet:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="typeId" header-align="center" align="center" label="检测类型id"> </el-table-column>
-			<el-table-column prop="content" header-align="center" align="center" label="检测内容"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="检测编码"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -1,9 +1,9 @@
 <template>
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-			<el-form-item>
+			<!-- <el-form-item>
 				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
-			</el-form-item>
+			</el-form-item> -->
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>

src/views/modules/monitoring/qualityInspectionType.vue

@@ -2,34 +2,14 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="检测类型名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:qualityinspectiontype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="检测类型名称"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="检测类型编码"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -64,11 +44,7 @@ const tableConfigs = [
 const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/qualityInspectionType',
-	fields: [
+	fields: [{ name: 'name', label: '检测类型' }, { name: 'code', label: '检测类型编码', api: '/monitoring/qualityInspectionType/getCode' }, 'remark'],
-		{ name: 'name', label: '检测类型' },
-		{ name: 'code', label: '检测类型编码', api: '/monitoring/qualityInspectionType/getCode' },
-		'remark'
-	],
 	operations: [
 		{ name: 'cancel', showAlways: true },
 		{ name: 'save', url: '/monitoring/qualityInspectionType', permission: '', showOnEdit: false },

src/views/modules/monitoring/reportCategory.vue

@@ -2,7 +2,7 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.name" placeholder="分类名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
@@ -65,7 +65,7 @@ export default {
 			tableConfigs,
 			addOrUpdateConfigs,
 			dataForm: {
-				key: ''
+				name: ''
 			},
 			dataList: [],
 			pageIndex: 1,
@@ -101,7 +101,7 @@ export default {
 				params: this.$http.adornParams({
 					page: this.pageIndex,
 					limit: this.pageSize,
-					key: this.dataForm.key
+					name: this.dataForm.name
 				})
 			}).then(({ data }) => {
 				if (data && data.code === 0) {

src/views/modules/monitoring/reportDetail.vue

@@ -2,7 +2,7 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.name" placeholder="报表名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
@@ -89,7 +89,7 @@ export default {
 			addOrUpdateConfigs,
 			tableConfigs: [],
 			dataForm: {
-				key: ''
+				name: ''
 			},
 			dataList: [],
 			pageIndex: 1,
@@ -179,7 +179,7 @@ export default {
 			const queries = {
 				page: this.pageIndex,
 				limit: this.pageSize,
-				key: this.dataForm.key
+				name: this.dataForm.name
 			}
 			if (this.$route.query.category) {
 				queries['category'] = this.$route.query.category

src/views/modules/monitoring/workShopSection.vue

@@ -2,39 +2,14 @@
 	<div class="mod-config">
 		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input v-model="dataForm.key" placeholder="工段名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:workshopsection:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
-			<el-table-column prop="productionLineId" header-align="center" align="center" label="产线ID"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
-			<el-table-column prop="sort" header-align="center" align="center" label="排序"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="外部系统编码"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -47,13 +22,13 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
 	</div>
 </template>
 
 <script>
-import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
+// import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
-// import AddOrUpdate from './workshopSection-add-or-update'
+import AddOrUpdate from './workshopSectionDialog.vue'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
@@ -117,8 +92,6 @@ export default {
 		getProductLine() {
 			this.$http.get(this.$http.adornUrl('/monitoring/productionLine/list')).then(({ data: res }) => {
 				if (res && res.code === 0) {
-					// this.plList = res.data
-					console.log('res', res)
 					this.addOrUpdateConfigs.fields.forEach(item => {
 						if (item.name === 'productionLineId') item.options = res.data.map(item => ({ label: item.name, value: item.id }))
 					})

src/views/modules/monitoring/workshopSectionDialog.vue

@@ -0,0 +1,368 @@
+<template>
+	<el-dialog
+		class="super-flexible-dialog"
+		:title="isDetail ? '详情' : !dataForm.id ? '新增' : '编辑'"
+		:visible.sync="visible"
+	>
+		<div style="max-height: 60vh; overflow-y: scroll; overflow-x: hidden;">
+			<el-form ref="dataForm" :model="dataForm" :rules="dataFormRules">
+				<el-row :gutter="20">
+					<el-col :span="12"
+						><el-form-item label="工段名称" prop="name">
+							<el-input
+								v-model="dataForm.name"
+								placeholder="请输入工段名称"
+							/> </el-form-item
+					></el-col>
+					<el-col :span="12"
+						><el-form-item label="工段编码" prop="code">
+							<el-input
+								v-model="dataForm.code"
+								placeholder="请输入工段编码"
+							/> </el-form-item
+					></el-col>
+				</el-row>
+
+				<el-row :gutter="20">
+					<el-col :span="12"
+						><el-form-item label="所属产线" prop="productionLineId">
+							<el-select
+								v-model="dataForm.productionLineId"
+								placeholder="请输入所属产线"
+							>
+								<el-option
+									v-for="line in lineList"
+									:key="line.id"
+									:value="line.id"
+									:label="line.name"
+								/>
+							</el-select> </el-form-item
+					></el-col>
+					<el-col :span="12"
+						><el-form-item label="描述" prop="description">
+							<el-input
+								v-model="dataForm.description"
+								placeholder="请输入描述"
+							/> </el-form-item
+					></el-col>
+				</el-row>
+
+				<el-row :gutter="20">
+					<el-col :span="12"
+						><el-form-item label="备注" prop="remark">
+							<el-input
+								v-model="dataForm.remark"
+								placeholder="请输入备注"
+							/> </el-form-item
+					></el-col>
+				</el-row>
+			</el-form>
+
+			<section class="attr-form-section" v-if="dataForm.id">
+				<h3>
+					设备绑定
+					<el-button type="text" v-if="!showAttrForm" @click="addEq"
+						>新增</el-button
+					>
+				</h3>
+				<div class="table" v-if="!showAttrForm">
+					<base-table
+						:data="eqList"
+						:table-head-configs="tableProps"
+						:max-height="500"
+						@operate-event="handleOperations"
+						@refreshDataList="getDataList"
+					/>
+					<el-pagination
+						@size-change="sizeChangeHandle"
+						@current-change="currentChangeHandle"
+						:current-page="page"
+						:page-sizes="[5, 10, 15, 20]"
+						:page-size="limit"
+						:total="eqTotal"
+						layout="total, sizes, prev, pager, next, jumper"
+					/>
+				</div>
+				<attr-form
+					v-else
+					ref="AttrFrom"
+					:workshop-section-id="dataForm.id"
+					@close-attr-form="showAttrForm = false"
+					@refresh-list="handleRefreshList"
+				/>
+			</section>
+		</div>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleClick({ name: 'cancel' })">返回</el-button>
+			<el-button
+				type="primary"
+				v-if="dataForm.id"
+				@click="handleClick({ name: 'update' })"
+				>更新</el-button
+			>
+			<el-button type="success" v-else @click="handleClick({ name: 'save' })"
+				>保存</el-button
+			>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import BaseTable from '@/components/base-table'
+import SmallTitle from '@/components/small-title'
+import { pick } from 'lodash/object'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import AttrForm from './workshopSectionDialogAttrForm.vue'
+
+const tableProps = [
+	{ name: '设备名', prop: 'equipmentName' },
+	{ name: '排序', prop: 'sort' },
+	{
+		name: '操作',
+		prop: 'operations',
+		fixed: 'right',
+		width: 180,
+		subcomponent: TableOperateComponent,
+		options: ['edit', 'delete']
+	}
+]
+
+export default {
+	name: 'WorkshopDialog',
+	components: { BaseTable, SmallTitle, AttrForm },
+	data() {
+		return {
+			visible: false,
+			isDetail: false,
+			tableProps,
+			lineList: [],
+			eqList: [],
+			eqTotal: 0,
+			dataForm: {
+				id: null,
+				// 工段名称
+				name: '',
+				// 工段编码
+				code: '',
+				// 所属产线
+				productionLineId: null,
+				// 描述
+				description: '',
+				// 备注
+				remark: ''
+			},
+			limit: 5,
+			page: 1,
+			dataFormRules: {},
+			showAttrForm: false
+		}
+	},
+	mounted() {
+		this.getLineList()
+	},
+	methods: {
+		init(id) {
+			this.dataForm = {
+				id: null,
+				name: '',
+				code: '',
+				productionLineId: null,
+				description: '',
+				remark: ''
+			}
+			this.showAttrForm = false
+			this.dataForm.id = id
+			// this.isDetail = !!id
+
+			this.$nextTick(() => {
+				if (id) {
+					// 编辑
+					this.$http({
+						url: this.$http.adornUrl(
+							'/monitoring/workshopSection/' + this.dataForm.id
+						),
+						method: 'get'
+					}).then(({ data: res }) => {
+						if (res.data) {
+							const {
+								name,
+								code,
+								productionLineId,
+								description,
+								remark
+							} = res.data
+							this.dataForm.name = name
+							this.dataForm.code = code
+							this.dataForm.productionLineId = productionLineId
+							this.dataForm.description = description
+							this.dataForm.remark = remark
+						}
+					})
+					// 获取list
+					this.getDataList()
+				} else {
+					this.getWsCode()
+				}
+			})
+
+			this.visible = true
+		},
+		getWsCode() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/workshopSection/getCode'),
+				method: 'post'
+			}).then(({ data: res }) => {
+				if (res.data) {
+					this.dataForm.code = res.data
+				}
+			})
+		},
+		getLineList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/productionLine/list'),
+				method: 'get'
+			}).then(({ data: res }) => {
+				if (res.data) {
+					this.lineList = res.data
+				} else {
+					this.lineList.splice(0)
+				}
+			})
+		},
+		getDataList() {
+			// 获取设备关联表
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/workshopSectionEquipment'),
+				method: 'get',
+				params: this.$http.adornParams({
+					limit: this.limit,
+					page: this.page,
+					id: this.dataForm.id
+				})
+			}).then(({ data: res }) => {
+				if (res.data && res.data.list) {
+					this.eqList = res.data.list
+					this.eqTotal = res.data.total
+				} else {
+					this.eqList.splice(0)
+					this.eqTotal = 0
+				}
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.limit = val
+			this.page = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.page = val
+			this.getDataList()
+		},
+		addEq() {
+			this.handleAddOrUpdate()
+		},
+		handleOperations({ type, data: id }) {
+			switch (type) {
+				case 'edit':
+					this.handleAddOrUpdate(id)
+					break
+				case 'delete':
+					this.handleDeleteEq(id)
+					break
+			}
+		},
+		handleDeleteEq(id) {
+			this.$confirm(`确定删除这条记录吗?`, '提示', {
+				// this.$confirm(`确定删除 ${id} 吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: '/yd-monitor/monitoring/workshopSectionEquipment',
+					method: 'delete',
+					data: [id]
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		},
+		handleRefreshList() {
+			this.getDataList()
+			this.showAttrForm = false
+		},
+		handleAddOrUpdate(id) {
+			this.showAttrForm = true
+			if (id) {
+				this.$nextTick(() => {
+					this.$refs.AttrFrom.setInitialId(id)
+				})
+			}
+		},
+		handleClick({ name }) {
+			switch (name) {
+				case 'cancel':
+					this.visible = false
+					break
+				case 'update':
+				case 'save':
+					this.handleCreateOrUpdate()
+					break
+			}
+		},
+		handleCreateOrUpdate() {
+			this.$http({
+				url: '/yd-monitor/monitoring/workshopSection',
+				method: this.dataForm.id ? 'put' : 'post',
+				data: {
+					...this.dataForm
+				}
+			}).then(({ data: res }) => {
+				this.$message.success({
+					message: '操作成功',
+					onClose: () => {
+						this.$emit('refreshDataList')
+						this.visible = false
+					}
+				})
+			})
+		}
+	}
+}
+</script>
+
+<style scoped>
+.super-flexible-dialog >>> .el-select,
+.super-flexible-dialog >>> .el-cascader {
+	width: 100%;
+}
+
+.super-flexible-dialog >>> ::-webkit-scrollbar {
+	width: 4px;
+	border-radius: 4px;
+	background: #fff;
+}
+
+.super-flexible-dialog >>> ::-webkit-scrollbar-thumb {
+	width: 4px;
+	border-radius: 4px;
+	background: #ccc;
+}
+
+.super-flexible-dialog >>> .hidden-input {
+	display: none;
+}
+</style>

src/views/modules/monitoring/workshopSectionDialogAttrForm.vue

@@ -0,0 +1,143 @@
+<template>
+	<div class="" style="background: #eee; border-radius: 8px; padding: 24px;">
+		<el-row>
+			<el-form ref="dataForm" :model="dataForm" :rules="dataFormRules">
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item
+							:label="edit ? '已绑定的设备' : '选择一个设备进行绑定'"
+							prop="equipmentId"
+						>
+							<el-select v-if="!edit" clearable v-model="dataForm.equipmentId">
+								<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
+					></el-col>
+					<el-col :span="12">
+						<el-form-item label="排序" prop="sort">
+							<el-input
+								v-model="dataForm.sort"
+								placeholder="请输入工段中设备的顺序"
+								clearable
+							/> </el-form-item
+					></el-col>
+				</el-row>
+			</el-form>
+		</el-row>
+		<el-row style="text-align: right">
+			<el-button size="small" @click="handleCancel">取消</el-button>
+			<el-button size="small" type="success" @click="handleSave">{{
+				edit ? '修改' : '绑定'
+			}}</el-button>
+		</el-row>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'AttrForm',
+	props: {
+		workshopSectionId: {
+			type: String,
+			required: true
+		}
+	},
+	data() {
+		return {
+			edit: false,
+			bindedEquipmentName: '',
+			dataForm: {
+				id: null,
+				sort: null,
+				equipmentId: null
+			},
+			dataFormRules: {
+				sort: [
+					{
+						type: 'integer',
+						message: '请输入整数',
+						transform: val => Number(val),
+						trigger: 'blur'
+					}
+				]
+			},
+			eqList: []
+		}
+	},
+	mounted() {
+		this.edit = false
+		this.bindedEquipmentName = ''
+		this.getEqList()
+	},
+	methods: {
+		setInitialId(id) {
+			this.edit = true
+			// 获取信息，让用户修改排序
+			this.$http({
+				url: '/yd-monitor/monitoring/workshopSectionEquipment/' + id,
+				method: 'get'
+			}).then(({ data: res }) => {
+				if (res.data) {
+					const { id, equipmentId, equipmentName, sort } = res.data
+					this.dataForm = { id, equipmentId, sort }
+					this.bindedEquipmentName = equipmentName
+				} else {
+					this.dataForm = { id: null, equipmentId: null, sort: null }
+					this.bindedEquipmentName = ''
+				}
+			})
+		},
+		getEqList() {
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/noBindEqu'),
+				method: 'get'
+			}).then(({ data: res }) => {
+				if (res.data) {
+					this.eqList = res.data.map(item => ({ id: item.id, name: item.name }))
+				} else {
+					this.eqList.splice(0)
+				}
+			})
+		},
+		handleCancel() {
+			this.eqList.splice(0)
+			this.dataForm = {
+				id: null,
+				sort: null,
+				equipmentId: null
+			}
+			this.$emit('close-attr-form')
+		},
+		handleSave() {
+			this.$http({
+				url: '/yd-monitor/monitoring/workshopSectionEquipment',
+				method: this.edit ? 'put' : 'post',
+				data: {
+					...this.dataForm,
+					workshopSectionId: this.workshopSectionId
+				}
+			}).then(({ data: res }) => {
+				if (res.data) {
+          this.$message.success({
+            message: '操作成功',
+            duration: 1500,
+            onClose: () => {
+              this.$emit('refresh-list')
+              this.handleCancel()
+            }
+          })
+        }
+			})
+		}
+	}
+}
+</script>