印花相关界面修改

src/api/rz/hour.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询染整线1小时数据列表
+// 查询染整线小时工艺参数列表
 export function listHour(query) {
     return request({
         url: '/rz/hour/list',
@@ -9,7 +9,7 @@ export function listHour(query) {
     })
 }
 
-// 查询染整线1小时数据详细
+// 查询染整线小时工艺参数详细
 export function getHour(id) {
     return request({
         url: '/rz/hour/' + id,
@@ -17,7 +17,7 @@ export function getHour(id) {
     })
 }
 
-// 新增染整线1小时数据
+// 新增染整线小时工艺参数
 export function addHour(data) {
     return request({
         url: '/rz/hour',
@@ -26,7 +26,7 @@ export function addHour(data) {
     })
 }
 
-// 修改染整线1小时数据
+// 修改染整线小时工艺参数
 export function updateHour(data) {
     return request({
         url: '/rz/hour',
@@ -35,7 +35,7 @@ export function updateHour(data) {
     })
 }
 
-// 删除染整线1小时数据
+// 删除染整线小时工艺参数
 export function delHour(id) {
     return request({
         url: '/rz/hour/' + id,

src/views/calc/calcYhj/index.vue

@@ -11,10 +11,10 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="设备ID" prop="deviceId">
+      <el-form-item label="产线编号" prop="deviceId">
         <el-input
             v-model="queryParams.deviceId"
-            placeholder="请输入设备ID"
+            placeholder="请输入产线编号"
             clearable
             @keyup.enter="handleQuery"
         />
@@ -91,7 +91,7 @@
         </template>
       </el-table-column>
       <el-table-column label="小时" align="center" prop="hour" />
-      <el-table-column label="设备ID" align="center" prop="deviceId" />
+      <el-table-column label="产线编号" align="center" prop="deviceId" />
       <el-table-column label="织造米数" align="center" prop="length" />
       <el-table-column label="版距" align="center" prop="distance" />
       <el-table-column label="备注" align="center" prop="remark" />

src/views/calc/dayYhj/index.vue

@@ -11,26 +11,10 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="设备ID" prop="deviceId">
+      <el-form-item label="产线编号" prop="deviceId">
         <el-input
           v-model="queryParams.deviceId"
-          placeholder="请输入设备ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="自然天统计长度" prop="dayLength">
-        <el-input
-          v-model="queryParams.dayLength"
-          placeholder="请输入自然天统计长度"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="自然天统计重量" prop="dayWeight">
-        <el-input
-          v-model="queryParams.dayWeight"
-          placeholder="请输入自然天统计重量"
+          placeholder="产线编号"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -41,74 +25,74 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['calc:dayYhj:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['calc:dayYhj:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['calc:dayYhj:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['calc:dayYhj:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="Plus"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['calc:dayYhj:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="Edit"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['calc:dayYhj:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="Delete"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['calc:dayYhj:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="Download"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['calc:dayYhj:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="dayYhjList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+<!--      <el-table-column label="ID" align="center" prop="id" />-->
       <el-table-column label="时间" align="center" prop="time" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="设备ID" align="center" prop="deviceId" />
-      <el-table-column label="自然天统计长度" align="center" prop="dayLength" />
-      <el-table-column label="自然天统计重量" align="center" prop="dayWeight" />
-      <el-table-column label="总米长" align="center" prop="length" />
-      <el-table-column label="总重量" align="center" prop="weight" />
-      <el-table-column label="A班米长" align="center" prop="lengthA" />
-      <el-table-column label="A班重量" align="center" prop="weightA" />
-      <el-table-column label="B班米长" align="center" prop="lengthB" />
-      <el-table-column label="B班重量" align="center" prop="weightB" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['calc:dayYhj:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['calc:dayYhj:remove']">删除</el-button>
-        </template>
-      </el-table-column>
+      <el-table-column label="产线编号" align="center" prop="deviceId" />
+<!--      <el-table-column label="自然天统计长度（米）" align="center" prop="dayLength" />-->
+<!--      <el-table-column label="自然天统计重量（吨）" align="center" prop="dayWeight" />-->
+      <el-table-column label="总米长（米）" align="center" prop="length" />
+      <el-table-column label="总重量（吨）" align="center" prop="weight" />
+      <el-table-column label="A班米长（米）" align="center" prop="lengthA" />
+      <el-table-column label="A班重量（吨）" align="center" prop="weightA" />
+      <el-table-column label="B班米长（米）" align="center" prop="lengthB" />
+      <el-table-column label="B班重量（吨）" align="center" prop="weightB" />
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['calc:dayYhj:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['calc:dayYhj:remove']">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/rz/dtype/index.vue

@@ -102,7 +102,7 @@
     />
 
     <!-- 添加或修改类型名称管理对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
       <el-form ref="dtypeRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="组别" prop="typeGroup">
           <el-radio-group v-model="form.typeGroup">
@@ -134,29 +134,31 @@
         </el-row>
         <el-table :data="twinDeviceTypeDataList" :row-class-name="rowTwinDeviceTypeDataIndex"
                   @selection-change="handleTwinDeviceTypeDataSelectionChange" ref="twinDeviceTypeData">
-          <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="数据名称" prop="dataName" width="250">
+          <el-table-column label="数据名称" prop="dataName" width="220">
             <template #default="scope">
-              <el-input v-model="scope.row.dataName" placeholder="请输入数据名称"/>
+              <el-input v-model="scope.row.dataName" placeholder="请输入数据名称" />
             </template>
           </el-table-column>
-          <el-table-column label="数据IOT字段" prop="dataCode" width="250">
+          <el-table-column label="排序" prop="dataSort" width="70">
             <template #default="scope">
-              <el-input v-model="scope.row.dataCode" placeholder="请输入数据IOT字段"/>
+              <el-input v-model="scope.row.dataSort" placeholder="" />
             </template>
           </el-table-column>
-          <el-table-column label="数据类型" prop="dataType" width="150">
+          <el-table-column label="人工设定" prop="dataCode" width="180">
             <template #default="scope">
-              <el-select v-model="scope.row.dataType"
-                         placeholder="请选择数据获取类型;1.累计类型  2.累计中间清零 3.状态记录">
-                <el-option
-                    v-for="dict in data_get_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                ></el-option>
-              </el-select>
+              <el-input v-model="scope.row.dataCode" placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column label="mes下发字段" prop="mesCode" width="180">
+            <template #default="scope">
+              <el-input v-model="scope.row.mesCode" placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column label="实际值字段" prop="actCode" width="210">
+            <template #default="scope">
+              <el-input v-model="scope.row.actCode" placeholder="" />
             </template>
           </el-table-column>
         </el-table>

src/views/rz/hour/index.vue

@@ -3,83 +3,53 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="日期" prop="dataDate">
         <el-date-picker clearable
-          v-model="queryParams.dataDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择日期">
+                        v-model="queryParams.dataDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="小时;0-23" prop="hour">
+      <el-form-item label="小时" prop="hour">
         <el-input
-          v-model="queryParams.hour"
-          placeholder="请输入小时;0-23"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.hour"
+            placeholder="请输入小时"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="数据时间" prop="dataTime">
         <el-date-picker clearable
-          v-model="queryParams.dataTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择数据时间">
+                        v-model="queryParams.dataTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择数据时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="设备ID" prop="deviceId">
         <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备ID"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.deviceId"
+            placeholder="请输入设备ID"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="数据" prop="data">
         <el-input
-          v-model="queryParams.data"
-          placeholder="请输入数据"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.data"
+            placeholder="请输入数据"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建人" prop="createdBy">
-        <el-input
-          v-model="queryParams.createdBy"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdTime">
-        <el-date-picker clearable
-          v-model="queryParams.createdTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updatedBy">
-        <el-input
-          v-model="queryParams.updatedBy"
-          placeholder="请输入更新人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatedTime">
-        <el-date-picker clearable
-          v-model="queryParams.updatedTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择更新时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="在线状态" prop="online">
+        <el-select v-model="queryParams.online" placeholder="请选择在线状态" clearable>
+          <el-option
+              v-for="dict in sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -90,40 +60,40 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['rz:hour:add']"
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['rz:hour:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['rz:hour:edit']"
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['rz:hour:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['rz:hour:remove']"
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['rz:hour:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['rz:hour:export']"
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['rz:hour:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -137,7 +107,7 @@
           <span>{{ parseTime(scope.row.dataDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="小时;0-23" align="center" prop="hour" />
+      <el-table-column label="小时" align="center" prop="hour" />
       <el-table-column label="数据时间" align="center" prop="dataTime" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.dataTime, '{y}-{m}-{d}') }}</span>
@@ -145,19 +115,11 @@
       </el-table-column>
       <el-table-column label="设备ID" align="center" prop="deviceId" />
       <el-table-column label="数据" align="center" prop="data" />
-      <el-table-column label="创建人" align="center" prop="createdBy" />
-      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updatedBy" />
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
+      <el-table-column label="在线状态" align="center" prop="online">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="sys_yes_no" :value="scope.row.online"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['rz:hour:edit']">修改</el-button>
@@ -165,35 +127,35 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
 
-    <!-- 添加或修改染整线1小时数据对话框 -->
+    <!-- 添加或修改染整线小时工艺参数对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="hourRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="日期" prop="dataDate">
           <el-date-picker clearable
-            v-model="form.dataDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择日期">
+                          v-model="form.dataDate"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="小时;0-23" prop="hour">
-          <el-input v-model="form.hour" placeholder="请输入小时;0-23" />
+        <el-form-item label="小时" prop="hour">
+          <el-input v-model="form.hour" placeholder="请输入小时" />
         </el-form-item>
         <el-form-item label="数据时间" prop="dataTime">
           <el-date-picker clearable
-            v-model="form.dataTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择数据时间">
+                          v-model="form.dataTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择数据时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="设备ID" prop="deviceId">
@@ -202,15 +164,24 @@
         <el-form-item label="数据" prop="data">
           <el-input v-model="form.data" placeholder="请输入数据" />
         </el-form-item>
+        <el-form-item label="在线状态" prop="online">
+          <el-radio-group v-model="form.online">
+            <el-radio
+                v-for="dict in sys_yes_no"
+                :key="dict.value"
+                :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="创建人" prop="createdBy">
           <el-input v-model="form.createdBy" placeholder="请输入创建人" />
         </el-form-item>
         <el-form-item label="创建时间" prop="createdTime">
           <el-date-picker clearable
-            v-model="form.createdTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择创建时间">
+                          v-model="form.createdTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择创建时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="更新人" prop="updatedBy">
@@ -218,10 +189,10 @@
         </el-form-item>
         <el-form-item label="更新时间" prop="updatedTime">
           <el-date-picker clearable
-            v-model="form.updatedTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择更新时间">
+                          v-model="form.updatedTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择更新时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -242,6 +213,7 @@
 import { listHour, getHour, delHour, addHour, updateHour } from "@/api/rz/hour";
 
 const { proxy } = getCurrentInstance();
+const { sys_yes_no } = proxy.useDict('sys_yes_no');
 
 const hourList = ref([]);
 const open = ref(false);
@@ -263,11 +235,7 @@ const data = reactive({
     dataTime: null,
     deviceId: null,
     data: null,
-    createdBy: null,
-    createdTime: null,
-    updatedBy: null,
-    updatedTime: null,
-    remark: null
+    online: null,
   },
   rules: {
   }
@@ -275,7 +243,7 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询染整线1小时数据列表 */
+/** 查询染整线小时工艺参数列表 */
 function getList() {
   loading.value = true;
   listHour(queryParams.value).then(response => {
@@ -300,6 +268,7 @@ function reset() {
     dataTime: null,
     deviceId: null,
     data: null,
+    online: null,
     createdBy: null,
     createdTime: null,
     updatedBy: null,
@@ -332,7 +301,7 @@ function handleSelectionChange(selection) {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "添加染整线1小时数据";
+  title.value = "添加染整线小时工艺参数";
 }
 
 /** 修改按钮操作 */
@@ -342,7 +311,7 @@ function handleUpdate(row) {
   getHour(_id).then(response => {
     form.value = response.data;
     open.value = true;
-    title.value = "修改染整线1小时数据";
+    title.value = "修改染整线小时工艺参数";
   });
 }
 
@@ -370,7 +339,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除染整线1小时数据编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除染整线小时工艺参数编号为"' + _ids + '"的数据项？').then(function() {
     return delHour(_ids);
   }).then(() => {
     getList();