Merge branch 'dev' of git.echepei.com:zhujiawei/Warehouse_management_ui into dev

src/api/monitor/alrtmList.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询在线用户列表
+export function list(query) {
+  return request({
+    url: '/warehouse/alarms/list',
+    method: 'get',
+    params: query
+  })
+}

src/api/monitor/monitorList.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询在线用户列表
+export function list(query) {
+  return request({
+    url: '/warehouse/webcam/list',
+    method: 'get',
+    params: query
+  })
+}

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -627,6 +627,25 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否质押" prop="isPledge">
+               <el-select
+                 v-model="form.isPledge"
+                 placeholder="请选择是否质押"
+                 clearable
+                 :disabled="browseStatus || form.warehouseStatus > 3"
+                 style="width: 80%"
+                 @change="feeUnitChange"
+                 >
+                   <el-option
+                     v-for="(item, index) in isPledgeOptions"
+                     :key="index.dictValue"
+                     :label="item.dictLabel"
+                     :value="item.dictValue"
+                   />
+                 </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :offset="16" :span="6">
@@ -6897,6 +6916,7 @@ export default {
       showDataElabel: null,
       showElabelDialog: false,
       elabelList: [],
+      isPledgeOptions:[],
       eId:'',
       eRow:{}
     }
@@ -6933,6 +6953,9 @@ export default {
     this.getDicts('f_declaration_elements').then((response) => {
       this.delementsList = response.data
     })
+    this.getDicts('is_pledge').then((response) => {
+      this.isPledgeOptions = response.data
+    })
     this.getDicts('data_ifweigh_status').then((response) => {
       this.ifinspectionList = response.data
     })

src/views/Warehousing/inStock/index.vue

@@ -280,6 +280,11 @@
                 </div>
               </el-link>
             </span>
+            <span v-else-if="item.label == 'isPledge'">
+              <span>
+                {{ scope.row.isPledge | isPledgeFormat(isPledgeOptions) }}
+              </span>
+            </span>
             <span v-else>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
@@ -590,6 +595,13 @@ export default {
         },
         {
           surface: "31",
+          label: "isPledge",
+          name: "是否质押",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "32",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -612,6 +624,7 @@ export default {
       // 公司名称
       company: '',
       fSbuOptions: [],
+      isPledgeOptions: [],
       pickerOptions: {
         shortcuts: [{
           text: '最近一周',
@@ -676,6 +689,10 @@ export default {
     this.getDicts("data_trademodes").then((response) => {
       this.fTrademodeidOptions = response.data;
     });
+
+    this.getDicts("is_pledge").then((response) => {
+      this.isPledgeOptions = response.data;
+    });
     this.getDicts("storage_type").then((response) => {
       this.fStorageTypeOptions = response.data;
       localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
@@ -751,6 +768,15 @@ export default {
       });
       return fStorageType;
     },
+    isPledgeFormat(row, list) {
+      let name = ""
+      list.map((e) => {
+        if (row == e.dictValue) {
+          name = e.dictLabel;
+        }
+      });
+      return name;
+    }
   },
   methods: {
     // 获取当前月的第一天和最后一天

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -246,14 +246,25 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">
+        </el-col>
+      </el-row>
+                <el-row>
+            <el-col :span="8">
+              <el-form-item label="是否质押" prop="isPledge">
+                <el-select v-model="form.isPledge" placeholder="请选择是否质押" clearable
+                  :disabled="browseStatus || form.warehouseStatus > 3" style="width: 80%" @change="feeUnitChange">
+                  <el-option v-for="(item, index) in isPledgeOptions" :key="index.dictValue" :label="item.dictLabel"
+                    :value="item.dictValue" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-form-item label="备注" prop="remark">
                 <el-input style="width: 80%" v-model="form.remark" type="textarea"
                   :disabled="browseStatus || form.warehouseStatus > 3" placeholder="请输入内容" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
               <el-form-item label="收费指示" prop="remark">
                 <el-input style="width: 80%" v-model="form.fRemarksFees" type="textarea"
                   :disabled="browseStatus || form.warehouseStatus > 3" placeholder="请输入内容" />
@@ -261,6 +272,38 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
+              <el-form-item>
+                <div style="display: flex; align-items: center">
+                  <el-table :data="CntrTable" style="width: 80%" :header-cell-style="{ lineHeight: '16px' }">
+                    <el-table-column prop="fCntrid " label="箱型" header-align="center" align="center">
+                      <template slot-scope="scope">
+                        <el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
+                          <el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName"
+                            :value="item.fId">
+                          </el-option>
+                        </el-select>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="fCntrcount" label="箱量" header-align="center" align="center">
+                      <template slot-scope="scope">
+                        <el-input placeholder="请输入箱量" v-model="scope.row.fCntrcount" size="mini">
+                        </el-input>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="fCntrcount" label="操作" header-align="center" align="center" width="50">
+                      <template slot-scope="scope">
+                        <el-button size="mini" type="text" @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                          icon="el-icon-delete"></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <el-tag class="tag-hover" @click="addRow"><i class="el-icon-plus"></i></el-tag>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :offset="16" :span="6">
               <el-button v-if="dataShowcar == '0'" @click="
                 detailsHidden2
@@ -276,39 +319,6 @@
               </el-button>
             </el-col>
           </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item>
-            <div style="display: flex; align-items: center">
-              <el-table :data="CntrTable" style="width: 80%" :header-cell-style="{ lineHeight: '16px' }">
-                <el-table-column prop="fCntrid " label="箱型" header-align="center" align="center">
-                  <template slot-scope="scope">
-                    <el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
-                      <el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName"
-                        :value="item.fId">
-                      </el-option>
-                    </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="fCntrcount" label="箱量" header-align="center" align="center">
-                  <template slot-scope="scope">
-                    <el-input placeholder="请输入箱量" v-model="scope.row.fCntrcount" size="mini">
-                    </el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="fCntrcount" label="操作" header-align="center" align="center" width="50">
-                  <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click.native.prevent="deleteRow(scope.$index, CntrTable)"
-                      icon="el-icon-delete"></el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-tag class="tag-hover" @click="addRow"><i class="el-icon-plus"></i></el-tag>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
       <div v-if="detailsHidden">
         <el-row style="margin-top: 30px">
           <el-col :span="8">
@@ -785,8 +795,7 @@
               <span v-else-if="item.label == 'fUnitprice'">
                 <el-input
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                  v-model="scope.row.fUnitprice" placeholder="单价"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  v-model="scope.row.fUnitprice" placeholder="单价" :disabled="browseStatus || scope.row.fBillstatus == 6"
                   @change="changeContractAmt(scope.row)" show-word-limit />
               </span>
               <span v-else-if="item.label == 'fAmount'">
@@ -1428,8 +1437,7 @@
               <span v-else-if="item.label == 'fUnitprice'">
                 <el-input
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                  v-model="scope.row.fUnitprice"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  v-model="scope.row.fUnitprice" :disabled="browseStatus || scope.row.fBillstatus == 6"
                   @change="changeContractAmt(scope.row)" placeholder="单价" show-word-limit />
               </span>
               <span v-else-if="item.label == 'fAmount'">
@@ -4795,6 +4803,7 @@ export default {
       showDataElabel: null,
       showElabelDialog: false,
       elabelList: [],
+      isPledgeOptions: [],
       eId: '',
       eRow: {}
     }
@@ -4871,6 +4880,9 @@ export default {
     this.getDicts('data_ifdamage_status').then((response) => {
       this.fIfdamageOptions = response.data
     })
+    this.getDicts('is_pledge').then((response) => {
+      this.isPledgeOptions = response.data
+    })
     this.getConfigKey('show.data_elabel').then((response) => {
       this.showDataElabel = response.msg
     })

src/views/Warehousing/outStock/index.vue

@@ -1,79 +1,38 @@
 <template>
   <div class="app-container">
     <div v-show="pageShow">
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        v-show="showSearch"
-        label-width="70px"
-        size="small"
-      >
+      <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="70px" size="small">
         <el-row>
           <el-col :span="6">
             <el-form-item label="客户" prop="fCorpid">
-              <el-select
-                v-model="queryParams.fCorpid"
-                clearable
-                filterable
-                placeholder="请输入关键词"
-                style="width: 200px"
-              >
-                <el-option
-                  v-for="(item, index) in fMblnoOptions"
-                  :key="index.fId"
-                  :label="item.fName"
-                  :value="item.fId"
-                ></el-option>
+              <el-select v-model="queryParams.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 200px">
+                <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName"
+                  :value="item.fId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="提单号" prop="fMblno">
-              <el-input
-                v-model="queryParams.fMblno"
-                placeholder="请输入提单号"
-                clearable
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              />
+              <el-input v-model="queryParams.fMblno" placeholder="请输入提单号" clearable style="width: 200px"
+                @keyup.enter.native="handleQuery" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="出库日期" prop="timeInterval">
-              <el-date-picker
-                v-model="queryParams.timeInterval"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                clearable
-                style="width: 230px"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                @keyup.enter.native="handleQuery"
-                :picker-options="pickerOptions"
-                unlink-panels
-              >
+              <el-date-picker v-model="queryParams.timeInterval" type="daterange" value-format="yyyy-MM-dd" clearable
+                style="width: 230px" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                @keyup.enter.native="handleQuery" :picker-options="pickerOptions" unlink-panels>
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="车号" prop="fWarehouseid">
-            <el-select
-                v-model="queryParams.fTruckno"
-                clearable
-                filterable
-                placeholder="请选择车号"
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-            >
-              <el-option
-                  v-for="(item, index) in fTrucknoList"
-                  :key="index"
-                  :label="item.fTruckno"
-                  :value="item.fTruckno"
-              ></el-option>
-            </el-select>
-          </el-form-item>
+              <el-select v-model="queryParams.fTruckno" clearable filterable placeholder="请选择车号" style="width: 200px"
+                @keyup.enter.native="handleQuery">
+                <el-option v-for="(item, index) in fTrucknoList" :key="index" :label="item.fTruckno"
+                  :value="item.fTruckno"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-collapse-transition>
@@ -81,41 +40,22 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="货物名称" prop="fGoodsid">
-                  <el-select
-                    v-model="queryParams.fGoodsid"
-                    clearable
-                    filterable
-                    placeholder="请选择货物名称"
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  >
-                    <el-option
-                      v-for="(item, index) in goodsOptions"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
-                    ></el-option>
+                  <el-select v-model="queryParams.fGoodsid" clearable filterable placeholder="请选择货物名称"
+                    style="width: 200px" @keyup.enter.native="handleQuery">
+                    <el-option v-for="(item, index) in goodsOptions" :key="index.fId" :label="item.fName"
+                      :value="item.fId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="品牌" prop="fMarks">
-                  <el-input
-                    v-model="queryParams.fMarks"
-                    placeholder="请输入品牌"
-                    clearable
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  />
+                  <el-input v-model="queryParams.fMarks" placeholder="请输入品牌" clearable style="width: 200px"
+                    @keyup.enter.native="handleQuery" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="出库状态" prop="fItemsStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="queryParams.fItemsStatus"
-                    placeholder="请选择出库状态"
-                  >
+                  <el-select style="width: 200px" v-model="queryParams.fItemsStatus" placeholder="请选择出库状态">
                     <el-option label="计划" value="1"></el-option>
                     <el-option label="卸货中" value="2" />
                     <el-option label="已装货" value="3" />
@@ -125,11 +65,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="费用状态" prop="fFeeStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="queryParams.fFeeStatus"
-                    placeholder="请选择费用状态"
-                  >
+                  <el-select style="width: 200px" v-model="queryParams.fFeeStatus" placeholder="请选择费用状态">
                     <el-option label="暂存" :value="1"></el-option>
                     <el-option label="部分" :value="2"></el-option>
                     <el-option label="全部入账" :value="3"></el-option>
@@ -140,84 +76,51 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="业务编号" prop="fBillno">
-                  <el-input
-                    v-model="queryParams.fBillno"
-                    placeholder="请输入业务编号"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                    style="width: 200px"
-                  />
+                  <el-input v-model="queryParams.fBillno" placeholder="请输入业务编号" clearable
+                    @keyup.enter.native="handleQuery" style="width: 200px" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="制单人" prop="createBy">
-                  <el-select
-                    v-model="queryParams.createBy"
-                    filterable
-                    clearable
-                    placeholder="请输入关键词"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in userOptions"
-                      :key="index.userName"
-                      :label="item.nickName"
-                      :value="item.userName"
-                    >
+                  <el-select v-model="queryParams.createBy" filterable clearable placeholder="请输入关键词"
+                    style="width: 200px">
+                    <el-option v-for="(item, index) in userOptions" :key="index.userName" :label="item.nickName"
+                      :value="item.userName">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="仓库" prop="fWarehouseid">
-                  <el-select
-                      v-model="queryParams.fWarehouseid"
-                      clearable
-                      filterable
-                      placeholder="请选择仓库"
-                      style="width: 200px"
-                      @keyup.enter.native="handleQuery"
-                  >
-                    <el-option
-                        v-for="(item, index) in warehouseOptions"
-                        :key="index.fId"
-                        :label="item.fName"
-                        :value="item.fId"
-                    ></el-option>
+                  <el-select v-model="queryParams.fWarehouseid" clearable filterable placeholder="请选择仓库"
+                    style="width: 200px" @keyup.enter.native="handleQuery">
+                    <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
+                      :value="item.fId"></el-option>
                   </el-select>
                 </el-form-item>
-<!--                <el-form-item label="经营单位" prop="fSbu">-->
-<!--                  <el-select-->
-<!--                    v-model="queryParams.fSbu"-->
-<!--                    clearable-->
-<!--                    filterable-->
-<!--                    placeholder="请输入关键词"-->
-<!--                    style="width: 200px"-->
-<!--                  >-->
-<!--                    <el-option-->
-<!--                      v-for="(item, index) in fMblnoOptions"-->
-<!--                      :key="index.fId"-->
-<!--                      :label="item.fName"-->
-<!--                      :value="item.fId"-->
-<!--                    ></el-option>-->
-<!--                  </el-select>-->
-<!--                </el-form-item>-->
+                <!--                <el-form-item label="经营单位" prop="fSbu">-->
+                <!--                  <el-select-->
+                <!--                    v-model="queryParams.fSbu"-->
+                <!--                    clearable-->
+                <!--                    filterable-->
+                <!--                    placeholder="请输入关键词"-->
+                <!--                    style="width: 200px"-->
+                <!--                  >-->
+                <!--                    <el-option-->
+                <!--                      v-for="(item, index) in fMblnoOptions"-->
+                <!--                      :key="index.fId"-->
+                <!--                      :label="item.fName"-->
+                <!--                      :value="item.fId"-->
+                <!--                    ></el-option>-->
+                <!--                  </el-select>-->
+                <!--                </el-form-item>-->
               </el-col>
               <el-col :span="6">
                 <el-form-item label="贸易方式" prop="fTrademodeid">
-                  <el-select
-                    v-model="queryParams.fTrademodeid"
-                    placeholder="请选择贸易方式"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in fTrademodeidOptions"
-                      :key="index.dictValue"
-                      :label="item.dictLabel"
-                      :value="item.dictValue"
-                    />
+                  <el-select v-model="queryParams.fTrademodeid" placeholder="请选择贸易方式" clearable
+                    @keyup.enter.native="handleQuery" style="width: 200px">
+                    <el-option v-for="(item, index) in fTrademodeidOptions" :key="index.dictValue"
+                      :label="item.dictLabel" :value="item.dictValue" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -225,13 +128,8 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="出库单号" prop="fEmblno">
-                  <el-input
-                    v-model="queryParams.fEmblno"
-                    placeholder="请输入出库单号"
-                    clearable
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  />
+                  <el-input v-model="queryParams.fEmblno" placeholder="请输入出库单号" clearable style="width: 200px"
+                    @keyup.enter.native="handleQuery" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -240,152 +138,71 @@
       </el-form>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['warehouseBusiness:outStock:add']"
-            >新增
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+            v-hasPermi="['warehouseBusiness:outStock:add']">新增
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="success"
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['warehouseBusiness:outStock:edit']"
-            >修改
+          <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['warehouseBusiness:outStock:edit']">修改
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['warehouseBusiness:outStock:export']"
-            >导出
+          <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
+            v-hasPermi="['warehouseBusiness:outStock:export']">导出
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="info"
-            icon="el-icon-download"
-            size="mini"
-            :disabled="single"
-            @click="copyUpdate"
-            v-hasPermi="['agreement:agreementStorage:export']"
-            >复制新增
+          <el-button type="info" icon="el-icon-download" size="mini" :disabled="single" @click="copyUpdate"
+            v-hasPermi="['agreement:agreementStorage:export']">复制新增
           </el-button>
         </el-col>
         <div class="tabSetting">
           <div style="margin-right: 20px">
-            <el-button
-              type="cyan"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
-            <el-button
-              v-show="show"
-              @click="show = !show"
-              icon="el-icon-arrow-up"
-              size="mini"
-              >展开</el-button
-            >
-            <el-button
-              v-show="!show"
-              @click="show = !show"
-              icon="el-icon-arrow-down"
-              size="mini"
-              >展开</el-button
-            >
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button v-show="show" @click="show = !show" icon="el-icon-arrow-up" size="mini">展开</el-button>
+            <el-button v-show="!show" @click="show = !show" icon="el-icon-arrow-down" size="mini">展开</el-button>
           </div>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           <div style="margin: 0 12px">
-            <el-button
-              icon="el-icon-setting"
-              size="mini"
-              circle
-              @click="showSetting = !showSetting"
-            ></el-button>
+            <el-button icon="el-icon-setting" size="mini" circle @click="showSetting = !showSetting"></el-button>
           </div>
         </div>
       </el-row>
-      <el-dialog
-        title="自定义列显示"
-        :visible.sync="showSetting"
-        width="700px"
-        v-dialogDrag
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" v-dialogDrag :close-on-click-modal="false">
         <template slot="title">
           <div class="avue-crud__dialog__header">
             <span class="el-dialog__title">
-              <span
-                style="
+              <span style="
                   display: inline-block;
                   width: 3px;
                   height: 20px;
                   margin-right: 5px;
                   float: left;
                   margin-top: 2px;
-                "
-              ></span>
+                "></span>
             </span>
           </div>
         </template>
         <div>配置排序列数据（拖动调整顺序）</div>
         <div style="margin-left: 17px">
-          <el-checkbox
-            v-model="allCheck"
-            label="全选"
-            @change="allChecked"
-          ></el-checkbox>
+          <el-checkbox v-model="allCheck" label="全选" @change="allChecked"></el-checkbox>
         </div>
         <div style="padding: 4px; display: flex; justify-content: center">
-          <draggable
-            v-model="setRowList"
-            group="site"
-            animation="300"
-            @start="onStart"
-            @end="onEnd"
-            handle=".indraggable"
-          >
+          <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
+            handle=".indraggable">
             <transition-group>
-              <div
-                v-for="item in setRowList"
-                :key="item.surface"
-                class="listStyle"
-              >
+              <div v-for="item in setRowList" :key="item.surface" class="listStyle">
                 <div style="width: 500px" class="indraggable">
                   <div class="progress" :style="{ width: item.width + 'px' }">
-                    <el-checkbox
-                      :label="item.name"
-                      v-model="item.checked"
-                      :true-label="0"
-                      :false-label="1"
-                      >{{ item.name }}
+                    <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name
+                    }}
                     </el-checkbox>
                   </div>
                 </div>
-                <el-input-number
-                  v-model.number="item.width"
-                  controls-position="right"
-                  :min="1"
-                  :max="500"
-                  size="mini"
-                ></el-input-number>
+                <el-input-number v-model.number="item.width" controls-position="right" :min="1" :max="500" size="mini">
+                </el-input-number>
               </div>
             </transition-group>
           </draggable>
@@ -397,113 +214,56 @@
         </span>
       </el-dialog>
 
-      <el-table
-        v-loading="loading"
-        :data="warehousebillsList"
-        @selection-change="handleSelectionChange"
-        show-summary
-        :summary-method="getSum"
-        ref="table"
-        :height="tableHeight"
-      >
+      <el-table v-loading="loading" :data="warehousebillsList" @selection-change="handleSelectionChange" show-summary
+        :summary-method="getSum" ref="table" :height="tableHeight">
         <el-table-column type="selection" width="60" fixed align="center" />
-        <el-table-column
-          type="index"
-          label="行号"
-          width="50"
-          align="center"
-          fixed
-        />
-        <el-table-column
-          v-for="(item, index) in getRowList"
-          :key="index"
-          :label="item.name"
-          :width="item.width"
-          :prop="item.label"
-          align="center"
-          :fixed="item.fixed"
-          :show-overflow-tooltip="true"
-          sortable
-        >
+        <el-table-column type="index" label="行号" width="50" align="center" fixed />
+        <el-table-column v-for="(item, index) in getRowList" :key="index" :label="item.name" :width="item.width"
+          :prop="item.label" align="center" :fixed="item.fixed" :show-overflow-tooltip="true" sortable>
           <template slot-scope="scope">
             <span v-if="item.label == 'fMblno'">
-              <el-link :underline="false" type="primary"
-                ><div @click="handleUpdate(scope.row)">
+              <el-link :underline="false" type="primary">
+                <div @click="handleUpdate(scope.row)">
                   {{ scope.row.fMblno }}
-                </div></el-link
-              >
+                </div>
+              </el-link>
+            </span>
+            <span v-else-if="item.label == 'isPledge'">
+              <span>
+                {{ scope.row.isPledge | isPledgeFormat(isPledgeOptions) }}
+              </span>
             </span>
             <span v-else>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          min-width="200"
-          fixed="right"
-        >
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="200" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row, true)"
-              v-hasPermi="['warehouseBusiness:outStock:edit']"
-              >查看
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
+              v-hasPermi="['warehouseBusiness:outStock:edit']">查看
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              v-if="
-                scope.row.fBillstatus == '录入' ||
-                scope.row.fBillstatus == '暂存' ||
-                scope.row.fBillstatus == '驳回'
-              "
-              @click="handleUpdate(scope.row, false)"
-              v-hasPermi="['warehouseBusiness:outStock:edit']"
-              >修改
+            <el-button size="mini" type="text" icon="el-icon-edit" v-if="
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存' ||
+              scope.row.fBillstatus == '驳回'
+            " @click="handleUpdate(scope.row, false)" v-hasPermi="['warehouseBusiness:outStock:edit']">修改
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
+            <el-button size="mini" type="text" icon="el-icon-delete"
               v-if="(scope.row.fItemsStatus == '待出库' || scope.row.fItemsStatus == '计划') && scope.row.warehouseStatus < 4 && scope.row.isCreate == 1 || (scope.row.fItemsStatus == '待出库' || scope.row.fItemsStatus == '计划') && scope.row.warehouseStatus < 4 && scope.row.isCreate == 0"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['warehouseBusiness:outStock:remove']"
-              >删除
+              @click="handleDelete(scope.row)" v-hasPermi="['warehouseBusiness:outStock:remove']">删除
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              v-if="
-                scope.row.fBillstatus == '请核' ||
-                scope.row.fBillstatus == '审核中'
-              "
-              @click="handleUpdate(scope.row, true)"
-              >审核进度
+            <el-button size="mini" type="text" icon="el-icon-delete" v-if="
+              scope.row.fBillstatus == '请核' ||
+              scope.row.fBillstatus == '审核中'
+            " @click="handleUpdate(scope.row, true)">审核进度
             </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </div>
-    <add-or-update
-      v-show="pageShow2"
-      @changeShow="showAddOrUpdate"
-      ref="addOrUpdateRef"
-      :chiId="formId"
-      :copyStatus="copyStatus"
-      :key="timer"
-    ></add-or-update>
+    <add-or-update v-show="pageShow2" @changeShow="showAddOrUpdate" ref="addOrUpdateRef" :chiId="formId"
+      :copyStatus="copyStatus" :key="timer"></add-or-update>
   </div>
 </template>
 
@@ -528,7 +288,7 @@ import {
 } from "@/api/warehouseBusiness/warehouseOutStock";
 import { listCorps } from "@/api/basicdata/corps";
 import { listWarehousesss } from "@/api/basicdata/warehouse";
-import {listGoods, queryVehicle} from "@/api/basicdata/goods";
+import { listGoods, queryVehicle } from "@/api/basicdata/goods";
 import { listUser, queryUserVal } from "@/api/system/user";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
@@ -753,7 +513,7 @@ export default {
           checked: 0,
           width: 100,
         },
-                {
+        {
           surface: "26",
           label: "fApplyMoney",
           name: "开票金额",
@@ -776,6 +536,13 @@ export default {
         },
         {
           surface: "29",
+          label: "isPledge",
+          name: "是否质押",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "30",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -794,7 +561,8 @@ export default {
       formId: null,
       ids: [],
       copyStatus: null,
-      fTrucknoList:[],
+      fTrucknoList: [],
+      isPledgeOptions:[],
       pickerOptions: {
         shortcuts: [{
           text: '最近一周',
@@ -854,7 +622,7 @@ export default {
     }
     this.queryParams.timeInterval = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + '23:59:59']
 
-    queryVehicle().then(res=>{
+    queryVehicle().then(res => {
       this.fTrucknoList = res.data
     })
     this.setRowList = this.tableDate;
@@ -862,6 +630,9 @@ export default {
     this.getDicts("data_trademodes").then((response) => {
       this.fTrademodeidOptions = response.data;
     });
+    this.getDicts('is_pledge').then((response) => {
+      this.isPledgeOptions = response.data
+    })
     listGoods({ fStatus: 0, delFlag: 0 }).then((response) => {
       this.goodsOptions = response.rows;
     });
@@ -891,6 +662,17 @@ export default {
       }
     })
   },
+  filters: {
+    isPledgeFormat(row, list) {
+      let name = ""
+      list.map((e) => {
+        if (row == e.dictValue) {
+          name = e.dictLabel;
+        }
+      });
+      return name;
+    }
+  },
   methods: {
     // 获取当前月的第一天和最后一天
     getMonth() {
@@ -900,7 +682,7 @@ export default {
       let currentMonth = date.getMonth()
       let nextMonth = ++currentMonth
       let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-      let oneDay = 1000*60*60*24
+      let oneDay = 1000 * 60 * 60 * 24
       let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
       let day = lastTime.getDate()
       if (day < 10) {
@@ -1066,7 +848,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const fId = row.fId || this.ids[0]|| row;
+      const fId = row.fId || this.ids[0] || row;
       this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {

src/views/monitor/alrtmList/index.vue

@@ -0,0 +1,164 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" label-width="100px" v-show="showSearch">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="告警时间" prop="alarmDateStart">
+            <el-date-picker v-model="queryParams.alarmDateStart" type="daterange" start-placeholder="开始日期"
+              end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="告警处理时间" prop="alarmDealDateStart">
+            <el-date-picker v-model="queryParams.alarmDealDateStart" type="daterange" start-placeholder="开始日期"
+              end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="告警处理人" prop="alarmDealPeople">
+            <el-input v-model="queryParams.alarmDealPeople" placeholder="请输入告警处理人" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="告警处理结果" prop="alarmDealResult">
+            <el-select v-model="queryParams.alarmDealResult" placeholder="请选择告警处理结果" clearable style="width: 100%">
+              <el-option v-for="(item, index) in dealOptions" :key="index.dictValue" :label="item.dictLabel"
+                :value="item.dictValue" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="show">
+        <el-col :span="6">
+          <el-form-item label="告警位置" prop="alarmLocation">
+            <el-input v-model="queryParams.alarmLocation" placeholder="请输入告警位置" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="设备名" prop="deviceName">
+            <el-input v-model="queryParams.deviceName" placeholder="请输入设备名" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="display:flex;justify-content: space-between;">
+      <div>
+      </div>
+      <div>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button v-show="show" @click="show = !show" icon="el-icon-arrow-up" size="mini">
+          展开
+        </el-button>
+        <el-button v-show="!show" @click="show = !show" icon="el-icon-arrow-down" size="mini">
+          展开
+        </el-button>
+        <right-toolbar style="margin-left: 12px" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </div>
+    </div>
+    <el-table v-loading="loading" :data="list" style="width: 100%;">
+      <el-table-column label="序号" type="index" width="50" />
+      <el-table-column v-for="(item, index) in tableOption" :key="index" :label="item.name" :width="item.width"
+        :prop="item.label" header-align="center" :align="item.align" :fixed="item.fixed" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="item.label == 'alarmDealResult'">
+            {{ scope.row.alarmDealResult | dealFormat(dealOptions) }}
+          </span>
+          <span v-else-if="item.label == 'deviceState'">
+            <span>
+              {{ scope.row.deviceState | deviceFormat(deviceOptions) }}
+            </span>
+          </span>
+          <span v-else>{{ scope.row[item.label] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" />
+  </div>
+</template>
+
+<script>
+import { tableOption } from "./js/index";
+import { list } from "@/api/monitor/alrtmList";
+import Axios from "axios";
+
+export default {
+  name: "Online",
+  data() {
+    return {
+      show: false,
+      tableOption: tableOption,
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      showSearch: true,
+      dealOptions: [],
+      deviceOption: [],
+    };
+  },
+  created() {
+    this.getDicts("alarm_deal_result").then((response) => {
+      this.dealOptions = response.data;
+    });
+    this.getDicts("device_state").then((response) => {
+      this.deviceOptions = response.data;
+    });
+    this.getList();
+  },
+  filters: {
+    dealFormat(row, list) {
+      let name = ""
+      list.map((e) => {
+        if (row == e.dictValue) {
+          name = e.dictLabel;
+        }
+      });
+      return name;
+    },
+    deviceFormat(row, list) {
+      let name = ""
+      list.map((e) => {
+        if (row == e.dictValue) {
+          name = e.dictLabel;
+        }
+      });
+      return name;
+    }
+  },
+  methods: {
+    /** 查询登录日志列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryForm = this.$options.data().queryForm
+      this.handleQuery();
+    }
+  }
+};
+</script>
+

src/views/monitor/alrtmList/js/index.js

@@ -0,0 +1,105 @@
+export const tableOption = [{
+    surface: "1",
+    label: "projectName",
+    name: "项目名称",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "2",
+    label: "companyName",
+    name: "客户名称",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "3",
+    label: "dNickName",
+    name: "设备名",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "4",
+    label: "alarmDate",
+    name: "告警时间",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "5",
+    label: "alarmDealDate",
+    name: "告警处理时间",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "6",
+    label: "alarmDealPeople",
+    name: "告警处理人",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "7",
+    label: "alarmDealResult",
+    name: "告警处理结果",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "8",
+    label: "alarmLocation",
+    name: "告警位置",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "9",
+    label: "alarmTypeName",
+    name: "报警类型名称",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "10",
+    label: "deviceLocation",
+    name: "设备位置",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "11",
+    label: "deviceState",
+    name: "设备状态",
+    align:"center",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "12",
+    label: "alarmSiteDescription",
+    name: "现场报警情况描述",
+    align:"center",
+    checked: 0,
+    width: 140,
+  },
+  {
+    surface: "13",
+    label: "alarmPlanResult",
+    name: "处理方案及结果",
+    align:"center",
+    checked: 0,
+    width: 120,
+  }
+]

src/views/monitor/monitorList/index.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" label-width="80px" v-show="showSearch">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="仓库" prop="fWarehouseName">
+            <el-input v-model="queryParams.fWarehouseName" placeholder="请输入仓库" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+        <el-form-item label="监控名称" prop="deviceName">
+          <el-input v-model="queryParams.deviceName" placeholder="请输入监控名称" clearable size="small"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="display:flex;justify-content: space-between;">
+      <div>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" disabled>新增
+        </el-button>
+      </div>
+      <div>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <right-toolbar style="margin-left: 12px" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </div>
+    </div>
+    <el-table v-loading="loading" :data="list" style="width: 100%;">
+      <el-table-column label="序号" type="index" width="50" />
+      <el-table-column v-for="(item, index) in tableOption" :key="index" :label="item.name" :width="item.width"
+        :prop="item.label" header-align="center" :align="item.align" :fixed="item.fixed"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="rowView(scope.row)">
+            查看视频
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="rowDell(scope.row)" disabled>
+            修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="rowDel(scope.row)" disabled>
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" />
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+      <span>
+        <el-form :model="form" ref="queryForm" :inline="true" label-width="100px">
+          <el-form-item label="仓库" prop="fWarehouseName">
+            <el-input v-model="form.fWarehouseName" placeholder="请输入仓库" clearable size="small" />
+          </el-form-item>
+          <el-form-item label="监控名称" prop="deviceName">
+            <el-input v-model="form.deviceName" placeholder="请输入监控名称" clearable size="small" />
+          </el-form-item>
+          <el-form-item label="设备序列号" prop="deviceSerial">
+            <el-input v-model="form.deviceSerial" placeholder="请输入设备序列号" clearable size="small" />
+          </el-form-item>
+          <el-form-item label="萤石云验证码" prop="code">
+            <el-input v-model="form.code" placeholder="请输入萤石云验证码" clearable size="small" />
+          </el-form-item>
+        </el-form>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit">{{ title == '添加' ? '保 存' : '修 改' }}</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="查看监控" :visible.sync="dialogVideo">
+      <div style="width:100%; height:60vh;">
+        <iframe :src="iframeSrc" width="100%" height="100%" frameborder="0" scrolling="no">
+        </iframe>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { tableOption } from "./js/index";
+import { list, getAccessToken, getTokenvideoWeb } from "@/api/monitor/monitorList";
+import Axios from "axios";
+
+export default {
+  name: "Online",
+  data() {
+    return {
+      title: '添加',
+      iframeSrc: '',
+      form: {},
+      tableOption: tableOption,
+      dialogVideo: false,
+      dialogVisible: false,
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fWarehouseName: undefined,
+        deviceName: undefined
+      },
+      showSearch: true,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询登录日志列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleAdd() {
+      this.title = '添加'
+      this.dialogVisible = true
+    },
+    rowView(row) {
+      Axios.post("/dev-api/api/LiveBroadcast/getAccessToken").then(res => {
+        Axios.post(`/dev-api/api/LiveBroadcast/getToken?productCode=1640070936703286&token=${res.data.data.access_token}`).then(res2 => {
+          console.log(res2)
+          Axios({
+            method: 'POST',
+            url: '/dev-api/api/LiveBroadcast/videoWeb',
+            params: {
+              deviceSerial: row.deviceSerial,
+              projectId: row.projectId,
+              token: res.data.data.access_token,
+              Authorization: res2.data.data.data.Authorization
+            }
+          })
+            .then(response => {
+              console.log(response)
+              this.dialogVideo = true
+              this.iframeSrc = response.data.data.data.previewUrl
+            });
+        })
+      })
+    },
+    rowDell(row) {
+      this.title = '修改'
+      this.dialogVisible = true
+      this.form = row
+    },
+    handleClose() {
+      this.form = this.$options.data().form
+    }
+  }
+};
+</script>
+

src/views/monitor/monitorList/js/index.js

@@ -0,0 +1,33 @@
+export const tableOption = [{
+    surface: "1",
+    label: "fWarehouseName",
+    name: "仓库",
+    align:"center",
+    checked: 0,
+    width: 200,
+  },
+  {
+    surface: "2",
+    label: "deviceName",
+    name: "监控名称",
+    align:"center",
+    checked: 0,
+    width: 200,
+  },
+  {
+    surface: "3",
+    label: "deviceSerial",
+    name: "设备序列号",
+    align:"center",
+    checked: 0,
+    width: 200,
+  },
+  {
+    surface: "4",
+    label: "code",
+    name: "萤石云验证码",
+    align:"center",
+    checked: 0,
+    width: 200,
+  }
+]