Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr

god-ui/src/views/dataInterface/humidityData/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+    <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
@@ -246,6 +246,8 @@ export default {
     };
   },
   created() {
+    this.queryParams.reserveTwo = this.$route.query.reserveTwo;
+    this.queryParams.reserveThree = this.$route.query.reserveThree;
     this.getList();
   },
   methods: {

god-ui/src/views/dataInterface/load/index.vue

@@ -246,6 +246,8 @@ export default {
     };
   },
   created() {
+    this.queryParams.reserveTwo = this.$route.query.reserveTwo;
+    this.queryParams.reserveThree = this.$route.query.reserveThree;
     this.getList();
   },
   methods: {

god-ui/src/views/dataInterface/particleSizeData/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+    <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
@@ -11,8 +11,8 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="颗粒度名称" prop="reserveThree">
+      <el-form-item label="采集数据名称" prop="reserveThree">
-        <el-select v-model="queryParams.reserveThree" placeholder="请选择颗粒度名称" clearable>
+        <el-select v-model="queryParams.reserveThree" placeholder="请选择采集数据名称" clearable>
           <el-option
             v-for="dict in dict.type.tiewire_device_line_type"
             :key="dict.value"
@@ -85,7 +85,7 @@
           <dict-tag :options="dict.type.tiewire_device_line_name" :value="scope.row.reserveTwo"/>
         </template>
       </el-table-column>
-      <el-table-column label="颗粒度名称" align="center" prop="reserveThree">
+      <el-table-column label="采集数据名称" align="center" prop="reserveThree">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.tiewire_device_line_type" :value="scope.row.reserveThree"/>
         </template>
@@ -132,7 +132,7 @@
 
     <!-- 添加或修改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 ref="form" :model="form" :rules="rules" label-width="100px">
         <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%">
@@ -144,8 +144,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="颗粒度名称" prop="reserveThree">
+        <el-form-item label="采集数据名称" prop="reserveThree">
-          <el-select :disabled="disabled" v-model="form.reserveThree" placeholder="请选择颗粒度名称" style="width: 100%">
+          <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"
@@ -171,6 +171,7 @@
         </el-form-item>
         <el-form-item label="上传时间" prop="reserveNine">
           <el-date-picker
+            style="width: 100%"
             v-model="form.reserveNine"
             type="datetime"
             placeholder="请选择时间"
@@ -246,6 +247,8 @@ export default {
     };
   },
   created() {
+    this.queryParams.reserveTwo = this.$route.query.reserveTwo;
+    this.queryParams.reserveThree = this.$route.query.reserveThree;
     this.getList();
   },
   methods: {

god-ui/src/views/dataInterface/pressures/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+    <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
@@ -246,6 +246,8 @@ export default {
     };
   },
   created() {
+    this.queryParams.reserveTwo = this.$route.query.reserveTwo;
+    this.queryParams.reserveThree = this.$route.query.reserveThree;
     this.getList();
   },
   methods: {

god-ui/src/views/dataInterface/temperature/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <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
@@ -11,8 +11,8 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="颗粒度名称" prop="reserveThree">
+      <el-form-item label="采集数据名称" prop="reserveThree">
-        <el-select v-model="queryParams.reserveThree" placeholder="请选择颗粒度名称" clearable>
+        <el-select v-model="queryParams.reserveThree" placeholder="请选择采集数据名称" clearable>
           <el-option
             v-for="dict in dict.type.tiewire_device_line_type"
             :key="dict.value"
@@ -85,7 +85,7 @@
           <dict-tag :options="dict.type.tiewire_device_line_name" :value="scope.row.reserveTwo"/>
         </template>
       </el-table-column>
-      <el-table-column label="颗粒度名称" align="center" prop="reserveThree">
+      <el-table-column label="采集数据名称" align="center" prop="reserveThree">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.tiewire_device_line_type" :value="scope.row.reserveThree"/>
         </template>
@@ -144,8 +144,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="颗粒度名称" prop="reserveThree">
+        <el-form-item label="采集数据名称" prop="reserveThree">
-          <el-select :disabled="disabled" v-model="form.reserveThree" placeholder="请选择颗粒度名称" style="width: 100%">
+          <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"
@@ -171,6 +171,7 @@
         </el-form-item>
         <el-form-item label="上传时间" prop="reserveNine">
           <el-date-picker
+            style="width: 100%"
             v-model="form.reserveNine"
             type="datetime"
             placeholder="请选择时间"
@@ -246,6 +247,8 @@ export default {
     };
   },
   created() {
+    this.queryParams.reserveTwo = this.$route.query.reserveTwo;
+    this.queryParams.reserveThree = this.$route.query.reserveThree;
     this.getList();
   },
   methods: {

god-ui/src/views/dataInterface/vibrationData/index.vue

@@ -258,6 +258,8 @@ export default {
     };
   },
   created() {
+    this.queryParams.reserveTwo = this.$route.query.reserveTwo;
+    this.queryParams.reserveThree = this.$route.query.reserveThree;
     this.getList();
   },
   methods: {

god-ui/src/views/dataInterface/viscosity/index.vue

@@ -246,6 +246,8 @@ export default {
     };
   },
   created() {
+    this.queryParams.reserveTwo = this.$route.query.reserveTwo;
+    this.queryParams.reserveThree = this.$route.query.reserveThree;
     this.getList();
   },
   methods: {

god-ui/src/views/tiewire/interface/index.vue

@@ -123,13 +123,21 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="接口地址" align="center" prop="address" width="150"/>
+      <el-table-column label="接口地址" align="center" prop="address" width="200"/>
       <!--<el-table-column label="跳转地址" align="center" prop="token"/>
       <el-table-column label="参数值" align="center" prop="paramValue"/>
       <el-table-column label="备注" align="center" prop="remark"/>-->
       <el-table-column label="接口状态" align="center" prop="dataType"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-promotion"
+            @click="handleJump(scope.row)"
+          >跳转接口
+          </el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -168,7 +176,7 @@
           <el-input v-model="form.interfaceName" placeholder="请输入接口名称"/>
         </el-form-item>
         <el-form-item label="协议类型" prop="protocolType">
-          <el-select v-model="form.protocolType" placeholder="请选择协议类型">
+          <el-select v-model="form.protocolType" placeholder="请选择协议类型" style="width: 100%">
             <el-option
               v-for="dict in dict.type.cqyg_protocol_docking_type"
               :key="dict.value"
@@ -181,7 +189,7 @@
           <el-input v-model="form.deviceBrand" placeholder="请输入设备品牌"/>
         </el-form-item>
         <el-form-item label="轧辊类型" prop="productType">
-          <el-select v-model="form.productType" placeholder="请选择轧辊类型">
+          <el-select v-model="form.productType" placeholder="请选择轧辊类型" style="width: 100%">
             <el-option
               v-for="dict in dict.type.tiewire_device_line_name"
               :key="dict.value"
@@ -191,7 +199,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="接口类型" prop="interfaceType">
-          <el-select v-model="form.interfaceType" placeholder="请选择接口类型">
+          <el-select v-model="form.interfaceType" placeholder="请选择接口类型" style="width: 100%">
             <el-option
               v-for="dict in dict.type.tiewire_device_line_type"
               :key="dict.value"
@@ -212,17 +220,15 @@
         <el-form-item label="接口状态" prop="dataType">
           <el-input v-model="form.dataType" placeholder="请输入接口状态"/>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注"/>
-        </el-form-item>
         <el-form-item label="跳转地址" prop="token">
           <el-input v-model="form.token" placeholder="请输入跳转地址"/>
         </el-form-item>
-        <el-form-item label="参数值" prop="paramValue">
+        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.paramValue" placeholder="请输入参数值"/>
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
         </el-form-item>
-
+       <!-- <el-form-item label="参数值" prop="paramValue">
-
+          <el-input v-model="form.paramValue" placeholder="请输入参数值"/>
+        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -306,9 +312,9 @@ export default {
         interfaceCode: null,
         interfaceName: null,
         protocolType: 'HTTP',
-        deviceBrand: '森吉米尔ZR21A',
+        deviceBrand: null,
-        productType: null,
+        productType: '10',
-        interfaceType: null,
+        interfaceType: '10',
         callType: '是',
         address: null,
         token: null,
@@ -377,7 +383,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除接口集成编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除接口？').then(function () {
         return delInterface(ids);
       }).then(() => {
         this.getList();
@@ -409,6 +415,19 @@ export default {
         row.callType = row.callType === "开启" ? "启用" : "停用";
       });
     },
+    /** 跳转周边资源按钮操作 */
+    handleJump(row) {
+      let path = row.token;
+      if (path) {
+        this.$router.push({
+          path: path,
+          query: {
+            reserveTwo: row.productType,
+            reserveThree: row.interfaceType
+          }// 要传递的参数
+        });
+      }
+    },
   }
 };
 </script>