ccjgmwz пре 3 година
родитељ
комит
0b36550518

+ 0 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -133,7 +133,6 @@
             </el-select>
           </el-form-item>
           <!-- 入库类型 -->
-          {{storageType1}}
           <el-form-item label="入库类型">
             <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList1.inOutType"
               placeholder="请选择入库类型" class="typeselect" @change="selectstorageType1">

+ 60 - 291
src/views/warehouse/warehouseManagementMintor.vue

@@ -1,9 +1,9 @@
 <!--仓库详情-->
-<template>
+<template style="background: #d3dce6;">
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">查看仓库详情</h2>
+        <h2 class="bg-left title">查看库点监控</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
         <el-button
@@ -21,322 +21,86 @@
         >
       </el-col>
     </el-row>
-    <div class="center">
-      <el-radio-group v-model="warehouseType" @change="warehouseTypechange">
-        <el-radio label="1">常用仓库</el-radio>
-        <el-radio label="2">临时仓库</el-radio>
-      </el-radio-group>
-      <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        <div class="small-title">基本信息</div>
-        <!--基本信息-->
-        <ws-info-table>
-          <!--仓库名称-->
-          <ws-form-item
-            class="warehouseName"
-            label="仓库名称"
-            span="1"
-            prop="warehouseName"
-          >
-            <ws-select
-              v-model="deptBudgetList.warehouseName"
-              placeholder="请输入仓库名称"
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in packtypeList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.warehouseName"
-              />
-            </ws-select>
-          </ws-form-item>
-          <!--负责人-->
-          <ws-form-item label="负责人" span="1" prop="personCharge">
-            {{ deptBudgetList.personCharge }}
-          </ws-form-item>
-          <!--负责人电话-->
-          <ws-form-item
-            label="负责人电话"
-            span="1"
-            prop="personPhone"
-            class="readonly"
-          >
-            {{ deptBudgetList.personPhone }}
-          </ws-form-item>
-           <ws-form-item label="其他负责人" span="1" prop="otherPersonCharge">
-            {{ deptBudgetList.otherPersonCharge }}
-          </ws-form-item>
-          <!--仓库所在地-->
-          <ws-form-item label="仓库所在地" span="1" prop="warehouseLocation">
-            {{ deptBudgetList.warehousePrivate
-            }}{{ deptBudgetList.warehouseCity
-            }}{{ deptBudgetList.warehouseArea }}
-          </ws-form-item>
-          <!--详细地址-->
-          <ws-form-item
-            label="详细地址"
-            span="1"
-            prop="detailedAddress"
-            class="readonly"
-          >
-            {{ deptBudgetList.detailedAddress }}
-          </ws-form-item>
-          <!--总储量(吨)-->
-          <ws-form-item
-            v-show="warehouseType == '1'"
-            label="总储量(吨)"
-            span="1"
-            prop="totalStorage"
-             
-          >
-            {{ totalStorage }}
-          </ws-form-item>
-        </ws-info-table>
-
-        <div
-          v-for="(item, index) in deptBudgetList.warehousePositionInfoList"
-          :key="index"
-        >
-          <ws-info-table>
-            <!--仓位编号-->
-            <ws-form-item
-              label="仓位编号"
-              span="1"
-              prop="binNumber"
-              class="forlist"
-            >
-              {{ item.binNumber }}
-            </ws-form-item>
-            <!--最大储量(吨)-->
-            <ws-form-item
-              label="最大储量(吨)"
-              span="1"
-              prop="maxStorage"
-              class="forlist"
-            >
-              {{ item.maxStorage }}
-            </ws-form-item>
-            <!--现有储量-->
-            <ws-form-item
-              :label="'现有储量(' + item.nowStorage + '吨)'"
-              span="1"
-              prop="detailStorage"
-            >
-              {{ item.detailStorage }}
-            </ws-form-item>
-            <!--备注(选填)-->
-            <ws-form-item label="备注(选填)" span="1" prop="remark">
-              {{ item.remark }}
-            </ws-form-item>
-          </ws-info-table>
-        </div>
-        <div class="small-title" v-show="warehouseType == '1'">仓库照片</div>
-        <div class="addressUrls">
-          <div v-for="(items, index) in addressUrls" class="addressUrl">
-            <img
-              v-show="addressUrls.length > 0"
-              width="100"
-              height="100"
-              :src="items"
-              alt=""
-            />
-          </div>
+    <div style="height:90vh;background: #d3dce6;">
+      <el-row :gutter="20" >
+        <div v-for="(item,index) in dataList">
+          <el-col :span="7" v-if="item.Status =='ON'">
+            <iframe :src='"https://live.eliangeyun.com/play.html?serial="+item.DeviceID+"&code="+item.ID+"&aspect=fullscreen"'  width="440" height="360" allowfullscreen ="true"
+                webkitallowfullscreen="true"
+                mozallowfullscreen="true"
+                allow="autoplay; fullscreen; microphone;"></iframe>
+          </el-col>
         </div>
-      </ws-form>
-    </div>
-    <div style="text-align: right; padding: 10px">
-      <el-button
-        class="bg-bottom-up"
-        type="primary"
-        size="small"
-        @click="returnWarehouse()"
-        >关闭</el-button
-      >
+      </el-row>
     </div>
+    
   </div>
 </template>
 <script>
-import { xiala, billoperatehis, getLook } from '@/model/warehouse/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import axios from 'axios'
 export default {
   name: 'viewSpareMoney',
   components: {
-    WsUpload,
-    Pagination,
+    axios
   },
   watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
-    },
   },
   data() {
     return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      radio: 1,
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      unitList: [],
-      warehouseType: '1',
-      // 提交类型
-      submitType: true,
-      size: 10,
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: [],
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      contractList: [],
-      deptBudgetList: {},
-      historyList: [],
-
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
-      },
-      accessoryTFs: false,
-      addressUrls: [],
+      dataList:[]
     }
   },
   activated() {
-    // this.selectpackingMethod()
-    this.showType = this.isShow
     this.loaddata()
   },
   computed: {
-    totalStorage: function () {
-      var sum = 0
-      if (this.deptBudgetList.warehousePositionInfoList) {
-        for (
-          var i = 0;
-          i < this.deptBudgetList.warehousePositionInfoList.length;
-          i++
-        ) {
-          sum += Number(
-            this.deptBudgetList.warehousePositionInfoList[i].maxStorage
-          )
-        }
-      }
-      return sum
-    },
   },
   methods: {
-    //返回按钮
     returnWarehouse() {
-       this.deptBudgetList = {}
-          this.addressUrls = []
       this.$router.push({ path: 'warehouseManagementList' })
     },
-    warehouseTypechange() {
-      this.addressUrls = []
-      this.deptBudgetList = {}
-      this.loaddata()
-    },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加,必须转化成字符串
-      }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
-        }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    selectpackingMethod(e) {
-      console.log(e)
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].warehouseName == e) {
-          this.getLook(this.packtypeList[i].id)
-        }
-      }
-    },
-    loaddata() {
-      // 仓库名称
-      xiala({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        warehouseType: this.warehouseType,
-      })
-        .toPromise()
-        .then((response) => {
-          this.packtypeList = response
-        })
-    },
-    getLook(compId1) {
-      getLook({
-        id: compId1,
-      })
-        .toPromise()
-        .then((response) => {
-          this.deptBudgetList = response
-          this.addressUrls = this.deptBudgetList.addressUrl.split(',')
-          this.addressUrls.pop()
-        })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-  },
+    loaddata(){
+      axios.get('https://live.eliangeyun.com/api/v1/device/channellist')
+        .then(resp =>{
+          this.dataList = resp.data.ChannelList
+          for(var i=0;i<this.dataList.length;i++){
+            console.log('ssss',this.dataList[i].Status);
+          }
+
+        }).catch(err =>{
+          console.log(err);
+        });
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
+ .el-row {
+    margin-bottom: 20px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .el-col {
+    border-radius: 4px;
+  }
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+  .bg-purple {
+    background: #d3dce6;
+  }
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
 .center {
   position: relative;
   margin-top: 100px;
@@ -366,6 +130,11 @@ export default {
   width: 60% !important;
 }
 
+	.sign1 {
+		width: 376px;
+		height: 376px;
+		top: 40px;
+	}
 //文字基本信息
 .center h3 {
   margin-left: 42px;

+ 2 - 2
vue.config.js

@@ -141,8 +141,8 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.107:8090/',
-        // target: 'http://192.168.1.122:9100/',
+        // target: 'http://192.168.1.107:8090/',
+        target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',