From 86ed2c446fb16ebb9e3750702ee5fc400e293365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E5=BA=8F=E6=8C=AF?= <luxuzhen@inspur.com>
Date: Wed, 3 Jan 2024 10:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=BD=A6=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E5=8F=8A=E4=BA=BA=E5=91=98=E8=A1=8C=E4=B8=BA?=
 =?UTF-8?q?AI=E6=99=BA=E8=83=BD=E8=AF=86=E5=88=AB=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataInterface/humidityData/index.vue      | 130 +++++++++-------
 god-ui/src/views/dataInterface/load/index.vue | 130 +++++++++-------
 .../views/dataInterface/pressures/index.vue   | 130 +++++++++-------
 .../dataInterface/vibrationData/index.vue     | 142 +++++++++++-------
 .../views/dataInterface/viscosity/index.vue   | 130 +++++++++-------
 5 files changed, 397 insertions(+), 265 deletions(-)

diff --git a/god-ui/src/views/dataInterface/humidityData/index.vue b/god-ui/src/views/dataInterface/humidityData/index.vue
index d3c7f636..ab972555 100644
--- a/god-ui/src/views/dataInterface/humidityData/index.vue
+++ b/god-ui/src/views/dataInterface/humidityData/index.vue
@@ -1,35 +1,31 @@
 <template>
   <div class="app-container">
-    <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
-    <!--      <el-form-item label="" prop="reserveOne">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveOne"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveTwo">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveTwo"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveThree">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveThree"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item>-->
-    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
-    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
-    <!--      </el-form-item>-->
-    <!--    </el-form>-->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="轧辊编号" prop="reserveEight">
+        <el-select v-model="queryParams.reserveTwo" placeholder="请选择轧辊编号" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_name"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="采集数据名称" prop="reserveThree">
+        <el-select v-model="queryParams.reserveThree" placeholder="请选择采集数据名称" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -83,19 +79,25 @@
 
     <el-table v-loading="loading" :data="godUniversalElectricMeterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="识别编号" align="center" prop="reserveOne"/>
-      <el-table-column label="识别类型" align="center" prop="reserveTwo"/>
-      <el-table-column label="识别例图" align="center" prop="reserveThree">
+      <!--      <el-table-column label="轧辊编号" align="center" prop="reserveOne"/>-->
+      <el-table-column label="轧辊编号" align="center" prop="reserveTwo">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.reserveThree" :width="50" :height="50"/>
+          <dict-tag :options="dict.type.tiewire_device_line_name" :value="scope.row.reserveTwo"/>
         </template>
       </el-table-column>
-      <el-table-column label="行为状态" align="center" prop="reserveFour"/>
-      <el-table-column label="是否报警" align="center" prop="reserveFive"/>
-      <el-table-column label="上传人" align="center" prop="reserveSix"/>
-      <el-table-column label="上传时间" align="center" prop="reserveSeven">
+      <el-table-column label="采集数据名称" align="center" prop="reserveThree">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reserveSeven, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <dict-tag :options="dict.type.tiewire_device_line_type" :value="scope.row.reserveThree"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="湿度测量" align="center" prop="reserveFour"/>
+      <el-table-column label="湿度标准" align="center" prop="reserveFive"/>
+      <el-table-column label="湿度来源" align="center" prop="reserveSix"/>
+      <el-table-column label="影响" align="center" prop="reserveSeven"/>
+      <el-table-column label="措施/建议" align="center" prop="reserveEight" :show-overflow-tooltip="true"/>
+      <el-table-column label="上传时间" align="center" prop="reserveNine">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reserveNine, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -131,24 +133,45 @@
     <!-- 添加或修改AI识别算法开发对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="识别类型" prop="reserveTwo">
-          <el-input v-model="form.reserveTwo" placeholder="请输入识别类型"/>
+        <el-form-item label="轧辊编号" prop="reserveTwo">
+          <!--          <el-input v-model="form.reserveTwo" placeholder="请输入轧辊编号"/>-->
+          <el-select :disabled="disabled" v-model="form.reserveTwo" placeholder="请选择轧辊编号" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_name"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="识别例图" prop="reserveThree">
-          <image-upload v-model="form.reserveThree"/>
+        <el-form-item label="采集数据名称" prop="reserveThree">
+          <el-select :disabled="disabled" v-model="form.reserveThree" placeholder="请选择采集数据名称" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="行为状态" prop="reserveFour">
-          <el-input v-model="form.reserveFour" placeholder="请输入行为状态"/>
+        <el-form-item label="湿度测量" prop="reserveFour">
+          <el-input v-model="form.reserveFour" placeholder="请输入湿度测量"/>
         </el-form-item>
-        <el-form-item label="是否报警" prop="reserveFive">
-          <el-input v-model="form.reserveFive" placeholder="请输入是否报警"/>
+        <el-form-item label="湿度标准参数" prop="reserveFive">
+          <el-input v-model="form.reserveFive" placeholder="请输入湿度标准参数"/>
         </el-form-item>
-        <el-form-item label="上传人" prop="reserveSix">
-          <el-input v-model="form.reserveSix" placeholder="请输入上传人"/>
+        <el-form-item label="湿度来源" prop="reserveSix">
+          <el-input v-model="form.reserveSix" placeholder="请输入湿度来源"/>
         </el-form-item>
-        <el-form-item label="上传时间" prop="reserveSeven">
+        <el-form-item label="影响" prop="reserveSeven">
+          <el-input v-model="form.reserveSeven" placeholder="请输入影响"/>
+        </el-form-item>
+        <el-form-item label="措施/建议" prop="reserveEight">
+          <el-input v-model="form.reserveEight" placeholder="请输入措施/建议"/>
+        </el-form-item>
+        <el-form-item label="上传时间" prop="reserveNine">
           <el-date-picker
-            v-model="form.reserveSeven"
+            v-model="form.reserveNine"
             type="datetime"
             placeholder="请选择时间"
             format="yyyy-MM-dd HH:mm:ss ">
@@ -174,6 +197,7 @@ import {
 
 export default {
   name: "GodUniversalElectricMeter",
+  dicts: ['tiewire_device_line_name', 'tiewire_device_line_type'],
   data() {
     return {
       // 遮罩层
@@ -213,7 +237,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'humidityData',
       },
       // 表单参数
       form: {},
@@ -258,7 +282,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'humidityData',
         remark: null
       };
       this.resetForm("form");
diff --git a/god-ui/src/views/dataInterface/load/index.vue b/god-ui/src/views/dataInterface/load/index.vue
index d3c7f636..fc92f111 100644
--- a/god-ui/src/views/dataInterface/load/index.vue
+++ b/god-ui/src/views/dataInterface/load/index.vue
@@ -1,35 +1,31 @@
 <template>
   <div class="app-container">
-    <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
-    <!--      <el-form-item label="" prop="reserveOne">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveOne"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveTwo">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveTwo"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveThree">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveThree"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item>-->
-    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
-    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
-    <!--      </el-form-item>-->
-    <!--    </el-form>-->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="轧辊编号" prop="reserveEight">
+        <el-select v-model="queryParams.reserveTwo" placeholder="请选择轧辊编号" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_name"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="采集数据名称" prop="reserveThree">
+        <el-select v-model="queryParams.reserveThree" placeholder="请选择采集数据名称" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -83,19 +79,25 @@
 
     <el-table v-loading="loading" :data="godUniversalElectricMeterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="识别编号" align="center" prop="reserveOne"/>
-      <el-table-column label="识别类型" align="center" prop="reserveTwo"/>
-      <el-table-column label="识别例图" align="center" prop="reserveThree">
+      <!--      <el-table-column label="轧辊编号" align="center" prop="reserveOne"/>-->
+      <el-table-column label="轧辊编号" align="center" prop="reserveTwo">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.reserveThree" :width="50" :height="50"/>
+          <dict-tag :options="dict.type.tiewire_device_line_name" :value="scope.row.reserveTwo"/>
         </template>
       </el-table-column>
-      <el-table-column label="行为状态" align="center" prop="reserveFour"/>
-      <el-table-column label="是否报警" align="center" prop="reserveFive"/>
-      <el-table-column label="上传人" align="center" prop="reserveSix"/>
-      <el-table-column label="上传时间" align="center" prop="reserveSeven">
+      <el-table-column label="采集数据名称" align="center" prop="reserveThree">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reserveSeven, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <dict-tag :options="dict.type.tiewire_device_line_type" :value="scope.row.reserveThree"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="轧辊车速" align="center" prop="reserveFour"/>
+      <el-table-column label="轧辊负载" align="center" prop="reserveFive"/>
+      <el-table-column label="电流" align="center" prop="reserveSix"/>
+      <el-table-column label="扭矩" align="center" prop="reserveSeven"/>
+      <el-table-column label="建议/分析" align="center" prop="reserveEight" :show-overflow-tooltip="true"/>
+      <el-table-column label="上传时间" align="center" prop="reserveNine">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reserveNine, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -131,24 +133,45 @@
     <!-- 添加或修改AI识别算法开发对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="识别类型" prop="reserveTwo">
-          <el-input v-model="form.reserveTwo" placeholder="请输入识别类型"/>
+        <el-form-item label="轧辊编号" prop="reserveTwo">
+          <!--          <el-input v-model="form.reserveTwo" placeholder="请输入轧辊编号"/>-->
+          <el-select :disabled="disabled" v-model="form.reserveTwo" placeholder="请选择轧辊编号" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_name"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="识别例图" prop="reserveThree">
-          <image-upload v-model="form.reserveThree"/>
+        <el-form-item label="采集数据名称" prop="reserveThree">
+          <el-select :disabled="disabled" v-model="form.reserveThree" placeholder="请选择采集数据名称" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="行为状态" prop="reserveFour">
-          <el-input v-model="form.reserveFour" placeholder="请输入行为状态"/>
+        <el-form-item label="轧辊车速" prop="reserveFour">
+          <el-input v-model="form.reserveFour" placeholder="请输入轧辊车速"/>
         </el-form-item>
-        <el-form-item label="是否报警" prop="reserveFive">
-          <el-input v-model="form.reserveFive" placeholder="请输入是否报警"/>
+        <el-form-item label="轧辊负载" prop="reserveFive">
+          <el-input v-model="form.reserveFive" placeholder="请输入轧辊负载"/>
         </el-form-item>
-        <el-form-item label="上传人" prop="reserveSix">
-          <el-input v-model="form.reserveSix" placeholder="请输入上传人"/>
+        <el-form-item label="电流" prop="reserveSix">
+          <el-input v-model="form.reserveSix" placeholder="请输入电流"/>
         </el-form-item>
-        <el-form-item label="上传时间" prop="reserveSeven">
+        <el-form-item label="扭矩" prop="reserveSeven">
+          <el-input v-model="form.reserveSeven" placeholder="请输入扭矩"/>
+        </el-form-item>
+        <el-form-item label="建议/分析" prop="reserveEight">
+          <el-input v-model="form.reserveEight" placeholder="请输入建议/分析"/>
+        </el-form-item>
+        <el-form-item label="上传时间" prop="reserveNine">
           <el-date-picker
-            v-model="form.reserveSeven"
+            v-model="form.reserveNine"
             type="datetime"
             placeholder="请选择时间"
             format="yyyy-MM-dd HH:mm:ss ">
@@ -174,6 +197,7 @@ import {
 
 export default {
   name: "GodUniversalElectricMeter",
+  dicts: ['tiewire_device_line_name', 'tiewire_device_line_type'],
   data() {
     return {
       // 遮罩层
@@ -213,7 +237,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'load',
       },
       // 表单参数
       form: {},
@@ -258,7 +282,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'load',
         remark: null
       };
       this.resetForm("form");
diff --git a/god-ui/src/views/dataInterface/pressures/index.vue b/god-ui/src/views/dataInterface/pressures/index.vue
index d3c7f636..1a051dd2 100644
--- a/god-ui/src/views/dataInterface/pressures/index.vue
+++ b/god-ui/src/views/dataInterface/pressures/index.vue
@@ -1,35 +1,31 @@
 <template>
   <div class="app-container">
-    <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
-    <!--      <el-form-item label="" prop="reserveOne">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveOne"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveTwo">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveTwo"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveThree">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveThree"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item>-->
-    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
-    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
-    <!--      </el-form-item>-->
-    <!--    </el-form>-->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="轧辊编号" prop="reserveEight">
+        <el-select v-model="queryParams.reserveTwo" placeholder="请选择轧辊编号" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_name"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="采集数据名称" prop="reserveThree">
+        <el-select v-model="queryParams.reserveThree" placeholder="请选择采集数据名称" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -83,19 +79,25 @@
 
     <el-table v-loading="loading" :data="godUniversalElectricMeterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="识别编号" align="center" prop="reserveOne"/>
-      <el-table-column label="识别类型" align="center" prop="reserveTwo"/>
-      <el-table-column label="识别例图" align="center" prop="reserveThree">
+      <!--      <el-table-column label="轧辊编号" align="center" prop="reserveOne"/>-->
+      <el-table-column label="轧辊编号" align="center" prop="reserveTwo">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.reserveThree" :width="50" :height="50"/>
+          <dict-tag :options="dict.type.tiewire_device_line_name" :value="scope.row.reserveTwo"/>
         </template>
       </el-table-column>
-      <el-table-column label="行为状态" align="center" prop="reserveFour"/>
-      <el-table-column label="是否报警" align="center" prop="reserveFive"/>
-      <el-table-column label="上传人" align="center" prop="reserveSix"/>
-      <el-table-column label="上传时间" align="center" prop="reserveSeven">
+      <el-table-column label="采集数据名称" align="center" prop="reserveThree">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reserveSeven, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <dict-tag :options="dict.type.tiewire_device_line_type" :value="scope.row.reserveThree"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="压力值" align="center" prop="reserveFour"/>
+      <el-table-column label="压力波动" align="center" prop="reserveFive"/>
+      <el-table-column label="报警状态" align="center" prop="reserveSix"/>
+      <el-table-column label="压力阈值" align="center" prop="reserveSeven"/>
+      <el-table-column label="措施/建议" align="center" prop="reserveEight" :show-overflow-tooltip="true"/>
+      <el-table-column label="上传时间" align="center" prop="reserveNine">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reserveNine, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -131,24 +133,45 @@
     <!-- 添加或修改AI识别算法开发对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="识别类型" prop="reserveTwo">
-          <el-input v-model="form.reserveTwo" placeholder="请输入识别类型"/>
+        <el-form-item label="轧辊编号" prop="reserveTwo">
+          <!--          <el-input v-model="form.reserveTwo" placeholder="请输入轧辊编号"/>-->
+          <el-select :disabled="disabled" v-model="form.reserveTwo" placeholder="请选择轧辊编号" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_name"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="识别例图" prop="reserveThree">
-          <image-upload v-model="form.reserveThree"/>
+        <el-form-item label="采集数据名称" prop="reserveThree">
+          <el-select :disabled="disabled" v-model="form.reserveThree" placeholder="请选择采集数据名称" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="行为状态" prop="reserveFour">
-          <el-input v-model="form.reserveFour" placeholder="请输入行为状态"/>
+        <el-form-item label="压力值" prop="reserveFour">
+          <el-input v-model="form.reserveFour" placeholder="请输入压力值"/>
         </el-form-item>
-        <el-form-item label="是否报警" prop="reserveFive">
-          <el-input v-model="form.reserveFive" placeholder="请输入是否报警"/>
+        <el-form-item label="压力波动参数" prop="reserveFive">
+          <el-input v-model="form.reserveFive" placeholder="请输入压力波动参数"/>
         </el-form-item>
-        <el-form-item label="上传人" prop="reserveSix">
-          <el-input v-model="form.reserveSix" placeholder="请输入上传人"/>
+        <el-form-item label="报警状态" prop="reserveSix">
+          <el-input v-model="form.reserveSix" placeholder="请输入报警状态"/>
         </el-form-item>
-        <el-form-item label="上传时间" prop="reserveSeven">
+        <el-form-item label="压力阈值" prop="reserveSeven">
+          <el-input v-model="form.reserveSeven" placeholder="请输入压力阈值"/>
+        </el-form-item>
+        <el-form-item label="措施/建议" prop="reserveEight">
+          <el-input v-model="form.reserveEight" placeholder="请输入措施/建议"/>
+        </el-form-item>
+        <el-form-item label="上传时间" prop="reserveNine">
           <el-date-picker
-            v-model="form.reserveSeven"
+            v-model="form.reserveNine"
             type="datetime"
             placeholder="请选择时间"
             format="yyyy-MM-dd HH:mm:ss ">
@@ -174,6 +197,7 @@ import {
 
 export default {
   name: "GodUniversalElectricMeter",
+  dicts: ['tiewire_device_line_name', 'tiewire_device_line_type'],
   data() {
     return {
       // 遮罩层
@@ -213,7 +237,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'pressures',
       },
       // 表单参数
       form: {},
@@ -258,7 +282,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'pressures',
         remark: null
       };
       this.resetForm("form");
diff --git a/god-ui/src/views/dataInterface/vibrationData/index.vue b/god-ui/src/views/dataInterface/vibrationData/index.vue
index d3c7f636..b3e2a485 100644
--- a/god-ui/src/views/dataInterface/vibrationData/index.vue
+++ b/god-ui/src/views/dataInterface/vibrationData/index.vue
@@ -1,35 +1,31 @@
 <template>
   <div class="app-container">
-    <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
-    <!--      <el-form-item label="" prop="reserveOne">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveOne"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveTwo">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveTwo"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveThree">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveThree"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item>-->
-    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
-    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
-    <!--      </el-form-item>-->
-    <!--    </el-form>-->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="轧辊编号" prop="reserveEight">
+        <el-select v-model="queryParams.reserveTwo" placeholder="请选择轧辊编号" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_name"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="采集数据名称" prop="reserveThree">
+        <el-select v-model="queryParams.reserveThree" placeholder="请选择采集数据名称" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -83,19 +79,28 @@
 
     <el-table v-loading="loading" :data="godUniversalElectricMeterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="识别编号" align="center" prop="reserveOne"/>
-      <el-table-column label="识别类型" align="center" prop="reserveTwo"/>
-      <el-table-column label="识别例图" align="center" prop="reserveThree">
+      <!--      <el-table-column label="轧辊编号" align="center" prop="reserveOne"/>-->
+      <el-table-column label="轧辊编号" align="center" prop="reserveTwo">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.reserveThree" :width="50" :height="50"/>
+          <dict-tag :options="dict.type.tiewire_device_line_name" :value="scope.row.reserveTwo"/>
         </template>
       </el-table-column>
-      <el-table-column label="行为状态" align="center" prop="reserveFour"/>
-      <el-table-column label="是否报警" align="center" prop="reserveFive"/>
-      <el-table-column label="上传人" align="center" prop="reserveSix"/>
-      <el-table-column label="上传时间" align="center" prop="reserveSeven">
+      <el-table-column label="采集数据名称" align="center" prop="reserveThree">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reserveSeven, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <dict-tag :options="dict.type.tiewire_device_line_type" :value="scope.row.reserveThree"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="振动幅度" align="center" prop="reserveFour"/>
+      <el-table-column label="振动频率" align="center" prop="reserveFive"/>
+      <el-table-column label="振动速度" align="center" prop="reserveSix"/>
+      <el-table-column label="振动加速度" align="center" prop="reserveSeven"/>
+      <el-table-column label="相位角" align="center" prop="reserveTen"/>
+      <el-table-column label="共振频率" align="center" prop="reserveEleven"/>
+      <el-table-column label="峰-峰值" align="center" prop="reserveTwelve"/>
+      <el-table-column label="谐波分析" align="center" prop="reserveEight" :show-overflow-tooltip="true"/>
+      <el-table-column label="上传时间" align="center" prop="reserveNine">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reserveNine, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -131,24 +136,54 @@
     <!-- 添加或修改AI识别算法开发对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="识别类型" prop="reserveTwo">
-          <el-input v-model="form.reserveTwo" placeholder="请输入识别类型"/>
+        <el-form-item label="轧辊编号" prop="reserveTwo">
+          <!--          <el-input v-model="form.reserveTwo" placeholder="请输入轧辊编号"/>-->
+          <el-select :disabled="disabled" v-model="form.reserveTwo" placeholder="请选择轧辊编号" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_name"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="识别例图" prop="reserveThree">
-          <image-upload v-model="form.reserveThree"/>
+        <el-form-item label="采集数据名称" prop="reserveThree">
+          <el-select :disabled="disabled" v-model="form.reserveThree" placeholder="请选择采集数据名称" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="行为状态" prop="reserveFour">
-          <el-input v-model="form.reserveFour" placeholder="请输入行为状态"/>
+        <el-form-item label="振动幅度" prop="reserveFour">
+          <el-input v-model="form.reserveFour" placeholder="请输入振动幅度"/>
         </el-form-item>
-        <el-form-item label="是否报警" prop="reserveFive">
-          <el-input v-model="form.reserveFive" placeholder="请输入是否报警"/>
+        <el-form-item label="振动频率参数" prop="reserveFive">
+          <el-input v-model="form.reserveFive" placeholder="请输入振动频率参数"/>
         </el-form-item>
-        <el-form-item label="上传人" prop="reserveSix">
-          <el-input v-model="form.reserveSix" placeholder="请输入上传人"/>
+        <el-form-item label="振动速度" prop="reserveSix">
+          <el-input v-model="form.reserveSix" placeholder="请输入振动速度"/>
         </el-form-item>
-        <el-form-item label="上传时间" prop="reserveSeven">
+        <el-form-item label="振动加速度" prop="reserveSeven">
+          <el-input v-model="form.reserveSeven" placeholder="请输入振动加速度"/>
+        </el-form-item>
+        <el-form-item label="相位角" prop="reserveTen">
+          <el-input v-model="form.reserveTen" placeholder="请输入相位角"/>
+        </el-form-item>
+        <el-form-item label="共振频率" prop="reserveEleven">
+          <el-input v-model="form.reserveEleven" placeholder="请输入共振频率"/>
+        </el-form-item>
+        <el-form-item label="峰-峰值" prop="reserveTwelve">
+          <el-input v-model="form.reserveTwelve" placeholder="请输入峰-峰值"/>
+        </el-form-item>
+        <el-form-item label="谐波分析" prop="reserveEight">
+          <el-input v-model="form.reserveEight" placeholder="请输入谐波分析"/>
+        </el-form-item>
+        <el-form-item label="上传时间" prop="reserveNine">
           <el-date-picker
-            v-model="form.reserveSeven"
+            v-model="form.reserveNine"
             type="datetime"
             placeholder="请选择时间"
             format="yyyy-MM-dd HH:mm:ss ">
@@ -174,6 +209,7 @@ import {
 
 export default {
   name: "GodUniversalElectricMeter",
+  dicts: ['tiewire_device_line_name', 'tiewire_device_line_type'],
   data() {
     return {
       // 遮罩层
@@ -213,7 +249,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'vibrationData',
       },
       // 表单参数
       form: {},
@@ -258,7 +294,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'vibrationData',
         remark: null
       };
       this.resetForm("form");
diff --git a/god-ui/src/views/dataInterface/viscosity/index.vue b/god-ui/src/views/dataInterface/viscosity/index.vue
index d3c7f636..050bd906 100644
--- a/god-ui/src/views/dataInterface/viscosity/index.vue
+++ b/god-ui/src/views/dataInterface/viscosity/index.vue
@@ -1,35 +1,31 @@
 <template>
   <div class="app-container">
-    <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
-    <!--      <el-form-item label="" prop="reserveOne">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveOne"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveTwo">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveTwo"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item label="" prop="reserveThree">-->
-    <!--        <el-input-->
-    <!--          v-model="queryParams.reserveThree"-->
-    <!--          placeholder="请输入"-->
-    <!--          clearable-->
-    <!--          @keyup.enter.native="handleQuery"-->
-    <!--        />-->
-    <!--      </el-form-item>-->
-    <!--      <el-form-item>-->
-    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
-    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
-    <!--      </el-form-item>-->
-    <!--    </el-form>-->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="轧辊编号" prop="reserveEight">
+        <el-select v-model="queryParams.reserveTwo" placeholder="请选择轧辊编号" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_name"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="采集数据名称" prop="reserveThree">
+        <el-select v-model="queryParams.reserveThree" placeholder="请选择采集数据名称" clearable>
+          <el-option
+            v-for="dict in dict.type.tiewire_device_line_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -83,19 +79,25 @@
 
     <el-table v-loading="loading" :data="godUniversalElectricMeterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="识别编号" align="center" prop="reserveOne"/>
-      <el-table-column label="识别类型" align="center" prop="reserveTwo"/>
-      <el-table-column label="识别例图" align="center" prop="reserveThree">
+      <!--      <el-table-column label="轧辊编号" align="center" prop="reserveOne"/>-->
+      <el-table-column label="轧辊编号" align="center" prop="reserveTwo">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.reserveThree" :width="50" :height="50"/>
+          <dict-tag :options="dict.type.tiewire_device_line_name" :value="scope.row.reserveTwo"/>
         </template>
       </el-table-column>
-      <el-table-column label="行为状态" align="center" prop="reserveFour"/>
-      <el-table-column label="是否报警" align="center" prop="reserveFive"/>
-      <el-table-column label="上传人" align="center" prop="reserveSix"/>
-      <el-table-column label="上传时间" align="center" prop="reserveSeven">
+      <el-table-column label="采集数据名称" align="center" prop="reserveThree">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reserveSeven, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <dict-tag :options="dict.type.tiewire_device_line_type" :value="scope.row.reserveThree"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="油液粘度" align="center" prop="reserveFour"/>
+      <el-table-column label="油液密度" align="center" prop="reserveFive"/>
+      <el-table-column label="温度补偿" align="center" prop="reserveSix"/>
+      <el-table-column label="标准和规范" align="center" prop="reserveSeven"/>
+      <el-table-column label="措施/建议" align="center" prop="reserveEight" :show-overflow-tooltip="true"/>
+      <el-table-column label="上传时间" align="center" prop="reserveNine">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reserveNine, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -131,24 +133,45 @@
     <!-- 添加或修改AI识别算法开发对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="识别类型" prop="reserveTwo">
-          <el-input v-model="form.reserveTwo" placeholder="请输入识别类型"/>
+        <el-form-item label="轧辊编号" prop="reserveTwo">
+          <!--          <el-input v-model="form.reserveTwo" placeholder="请输入轧辊编号"/>-->
+          <el-select :disabled="disabled" v-model="form.reserveTwo" placeholder="请选择轧辊编号" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_name"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="识别例图" prop="reserveThree">
-          <image-upload v-model="form.reserveThree"/>
+        <el-form-item label="采集数据名称" prop="reserveThree">
+          <el-select :disabled="disabled" v-model="form.reserveThree" placeholder="请选择采集数据名称" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.tiewire_device_line_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="行为状态" prop="reserveFour">
-          <el-input v-model="form.reserveFour" placeholder="请输入行为状态"/>
+        <el-form-item label="油液粘度" prop="reserveFour">
+          <el-input v-model="form.reserveFour" placeholder="请输入油液粘度"/>
         </el-form-item>
-        <el-form-item label="是否报警" prop="reserveFive">
-          <el-input v-model="form.reserveFive" placeholder="请输入是否报警"/>
+        <el-form-item label="油液密度参数" prop="reserveFive">
+          <el-input v-model="form.reserveFive" placeholder="请输入油液密度参数"/>
         </el-form-item>
-        <el-form-item label="上传人" prop="reserveSix">
-          <el-input v-model="form.reserveSix" placeholder="请输入上传人"/>
+        <el-form-item label="温度补偿" prop="reserveSix">
+          <el-input v-model="form.reserveSix" placeholder="请输入温度补偿"/>
         </el-form-item>
-        <el-form-item label="上传时间" prop="reserveSeven">
+        <el-form-item label="标准和规范" prop="reserveSeven">
+          <el-input v-model="form.reserveSeven" placeholder="请输入标准和规范"/>
+        </el-form-item>
+        <el-form-item label="措施/建议" prop="reserveEight">
+          <el-input v-model="form.reserveEight" placeholder="请输入措施/建议"/>
+        </el-form-item>
+        <el-form-item label="上传时间" prop="reserveNine">
           <el-date-picker
-            v-model="form.reserveSeven"
+            v-model="form.reserveNine"
             type="datetime"
             placeholder="请选择时间"
             format="yyyy-MM-dd HH:mm:ss ">
@@ -174,6 +197,7 @@ import {
 
 export default {
   name: "GodUniversalElectricMeter",
+  dicts: ['tiewire_device_line_name', 'tiewire_device_line_type'],
   data() {
     return {
       // 遮罩层
@@ -213,7 +237,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'viscosity',
       },
       // 表单参数
       form: {},
@@ -258,7 +282,7 @@ export default {
         reserveThirteen: null,
         reserveFourteen: null,
         sysType: null,
-        moduleType: 'keyAreaPersonnel',
+        moduleType: 'viscosity',
         remark: null
       };
       this.resetForm("form");