产品详情接口完善

src/api/modules/equipmentManage.api.js

@@ -65,14 +65,6 @@ export default ({
           method: 'get',
         })
       },
-        //设备详情-运行数据
-      runData( data ) {
-        return request({
-          url: `/device-data/getPageList`,
-          method: 'post',
-          data
-        })
-      },
         //设备详情-设备运行历史数据
       getPintsPageList( data ) {
         return request({

src/api/modules/productManage.api.js

@@ -82,7 +82,46 @@ export default ({
             url: `/productCategory/getSonList/${orgCode}`,
             method: 'get',
           })
-        }
+        },
+        //产品详情-运行数据
+        runData( data ) {
+          return request({
+            url: `/productInfo/getDeviceRunDataPageList`,
+            method: 'post',
+            data
+          })
+        },
 
+        //产品详情-运行数据-开始检测
+        ordersSend( data ) {
+          return request({
+            url: `/gotOrders/send`,
+            method: 'post',
+            data
+          })
+        },
+        //产品详情-运行数据-查看详情
+        runDataDetail( id ) {
+          return request({
+            url: `/productInfo/getDeviceRunData/${id}`,
+            method: 'get'
+          })
+        },
+        //产品详情-设备信息-添加关联
+        addAssociationsProduct( data ) {
+          return request({
+            url: `/productInfo/addAssociationsProduct`,
+            method: 'post',
+            data
+          })
+        },
+        //产品详情-设备信息-取消关联
+        disassociateProduct( id ) {
+          return request({
+            url: `productInfo/disassociateProduct/${id}`,
+            method: 'get',
+          })
+        },
+        
   })
   

src/views/demo/equipmentManage/equipmentInfo/index.vue

@@ -651,7 +651,7 @@ export default {
           console.log('收到来着',topic,'的信息',message.toString())
           const res = JSON.parse(message.toString())
           this.runData=res.data
-          //console.log(res, 'res')
+          console.log(res, 'res',this.runData,'runData')
           // switch(topic) {
           //    case 'top/lll' :
           //      this.msg = res.msg

src/views/demo/productManage/productInfo/index.vue

@@ -143,7 +143,7 @@
                     <el-form-item label="时间:">
                       <el-date-picker
                         size="mini"
-                        v-model="formTime.time"
+                        v-model="formTime.dataTime"
                         type="date"
                         placeholder="请选择">
                       </el-date-picker>
@@ -153,6 +153,7 @@
                         size="mini"
                         type="primary"
                         icon="el-icon-search"
+                        @click="getRun()"
                         >查询</el-button
                       >
                     </el-form-item>
@@ -162,7 +163,7 @@
                         size="mini"
                         type="primary"
                         icon="el-icon-refresh-left"
-                        @click="formTime.time = ''"
+                        @click="formTime.dataTime = '';getRun()"
                         >重置</el-button
                       >
                     </el-form-item>
@@ -187,9 +188,9 @@
                     :index="indexMethod"
                     show-overflow-tooltip
                   ></el-table-column>
-                  <!-- <el-table-column prop="device" label="检测时间" align="center">
+                  <el-table-column prop="dataTime" label="检测时间" width="200" align="center">
                   </el-table-column>
-                  <el-table-column prop="device" label="设备编号" align="center">
+                  <!-- <el-table-column prop="device" label="设备编号" align="center">
                   </el-table-column>
                   <el-table-column prop="tempValue" label="温度(℃)" align="center">
                   </el-table-column>
@@ -216,21 +217,21 @@
                   >
                   </el-table-column> -->
 
-                  <el-table-column prop="scanNum" label="最高温度(℃)" align="center">
+                  <el-table-column prop="maxValue" label="最高温度(℃)" align="center">
                   </el-table-column>
 
-                  <el-table-column prop="scanNum" label="最低温度(℃)" align="center">
+                  <el-table-column prop="minValue" label="最低温度(℃)" align="center">
                   </el-table-column>
-                  <el-table-column prop="scanNum" label="平均温度(℃)" align="center">
+                  <el-table-column prop="avgValue" label="平均温度(℃)" align="center">
                   </el-table-column>
-                  <el-table-column prop="scanNum" label="最高湿度(%RH)" align="center">
+                  <el-table-column prop="maxWet" label="最高湿度(%RH)" align="center">
                   </el-table-column>
 
-                  <el-table-column prop="scanNum" label="最低湿度(%RH)" align="center">
+                  <el-table-column prop="minWet" label="最低湿度(%RH)" align="center">
                   </el-table-column>
-                  <el-table-column prop="scanNum" label="平均湿度(%RH)" align="center">
+                  <el-table-column prop="avgWet" label="平均湿度(%RH)" align="center">
                   </el-table-column>
-                  <el-table-column prop="scanNum" label="平均露点温度(℃)" align="center">
+                  <el-table-column prop="avgDew" label="平均露点温度(℃)" align="center">
                   </el-table-column>
                   <el-table-column label="操作" width="140" align="center">
                     <template slot-scope="scope">
@@ -243,6 +244,16 @@
                     </template>
                   </el-table-column>
                 </el-table>
+                <el-pagination
+                  @size-change="handleSizeChange2"
+                  @current-change="handleCurrentChange2"
+                  :current-page="1"
+                  :page-sizes="[10, 20, 30, 40]"
+                  :page-size="pagination2.pageSize"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="pagination2.total"
+                >
+                </el-pagination>
               </el-tab-pane>
 
               <el-tab-pane label="报警记录" name="fourth"></el-tab-pane>
@@ -264,14 +275,14 @@
                   <el-form-item label="设备名称:">
                   <el-select
                     size="mini"
-                    v-model="formInline.eqName"
+                    v-model="formInline.eqCode"
                     placeholder="请选择"
                   >
                     <el-option
-                      v-for="item in productData"
+                      v-for="item in productData1"
                       :key="item.id"
                       :label="item.eqName"
-                      :value="item.eqName"
+                      :value="item.eqCode"
                     >
                     </el-option>
                   </el-select>
@@ -298,8 +309,9 @@
             
               <el-table
               ref="multipleTable"
-                :data="productData"
+                :data="productData1"
                 border
+                @selection-change="handleSelectionChange"
                 style="width: 100%"
               >
     <el-table-column
@@ -521,8 +533,9 @@ export default {
       info:{},
       dialogTableVisible:false,
       formInline:{},
-      formTime:{time:''},
+      formTime:{dataTime:''},
       productData:[{}],
+      productData1:[{}],
       activeName: "first",
       checkInfo: [
         {
@@ -585,6 +598,7 @@ export default {
           val1: [""],
         },
       ],
+      deviceInfoList:[],
       //分页
       pagination: {
         // 每页显示的条数
@@ -603,14 +617,52 @@ export default {
         // 总数
         total: 20,
       },
+      //运行数据分页
+      pagination2: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
     };
   },
   created(){
     this.getBasic()
-    this.getList()
 
   },
   methods: {
+    //添加关联
+    sure(){
+      let data={
+        deviceInfoList:this.deviceInfoList,
+        proCode:this.info.proCode
+      }
+      api.addAssociationsProduct(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.dialogTableVisible = false;
+            this.getList()
+            this.$message({
+              type: "success",
+              message: "关联成功",
+            });
+          }else{
+            this.$message({
+              type: "error",
+              message: res.msg,
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    handleSelectionChange(val) {
+      console.log(val);
+      this.deviceInfoList = val;
+    },
     //检测开始
     checkStart() {
       this.$confirm("确认发送温湿度检测请求?", "检测操作提示", {
@@ -618,10 +670,32 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        this.$message({
-          type: "success",
-          message: "发送成功",
+        console.log(this.info);
+        let data={
+          orgCode: this.info.orgCode,
+          labelCode: this.runData[0].labelCode,
+          // eqCode: this.info.eqCode,
+          proCategoryCode: this.info.proCategoryCode
+        }
+        api.ordersSend(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.getRun();
+            this.$message({
+              type: "success",
+              message: "发送成功",
+            });
+          }else{
+            this.$message({
+              type: "error",
+              message: res.msg,
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
         });
+
       });
     },
     // 查看检测信息
@@ -629,16 +703,69 @@ export default {
       console.log(12);
       this.$set(this, "checkDialog", true);
       this.checkDialog = true;
+      this.checkInfo=[
+        {
+          name: "检测时间",
+          val: [row.dataTime],
+        },
+        {
+          name: "最高温度(℃)",
+          val: [row.maxValue],
+          name1: "最低温度(℃)",
+          val1: [row.minValue],
+          name2: "平均温度(℃)",
+          val2: [row.avgValue],
+        },
+        {
+          name: "最高湿度(%RH)",
+          val: [row.maxWet],
+          name1: "最低湿度(%RH)",
+          val1: [row.minWet],
+          name2: "平均湿度(%RH)",
+          val2: [row.avgWet],
+        },
+        {
+          name: "最高露点温度(℃)",
+          val: [row.maxDew],
+          name1: "最低露点温度(℃)",
+          val1: [row.minDew],
+          name2: "平均露点温度(℃)",
+          val2: [row.avgDew],
+        },
+      ]
+      api.runDataDetail(row.id)
+        .then((res) => {
+          if (res.code == 200) {
+            let data=res.data
+            this.checkInfo1=[]
+            data.forEach(item=>{
+              this.checkInfo1.push(
+                {
+                  title:item.sign,
+                  name: "温度(℃)",
+                  val: [item.tempValue],
+                  name1: "湿度(%RH)",
+                  val1: [item.wetValue],
+                  name2: "露点温度(℃)",
+                  val2: [item.dewValue],
+                }
+              )
+            })
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     search() {
-      this.getList()
+      this.getList1()
 
     },
     reset() {
-      this.pagination.curPage=1;
-      this.pagination.pageSize=10;
+      this.pagination1.curPage=1;
+      this.pagination1.pageSize=10;
       this.formInline={}
-      this.getList()
+      this.getList1()
     },
     closeAddSb() {
       this.formInline = {};
@@ -649,10 +776,11 @@ export default {
     },
     //获取列表数据
     getList() {
-      var condition = this.formInline;
-      condition = JSON.stringify(condition);
+      let condition = {};
       condition.org_code=localStorage.getItem("orgCode");
-      var data = {
+      condition.proCode=this.info.proCode;
+      condition = JSON.stringify(condition);
+      let data = {
         pageIndex: this.pagination.curPage,
         pageSize: this.pagination.pageSize,
         condition: condition,
@@ -660,6 +788,7 @@ export default {
       api.equipmentList(data)
         .then((res) => {
           if (res.code == 200) {
+            console.log(res.data,11);
             this.productData = res.data.records;
             this.pagination.pageSize = res.data.size;
             this.pagination.total = res.data.total;
@@ -669,6 +798,29 @@ export default {
           console.log(err);
         });
     },
+    //获取列表数据
+    getList1() {
+      let condition = this.formInline;
+      condition.org_code=localStorage.getItem("orgCode");
+      condition = JSON.stringify(condition);
+      let data = {
+        pageIndex: this.pagination.curPage,
+        pageSize: this.pagination.pageSize,
+        condition: condition,
+      };
+      api.equipmentList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            console.log(res.data,11);
+            this.productData1 = res.data.records;
+            this.pagination1.pageSize = res.data.size;
+            this.pagination1.total = res.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
     edit(){
       this.$refs.addDialog.dialogFormVisible=true
             this.$refs.addDialog.getInfo(this.info)
@@ -719,9 +871,23 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '取消关联成功'
+          api.disassociateProduct(row.id)
+          .then((res) => {
+            if (res.code == 200) {
+              this.getList()
+              this.$message({
+                type: "success",
+                message: "取消成功",
+              });
+            }else{
+              this.$message({
+                type: "error",
+                message: res.msg,
+              });
+            }
+          })
+          .catch((err) => {
+            console.log(err);
           });
         })
     },
@@ -733,19 +899,39 @@ export default {
       if(v.name=='fourth'){
         this.$router.push({ path: "alarmRecord" })
       }else if(v.name=='second'){
-        api
-          .runData()
+        this.getRun()
+      }else if(v.name=='third'){
+        this.getList()
+        this.getList1()
+      }
+    },
+    //获取历史定时任务数据
+    getRun(){
+      var condition = this.formTime;
+      condition.proCode = this.info.proCode;
+      condition.orgCode = this.info.orgCode;
+      condition = JSON.stringify(condition);
+      var data = {
+          pageIndex: this.pagination2.curPage,
+          pageSize: this.pagination2.pageSize,
+          condition: condition,
+        };
+      api
+          .runData(data)
           .then((res) => {
             if (res.code == 200) {
-              this.runData=res.data.records
+              this.runData=res.data.records;
+              this.runData.forEach(item=>{
+                item.points=JSON.parse(item.points)
+              })
+              this.pagination2.pageSize = res.data.size;
+              this.pagination2.total = res.data.total;
             }
           })
           .catch((err) => {
             console.log(err);
           });
-      }
     },
-
     //表格序号
     indexMethod(index) {
       return (
@@ -772,6 +958,16 @@ export default {
       this.pagination1.curPage = val;
       this.getList();
     },
+    // 每页条数改变
+    handleSizeChange2(val) {
+      this.pagination2.pageSize = val;
+      this.getRun();
+    },
+    // 当前页改变
+    handleCurrentChange2(val) {
+      this.pagination2.curPage = val;
+      this.getRun();
+    },
   },
   mounted() {},
 };