index.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="ico" type="image/x-icon" href="static/favicon.ico">
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico">
+  <script src="./static/js/h5player/h5player.min.js"></script>
     <title>智慧青粮粮库管理系统</title>
 </head>
 

src/api/base/index.js

@@ -5,6 +5,7 @@ import {PLUS} from "@/utils/systemUtils";
 export const basicUploadUrl = `${depot_basic}/fileUpload/uploadFile`
 export const storehouseImportUrl = `${depot_basic}/Storehouse/importFile`
 export const wareImportUrl = `${depot_basic}/Warehouse/importFile`
+export const aojianImportUrl = `${depot_basic}/UnitAisle/importFile`
 export const tankImportUrl = `${depot_basic}/Tank/importFile`
 export const uploadUrlV2 = `${depot_smart_storage}/dev/file/uploadMinioReturnUrl`
 export const cameraImportUrl = `${depot_monitor}/camera/importFile`
@@ -460,12 +461,12 @@ export function cameraEdit(id) {
 }
 
 export function cameraSave(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
   return request({
     url: `${depot_monitor}/camera/saveCamera`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data,
   })
 }
 
@@ -544,7 +545,6 @@ export function getFileAojian(formData) {
     params: formData,
   })
 }
-//
 
 export function getFileAojianAddOrEdit(data) {
   const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')

src/api/base/rotationApi.js

@@ -6,75 +6,73 @@ import {
   depot_monitor,
   depot_qualitycheck,
   depot_device,
-  depot_storage
+  depot_storage,
 } from "@/api"
 import request from "@/utils/require"
-import { PLUS } from "@/utils/systemUtils"
-// depot-smart-storage
 // 半月报表列表接口
-export function list(data) {
+export function list (data) {
   return request({
     url: `${depot_business}/business-rp-biweekly-report/getList`,
     // headers: { "content-type": "application/x-www-form-urlencoded" },
     method: "post",
     params: data,
-  });
+  })
 }
 // 半月报表删除
-export function removeById(query) {
+export function removeById (query) {
   return request({
     url: `${depot_business}/business-rp-biweekly-report/removeById`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 新增时候获取轮换计划下拉列表数据
-export function getRpReportList(query) {
+export function getRpReportList (query) {
   return request({
     url: `${depot_business}/business-rp-biweekly-report/getRpReportList`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 轮换计划下拉列表数据触发change事件接口
-export function getRpReportDetailsByAdd(query) {
+export function getRpReportDetailsByAdd (query) {
   return request({
     url: `${depot_business}/business-rp-biweekly-report/getRpReportDetailsByAdd`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 轮换计划新增数据
-export function addData(data) {
+export function addData (data) {
   return request({
     url: `${depot_business}/business-rp-biweekly-report/add`,
     // headers: { "content-type": "application/x-www-form-urlencoded" },
     method: "post",
     data: data,
-  });
+  })
 }
 // 轮换计划上报数据
-export function reporting(data) {
+export function reporting (data) {
   return request({
     url: `${depot_business}/business-rp-biweekly-report/add`,
     // headers: { "content-type": "application/x-www-form-urlencoded" },
     method: "post",
     data: data,
-  });
+  })
 }
 // 轮换计划上报
-export function getDetailData(query) {
+export function getDetailData (query) {
   return request({
     url: `${depot_business}/business-rp-biweekly-report/getDetail`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
 // -----------轮换计划上报模块接口-------------
 
 // 轮换上报列表分页
-export function getListData(data) {
+export function getListData (data) {
   // const formData = Object.keys(data)
   //   .map((k) => `${k}=${encodeURIComponent(data[k])}`)
   //   .join("&")
@@ -84,271 +82,271 @@ export function getListData(data) {
     // headers: { "content-type": "application/x-www-form-urlencoded" },
     method: "post",
     params: data,
-  });
+  })
 }
 // 轮换上报删除接口
-export function removeByIdData(data) {
+export function removeByIdData (data) {
   return request({
     url: `${depot_business}/business-rp-report/removeById`,
     method: "post",
     params: data,
-  });
+  })
 }
 // 新增时候调取单位信息接口
-export function getUnitInfoData(query) {
+export function getUnitInfoData (query) {
   return request({
     url: `${depot_system}/unitInfo/getById`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 列表定检数据
-export function getDetailReportIds(query) {
+export function getDetailReportIds (query) {
   return request({
     url: `${depot_business}/business-rp-report/getFindByReportIds`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 出库信息内粮库下拉框数据
-export function getFindByOrgInfo(query) {
+export function getFindByOrgInfo (query) {
   return request({
     url: `${depot_business}/business-rp-report/findByOrgInfo`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 出库信息内仓房下拉框数据
-export function getFindByStoreHouseInfo(query) {
+export function getFindByStoreHouseInfo (query) {
   return request({
     url: `${depot_business}/business-rp-report/findByStoreHouseInfo`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 出库信息内货位下拉框数据
-export function getFindByWareHouseInfo(query) {
+export function getFindByWareHouseInfo (query) {
   return request({
     url: `${depot_business}/business-rp-report/findByWareHouseInfoDatd`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 根据warehouseId查询粮情卡数据
-export function getGrainSituation(query) {
+export function getGrainSituation (query) {
   return request({
     url: `${depot_business}/business-rp-report/findByWarehouseInfo`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 // 新增增加数据接口
-export function getRecListDataAdd(data) {
+export function getRecListDataAdd (data) {
   return request({
     url: `${depot_business}/business-rp-report/add`,
     // headers: { "content-type": "application/x-www-form-urlencoded" },
     method: "post",
     data: data,
-  });
+  })
 }
 // 根据warehouseId货位查询粮情卡质检报告
-export function getDetectionReport(query) {
+export function getDetectionReport (query) {
   return request({
     url: `${depot_business}/business-rp-biweekly-report/sbjk/getFindByWarehouseId`,
     // headers: { "content-type": "application/x-www-form-urlencoded" },
     method: "get",
     params: query,
-  });
+  })
 }
 // 查看详情数据
-export function getDetectioncheckData(query) {
+export function getDetectioncheckData (query) {
   return request({
     url: `${depot_business}/business-rp-report/getRpReportFindByById`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
 // ---------------轮换计划接收页面------------------
 // 轮换计划接收列表
-export function getRecListData(data) {
+export function getRecListData (data) {
   return request({
     url: `${depot_business}/business-rp-report/getRecList`,
     // headers: { "content-type": "application/x-www-form-urlencoded" },
     method: "post",
     params: data,
-  });
+  })
 }
 // 轮换计划接收查看详情
-export function getRpReportDil(query) {
+export function getRpReportDil (query) {
   return request({
     url: `${depot_business}/business-rp-report/getRpReportRecDetail`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
 // --- 采购销售管理
-export function CAIGUOgetList(query) {
+export function CAIGUOgetList (query) {
   return request({
     url: `${depot_device}/business-im-purchase-sale/getList`,
     method: "get",
     params: query || {},
-  });
+  })
 }
-export function CAIGUOadd(data) {
+export function CAIGUOadd (data) {
   return request({
     url: `${depot_device}/business-im-purchase-sale/saveAndUpdate`,
     // headers: { "content-type": "application/x-www-form-urlencoded" },
     // headers: { 'Content-Type': 'application/json' },
     method: "post",
     data: data,
-  });
+  })
 }
 
-export function CAIGUOview(query) {
+export function CAIGUOview (query) {
   return request({
     url: `${depot_device}/business-im-purchase-sale/getById`,
     method: "get",
     params: query || {},
-  });
+  })
 }
-export function CAIGUOdelit(data) {
+export function CAIGUOdelit (data) {
   return request({
     url: `${depot_device}/business-im-purchase-sale/saveAndUpdate`,
     method: "post",
     params: data,
-  });
+  })
 }
 ///business-im-purchase-sale/delete/{id}
-export function CAIGUOdel(query) {
+export function CAIGUOdel (query) {
   return request({
     url: `${depot_device}/business-im-purchase-sale/delete/${query}`,
     method: "delete",
     params: query || {},
-  });
+  })
 }
 
 // /资产管理 --
-export function ZICHANGLIList(query) {
+export function ZICHANGLIList (query) {
   return request({
     url: `${depot_device}/businessImAsset/getList`,
     method: "get",
     params: query || {},
-  });
+  })
 }
-export function ZICHANGadd(data) {
+export function ZICHANGadd (data) {
   return request({
     url: `${depot_device}/businessImAsset/save`,
     method: "post",
     data: data,
-  });
+  })
 }
 
-export function ZICHANGview(query) {
+export function ZICHANGview (query) {
   return request({
     url: `${depot_device}/businessImAsset/loadDataById`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
-export function ZICHANGdel(data) {
+export function ZICHANGdel (data) {
   return request({
     url: `${depot_device}/businessImAsset/remove`,
     method: "post",
     params: data,
-  });
+  })
 }
 //获取资产编号
-export function ZICHANGorgId(query) {
+export function ZICHANGorgId (query) {
   return request({
     url: `${depot_device}/businessImAsset/getAssetCode?orgId=${query}`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
 //成品粮购销计划列表
-export function CPLGXIAOJIHAOlist(data) {
+export function CPLGXIAOJIHAOlist (data) {
   return request({
     url: `${depot_business}/pgGopsPlan/getList`,
     method: "post",
     params: data,
-  });
+  })
 }
-export function CPLGXIAOJIHAOadd(data) {
+export function CPLGXIAOJIHAOadd (data) {
   return request({
     url: `${depot_business}pgGopsPlan/add`,
     method: "post",
     data: data,
-  });
+  })
 }
 
-export function CPLGXIAOJIHAOgetCplSpList(query) {
+export function CPLGXIAOJIHAOgetCplSpList (query) {
   return request({
     url: `${depot_business}/pgGopsPlan/getCplSpList`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
-export function CPLGXIAOJIHAOgetPgPlanDetail(query) {
+export function CPLGXIAOJIHAOgetPgPlanDetail (query) {
   return request({
     url: `${depot_business}/pgGopsPlan/getPgPlanDetail`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
-export function CPLGXIAOJIHAOdel(data) {
+export function CPLGXIAOJIHAOdel (data) {
   return request({
     url: `${depot_business}/pgGopsPlan/removeById`,
     method: "post",
     params: data,
-  });
+  })
 }
 
-export function FYBZWHList(query) {
+export function FYBZWHList (query) {
   return request({
     url: `${depot_intelligent}/business-fs-cost-standard/getList`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
-export function FYBZWHdel(query) {
+export function FYBZWHdel (query) {
   return request({
     url: `${depot_intelligent}/business-fs-cost-standard/delete/${query}`,
     method: "delete",
     params: query || {},
-  });
+  })
 }
 
-export function FYBZWHgetGrainVariety(query) {
+export function FYBZWHgetGrainVariety (query) {
   return request({
     url: `${depot_intelligent}/business-fs-cost-standard/getGrainVariety`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
-export function FYBZWHadd(data) {
+export function FYBZWHadd (data) {
   return request({
     url: `${depot_intelligent}/business-fs-cost-standard/save`,
     method: "post",
     data: data,
-  });
+  })
 }
-export function FYBZWHview(query) {
+export function FYBZWHview (query) {
   return request({
     url: `${depot_intelligent}/business-fs-cost-standard/getById/${query}`,
     method: "get",
     params: query || {},
-  });
+  })
 }
 
-export function FYBZWHput(data) {
+export function FYBZWHput (data) {
   return request({
     url: `${depot_intelligent}/business-fs-cost-standard/update`,
     method: "put",
@@ -371,3 +369,93 @@ export function CPLview (query) {
     params: query || {},
   })
 }
+// 利息维护 depot-smart-storage
+export function LXWHlist (query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-interest-maintain/getList`,
+    method: "get",
+    params: query || {},
+  })
+}
+export function LXWHadd (data) {
+  return request({
+    url: `${depot_intelligent}/business-fs-interest-maintain/save`,
+    method: "post",
+    data: data,
+  })
+}
+export function LXWHdel (query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-interest-maintain/delete/${query}`,
+    method: "delete",
+    params: query || {},
+  })
+}
+export function LXWHview (query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-interest-maintain/getById/${query}`,
+    method: "get",
+    params: query || {},
+  })
+}
+
+export function LXWHput (data) {
+  return request({
+    url: `${depot_intelligent}/business-fs-interest-maintain/update`,
+    method: "put",
+    data: data,
+  })
+}
+// 出库验收确认
+export function CRKYSQRlist (query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-out-confirm/getList`,
+    method: "get",
+    params: query || {},
+  })
+}
+export function CRKYSQRadd (data) {
+  return request({
+    url: `${depot_intelligent}/business-fs-out-confirm/save`,
+    method: "post",
+    data: data,
+  })
+}
+export function CRKYSQRgetContractData (query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-out-confirm/getContractData`,
+    method: "get",
+    params: query || {},
+  })
+}
+
+export function CRKYSQRgetByContractId (query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-out-confirm/getByContractId/${query}`,
+    method: "get",
+    params: query || {},
+  })
+}
+
+export function CRKYSQRview (query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-out-confirm/getById/${query}`,
+    method: "get",
+    params: query || {},
+  })
+}
+export function CRKYSQRdel (query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-out-confirm/delete/${query}`,
+    method: "delete",
+    params: query || {},
+  })
+}
+
+export function CRKYSQRput (data) {
+  return request({
+    url: `${depot_intelligent}/business-fs-out-confirm/update`,
+    method: "put",
+    data: data,
+  })
+}

src/api/deviceManagement/index.js

@@ -96,6 +96,14 @@ export function getCheckListNoPage(query) {
   })
 }
 
+export function checkListRemove(data) {
+  return request({
+    url: `${depot_device}/deviceCheck/remove`,
+    method: 'post',
+    params: data
+  })
+}
+
 export function deviceCheckList(page, query) {
   return request({
     url: `${depot_device}/deviceCheck/getCheckList?pageNum=${page.page}&pageSize=${page.size}`,
@@ -121,12 +129,12 @@ export function getByDeviceCode(query) {
 }
 
 export function deviceCheckSave(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace('_____PLACEHOLDER_PLUS_____', '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace('_____PLACEHOLDER_PLUS_____', '+')
   return request({
     url: `${depot_device}/deviceCheck/save`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
@@ -163,12 +171,12 @@ export function deviceSbCodeModelList(query) {
 }
 
 export function deviceKeepSave(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
   return request({
     url: `${depot_device}/deviceKeep/save`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
@@ -189,62 +197,63 @@ export function deviceRepairLoadDataById (query) {
 }
 
 export function deviceKeepEnd(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
   return request({
     url: `${depot_device}/deviceKeep/end`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
 export function deviceRepairEnd(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
   return request({
     url: `${depot_device}/deviceRepair/end`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
 export function deviceGetSave(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
   return request({
     url: `${depot_device}/deviceGet/save`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
 export function saveBack(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
   return request({
     url: `${depot_device}/deviceGet/saveBack`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
 export function deviceRepairSave(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
   return request({
     url: `${depot_device}/deviceRepair/save`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    data: data,
   })
 }
 
 export function outUpdate(data) {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
+  // const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(PLUS, '+')
   return request({
     url: `${depot_device}/devicePutStorage/outUpdate`,
-    headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
+    // headers: {'content-type': 'application/x-www-form-urlencoded;charset=utf-8'},
     method: 'post',
-    data: formData,
+    params: data,
+    // data: formData,
   })
 }
 

src/api/receiptConfirmation/index.js

@@ -49,11 +49,11 @@ export function InConfirmDelete(id) {
     })
 }
 
-
+// /business-fs-in-confirm/getContractData
 // 合同下拉  
 export function getContractInfo(orgId) {
     return request({
-        url: `${depot_intelligent}/business-fs-statistical-account/getContract/?orgId=${orgId}`,
+        url: `${depot_intelligent}/business-fs-in-confirm/getContractData/?orgId=${orgId}`,
         method: 'get',
     })
 }
@@ -65,4 +65,4 @@ export function updateInConfirm(data) {
         method: 'put',
         data,
     })
-}
+}

src/api/revenueContributionModule/index.js

@@ -0,0 +1,114 @@
+import request from "@/utils/require";
+import { depot_intelligent } from "../index";
+// 分页列表
+export function getPageList(query) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getPageList`,
+    method: "get",
+    params: query,
+  });
+}
+
+// 获取合同列表
+export function getContractInfo(orgId) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getContractInfo/${orgId}`,
+    method: "get",
+  });
+}
+
+// 销售收入上缴详情
+export function getDetails(id) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/details/${id}`,
+    method: "post",
+  });
+}
+
+// 合同信息
+export function getContractInfoById(id) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getContractInfoById/${id}`,
+    method: "get",
+  });
+}
+
+// 原核定入库价格
+export function getCardInfo(data) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getCardInfo/${data.orgId}/${data.basicStorehouseId}/${data.warehouseId}`,
+    method: "get",
+  });
+}
+
+// 质检损益信息
+export function getConsistenceAccountInfo(data) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getConsistenceAccountInfo/${data.orgId}/${data.basicStorehouseId}/${data.warehouseId}`,
+    method: "get",
+  });
+}
+
+// 三账一致性-会计账
+export function accountingBooks(contractNumber) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getConsistenceAccountInfo/${contractNumber}`,
+    method: "get",
+  });
+}
+
+//三账一致性-实际出库情况
+export function getOutStorageInfo(contractNumber) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getOutStorageInfo/${contractNumber}`,
+    method: "get",
+  });
+}
+
+// 三账一致性-出库明细
+export function getOutStorageDetailed(contractNumber) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getOutStorageDetailed/${contractNumber}`,
+    method: "get",
+  });
+}
+
+// 结算信息
+export function getSettlementInfo(contractNumber) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getSettlementInfo/${contractNumber}`,
+    method: "get",
+  });
+}
+
+// 差价上缴
+export function getDiffPriceInfo(contractNumber) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/getDiffPriceInfo/${contractNumber}`,
+    method: "get",
+  });
+}
+// 会计账新增
+export function saveData(data) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/save`,
+    method: "post",
+    data: data,
+  });
+}
+// 修改
+export function update(data) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/update`,
+    method: "post",
+    data: data,
+  });
+}
+
+// 删除
+export function deleteData(id) {
+  return request({
+    url: `${depot_intelligent}/business-fs-sale-revenue/delete/${id}`,
+    method: "post",
+  });
+}

src/api/system/index.js

@@ -174,7 +174,7 @@ export function getgetTreeList(page, query) {
  * {"funcId":40,"funcName":"待办与审批","funcUrl":"123","funcSort":1,"parentId":8,"icoUrl":null,"status":null,"remark":null,"delFlag":null,"children":null}
  */
 export const saveFuncInfo = (data) => {
-  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replaceAll('_____PLACEHOLDER_PLUS_____', '+')
+  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&').replace(/_____PLACEHOLDER_PLUS_____/g, '+')
   return request({
     url: `${depot_system}/funcInfo/save`,
     method: 'post',

src/api/video/index.js

@@ -0,0 +1,62 @@
+import request from '@/utils/require'
+import {depot_business, depot_system, depot_monitor} from '../index'
+
+export function getPreview(query) {
+  return request({
+    url: `${depot_monitor}/previewPlayback/getPreview`,
+    method: 'get',
+    params: query
+  })
+}
+
+export function getNVRVideo(query) {
+  return request({
+    url: `${depot_monitor}/camera/getNVRVideo`,
+    method: 'get',
+    params: query
+  })
+}
+
+export function recordStart(data) {
+  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&')
+  return request({
+    url: `${depot_monitor}/previewPlayback/recordStart`,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+    method: 'post',
+    data: formData
+  })
+}
+
+export function recordStop(query) {
+  return request({
+    url: `${depot_monitor}/previewPlayback/recordStop`,
+    method: 'get',
+    params: query
+  })
+}
+
+export function controlling(data) {
+  return request({
+    url: `${depot_monitor}/previewPlayback/controlling`,
+    method: 'get',
+    params: data
+  })
+}
+
+export function manualCapture(data) {
+  const formData = Object.keys(data).map(k => `${k}=${encodeURIComponent(data[k])}`).join('&')
+  return request({
+    url: `${depot_monitor}/previewPlayback/manualCapture`,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+    method: 'post',
+    data: formData
+  })
+}
+
+export function getPlayback(data) {
+  return request({
+    url: `${depot_monitor}/previewPlayback/getPlayback`,
+    method: 'post',
+    data: data
+  })
+}

src/components/common/data.js

@@ -489,10 +489,10 @@ export const LEVEL = [
 ]
 
 export const NUM = [
-  { value: '1', label: '1'},
-  { value: '2', label: '2'},
-  { value: '3', label: '3'},
-  { value: '4', label: '4'},
+  { value: '1', label: '1x1'},
+  { value: '2', label: '2x2'},
+  { value: '3', label: '3x3'},
+  { value: '4', label: '4x4'},
 ]
 
 export const IN_APPLICATION = [
@@ -616,8 +616,8 @@ export const DEVICE_TYPE_2 = [
 
 export const CAMERA_TYPE = [
   { value: '1', label: '球形摄像机'},
-  { value: '2', label: '球形摄像机'},
-  { value: '3', label: '球形摄像机'},
+  { value: '2', label: '枪式摄像机'},
+  { value: '3', label: '半球形摄像机'},
 ]
 
 export const BUS_TYPE = [

src/components/common/player/live_v2.vue

@@ -0,0 +1,476 @@
+<script>
+import liveControl from "@/components/common/player/components/liveControl.vue";
+import videoPlayer from "@/components/common/player/components/videoPlayer.vue";
+import {mapGetters} from "vuex";
+import cameraControl from "@/components/common/player/components/cameraControl.vue";
+import CommonSelect from "@/components/common/commonSelect/index.vue";
+import {getPreview, getNVRVideo, recordStart, recordStop, controlling, manualCapture} from "@/api/video";
+const IS_MOVE_DEVICE = false
+const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
+
+export default {
+  name: "live_v2",
+  components: {CommonSelect, cameraControl, videoPlayer, liveControl},
+  computed: {
+    ... mapGetters(['orgName', 'orgId']),
+    mode: function() {
+      // return this.tabActive === 'mse' ? 0 : 1
+      return 0 // 0 普通模式   1 高级模式
+    }
+  },
+  data() {
+    return {
+      cameraListData: [],
+      activeName: 'cameraList',
+      isMoveDevice: IS_MOVE_DEVICE,
+      player: null,
+      splitNum: 1,
+      mseSupport: MSE_IS_SUPPORT,
+      videoMap: {}, // window index - {ws url, camera index code}
+      currentWindowIndex: 0,
+      viewUrl: null,
+    }
+  },
+  mounted() {
+    this.init()
+    this.createPlayer()
+  },
+  methods: {
+    init() {
+      window.addEventListener('resize', () => {
+        this.player.JS_Resize()
+      })
+      this.getCameraList()
+    },
+    createPlayer() {
+      this.player = new window.JSPlugin({
+        szId: 'player',
+        szBasePath: "/static/js/h5player/",
+        iMaxSplit: 4,
+        iCurrentSplit: this.splitNum,
+        openDebug: true,
+        oStyle: {
+          borderSelect: IS_MOVE_DEVICE ? '#000' : '#FFCC00',
+        }
+      })
+
+      // 事件回调绑定
+      this.player.JS_SetWindowControlCallback({
+        windowEventSelect: function (iWndIndex) {  //插件选中窗口回调
+          console.log('windowSelect callback: ', iWndIndex);
+          this.currentWindowIndex = iWndIndex
+        },
+        pluginErrorHandler: function (iWndIndex, iErrorCode, oError) {  //插件错误回调
+          console.log('pluginError callback: ', iWndIndex, iErrorCode, oError);
+        },
+        windowEventOver: function (iWndIndex) {  //鼠标移过回调
+          //console.log(iWndIndex);
+        },
+        windowEventOut: function (iWndIndex) {  //鼠标移出回调
+          //console.log(iWndIndex);
+        },
+        windowEventUp: function (iWndIndex) {  //鼠标mouseup事件回调
+          //console.log(iWndIndex);
+        },
+        windowFullCcreenChange: function (bFull) {  //全屏切换回调
+          console.log('fullScreen callback: ', bFull);
+        },
+        firstFrameDisplay: function (iWndIndex, iWidth, iHeight) {  //首帧显示回调
+          console.log('firstFrame loaded callback: ', iWndIndex, iWidth, iHeight);
+        },
+        performanceLack: function () {  //性能不足回调
+          console.log('performanceLack callback: ');
+        }
+      });
+    },
+    play(index, url) {
+      return new Promise((resolve, reject) => {
+        this.player.JS_Play(url, { playURL: url, mode: this.mode }, index).then(
+          () => {
+            console.log('realplay success')
+            resolve()
+          },
+          e => {
+            console.error(e)
+            reject(e)
+          }
+        )
+      })
+    },
+    testPaly() {
+      this.viewUrl = this.viewUrl.replace('59.220.180.103', '172.18.93.217')
+      this.player.JS_Play(this.viewUrl, { playURL: this.viewUrl, mode: this.mode }, 0).then(
+        () => {
+          console.log('realplay success')
+          resolve()
+        },
+        e => {
+          console.error(e)
+          reject(e)
+        }
+      )
+    },
+    stopPlay() {
+      if(this.videoMap[this.currentWindowIndex]) {
+        const data = this.videoMap[this.currentWindowIndex]
+        if(data.taskID) {
+          return this.$message.warning('该窗口有正在录制的视频，请先结束录制')
+        }
+      }
+      this.player.JS_Stop().then(
+        () => {
+          console.log('stop realplay success')
+          if(this.videoMap[this.currentWindowIndex]) {
+            delete this.videoMap[this.currentWindowIndex]
+          }
+        },
+        e => { console.error(e) }
+      )
+    },
+    stopAllPlay() {
+      for(const i of Object.keys(this.videoMap)) {
+        const data = this.videoMap[i]
+        if(data.taskID) {
+          return this.$message.warning('该窗口有正在录制的视频，请先结束录制')
+        }
+      }
+      this.player.JS_StopRealPlayAll().then(
+        () => { console.log('stopAllPlay success'); this.videoMap = {} },
+        e => { console.error(e) }
+      )
+    },
+    wholeFullScreen() {
+      this.player.JS_FullScreenDisplay(true).then(
+        () => { console.log(`wholeFullScreen success`) },
+        e => { console.error(e) }
+      )
+    },
+    arrangeWindow(n) {
+      let splitNum = parseInt(this.splitNum)
+      console.log('split num', splitNum)
+      this.player.JS_ArrangeWindow(splitNum).then(
+        () => { console.log(`arrangeWindow to ${splitNum}x${splitNum} success`) },
+        e => { console.error(e) }
+      )
+    },
+    getCameraList() {
+      this.cameraListData = []
+      return getNVRVideo({orgid: this.orgId}).then(resp => {
+        const list = resp || []
+        const tree = [
+          {
+            root: true,
+            label: '仓内',
+            children: [],
+          },
+          {
+            root: true,
+            label: '业务',
+            children: [],
+          },
+          {
+            root: true,
+            label: '安防',
+            children: [],
+          },
+        ]
+        list.forEach(d => {
+          const type = d.cameraType
+          const temp = {
+            label: d.cameraName,
+            ... d
+          }
+          if(type === '1') {
+            tree[0].children.push(temp)
+          }else if(type === '2') {
+            tree[1].children.push(temp)
+          }else if(type === '3') {{
+            tree[2].children.push(temp)
+          }}
+        })
+        this.cameraListData = tree
+      })
+    },
+    onTreeNodeClick(n) {
+      console.log('select tree node', n)
+      if(n.root) return
+      const cameraId = n.cameraId
+      this.getVideo(n.cameraIndexCode).then(resp => {
+        if(! resp || ! resp.url) return this.$message.error('无法获取视频地址')
+        const url = resp.url
+        const exists = Object.values(this.videoMap).findIndex(u => u.cameraIndexCode === n.cameraIndexCode)
+        if(exists >= 0) {
+          return this.$message.warning(`该视频已经在 ${exists + 1} 窗口播放`)
+        }
+        this.play(this.currentWindowIndex, url).then(_ => {
+          this.$set(this.videoMap, this.currentWindowIndex, {
+            url, cameraIndexCode: n.cameraIndexCode, cameraId
+          })
+        }).catch(err => {
+          console.error('play error', err)
+          this.$message.error('播放失败')
+        })
+      })
+
+    },
+    getVideo(cameraIndexCode) {
+      return getPreview({cameraIndexCode, protocol: 'WS'})
+    },
+    recordBegin() {
+      if(this.videoMap[this.currentWindowIndex]) {
+        const data = this.videoMap[this.currentWindowIndex]
+        if(data.taskID) {
+          return this.$message.warning('该视频正在录制')
+        }
+        const d = {
+          cameraRecordJson: JSON.stringify({ cameraIndexCode: data.cameraIndexCode, cameraId: data.cameraId }),
+          recordStartReqDTOJson: JSON.stringify({ cameraIndexCode: data.cameraIndexCode, type: 1 })
+        }
+        recordStart(d).then(resp => {
+          if(resp && resp.taskID) {
+            this.$message.success('开始录制')
+            data.taskID = resp.taskID
+            this.$set(this.videoMap, this.currentWindowIndex, data)
+          }else {
+            return this.$message.error('录制失败')
+          }
+        })
+      }else {
+        return this.$message.warning('请先选择预览该窗口,或者选择已经预览中的窗口录制')
+      }
+    },
+    recordEnd() {
+      if(this.videoMap[this.currentWindowIndex]) {
+        const data = this.videoMap[this.currentWindowIndex]
+        if(!data.taskID) {
+          return this.$message.warning('该窗口没有正在录制的视频任务')
+        }
+        recordStop({taskID: data.taskID, cameraIndexCode: data.cameraIndexCode}).then(_ => {
+          this.$message.success('录制结束')
+          delete data['taskID']
+          this.$set(this.videoMap, this.currentWindowIndex, data)
+        })
+      }else {
+        return this.$message.warning('该窗口没有正在录制的视频')
+      }
+    },
+    doControl(command, action = 0, speed = 20, presetIndex = 10) {
+      if(this.videoMap[this.currentWindowIndex]) {
+        const data = this.videoMap[this.currentWindowIndex]
+        const cameraId = data.cameraId
+        const c = this.findCameraByCameraId(cameraId)
+        if(c.cameraType	!== '1') {
+          return this.$message.warning('该操作必须是球形摄像机')
+        }
+        const cmd = {
+          action,
+          command,
+          speed,
+          presetIndex,
+          cameraIndexCode: data.cameraIndexCode,
+        }
+        controlling(cmd)
+      }else {
+        return this.$message.warning('请选择播放中的窗口')
+      }
+    },
+    doControl1(command) {
+      this.doControl(command, 0)
+      setTimeout(() => {
+        this.doControl(command, 1)
+      }, 2000)
+    },
+    startTrack() {
+      this.doControl('START_TRACK', 0)
+    },
+    stopTrack() {
+      this.doControl('STOP_TRACK', 1)
+    },
+    findCameraByCameraId(cameraId) {
+      for(const root of this.cameraListData) {
+        const list = root.children || []
+        for(const d of list) {
+          if(d.cameraId == cameraId) {
+            return d
+          }
+        }
+      }
+      return undefined
+    },
+    doRemoteCapture(data) {
+      const cameraId = data.cameraId
+      const d = this.findCameraByCameraId(cameraId)
+      if(d) {
+        const storehouseId = d.storehouseId
+        const q = {
+          captureReqDTOJson: JSON.stringify({ "cameraIndexCode": data.cameraIndexCode }),
+          cameraCaptureJson: JSON.stringify({"orgId": this.orgId,"storehouseId": storehouseId,"cameraId": cameraId} )
+        }
+        manualCapture(q).then(resp => {
+          if(resp) {
+            this.$systemUtils.download(resp)
+          }
+        })
+      }
+    },
+    captureOne() {
+      if(this.videoMap[this.currentWindowIndex]) {
+        const data = this.videoMap[this.currentWindowIndex]
+        this.doRemoteCapture(data)
+      }else {
+        return this.$message.warning('请选择播放中的窗口')
+      }
+
+    },
+    captureAll() {
+      for(const d of Object.values(this.videoMap)) {
+        this.doRemoteCapture(d)
+      }
+    }
+  }
+}
+</script>
+
+<template>
+  <div class="box">
+    <div class="player-box">
+    <div class="title">
+      <span><i></i> 播放通道</span>
+      <span>{{orgName}}</span>
+      <span @click="wholeFullScreen" style="cursor: pointer;"><i></i>全屏画面播放</span>
+    </div>
+    <div id="player"></div>
+    </div>
+    <div class="control-box">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="摄像头列表" name="cameraList" style="margin: 5px 5px 5px 5px;">
+          <el-tree :data="cameraListData" :props="{children: 'children', label: 'label'}" @node-click="onTreeNodeClick"/>
+        </el-tab-pane>
+      <el-tab-pane label="操作" name="options" style="margin: 5px 5px 5px 5px;">
+        <el-row type="flex" align="middle" justify="center" class="row">
+          <el-col :span="8">窗口数量</el-col>
+          <el-col :span="16"><common-select v-model="splitNum" type="NUM" @native-change="arrangeWindow" :clearable="false"></common-select></el-col>
+        </el-row>
+        <el-row class="row">
+          <el-col :span="12">
+            <el-button type="primary" class="btn" @click="startTrack">轮巡</el-button>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary" class="btn" @click="stopTrack">终止轮巡</el-button>
+          </el-col>
+        </el-row>
+        <el-row class="row">
+          <el-col :span="12">
+            <el-button type="primary" class="btn" @click="captureOne">窗口抓拍</el-button>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary" class="btn" @click="stopPlay">窗口关闭</el-button>
+          </el-col>
+        </el-row>
+        <el-row class="row">
+          <el-col :span="12">
+            <el-button type="primary" class="btn" @click="captureAll">全部抓图</el-button>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary" class="btn" @click="stopAllPlay">全部关闭</el-button>
+          </el-col>
+        </el-row>
+        <el-row class="row">
+          云控制台
+        </el-row>
+        <el-row class="row">
+          <template v-for="list in
+                  [[{label: '↖', code: 'LEFT_UP'}, {label: '↑', code: 'UP'}, {label: '↗', code: 'RIGHT_UP'}],
+                  [{label: '←', code: 'LEFT'}, {label: 'center', code: 'GOTO_PRESET'}, {label: '→', code: 'RIGHT'}],
+                  [{label: '↙', code: 'LEFT_DOWN'}, {label: '↓', code: 'DOWN'}, {label: '↘', code: 'RIGHT_DOWN'}]]">
+            <el-row class="row">
+              <el-button v-if="item.code !== 'GOTO_PRESET'" v-for="item in list" :key="item.code" class="small-btn" @click="doControl1(item.code)">{{item.label}}</el-button>
+              <el-button v-else class="small-btn" icon="el-icon-refresh" @click="doControl(item.code)"></el-button>
+            </el-row>
+          </template>
+        </el-row>
+        <el-row class="row">
+          <el-col :span="12">
+            <el-button type="primary" class="btn" icon="el-icon-plus" @click="doControl1('FOCUS_NEAR')">聚焦</el-button>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary" class="btn" icon="el-icon-remove" @click="doControl1('FOCUS_FAR')">聚焦</el-button>
+          </el-col>
+        </el-row>
+        <el-row class="row">
+          <el-col :span="12">
+            <el-button type="primary" class="btn" icon="el-icon-plus"  @click="doControl1('ZOOM_IN')">调焦</el-button>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary" class="btn" icon="el-icon-remove"  @click="doControl1('ZOOM_OUT')">调焦</el-button>
+          </el-col>
+        </el-row>
+<!--        <el-row class="row">-->
+<!--          <el-col :span="12">-->
+<!--            <el-button type="primary" class="btn" @click="recordBegin">录像开始</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-button type="primary" class="btn" @click="recordEnd">录像结束</el-button>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row class="row" style="margin-top: 10px">-->
+<!--          <el-col :span="12">-->
+<!--            <el-input v-model="viewUrl"/>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-button type="primary" class="btn" @click="testPaly">test</el-button>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+      </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<style scoped lang="scss">
+.box {
+  width: 100%;
+  display: flex;
+  .player-box {
+    .title {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 5px;
+    }
+  }
+  .control-box {
+    margin-left: 10px;
+    width: 30%;
+
+    .btn {
+      width: 120px;
+      margin-top: 5px;
+    }
+
+    .small-btn {
+      width: 80px;
+      margin-top: 5px;
+    }
+  }
+}
+
+@media screen and (max-width: 991px) {
+  #player {
+    width: calc(100vw - 16px);
+    height: calc((100vw - 16px) * 5 / 8);
+  }
+  .title {
+    width: calc(100vw - 16px);
+  }
+}
+@media screen and (min-width: 992px) {
+  #player {
+    width: calc(50vw - 8px);
+    height: calc((50vw - 8px) * 5 / 8);
+  }
+  .title {
+    width: calc(50vw - 8px);
+  }
+}
+</style>

src/components/common/player/playback_v2.vue

@@ -0,0 +1,364 @@
+<script>
+import liveControl from "@/components/common/player/components/liveControl.vue";
+import videoPlayer from "@/components/common/player/components/videoPlayer.vue";
+import {mapGetters} from "vuex";
+import cameraControl from "@/components/common/player/components/cameraControl.vue";
+import CommonSelect from "@/components/common/commonSelect/index.vue";
+import {getPreview, getNVRVideo, recordStart, recordStop, controlling, manualCapture, getPlayback} from "@/api/video";
+const IS_MOVE_DEVICE = false
+const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
+
+export default {
+  components: {CommonSelect, cameraControl, videoPlayer, liveControl},
+  computed: {
+    ... mapGetters(['orgName', 'orgId']),
+    mode: function() {
+      // return this.tabActive === 'mse' ? 0 : 1
+      return 0 // 0 普通模式   1 高级模式
+    }
+  },
+  data() {
+    return {
+      cameraListData: [],
+      activeName: 'cameraList',
+      isMoveDevice: IS_MOVE_DEVICE,
+      player: null,
+      splitNum: 1,
+      mseSupport: MSE_IS_SUPPORT,
+      videoMap: {}, // window index - {ws url, camera index code}
+      currentWindowIndex: 0,
+      viewUrl: null,
+      date: []
+    }
+  },
+  mounted() {
+    this.init()
+    this.createPlayer()
+  },
+  methods: {
+    init() {
+      window.addEventListener('resize', () => {
+        this.player.JS_Resize()
+      })
+      this.getCameraList()
+    },
+    createPlayer() {
+      this.player = new window.JSPlugin({
+        szId: 'player',
+        szBasePath: "/static/js/h5player/",
+        iMaxSplit: 4,
+        iCurrentSplit: this.splitNum,
+        openDebug: true,
+        oStyle: {
+          borderSelect: IS_MOVE_DEVICE ? '#000' : '#FFCC00',
+        }
+      })
+
+      // 事件回调绑定
+      this.player.JS_SetWindowControlCallback({
+        windowEventSelect: function (iWndIndex) {  //插件选中窗口回调
+          console.log('windowSelect callback: ', iWndIndex);
+          this.currentWindowIndex = iWndIndex
+        },
+        pluginErrorHandler: function (iWndIndex, iErrorCode, oError) {  //插件错误回调
+          console.log('pluginError callback: ', iWndIndex, iErrorCode, oError);
+        },
+        windowEventOver: function (iWndIndex) {  //鼠标移过回调
+          //console.log(iWndIndex);
+        },
+        windowEventOut: function (iWndIndex) {  //鼠标移出回调
+          //console.log(iWndIndex);
+        },
+        windowEventUp: function (iWndIndex) {  //鼠标mouseup事件回调
+          //console.log(iWndIndex);
+        },
+        windowFullCcreenChange: function (bFull) {  //全屏切换回调
+          console.log('fullScreen callback: ', bFull);
+        },
+        firstFrameDisplay: function (iWndIndex, iWidth, iHeight) {  //首帧显示回调
+          console.log('firstFrame loaded callback: ', iWndIndex, iWidth, iHeight);
+        },
+        performanceLack: function () {  //性能不足回调
+          console.log('performanceLack callback: ');
+        }
+      });
+    },
+    play(index, url) {
+      return new Promise((resolve, reject) => {
+        this.player.JS_Play(url, { playURL: url, mode: this.mode }, index).then(
+          () => {
+            console.log('realplay success')
+            resolve()
+          },
+          e => {
+            console.error(e)
+            reject(e)
+          }
+        )
+      })
+    },
+    testPaly() {
+      this.viewUrl = this.viewUrl.replace('59.220.180.103', '172.18.93.217')
+      this.player.JS_Play(this.viewUrl, { playURL: this.viewUrl, mode: this.mode }, 0).then(
+        () => {
+          console.log('realplay success')
+          resolve()
+        },
+        e => {
+          console.error(e)
+          reject(e)
+        }
+      )
+    },
+    stopPlay() {
+      if(this.videoMap[this.currentWindowIndex]) {
+        const data = this.videoMap[this.currentWindowIndex]
+        if(data.taskID) {
+          return this.$message.warning('该窗口有正在录制的视频，请先结束录制')
+        }
+      }
+      this.player.JS_Stop().then(
+        () => {
+          console.log('stop realplay success')
+          if(this.videoMap[this.currentWindowIndex]) {
+            delete this.videoMap[this.currentWindowIndex]
+          }
+        },
+        e => { console.error(e) }
+      )
+    },
+    stopAllPlay() {
+      for(const i of Object.keys(this.videoMap)) {
+        const data = this.videoMap[i]
+        if(data.taskID) {
+          return this.$message.warning('该窗口有正在录制的视频，请先结束录制')
+        }
+      }
+      this.player.JS_StopRealPlayAll().then(
+        () => { console.log('stopAllPlay success'); this.videoMap = {} },
+        e => { console.error(e) }
+      )
+    },
+    wholeFullScreen() {
+      this.player.JS_FullScreenDisplay(true).then(
+        () => { console.log(`wholeFullScreen success`) },
+        e => { console.error(e) }
+      )
+    },
+    arrangeWindow(n) {
+      let splitNum = parseInt(this.splitNum)
+      console.log('split num', splitNum)
+      this.player.JS_ArrangeWindow(splitNum).then(
+        () => { console.log(`arrangeWindow to ${splitNum}x${splitNum} success`) },
+        e => { console.error(e) }
+      )
+    },
+    getCameraList() {
+      this.cameraListData = []
+      return getNVRVideo({orgid: this.orgId}).then(resp => {
+        const list = resp || []
+        const tree = [
+          {
+            root: true,
+            label: '仓内',
+            children: [],
+          },
+          {
+            root: true,
+            label: '业务',
+            children: [],
+          },
+          {
+            root: true,
+            label: '安防',
+            children: [],
+          },
+        ]
+        list.forEach(d => {
+          const type = d.cameraType
+          const temp = {
+            label: d.cameraName,
+            ... d
+          }
+          if(type === '1') {
+            tree[0].children.push(temp)
+          }else if(type === '2') {
+            tree[1].children.push(temp)
+          }else if(type === '3') {{
+            tree[2].children.push(temp)
+          }}
+        })
+        this.cameraListData = tree
+      })
+    },
+    onTreeNodeClick(n) {
+      console.log('select tree node', n)
+      if(n.root) return
+      if(! this.date || this.date.length <= 0 ) {
+        return this.$message.warning('请先选择日期')
+      }
+      this.getPlaybackVideo(n.cameraIndexCode).then(resp => {
+        const {url} = resp
+        if(url) {
+          const [realUrl, params] = url.split('?')
+          const [ startTime, endTime ] = this.date
+          console.log('实际播放的 url', realUrl)
+          this.player.JS_Play(realUrl, { playURL: realUrl, mode: this.mode }, 0, startTime, endTime).then(
+            () => {
+              console.log('playbackStart success')
+            },
+            e => { console.error(e) }
+          )
+        }else {
+          this.$message.error('无法获取视频地址')
+        }
+      })
+
+    },
+    getPlaybackVideo(cameraIndexCode) {
+      const [beginTime, endTime] = this.date
+      return getPlayback({
+        beginTime, endTime, cameraIndexCode, recordLocation: 1, protocol: 'wss'
+      })
+    },
+
+    pause() {
+      this.player.JS_Pause().then(
+        () => { console.log('playbackPause success') },
+        e => { console.error(e) }
+      )
+    },
+    resume() {
+      this.player.JS_Resume().then(
+        () => { console.log('playbackResume success') },
+        e => { console.error(e) }
+      )
+    },
+    stop() {
+      this.player.JS_Stop().then(
+        () => {  },
+        e => { console.error(e) }
+      )
+    },
+    slow() {
+      this.player.JS_Slow().then(
+        rate => {
+          // this.playback.rate = rate
+        },
+        e => { console.error(e) }
+      )
+    },
+    fast(){
+      this.player.JS_Fast().then(
+        rate => {
+          // this.playback.rate = rate
+        },
+        e => { console.error(e) }
+      )
+    },
+    findCameraByCameraId(cameraId) {
+      for(const root of this.cameraListData) {
+        const list = root.children || []
+        for(const d of list) {
+          if(d.cameraId == cameraId) {
+            return d
+          }
+        }
+      }
+      return undefined
+    },
+
+  }
+}
+</script>
+
+<template>
+  <div class="box">
+    <div class="player-box">
+      <div class="title">
+        <span><i></i> 播放通道</span>
+        <span>{{orgName}}</span>
+        <span @click="wholeFullScreen" style="cursor: pointer;"><i></i>全屏画面播放</span>
+      </div>
+      <div id="player"></div>
+    </div>
+    <div class="control-box">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="摄像头列表" name="cameraList" style="margin: 5px 5px 5px 5px;">
+          回放日期: <el-date-picker type="datetimerange" value-format="yyyy-MM-ddTHH:mm:ss.000+08:00" v-model="date" style="margin-top: 5px;"/>
+          <el-tree :data="cameraListData" :props="{children: 'children', label: 'label'}" @node-click="onTreeNodeClick" style="margin-top: 10px" />
+        </el-tab-pane>
+        <el-tab-pane label="操作" name="options" style="margin: 5px 5px 5px 5px;">
+          <el-row class="row">
+            <el-col :span="12">
+              <el-button type="primary" class="btn" @click="slow">慢放</el-button>
+            </el-col>
+            <el-col :span="12">
+              <el-button type="primary" class="btn" @click="fast">快放</el-button>
+            </el-col>
+          </el-row>
+          <el-row class="row">
+            <el-col :span="6">
+              <el-button type="primary" class="btn" @click="pause">暂停</el-button>
+            </el-col>
+            <el-col :span="6">
+              <el-button type="primary" class="btn" @click="resume">恢复</el-button>
+            </el-col>
+            <el-col :span="6">
+              <el-button type="primary" class="btn" @click="stop">停止</el-button>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<style scoped lang="scss">
+.box {
+  width: 100%;
+  display: flex;
+  .player-box {
+    .title {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 5px;
+    }
+  }
+  .control-box {
+    margin-left: 10px;
+    width: 30%;
+
+    .btn {
+      width: 100px;
+      margin-top: 5px;
+      margin-left: 10px;
+    }
+
+    .small-btn {
+      width: 80px;
+      margin-top: 5px;
+    }
+  }
+}
+
+@media screen and (max-width: 991px) {
+  #player {
+    width: calc(100vw - 16px);
+    height: calc((100vw - 16px) * 5 / 8);
+  }
+  .title {
+    width: calc(100vw - 16px);
+  }
+}
+@media screen and (min-width: 992px) {
+  #player {
+    width: calc(50vw - 8px);
+    height: calc((50vw - 8px) * 5 / 8);
+  }
+  .title {
+    width: calc(50vw - 8px);
+  }
+}
+</style>

src/components/common/topMenu.vue

@@ -1,26 +1,31 @@
 <template>
   <div class="menu-container">
     <div class="btn left-btn" @click="scrollLeft">
-      <img v-show="hasPrev" src="@/assets/wisdom_images/left-nav.png">
+      <img v-show="hasPrev" src="@/assets/wisdom_images/left-nav.png" />
     </div>
     <nav class="menu" ref="menu">
       <ul>
-        <li v-for="(item, index) in list" :key="index" class="menu-item" :class="{activate: $store.state.user.topMenuIndex === index}" @click="openMenu(item, index)">
+        <li
+          v-for="(item, index) in list"
+          :key="index"
+          class="menu-item"
+          :class="{ activate: $store.state.user.topMenuIndex === index }"
+          @click="openMenu(item, index)"
+        >
           <i :class="item.icon"></i>
-          {{item.funcName}}
+          {{ item.funcName }}
         </li>
       </ul>
     </nav>
     <div class="btn right-btn" @click="scrollRight">
-      <img v-show="hasNext" src="@/assets/wisdom_images/right-nav.png">
+      <img v-show="hasNext" src="@/assets/wisdom_images/right-nav.png" />
     </div>
   </div>
 </template>
 
 <script>
-
-const ITEM_WIDTH = 130
-const ITEM_BORDER = 1
+const ITEM_WIDTH = 130;
+const ITEM_BORDER = 1;
 export default {
   data() {
     return {
@@ -31,9 +36,9 @@ export default {
       funcTree: null,
       list: [
         {
-          icon: 'el-icon-s-home',
-          funcName: '首页',
-          funcUrl: '/home',
+          icon: "el-icon-s-home",
+          funcName: "首页",
+          funcUrl: "/home",
           resourceCode: null,
         },
         // {
@@ -91,14 +96,13 @@ export default {
         //   funcUrl: '/system/userManagement',
         //   resourceCode: 'RM1001008008',
         // },
-
-      ]
-    }
+      ],
+    };
   },
   created() {
-    this.visibleItems = this.list.length
+    this.visibleItems = this.list.length;
     // this.welcome()
-    this.welcome2()
+    this.welcome2();
     const menuCode = sessionStorage.getItem("menuCode");
     const menuData = JSON.parse(sessionStorage.getItem("xzdata"));
 
@@ -109,28 +113,26 @@ export default {
     //     }
     //   });
     // }
-    window.addEventListener('resize', this.updateVisibleItems);
+    window.addEventListener("resize", this.updateVisibleItems);
   },
   mounted() {
     this.updateVisibleItems();
     this.$nextTick(() => {
-      this.$refs.menu.scrollLeft = 0
-    })
+      this.$refs.menu.scrollLeft = 0;
+    });
   },
   beforeDestroy() {
-    window.removeEventListener('resize', this.updateVisibleItems);
+    window.removeEventListener("resize", this.updateVisibleItems);
   },
   watch: {
     defaultActiveUrl(n, o) {
-      console.log('------', n)
-    }
+      console.log("------", n);
+    },
   },
   methods: {
-    handleSelect() {
-
-    },
+    handleSelect() {},
     scrollLeft() {
-      this.$refs.menu.scrollLeft -= (ITEM_WIDTH + 2);
+      this.$refs.menu.scrollLeft -= ITEM_WIDTH + 2;
       // if(this.$refs.menu.scrollLeft <= 0) {
       //   this.hasPrev = false
       // }else {
@@ -138,7 +140,7 @@ export default {
       // }
     },
     scrollRight() {
-      this.$refs.menu.scrollLeft += (ITEM_WIDTH + 2);
+      this.$refs.menu.scrollLeft += ITEM_WIDTH + 2;
       // if(this.$refs.menu.scrollLeft >= (ITEM_WIDTH + 2) * this.list.length) {
       //   this.hasNext = false
       // }else {
@@ -146,7 +148,10 @@ export default {
       // }
     },
     updateVisibleItems() {
-      const width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+      const width =
+        window.innerWidth ||
+        document.documentElement.clientWidth ||
+        document.body.clientWidth;
       if (width <= 690) {
         this.visibleItems = 2;
       } else if (width <= 800) {
@@ -160,55 +165,58 @@ export default {
       } else {
         this.visibleItems = this.list.length;
       }
-      this.$refs.menu.style.width = `${this.visibleItems * ITEM_WIDTH + this.visibleItems * 2}px`;
+      this.$refs.menu.style.width = `${
+        this.visibleItems * ITEM_WIDTH + this.visibleItems * 2
+      }px`;
     },
     openMenu(item, index) {
-      console.log('open menu', item, index)
-      if (['crk', '/crk'].indexOf(item.funcUrl) >= 0) {
-        // this.$store.state.flag = 1;
+      console.log("open menu", item, index);
+      if (["crk", "/crk"].indexOf(item.funcUrl) >= 0) {
+        this.$store.state.flag = 1;
         // return
-        return this.$systemUtils.gotoCrkSystem(this)
-      }else {
-        // this.$store.state.flag = 2;
+        this.$store.commit("SET_TOP_MENU_INDEX", index);
+        // return this.$systemUtils.gotoCrkSystem(this)
+      } else {
+        this.$store.state.flag = 2;
       }
-      if (this.$store.state.user.topMenuIndex === index) return
-      this.$store.commit('SET_TOP_MENU_INDEX', index)
+      if (this.$store.state.user.topMenuIndex === index) return;
+      this.$store.commit("SET_TOP_MENU_INDEX", index);
       // if(!item.resourceCode) {
       //   return this.$router.push({path: item.funcUrl})
       // }
 
-      this.getMenuList(item, index)
+      this.getMenuList(item, index);
     },
     welcome() {
       this.loginPeople = sessionStorage.getItem("userName");
       const data = JSON.parse(sessionStorage.getItem("xzdata"));
-      this.xzdata = data
-      this.$store.commit("SET_MENU_DATA", data)
-      const defaultCode = 'RM1001008001'
-      let leftMenuList = []
+      this.xzdata = data;
+      this.$store.commit("SET_MENU_DATA", data);
+      const defaultCode = "RM1001008001";
+      let leftMenuList = [];
       this.xzdata.forEach((item) => {
         if (item.resourceCode == defaultCode) {
-          leftMenuList = [item]
+          leftMenuList = [item];
         }
       });
       this.$store.dispatch("changeLeftMenu", leftMenuList);
     },
     welcome2() {
       const tree = JSON.parse(sessionStorage.getItem("FUN_TREE"));
-      this.funcTree = tree
-      let defaultChild = []
+      this.funcTree = tree;
+      let defaultChild = [];
       for (const menu of tree) {
         if (defaultChild.length <= 0) {
-          defaultChild = menu.children
+          defaultChild = menu.children;
         }
         this.list.push({
-          icon: 'el-icon-s-home',
+          icon: "el-icon-s-home",
           funcName: menu.funcName,
           funcUrl: menu.funcUrl,
           funcId: menu.funcId,
-          resourceCode: 'RM1001008007',
-          children: menu.children
-        })
+          resourceCode: "RM1001008007",
+          children: menu.children,
+        });
       }
       this.$store.dispatch("changeLeftMenu", defaultChild);
     },
@@ -219,21 +227,21 @@ export default {
       if (arr[0] && arr[0].children && arr[0].children.length) {
         this.getFirstMenu(arr[0].children);
       } else {
-        console.log('first menu', arr[0])
+        console.log("first menu", arr[0]);
         this.menuUrl = arr[0].funcUrl;
       }
     },
     getMenuList(item, index) {
-      console.log('get menu list', item, index,)
+      console.log("get menu list", item, index);
       // debugger
       let leftMenuList = item.children;
       if (item.children && item.children.length > 0) {
         this.getFirstMenu(item.children);
-        console.log('menuUrl', this.menuUrl)
-        this.$router.push({path: this.menuUrl});
+        console.log("menuUrl", this.menuUrl);
+        this.$router.push({ path: this.menuUrl });
       } else {
         if (item.funcUrl.indexOf("http") == -1) {
-          this.$router.push({path: item.funcUrl});
+          this.$router.push({ path: item.funcUrl });
         } else {
           window.location.href = item.funcUrl;
         }
@@ -242,7 +250,7 @@ export default {
       this.isClick = index;
       sessionStorage.menuIdx = index;
       // this.getFirstMenu([item]);
-      this.$store.commit('SET_DEFAULT_ACTIVE_URL', this.menuUrl)
+      this.$store.commit("SET_DEFAULT_ACTIVE_URL", this.menuUrl);
       sessionStorage.setItem("leftMenuList", JSON.stringify(leftMenuList));
       sessionStorage.setItem("menuCode", code);
       sessionStorage.setItem("resourceCode", code);
@@ -251,8 +259,8 @@ export default {
 
       this.$store.dispatch("changeLeftMenu", leftMenuList);
     },
-  }
-}
+  },
+};
 </script>
 
 
@@ -302,7 +310,6 @@ export default {
   list-style-type: none;
 }
 
-
 .menu-item {
   width: 130px;
   height: 100%;

src/components/system/oilTankEdit.vue

@@ -166,6 +166,51 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- 新 -->
+        <el-row type="flex" align="middle" justify="center" class="row">
+          <el-col :span="8">
+            <el-form-item label="设计单位" prop="orgCode">
+              <el-input v-model="form.sjdw" :readonly="readonly"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="建设单位" prop="orgCode">
+              <el-input v-model="form.jsdw" :readonly="readonly"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="监理单位" prop="orgCode">
+              <el-input v-model="form.jldw" :readonly="readonly"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
+          <el-col :span="8">
+            <el-form-item label="设计年限" prop="orgCode">
+              <el-input
+                v-model="form.designLife"
+                :readonly="readonly"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="启用日期" prop="builddate">
+              <el-date-picker
+                value-format="yyyy-MM-dd"
+                type="date"
+                v-model="form.startDate"
+                :readonly="readonly"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保管员" prop="orgCode">
+              <el-input v-model="form.keeper" :readonly="readonly"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
             <el-form-item label="油罐图" prop="agentDepotName">
@@ -385,6 +430,12 @@ export default {
         tankChart: null,
         tanklibChart: null,
         builddate: null,
+        sjdw: null,
+        jsdw: null,
+        jldw: null,
+        designLife: null,
+        startDate: null,
+        keeper: null,
       };
     },
     onUpload(state, resp) {
@@ -404,8 +455,10 @@ export default {
         ...this.form,
       };
       this.$systemUtils.parseField2Float(data, [
-        'tankCapacity', 'height', 'diameter'
-      ])
+        "tankCapacity",
+        "height",
+        "diameter",
+      ]);
       return {
         tankJson: JSON.stringify(data),
         orgId: this.orgId,

src/main.js

@@ -43,12 +43,12 @@ import VueAwesomeSwiper from 'vue-awesome-swiper'
 
 import dateUtils from "./utils/dateUtils";
 import {printElement} from "./utils/el-print";
-import * as systemUtils from "./utils/systemUtils";
 import enumUtils from "./utils/enumUtils"
+import * as systemUtils from "./utils/systemUtils";
 
 Vue.use(VueAwesomeSwiper)
 
-import {startCheck} from "@/utils/loginStatusChecker";
+import { startCheckPreApi} from "@/utils/loginStatusChecker";
 
 //1.引入时间处理函数
 import utils from './utils/index'
@@ -87,6 +87,7 @@ enumUtils.tryRefresh().then(resp => {
     components: { App },
     template: '<App/>'
   })
-  startCheck()
+  startCheckPreApi()
+  // startCheck()
 })
 

src/page/APayment/components/monthlyReport.vue

@@ -0,0 +1,848 @@
+<template>
+  <div>
+    <el-dialog
+      :close-on-press-escape="false"
+      :visible.sync="visible"
+      :before-close="handleDialogClose"
+      :close-on-click-modal="false"
+      class="dialog-box"
+      width="86%"
+    >
+      <el-divider>{{ titleText }}出库确认单</el-divider>
+      <el-form
+        label-width="150px"
+        :rules="rules"
+        ref="ruleForm"
+        :model="formState"
+      >
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="合同编号" prop="contractId">
+              <el-select
+                v-model="formState.contractId"
+                clearable
+                :disabled="showLock"
+                placeholder="请选择"
+                @change="houseOptionsChange"
+              >
+                <el-option
+                  v-for="item in houseOptions"
+                  :key="item.id"
+                  :label="item.contractNumber"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"
+            ><el-form-item label="合同名称" prop="grainTypeId">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="true"
+                v-model:value="formStateDEl.contractTitle"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"
+            ><el-form-item label="合同类型" prop="grainVarietyId">
+              <el-select
+                v-model="formStateDEl.contractType"
+                clearable
+                :disabled="true"
+                placeholder="请选择"
+              >
+                <el-option label="采购合同" :value="1"> </el-option>
+                <el-option label="销售合同" :value="2"> </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"
+            ><el-form-item label="销往单位" prop="standardType">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="true"
+                v-model:value="formStateDEl.purchaseUnit"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8"
+            ><el-form-item label="出库确认时间" prop="outboundConfirmationTime">
+              <el-date-picker
+                v-model="formState.outboundConfirmationTime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="date"
+                :disabled="showLock"
+                placeholder="日期"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8"
+            ><el-form-item label="出库确认单号" prop="standardType">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="true"
+                v-model:value="formState.outboundConfirmationNumber"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <!-- 表格 -->
+            <el-table
+              :summary-method="getSummaries"
+              show-summary
+              :data="tableData"
+              border
+              stripe
+              highlight-current-row
+              v-loading="listLoading"
+              style="width: 100%"
+            >
+              <el-table-column
+                align="center"
+                type="index"
+                width="60"
+                label="序号"
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                prop="basicStorehouseName"
+                label="仓房名称"
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="warehouseName"
+                label="货位名称"
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="grainVarietyName"
+                label="品种"
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="grainNatureName"
+                label="性质"
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                prop="settleQuantity"
+                label="结算数量(吨）"
+                v-slot="scope"
+              >
+                <el-input
+                  class="title-box"
+                  autocomplete="off"
+                  v-model="scope.row.settleQuantity"
+                  :disabled="!formState.contractId || showLock"
+                  @input="unitPricechange(scope.row)"
+                />
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="settlePrice"
+                label="结算价格（元/吨）"
+                v-slot="scope"
+              >
+                <el-input
+                  class="title-box"
+                  autocomplete="off"
+                  v-model="scope.row.settlePrice"
+                  :disabled="!formState.contractId || showLock"
+                  @input="Sliangchange(scope.row)"
+                />
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="settleAmount"
+                label="结算金额"
+                v-slot="scope"
+              >
+                <div>
+                  {{
+                    (scope.row.settleAmount =
+                      scope.row.settleQuantity * scope.row.settlePrice)
+                  }}
+                </div>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="100">
+                <template v-slot="scope">
+                  <el-popconfirm
+                    title="确定删除吗？"
+                    icon="el-icon-info"
+                    icon-color="red"
+                    @confirm="deleteList(scope.row)"
+                  >
+                    <el-button
+                      type="primary"
+                      size="small"
+                      :disabled="showLock"
+                      slot="reference"
+                      icon="el-icon-delete"
+                      >删除</el-button
+                    >
+                  </el-popconfirm>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row>
+
+        <el-divider>{{ titleText }}贷款信息</el-divider>
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="贷款收回单位" prop="loanRecoveryUnit">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.loanRecoveryUnit"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="贷款收回数量" prop="loanRecoveryQuantity">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.loanRecoveryQuantity"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"
+            ><el-form-item label="贷款收回金额" prop="loanRecoveryAmount">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.loanRecoveryAmount"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"
+            ><el-form-item label="贷款归还时间" prop="loanReturnTime">
+              <el-date-picker
+                v-model="formState.loanReturnTime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="date"
+                :disabled="showLock"
+                placeholder="日期"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8"
+            ><el-form-item label="贷款归还金额" prop="loanReturnAmount">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.loanReturnAmount"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider>{{ titleText }}销售发票情况</el-divider>
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="单位" prop="invoiceUnit">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.invoiceUnit"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="发票数量" prop="invoiceQuantity">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.invoiceQuantity"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"
+            ><el-form-item label="发票单价" prop="invoiceUnitPrice">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.invoiceUnitPrice"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8"
+            ><el-form-item label="发票金额" prop="invoiceAmount">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.invoiceAmount"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider>{{ titleText }}差价上缴</el-divider>
+
+        <el-row>
+          <el-col :span="24">
+            <el-table
+              :data="tableDataSZ"
+              border
+              stripe
+              highlight-current-row
+              v-loading="listLoading"
+              style="width: 100%"
+            >
+              <el-table-column
+                align="center"
+                prop="projectType"
+                label="项目"
+                v-slot="scope"
+              >
+                <div v-if="scope.row.projectType == 1">销售</div>
+                <div v-if="scope.row.projectType == 2">损耗</div>
+                <div v-if="scope.row.projectType == 3">入库（用负数表示）</div>
+                <div v-if="scope.row.projectType == 4">
+                  交易手续费（用负数表示）
+                </div>
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="quantity"
+                label="数量"
+                v-slot="scope"
+              >
+                <el-input
+                  class="title-box"
+                  autocomplete="off"
+                  v-model="scope.row.quantity"
+                  :disabled="showLock"
+                />
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="amount"
+                label="金额"
+                v-slot="scope"
+              >
+                <el-input
+                  class="title-box"
+                  autocomplete="off"
+                  v-model="scope.row.amount"
+                  :disabled="showLock"
+                />
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col style="height: 30px" :span="24"> </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button v-if="this.isTypeData != '3'" @click="preserve"
+          >提交</el-button
+        >
+        <el-button @click="handleDialogClose">关闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  CRKYSQRadd,
+  CRKYSQRview,
+  CRKYSQRput,
+  CRKYSQRgetContractData,
+  CRKYSQRgetByContractId,
+} from "@/api/base/rotationApi.js";
+export default {
+  props: {
+    dataObj: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      RRTYUQQW: [],
+      tableData: [],
+      tableDataSZ: [
+        { projectType: "1", quantity: "", amount: "" },
+        { projectType: "2", quantity: "", amount: "" },
+        { projectType: "3", quantity: "", amount: "" },
+        { projectType: "4", quantity: "", amount: "" },
+      ],
+      listLoading: false,
+      isTypeData: "",
+      showLock: false,
+      visible: false,
+      titleText: "",
+      orgId: null,
+      formState: {
+        id: "",
+        contractId: "",
+        outboundConfirmationTime: "",
+        loanRecoveryUnit: null,
+        loanRecoveryQuantity: null,
+        loanRecoveryAmount: "",
+        loanReturnTime: null,
+        loanReturnAmount: null,
+        invoiceUnit: "",
+        invoiceQuantity: "",
+        invoiceUnitPrice: "",
+        invoiceAmount: "",
+        outboundConfirmationNumber: "",
+      },
+      formStateDEl: {
+        contractTitle: "",
+        contractType: "",
+        purchaseUnit: "",
+      },
+      houseOptions: [],
+      rules: {
+        contractId: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        outboundConfirmationTime: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        loanRecoveryUnit: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        loanRecoveryQuantity: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        loanRecoveryAmount: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        loanReturnTime: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        loanReturnAmount: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        invoiceUnit: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        invoiceQuantity: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        invoiceUnitPrice: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        invoiceAmount: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  watch: {
+    dataObj: {
+      handler(val) {
+        this.titleText = val.titleText;
+        this.visible = val.visible;
+        this.showLock = val.showLock;
+        this.isTypeData = val.isType; //isType = 1是新增 2是编辑 3是查看
+        this.lengthACC = val.lengthACC;
+        this.$nextTick(() => {
+          if (val.isType == "1") {
+            this.tableData = [];
+            // this.tableData.push({ acc: new Date().getTime() });
+            // this.formState.purchaseCode = this.getCurrentTimeWithPrefix();
+          }
+          if (val.isType == "2" || val.isType == "3") {
+            this.checkData();
+          }
+          this.getRpReportListData();
+          this.xialalbList();
+        });
+      },
+      // immediate: true,
+      deep: true,
+    },
+    // tableData: {
+    //   handler(val) {
+    //     this.total = this.tableData.reduce((total, item) => {
+    //       console.log(item.settleAmount);
+    //       const delTT = parseFloat(+item.settleAmount);
+    //       if (!isNaN(delTT)) {
+    //         return total + delTT;
+    //       } else {
+    //         return total;
+    //       }
+    //     }, 0);
+    //   },
+    //   // immediate: true,
+    //   deep: true,
+    // },
+  },
+  mounted() {},
+
+  methods: {
+    getRpReportListData() {
+      const userInfoJSON = JSON.parse(sessionStorage.getItem("userInfo"));
+      this.orgId = userInfoJSON.orgId;
+    },
+    async xialalbList() {
+      const userInfoJSON = JSON.parse(sessionStorage.getItem("userInfo"));
+      const res = await CRKYSQRgetContractData({ orgId: userInfoJSON.orgId });
+      this.houseOptions = res.data;
+    },
+
+    houseOptionsChange(v) {
+      this.xiCRKYSQRgetByContractId(v);
+    },
+
+    async xiCRKYSQRgetByContractId(id) {
+      const res = await CRKYSQRgetByContractId(id);
+      this.formStateDEl = res.data;
+      this.tableData = [];
+      this.RRTYUQQW = [];
+      this.tableData = res.data.storeWareDetailDataVOList;
+      // this.RRTYUQQW = res.data.storeWareDetailDataVOList;
+      this.RRTYUQQW = JSON.parse(
+        JSON.stringify(res.data.storeWareDetailDataVOList)
+      );
+    },
+    houseChanged(val) {},
+    editData(v) {
+      this.tableData.push({ acc: new Date().getTime() });
+    },
+    deleteList(v) {
+      if (this.tableData.length <= 1) return;
+      this.tableData = this.tableData.filter((item) => {
+        return item.id !== v.id;
+      });
+    },
+
+    validateData(tableData, RRTYUQQW) {
+      let del = [];
+      for (const item of tableData) {
+        const matchingItem = RRTYUQQW.find((cun) => cun.id === item.id);
+        if (matchingItem) {
+          //新
+          const itemSettleQuantity = Number(item.settleQuantity);
+          //初
+          const cunSettleQuantity = Number(matchingItem.settleQuantity);
+
+          if (Math.round(itemSettleQuantity) > Math.round(cunSettleQuantity)) {
+            del.push(false);
+          } else if (
+            Math.round(itemSettleQuantity) == Math.round(cunSettleQuantity)
+          ) {
+            del.push(true);
+          }
+        }
+        // if (
+        //   item.settleQuantity === -1 ||
+        //   item.settleQuantity === "" ||
+        //   item.settleQuantity === null ||
+        //   item.settleQuantity === undefined
+        // ) {
+        //   this.$message.error("结算数量(吨）不能为 -1 或 空 !");
+        //   return false;
+        // }
+      }
+      return del;
+    },
+    // 保存
+    preserve() {
+      // 判断新增还是编辑  isType = 1是新增 2是编辑 3是查看
+      if (this.isTypeData === "1") {
+        this.$refs["ruleForm"].validate((valid) => {
+          if (valid) {
+            let EERT = this.validateData(this.tableData, this.RRTYUQQW);
+            console.log(EERT);
+            if (EERT.every((item) => item === true)) {
+              console.log("通过");
+            } else {
+              this.$message.error("结算数量(吨）修改数量不能大于之前数量！");
+              return;
+            }
+            for (const item of this.tableData) {
+              if (
+                item.settleQuantity == -1 ||
+                item.settleQuantity == "" ||
+                item.settleQuantity == null ||
+                item.settleQuantity == undefined
+              ) {
+                return this.$message.error("结算数量(吨）不能为 -1 或 空 !");
+              }
+            }
+
+            let totalSettleAmount = this.tableData.reduce((total, item) => {
+              const delTT = parseFloat(+item.settleAmount);
+              if (!isNaN(delTT)) {
+                return total + delTT;
+              } else {
+                return total;
+              }
+            }, 0);
+            let totalSettleQuantity = this.tableData.reduce((total, item) => {
+              const delTT = parseFloat(+item.settleQuantity);
+              if (!isNaN(delTT)) {
+                return total + delTT;
+              } else {
+                return total;
+              }
+            }, 0);
+
+            let data = {
+              ...this.formState,
+              fsOutConfirmContractItemList: this.tableData,
+              fsOutConfirmDiffPriceItemList: this.tableDataSZ,
+              totalSettleAmount: totalSettleAmount,
+              totalSettleQuantity: totalSettleQuantity,
+              orgId: this.orgId,
+            };
+            delete data.id;
+            delete data.outboundConfirmationNumber;
+            return CRKYSQRadd(data).then((res) => {
+              this.handleDialogClose();
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      } else if (this.isTypeData === "2") {
+        // console.log("1", this.RRTYUQQW, "2", this.tableData);
+        this.$refs["ruleForm"].validate((valid) => {
+          if (valid) {
+            let EERT = this.validateData(this.tableData, this.RRTYUQQW);
+            console.log(EERT);
+            if (EERT.every((item) => item === true)) {
+              console.log("通过");
+            } else {
+              this.$message.error("结算数量(吨）修改数量不能大于之前数量！");
+              return;
+            }
+            for (const item of this.tableData) {
+              if (
+                item.settleQuantity === -1 ||
+                item.settleQuantity === "" ||
+                item.settleQuantity === null ||
+                item.settleQuantity === undefined
+              ) {
+                return this.$message.error("结算数量(吨）不能为 -1 或 空 !");
+              }
+            }
+
+            let totalSettleAmount = this.tableData.reduce((total, item) => {
+              const delTT = parseFloat(+item.settleAmount);
+              if (!isNaN(delTT)) {
+                return total + delTT;
+              } else {
+                return total;
+              }
+            }, 0);
+            let totalSettleQuantity = this.tableData.reduce((total, item) => {
+              const delTT = parseFloat(+item.settleQuantity);
+              if (!isNaN(delTT)) {
+                return total + delTT;
+              } else {
+                return total;
+              }
+            }, 0);
+
+            let data = {
+              ...this.formState,
+              fsOutConfirmContractItemList: this.tableData,
+              fsOutConfirmDiffPriceItemList: this.tableDataSZ,
+              totalSettleAmount: totalSettleAmount,
+              totalSettleQuantity: totalSettleQuantity,
+              orgId: this.orgId,
+              id: this.dataObj.id,
+            };
+            return CRKYSQRput(data).then((res) => {
+              this.handleDialogClose();
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      }
+    },
+
+    async xiCRKd(id) {
+      const res = await CRKYSQRgetByContractId(id);
+      this.formStateDEl = {
+        contractTitle: res.data.contractTitle,
+        contractType: res.data.contractType,
+        purchaseUnit: res.data.purchaseUnit,
+      };
+    },
+    //  查看
+    checkData() {
+      return CRKYSQRview(this.dataObj.id).then((res) => {
+        this.formState = {
+          id: res.data.id,
+          contractId: res.data.contractId,
+          outboundConfirmationTime: res.data.outboundConfirmationTime,
+          loanRecoveryUnit: res.data.loanRecoveryUnit,
+          loanRecoveryQuantity: res.data.loanRecoveryQuantity,
+          loanRecoveryAmount: res.data.loanRecoveryAmount,
+          loanReturnTime: res.data.loanReturnTime,
+          loanReturnAmount: res.data.loanReturnAmount,
+          invoiceUnit: res.data.invoiceUnit,
+          invoiceQuantity: res.data.invoiceQuantity,
+          invoiceUnitPrice: res.data.invoiceUnitPrice,
+          invoiceAmount: res.data.invoiceAmount,
+          outboundConfirmationNumber: res.data.outboundConfirmationNumber,
+        };
+        this.tableData = [];
+        this.RRTYUQQW = [];
+        this.tableDataSZ = [
+          { projectType: "1", quantity: "", amount: "" },
+          { projectType: "2", quantity: "", amount: "" },
+          { projectType: "3", quantity: "", amount: "" },
+          { projectType: "4", quantity: "", amount: "" },
+        ];
+
+        this.RRTYUQQW = JSON.parse(
+          JSON.stringify(res.data.storeWareDetailDataVOList)
+        );
+        this.tableData = JSON.parse(
+          JSON.stringify(res.data.storeWareDetailDataVOList)
+        );
+        // this.tableData = res.data.storeWareDetailDataVOList;
+        this.tableDataSZ = res.data.fsOutConfirmDiffPriceItemList;
+        this.xiCRKd(this.formState.contractId);
+        // 因为在弹框关闭时候还是调用一次查看接口，避免出现新增时候数据渲染了需手动清空
+        if (!this.visible) {
+          for (let key in this.formState) {
+            this.formState[key] = "";
+          }
+          for (let key in this.formStateDEl) {
+            this.formState[key] = "";
+          }
+          this.tableDataSZ = [
+            { projectType: "1", quantity: "", amount: "" },
+            { projectType: "2", quantity: "", amount: "" },
+            { projectType: "3", quantity: "", amount: "" },
+            { projectType: "4", quantity: "", amount: "" },
+          ];
+        }
+      });
+    },
+    getCurrentTimeWithPrefix() {
+      const currentDate = new Date();
+      const year = currentDate.getFullYear().toString();
+      const month = (currentDate.getMonth() + 1).toString().padStart(2, "0");
+      const day = currentDate.getDate().toString().padStart(2, "0");
+      const timePrefix = "ZC";
+      const currentTimeWithPrefix = `${timePrefix}${year}${month}${day}0${this.lengthACC}`;
+      return currentTimeWithPrefix;
+    },
+
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "小计";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        !values.every((value) => isNaN(value));
+        if (
+          column.property === "settleAmount" ||
+          column.property === "settleQuantity" ||
+          column.property === "settlePrice"
+        ) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index];
+        } else {
+          sums[index] = "";
+        }
+      });
+      return sums;
+    },
+    // 左上角x的关闭
+    handleDialogClose() {
+      this.$refs["ruleForm"].resetFields();
+      for (let key in this.formState) {
+        this.formState[key] = "";
+      }
+      for (let key in this.formStateDEl) {
+        this.formState[key] = "";
+      }
+      this.tableDataSZ = [
+        { projectType: "1", quantity: "", amount: "" },
+        { projectType: "2", quantity: "", amount: "" },
+        { projectType: "3", quantity: "", amount: "" },
+        { projectType: "4", quantity: "", amount: "" },
+      ];
+      this.visible = false;
+      this.$emit("isVisible", false);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/.el-table .el-table__cell {
+  padding: 6px 0 !important;
+}
+
+/deep/.el-date-editor {
+  width: 100%;
+}
+
+/* 整个滚动条 */
+div::-webkit-scrollbar {
+  width: 8px;
+  /* 设置滚动条的宽度 */
+}
+
+/* 滚动条轨道 */
+div::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 4px;
+  /* 设置轨道的背景颜色 */
+}
+
+/* 滚动条的滑块 */
+div::-webkit-scrollbar-thumb {
+  background: #888;
+  border-radius: 4px;
+  /* 设置滑块的背景颜色 */
+}
+
+.outbound-btn {
+  height: 200px;
+  margin-bottom: 36px;
+}
+
+.table-title {
+  float: right;
+  margin-bottom: 8px;
+}
+
+.tab-box {
+  height: 220px;
+  overflow-y: auto;
+}
+</style>

src/page/APayment/index.vue

@@ -0,0 +1,255 @@
+<!-- 出库验收确认 -->
+<template>
+  <div class="content-main">
+    <div class="search-bm-boder">
+      <el-row>
+        <el-form
+          label-width="120px"
+          :inline="true"
+          class="demo-form-inline search-form"
+        >
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="addData"
+              >新增</el-button
+            >
+            <el-divider direction="vertical"></el-divider>
+          </el-form-item>
+          <el-form-item label="合同编号:" prop="unitName">
+            <el-input
+              class="title-box"
+              autocomplete="off"
+              placeholder="请输入"
+              v-model="searchData.contractNumber"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="search"
+              >查询</el-button
+            >
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="reset('searchForm')"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </el-row>
+    </div>
+    <!-- 表格 -->
+    <el-table
+      :data="tableData"
+      border
+      stripe
+      highlight-current-row
+      v-loading="listLoading"
+      style="width: 100%"
+    >
+      <el-table-column
+        align="center"
+        type="index"
+        width="60"
+        label="序号"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="contractNumber"
+        label="合同编号"
+      ></el-table-column>
+      <el-table-column align="center" prop="totalNum" label="数量(公斤)">
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="totalPrice"
+        label="金额（元）"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="confirmNum"
+        label="确认数量（公斤）"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="createdate"
+        label="创建日期"
+      ></el-table-column>
+      <el-table-column label="操作" align="center" width="320">
+        <template v-slot="scope">
+          <el-button
+            type="primary"
+            @click="editData(scope.row)"
+            size="small"
+            icon="el-icon-edit"
+            >编辑</el-button
+          >
+          <el-button
+            type="primary"
+            @click="viewData(scope.row)"
+            size="small"
+            icon="el-icon-view"
+            >查看</el-button
+          >
+          <el-popconfirm
+            title="确定删除吗？"
+            icon="el-icon-info"
+            icon-color="red"
+            @confirm="deleteList(scope.row)"
+          >
+            <el-button
+              type="primary"
+              size="small"
+              slot="reference"
+              icon="el-icon-delete"
+              >删除</el-button
+            >
+          </el-popconfirm>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页开始 -->
+    <div class="pag-right clearFix">
+      <el-pagination
+        class="right"
+        :current-page.sync="limit.page"
+        :page-size="limit.size"
+        :page-sizes="[10, 20, 30, 40]"
+        :total="limit.total"
+        @current-change="handleCurrentChangeTask"
+        @size-change="handleSizeChangeTask"
+        layout="total, sizes, prev, pager, next, jumper"
+        v-if="paginationShow"
+      ></el-pagination>
+    </div>
+    <MonthlyReport :dataObj="dataObj" @isVisible="isVisible" />
+  </div>
+</template>
+<script>
+import MonthlyReport from "./components/monthlyReport.vue";
+import { CRKYSQRlist, CRKYSQRdel } from "@/api/base/rotationApi.js";
+export default {
+  components: { MonthlyReport },
+  data() {
+    return {
+      listLoading: false,
+      paginationShow: true,
+      dataObj: {
+        visible: false,
+        titleText: "",
+        showLock: false,
+        isType: "",
+        lengthACC: 0,
+      },
+      searchData: {
+        contractNumber: "",
+      },
+      limit: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+      tableData: [],
+    };
+  },
+
+  mounted() {
+    this.getList();
+  },
+
+  methods: {
+    getList() {
+      const userInfoJSON = JSON.parse(sessionStorage.getItem("userInfo"));
+      const obj = {
+        ...this.searchData,
+        orgId: userInfoJSON.orgId,
+        pageNum: this.limit.page,
+        pageSize: this.limit.size,
+      };
+      return CRKYSQRlist(obj).then((res) => {
+        this.tableData = [];
+        this.tableData = res.data.records;
+        this.limit.total = res.data.total;
+      });
+    },
+    // 查询
+    search() {
+      this.getList();
+    },
+    // 重置
+    reset() {
+      this.searchData.contractNumber = "";
+      this.getList();
+    },
+    // 新增
+    addData() {
+      this.dataObj.isType = "1";
+      this.dataObj.titleText = "新增";
+      // this.dataObj.lengthACC = this.tableData.length + 1
+      this.dataObj.visible = true;
+      this.dataObj.showLock = false;
+    },
+    // 编辑
+    editData(row) {
+      this.dataObj.id = row.id;
+      this.dataObj.isType = "2";
+      this.dataObj.titleText = "编辑";
+      this.dataObj.visible = true;
+      this.dataObj.showLock = false;
+    },
+    // 查看
+    viewData(row) {
+      this.dataObj.id = row.id;
+      this.dataObj.isType = "3";
+      this.dataObj.titleText = "查看";
+      this.dataObj.visible = true;
+      this.dataObj.showLock = true;
+    },
+    // 删除
+    deleteList(row) {
+      return CRKYSQRdel(row.id).then((res) => {
+        this.getList();
+      });
+    },
+    // 子组件传递
+    isVisible(val) {
+      this.dataObj.visible = val;
+      this.dataObj.showLock = val;
+      this.dataObj.titleText = "";
+      this.searchData.contractNumber = "";
+      this.getList();
+    },
+    // 分页
+    handleCurrentChangeTask(page) {
+      this.limit.page = page;
+      this.getList();
+    },
+    handleSizeChangeTask(size) {
+      this.limit.size = size;
+      this.getList();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.hide-buttons .el-input-number__decrease,
+.hide-buttons .el-input-number__increase {
+  display: none;
+}
+
+.hide-buttons .el-input__inner {
+  text-align: left;
+  padding-left: 14px;
+  padding-right: 0;
+}
+.button_S {
+  margin-bottom: 10px;
+}
+</style>

src/page/Amaintenance/components/monthlyReport.vue

@@ -0,0 +1,337 @@
+<template>
+  <div>
+    <el-dialog
+      :close-on-press-escape="false"
+      :visible.sync="visible"
+      :before-close="handleDialogClose"
+      :close-on-click-modal="false"
+      class="dialog-box"
+      width="86%"
+    >
+      <el-divider>{{ titleText }}</el-divider>
+      <el-form
+        label-width="150px"
+        :rules="rules"
+        ref="ruleForm"
+        :model="formState"
+      >
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="利息单号" prop="standardName">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="true"
+                v-model:value="formState.interestBillNo"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="日期" prop="year">
+              <!-- -MM-dd HH:mm:ss -->
+              <el-date-picker
+                v-model="formState.year"
+                value-format="yyyy-MM"
+                type="month"
+                :disabled="showLock"
+                placeholder="日期年月"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"
+            ><el-form-item label="农发行实收利息" prop="actualInterestReceived">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.actualInterestReceived"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"
+            ><el-form-item label="对其他扣款" prop="otherDeduction">
+              <el-input
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.otherDeduction"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24"
+            ><el-form-item label="备注" prop="remark">
+              <el-input
+                type="textarea"
+                class="title-box"
+                autocomplete="off"
+                :disabled="showLock"
+                v-model:value="formState.remark"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col style="height: 100px" :span="24"> </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button v-if="this.isTypeData != '3'" @click="preserve"
+          >提交</el-button
+        >
+        <el-button @click="handleDialogClose">关闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  reporting,
+  LXWHadd,
+  FYBZWHgetGrainVariety,
+  LXWHview,
+  LXWHput,
+} from "@/api/base/rotationApi.js";
+export default {
+  props: {
+    dataObj: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      tableData: [{ acc: new Date().getTime() }],
+      listLoading: false,
+      isTypeData: "",
+      showLock: false,
+      visible: false,
+      titleText: "",
+      orgId: null,
+      formState: {
+        id: "",
+        interestBillNo: "",
+        year: null,
+        actualInterestReceived: null,
+        otherDeduction: "",
+        remark: null,
+        month: null,
+        // standardValue: null,
+        // updatedate: "",
+        // updatename: "",
+      },
+      houseOptions: [],
+      rules: {
+        year: [{ required: true, message: "请输入或选择", trigger: "blur" }],
+        actualInterestReceived: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+        otherDeduction: [
+          { required: true, message: "请输入或选择", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  watch: {
+    dataObj: {
+      handler(val) {
+        this.titleText = val.titleText;
+        this.visible = val.visible;
+        this.showLock = val.showLock;
+        this.isTypeData = val.isType; //isType = 1是新增 2是编辑 3是查看
+        this.lengthACC = val.lengthACC;
+        this.$nextTick(() => {
+          if (val.isType == "1") {
+            this.getRpReportListData();
+            // this.formState.purchaseCode = this.getCurrentTimeWithPrefix();
+          }
+          if (val.isType == "2" || val.isType == "3") {
+            this.checkData();
+          }
+          // this.xialalbList();
+        });
+      },
+      // immediate: true,
+      deep: true,
+    },
+  },
+  mounted() {},
+
+  methods: {
+    getRpReportListData() {
+      const userInfoJSON = JSON.parse(sessionStorage.getItem("userInfo"));
+      this.orgId = userInfoJSON.orgId;
+    },
+
+    async xialalbList() {
+      const res = await FYBZWHgetGrainVariety();
+      this.houseOptions = res.data;
+      // grainVarietyName grainVarietyId
+    },
+
+    houseChanged(val) {},
+    // 保存
+    preserve() {
+      // 判断新增还是编辑  isType = 1是新增 2是编辑 3是查看
+      if (this.isTypeData === "1") {
+        this.$refs["ruleForm"].validate((valid) => {
+          if (valid) {
+            let del = this.formState.year.split("-");
+            this.formState.year = del[0];
+            this.formState.month = del[1];
+            let data = {
+              ...this.formState,
+              orgId: this.orgId,
+            };
+            delete data.interestBillNo;
+            delete data.id;
+            return LXWHadd(data).then((res) => {
+              this.handleDialogClose();
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      } else if (this.isTypeData === "2") {
+        this.$refs["ruleForm"].validate((valid) => {
+          if (valid) {
+            let del = this.formState.year.split("-");
+            this.formState.year = del[0];
+            this.formState.month = del[1];
+            let obj = {
+              ...this.formState,
+              orgId: this.orgId,
+            };
+            return LXWHput(obj).then((res) => {
+              this.handleDialogClose();
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      }
+    },
+    // 上报
+    reporting() {
+      // 判断新增还是编辑
+      if (this.isTypeData === "1") {
+        this.$refs["ruleForm"].validate((valid) => {
+          if (valid) {
+            let obj = {
+              reportGrainList: this.formState.warehousinglist,
+              orgId: this.orgId,
+              rpReportId: this.formState.rpReportId,
+              reportTime: this.formState.reportTime,
+              status: 1,
+            };
+            return reporting(obj).then((res) => {
+              this.handleDialogClose();
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      } else if (this.isTypeData === "2") {
+        this.$refs["ruleForm"].validate((valid) => {
+          if (valid) {
+            let obj = {
+              id: this.dataObj.id,
+              reportGrainList: this.formState.warehousinglist,
+              orgId: this.orgId,
+              rpReportId: this.formState.rpReportId,
+              reportTime: this.formState.reportTime,
+              status: 1,
+            };
+            return reporting(obj).then((res) => {
+              this.handleDialogClose();
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      }
+    },
+    //  查看
+    checkData() {
+      return LXWHview(this.dataObj.id).then((res) => {
+        this.formState.id = res.data.id;
+        this.formState.interestBillNo = res.data.interestBillNo;
+        this.formState.otherDeduction = res.data.otherDeduction;
+        this.formState.actualInterestReceived = res.data.otherDeduction;
+        this.formState.remark = res.data.remark;
+        this.formState.year = res.data.yearAndMonth;
+        // 因为在弹框关闭时候还是调用一次查看接口，避免出现新增时候数据渲染了需手动清空
+        if (!this.visible) {
+          for (let key in this.formState) {
+            this.formState[key] = "";
+          }
+        }
+      });
+    },
+    // getCurrentTimeWithPrefix() {
+    //   const currentDate = new Date();
+    //   const year = currentDate.getFullYear().toString();
+    //   const month = (currentDate.getMonth() + 1).toString().padStart(2, "0");
+    //   const day = currentDate.getDate().toString().padStart(2, "0");
+    //   const timePrefix = "ZC";
+    //   const currentTimeWithPrefix = `${timePrefix}${year}${month}${day}0${this.lengthACC}`;
+    //   return currentTimeWithPrefix;
+    // },
+    // 左上角x的关闭
+    handleDialogClose() {
+      this.$refs["ruleForm"].resetFields();
+      for (let key in this.formState) {
+        this.formState[key] = "";
+      }
+      this.visible = false;
+      this.$emit("isVisible", false);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/.el-table .el-table__cell {
+  padding: 6px 0 !important;
+}
+
+/deep/.el-date-editor {
+  width: 100%;
+}
+
+/* 整个滚动条 */
+div::-webkit-scrollbar {
+  width: 8px;
+  /* 设置滚动条的宽度 */
+}
+
+/* 滚动条轨道 */
+div::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 4px;
+  /* 设置轨道的背景颜色 */
+}
+
+/* 滚动条的滑块 */
+div::-webkit-scrollbar-thumb {
+  background: #888;
+  border-radius: 4px;
+  /* 设置滑块的背景颜色 */
+}
+
+.outbound-btn {
+  height: 200px;
+  margin-bottom: 36px;
+}
+
+.table-title {
+  float: right;
+  margin-bottom: 8px;
+}
+
+.tab-box {
+  height: 220px;
+  overflow-y: auto;
+}
+</style>

src/page/Amaintenance/index.vue

@@ -0,0 +1,259 @@
+<!-- 利息维护 -->
+<template>
+  <div class="content-main">
+    <div class="search-bm-boder">
+      <el-row>
+        <el-form
+          label-width="120px"
+          :inline="true"
+          class="demo-form-inline search-form"
+        >
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="addData"
+              >新增</el-button
+            >
+            <el-divider direction="vertical"></el-divider>
+          </el-form-item>
+          <el-form-item label="利息单号:" prop="unitName">
+            <el-input
+              class="title-box"
+              autocomplete="off"
+              placeholder="请输入"
+              v-model="searchData.interestBillNo"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="search"
+              >查询</el-button
+            >
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="reset('searchForm')"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </el-row>
+    </div>
+    <!-- 表格 -->
+    <el-table
+      :data="tableData"
+      border
+      stripe
+      highlight-current-row
+      v-loading="listLoading"
+      style="width: 100%"
+    >
+      <el-table-column
+        align="center"
+        type="index"
+        width="60"
+        label="序号"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="interestBillNo"
+        label="利息单号"
+      ></el-table-column>
+      <el-table-column align="center" prop="yearAndMonth" label="日期">
+        <!-- <template v-slot="scope">
+          <div v-if="scope.row.standardType == 1">保管费用标准</div>
+          <div v-if="scope.row.standardType == 2">轮换费用标准</div>
+        </template> -->
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="actualInterestReceived"
+        label="农发行实收利息"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="otherDeduction"
+        label="其他扣款"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="createdate"
+        label="创建时间"
+      ></el-table-column>
+      <el-table-column label="操作" align="center" width="320">
+        <template v-slot="scope">
+          <el-button
+            type="primary"
+            @click="editData(scope.row)"
+            size="small"
+            icon="el-icon-edit"
+            >编辑</el-button
+          >
+          <el-button
+            type="primary"
+            @click="viewData(scope.row)"
+            size="small"
+            icon="el-icon-view"
+            >查看</el-button
+          >
+          <el-popconfirm
+            title="确定删除吗？"
+            icon="el-icon-info"
+            icon-color="red"
+            @confirm="deleteList(scope.row)"
+          >
+            <el-button
+              type="primary"
+              size="small"
+              slot="reference"
+              icon="el-icon-delete"
+              >删除</el-button
+            >
+          </el-popconfirm>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页开始 -->
+    <div class="pag-right clearFix">
+      <el-pagination
+        class="right"
+        :current-page.sync="limit.page"
+        :page-size="limit.size"
+        :page-sizes="[10, 20, 30, 40]"
+        :total="limit.total"
+        @current-change="handleCurrentChangeTask"
+        @size-change="handleSizeChangeTask"
+        layout="total, sizes, prev, pager, next, jumper"
+        v-if="paginationShow"
+      ></el-pagination>
+    </div>
+    <MonthlyReport :dataObj="dataObj" @isVisible="isVisible" />
+  </div>
+</template>
+<script>
+import MonthlyReport from "./components/monthlyReport.vue";
+import { LXWHlist, LXWHdel } from "@/api/base/rotationApi.js";
+export default {
+  components: { MonthlyReport },
+  data() {
+    return {
+      listLoading: false,
+      paginationShow: true,
+      dataObj: {
+        visible: false,
+        titleText: "",
+        showLock: false,
+        isType: "",
+        lengthACC: 0,
+      },
+      searchData: {
+        interestBillNo: "",
+      },
+      limit: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+      tableData: [],
+    };
+  },
+
+  mounted() {
+    this.getList();
+  },
+
+  methods: {
+    getList() {
+      const userInfoJSON = JSON.parse(sessionStorage.getItem("userInfo"));
+      const obj = {
+        ...this.searchData,
+        orgId: userInfoJSON.orgId,
+        pageNum: this.limit.page,
+        pageSize: this.limit.size,
+      };
+      return LXWHlist(obj).then((res) => {
+        this.tableData = [];
+        this.tableData = res.data.records;
+        this.limit.total = res.data.total;
+      });
+    },
+    // 查询
+    search() {
+      this.getList();
+    },
+    // 重置
+    reset() {
+      this.searchData.interestBillNo = "";
+      this.getList();
+    },
+    // 新增
+    addData() {
+      this.dataObj.isType = "1";
+      this.dataObj.titleText = "新增利息维护";
+      // this.dataObj.lengthACC = this.tableData.length + 1
+      this.dataObj.visible = true;
+      this.dataObj.showLock = false;
+    },
+    // 编辑
+    editData(row) {
+      this.dataObj.id = row.id;
+      this.dataObj.isType = "2";
+      this.dataObj.titleText = "编辑利息维护";
+      this.dataObj.visible = true;
+      this.dataObj.showLock = false;
+    },
+    // 查看
+    viewData(row) {
+      this.dataObj.id = row.id;
+      this.dataObj.isType = "3";
+      this.dataObj.titleText = "查看利息维护";
+      this.dataObj.visible = true;
+      this.dataObj.showLock = true;
+    },
+    // 删除
+    deleteList(row) {
+      return LXWHdel(row.id).then((res) => {
+        this.getList();
+      });
+    },
+    // 子组件传递
+    isVisible(val) {
+      this.dataObj.visible = val;
+      this.dataObj.showLock = val;
+      this.dataObj.titleText = "";
+      this.searchData.interestBillNo = "";
+      this.getList();
+    },
+    // 分页
+    handleCurrentChangeTask(page) {
+      this.limit.page = page;
+      this.getList();
+    },
+    handleSizeChangeTask(size) {
+      this.limit.size = size;
+      this.getList();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.hide-buttons .el-input-number__decrease,
+.hide-buttons .el-input-number__increase {
+  display: none;
+}
+
+.hide-buttons .el-input__inner {
+  text-align: left;
+  padding-left: 14px;
+  padding-right: 0;
+}
+.button_S {
+  margin-bottom: 10px;
+}
+</style>

src/page/CostStandard/index.vue

@@ -68,7 +68,6 @@
         prop="standardName"
         label="标准名称"
       ></el-table-column>
-      </el-table-column>
       <el-table-column
         align="center"
         prop="standardType"

src/page/Layout/layout.vue

@@ -10,7 +10,12 @@
       <!-- <div class="project-title iconfont iconchubeiliangguanli"> 储备粮管理</div> -->
     </el-row>
     <el-row>
-      <el-col :span="4" :style="{ height: wrapHeight + 'px' }" id="nav">
+      <el-col
+        :span="4"
+        :style="{ height: wrapHeight + 'px' }"
+        id="nav"
+        class="menuList-wrap"
+      >
         <MenuList></MenuList>
       </el-col>
       <el-col :span="20" id="main" :style="{ height: wrapHeight + 'px' }">
@@ -44,8 +49,6 @@ export default {
     // Applications
   },
   data() {
-    const u = localStorage.getItem("_userName");
-    const p = localStorage.getItem("_password");
     return {
       id: this.$route.params.id,
       dat: {
@@ -55,9 +58,24 @@ export default {
       u: localStorage.getItem("_userName"),
       p: localStorage.getItem("_password"),
       clientHeight: document.documentElement.clientHeight,
-      url: `http://101.36.160.210:31055/crk/#/welcome?username=${u}&password=${p}`,
+      // url: `http://101.36.160.210:31055/crk/?k_username=${u}&k_password=${p}&code=1`,
+      // url: `http://59.220.179.234:80/#/welcome/?username=${u}&password=${p}&code=1`,
+      // url: `http://172.18.93.228:80/#/welcome?username=${u}&password=${p}`,
+      url: "",
     };
   },
+  created() {
+    const u = localStorage.getItem("_userName");
+    const p = localStorage.getItem("_password");
+    const isProd = process.env.NODE_ENV === "production";
+    // let url;
+    if (!isProd) {
+      // this.url = `http://101.36.160.210:31055/crk/#/welcome/?username=${u}&password=${p}`;
+      this.url = `http://101.36.160.210:31055/crk/?k_username=${u}&k_password=${p}`;
+    } else {
+      this.url = `http://172.18.93.228:80/#/welcome?username=${u}&password=${p}`;
+    }
+  },
   computed: {
     wrapHeight() {
       return this.clientHeight - 70 - 40;

src/page/Layout/menuList/menuItem.vue

@@ -6,7 +6,7 @@
       :item="firstItem"
       :index="firstIndex + ''"
       @handle-select="handleSelect"
-      />
+    />
   </div>
 </template>
 
@@ -19,36 +19,34 @@ export default {
   name: "menuItem",
   props: {
     routeList: {
-      type: Array
-    }
+      type: Array,
+    },
   },
-  components: {MyMenuItem},
+  components: { MyMenuItem },
   data() {
     return {};
   },
-  created() {
-
-  },
+  created() {},
   methods: {
     handleSelect(item) {
       sessionStorage.setItem("searchData", null);
       sessionStorage.setItem("searchDataTab1", null);
       sessionStorage.setItem("pageData", null);
       sessionStorage.setItem("resourceCode", item.resourceCode);
-    }
-  }
+    },
+  },
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .router-link-active {
   text-decoration: none;
 }
 .el-menu-item,
 .el-submenu /deep/ .el-submenu__title {
   margin: 1px 0;
-  background: url("../../../assets/wisdom_images/menuBottomLine.png") no-repeat
-    bottom;
+  /* background: url("../../../assets/wisdom_images/menuBottomLine.png") no-repeat
+    bottom; */
 }
 .iconStyle {
   color: #0357ab !important;
@@ -64,7 +62,6 @@ export default {
   padding-left: 55px !important;
 }
 .menuSecondary2 {
-
 }
 
 .menuSecondaryWrap2:before {

src/page/Layout/menuList/menuList.vue

@@ -4,13 +4,22 @@
       <el-menu
         router
         :default-active="defaultActive"
+        :default-openeds="defaultOpened"
+        :background-color="theme.menuBg"
+        :text-color="theme.menuText"
+        :unique-opened="false"
+        active-text-color="#fff"
+      >
+        <!-- <el-menu
+        router
+        :default-active="defaultActive"
         class="el-menu-vertical-demo"
         background-color="#F4F5F8"
         text-color="#797979"
         active-text-color="#fff"
         :default-openeds="defaultOpened"
         :unique-opened="true"
-      >
+      > -->
         <Menu-item :routeList="routeList"></Menu-item>
       </el-menu>
     </el-scrollbar>
@@ -20,6 +29,7 @@
 <script>
 import MenuItem from "./menuItem";
 import { mapGetters } from "vuex";
+import theme from "@/style/theme.scss";
 
 export default {
   name: "menuList",
@@ -27,37 +37,40 @@ export default {
     return {
       routeList: [],
       defaultActive: "",
-      defaultOpened: ['0'],
+      defaultOpened: ["0"],
     };
   },
   components: {
     MenuItem,
   },
   computed: {
+    theme() {
+      return theme;
+    },
     ...mapGetters({
       leftMenuList: "leftMenuList",
-      defaultActiveUrl: 'defaultActiveUrl',
+      defaultActiveUrl: "defaultActiveUrl",
     }),
-    firstLevelName () {
-      if((! this.leftMenuList) || this.leftMenuList.length <= 0) return ''
-      return this.leftMenuList[0].resourceName
-    }
+    firstLevelName() {
+      if (!this.leftMenuList || this.leftMenuList.length <= 0) return "";
+      return this.leftMenuList[0].resourceName;
+    },
   },
   watch: {
     leftMenuList(n, o) {
-      this.defaultActive = this.defaultActiveUrl
-      this.routeList = n
-      console.log('菜单修改', n, this.defaultActive)
+      this.defaultActive = this.defaultActiveUrl;
+      this.routeList = n;
+      console.log("菜单修改", n, this.defaultActive);
     },
     defaultActiveUrl(n, o) {
-      this.defaultActive = this.defaultActiveUrl
-    }
+      this.defaultActive = this.defaultActiveUrl;
+    },
   },
   created() {
     // alert("99");
     // console.log(JSON.parse(sessionStorage.getItem('leftMenuList')))
-    this.routeList = this.routes()
-    console.log('left menu list', this.routeList)
+    this.routeList = this.routes();
+    console.log("left menu list", this.routeList);
     let href = window.location.href;
     // console.log(href, "href");
     // console.log(this.$route.path, "this.$route.path");
@@ -90,14 +103,14 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style  lang="scss" scoped>
 .live-scrollbar {
   height: 100%;
 }
 
 /*   隐藏 横向滚动条*/
-.el-scrollbar /deep/ .el-scrollbar__wrap {
-  overflow-x: hidden;
+.el-scrollbar__wrap {
+  overflow-x: hidden !important;
 }
 .el-scrollbar /deep/ .is-horizontal {
   display: none;

src/page/Layout/menuList/myMenuItem.vue

@@ -36,3 +36,7 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+
+</style>

src/page/basicData/components/cameraListEdit.vue

@@ -113,6 +113,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row type="flex" align="middle" justify="center" class="row">
+          <el-col :span="8">
+            <el-form-item label="摄像头唯一标识" prop="cameraIndexCode">
+              <el-input v-model="form.cameraIndexCode" :readonly="readonly"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+          </el-col>
+        </el-row>
         <el-divider> 硬盘录像机信息</el-divider>
         <div v-if="!readonly" class="btn-group">
           <el-button type="primary" icon="el-icon-plus" @click="add">添加</el-button>
@@ -194,7 +203,7 @@ export default {
     return {
       selectShow: false,
       tableData: [],
-      nvrId: null,
+
       defaultForm: {
         name: null,
         alias: null,
@@ -203,6 +212,7 @@ export default {
         password: null,
         ip: null,
         subnetmask: null,
+        nvrId: null,
         gateway: null,
         type: null,
         port: null,
@@ -215,11 +225,13 @@ export default {
         powerPosition: null,
         storehouseId: null,
         channelNumber: null,
+        cameraIndexCode: null,
       },
       rules: {
         name: simple_required, alias: simple_required, factory: simple_required,
         username: simple_required, password: simple_required, ip: simple_required,
         type: simple_required, port :simple_required, live: simple_required,
+        cameraIndexCode: simple_required,
       }
     }
   },
@@ -236,7 +248,7 @@ export default {
       if(resp.nvrEdit) {
         // resp.nvrEdit.channelNumber = ret.channelNumber
         this.tableData = [resp.nvrEdit]
-        this.nvrId = resp.nvrEdit.id
+        ret.nvrId = resp.nvrEdit.id
       }else {
         this.tableData = []
       }
@@ -247,10 +259,11 @@ export default {
         ... this.form ,
         orgId: this.orgId,
       }
-      return {
-        cameraJson: JSON.stringify(d),
-        nvrId: this.nvrId,
-      }
+      // return {
+      //   cameraJson: JSON.stringify(d),
+      //   nvrId: this.nvrId,
+      // }
+      return d
     },
     beforeSaveCheck() {
       if(this.tableData.length > 1) {
@@ -279,7 +292,7 @@ export default {
     },
 
     onSelect(data) {
-      this.nvrId = data.id
+      this.form.nvrId = data.id
       this.tableData.push(data)
     },
 

src/page/basicData/components/warehouseListEdit.vue

@@ -71,7 +71,7 @@
           <template>
             <el-col :span="8">
               <el-form-item label="统一货位编码" prop="tyhwbm">
-                <el-input v-model="form.tyhwbm" :readonly="readonly || isEdit" />
+                <el-input v-model="form.tyhwbm" disabled placeholder="保存后生成" />
               </el-form-item>
             </el-col>
 
@@ -251,6 +251,7 @@ export default {
       orgNameDEl: "",
       aisleId: null,
       ajdh: null,
+      tyajbm: null,
       gaojOption: [],
       form: {
         warehouseCode: "",
@@ -263,13 +264,17 @@ export default {
         warehouseCode: number_data_del_tw,
         warehouseUseTime: simple_required,
         warehouseCapacity: simple_required,
-        tyhwbm: simple_required,
+        // tyhwbm: simple_required,
       },
     };
   },
   created() {},
   methods: {
     setUp() {
+      this.tyajbm = null
+      this.aisleId = null
+      this.ajdh = null
+      this.gaojOption = []
       this.initHouseIdNameMap("storehouseId");
       this.initOrgIdNameMap();
       this.initHouseOptions();
@@ -280,7 +285,13 @@ export default {
     parseResp(resp) {
       console.log("resp", resp);
       resp.houseName = parseInt(resp.houseName);
-      this.getFileAojianGet({ orgId: this.orgId, cfid: resp.storehouseId });
+      this.aisleId = resp.aisleId
+      this.getFileAojianGet({ unitId: this.orgId, storehouseId: resp.storehouseId, libraryType: 0 }).then(_ => {
+        const h = this.gaojOption.find((d) => d.id === resp.aisleId);
+        if(h) {
+          this.tyajbm = h.tyajbm
+        }
+      })
       return resp;
     },
 
@@ -310,9 +321,11 @@ export default {
         console.log("3333", h);
         this.ajmc = h.ajmc;
         this.ajdh = h.ajdh;
+        this.tyajbm = h.tyajbm
       }else {
         this.ajmc = null
         this.ajdh = null
+        this.tyajbm = null
       }
 
     },
@@ -365,6 +378,7 @@ export default {
       return {
         warehouseJson: JSON.stringify(data),
         fileIds: '[]',
+        tyajbm: this.tyajbm,
       };
     },
     checkWareCode() {
@@ -381,38 +395,46 @@ export default {
         })
       }
     },
+
+    async doSave() {
+      const data = this.getLocalData();
+
+      const fd = new FormData();
+      for (const key in data) {
+        fd.append(key, data[key]);
+      }
+
+      // console.log(fd.get("storehouseJson"));
+
+      const resp = await getFileAojianAddOrEdit(data);
+      if (resp.status === "success") {
+        this.$message.success("保存成功");
+        this.show = false;
+        this.$emit("on-save");
+      } else {
+        this.$message.error(resp.msg);
+      }
+    },
     save() {
 
       console.log("data", this.form);
       this.$refs.editForm.validate(async (ok) => {
         if (ok) {
-          findWareCode({
-            storehouseId: this.form.storehouseId,
-            warehouseCode: this.form.warehouseCode,
-            orgId: this.orgId,
-          }).then(async (resp) => {
-            if(resp == 0) {
-              return this.$message.error('货位编号已存在')
-            }else if(resp == 1) {
-              const data = this.getLocalData();
-
-              const fd = new FormData();
-              for (const key in data) {
-                fd.append(key, data[key]);
-              }
-
-              // console.log(fd.get("storehouseJson"));
-
-              const resp = await getFileAojianAddOrEdit(data);
-              if (resp.status === "success") {
-                this.$message.success("保存成功");
-                this.show = false;
-                this.$emit("on-save");
-              } else {
-                this.$message.error(resp.msg);
+          if(this.isAdd) {
+            findWareCode({
+              storehouseId: this.form.storehouseId,
+              warehouseCode: this.form.warehouseCode,
+              orgId: this.orgId,
+            }).then(async (resp) => {
+              if(resp == 0) {
+                return this.$message.error('货位编号已存在')
+              }else if(resp == 1) {
+                this.doSave()
               }
-            }
-          })
+            })
+          }else if(this.isEdit) {
+            this.doSave()
+          }
         }
       });
     },

src/page/basicData/granaryList.vue

@@ -18,9 +18,18 @@
               @click="add"
               >新增</el-button
             >
-            <el-button type="primary" size="small" icon="el-icon-download"
-              >导入</el-button
+            <el-upload
+              style="display: inline-block"
+              accept=".xlsx"
+              :action="aojianImportUrl"
+              :before-upload="beforeImport"
+              :on-success="afterImport"
+              :show-file-list="false"
+              :data="{userInfo: JSON.stringify($store.state.user.userInfo), orgId: orgId, fileType: 'xlsx'}"
+              :limit="100"
             >
+              <el-button size="small" type="primary" icon="el-icon-download">导入</el-button>
+            </el-upload>
             <el-button type="primary" size="small" icon="el-icon-upload2">
               <template v-slot>
                 <a
@@ -158,6 +167,17 @@
       :edit-data="editData"
       @on-save="getList"
     />
+
+    <el-dialog
+      title="上传结果"
+      :visible.sync="uploadResultShow"
+      width="30%"
+    >
+      {{importMsg}}
+      <span slot="footer" class="dialog-footer">
+    <el-button type="primary" @click="uploadResultShow = false">确 定</el-button>
+  </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -169,7 +189,7 @@ import {
   hasOrgName,
   houseAndWareQuery,
 } from "@/components/simpleList";
-import { granaryList, granaryRemove } from "@/api/base";
+import { granaryList, granaryRemove, aojianImportUrl } from "@/api/base";
 import edit from "./components/granaryListEdit.vue";
 
 export default {
@@ -178,6 +198,9 @@ export default {
   components: { edit },
   data() {
     return {
+      aojianImportUrl,
+      uploadResultShow: false,
+      importMsg: null,
       form: {
         storeName: null,
         ajmc: null,
@@ -191,6 +214,17 @@ export default {
       this.initHouseOptions();
       this.initHouseIdNameMap("vcfcode", "storehouseCode");
     },
+    beforeImport() {
+      this.listLoading = true
+    },
+    afterImport(response, file, fileList) {
+      if(response) {
+        this.importMsg = response
+        this.uploadResultShow = true
+      }
+      this.listLoading = false
+      this.getList()
+    },
     // 删除 id
     getDelParams(data) {
       return data.id;

src/page/basicData/storehouseList.vue

@@ -273,8 +273,10 @@ export default {
       this.listLoading = true
     },
     afterImport(response, file, fileList) {
-      this.importMsg = response
-      this.uploadResultShow = true
+      if(response) {
+        this.importMsg = response
+        this.uploadResultShow = true
+      }
       this.listLoading = false
       this.getList()
     },

src/page/basicData/warehouseList.vue

@@ -219,8 +219,10 @@ export default {
       this.listLoading = true
     },
     afterImport(response, file, fileList) {
-      this.importMsg = response
-      this.uploadResultShow = true
+      if(response) {
+        this.importMsg = response
+        this.uploadResultShow = true
+      }
       this.listLoading = false
       this.getList()
     },

src/page/contractsManagement/components/contractsEdit/index.vue

@@ -414,6 +414,8 @@ export default {
         contractType: simple_required,
         signingTime: simple_required,
         customerName: simple_required,
+        moneyQuantity: simple_required,
+        grainQuantity: simple_required,
       },
       rawData: null,
       canSave: false,
@@ -515,6 +517,9 @@ export default {
       this.rawData = data
       this.loading = false
       this.form = data.contract
+      data.storeWareDetailList.forEach(d => {
+        d.key = this.$systemUtils.genKey()
+      })
       this.grainInfoList = data.storeWareDetailList
       console.log('合同获取数据', data)
       if(data.contract.attachment) {
@@ -626,6 +631,9 @@ export default {
           return list
         })
       }).then(list => {
+        list.forEach(d => {
+          d.key = this.$systemUtils.genKey()
+        })
         this.grainInfoList = list
       }).finally(_ => {
         this.planSelectShow = false
@@ -708,12 +716,19 @@ export default {
     doSave() {
       const contractJson = JSON.stringify(this.getLocalData())
       let details = []
+      let tableRef
       if(this.isInContract) {
+        tableRef = this.$refs.inTable
         details = this.$refs.inTable.getTableData()
       }else {
+        tableRef = this.$refs.outTable
         details = this.$refs.outTable.getTableData()
       }
-      if(details.length <= 0) return this.$message.error('必须填写一条计划详情信息')
+      if(! tableRef.checkInput()) return Promise.reject()
+      if(details.length <= 0) {
+        this.$message.error('必须填写一条计划详情信息')
+        return Promise.reject()
+      }
       const delKeys = ['basic_storehouse_id', 'warehouse_id', 'key', 'inspection_report_id']
       details.forEach(d => {
         if(this.isAdd) {

src/page/contractsManagement/components/planDetailTableIn.vue

@@ -54,7 +54,7 @@
         <el-button
           type="primary"
           size="small"
-          @click="del(scope)"
+          @click="del(scope.row)"
         >删除</el-button>
       </template>
     </el-table-column>
@@ -139,6 +139,7 @@ export default {
     del(data) {
       if(this.readonly) return
       this.tableData = this.tableData.filter(d => d.key !== data.key)
+      this.calTotal()
       // const index = data.$index
       // this.$emit('on-del', index)
     },
@@ -150,6 +151,19 @@ export default {
     },
     calOutTotal(data) {
       return calOutTotal(data)
+    },
+    checkInput() {
+      const w = this.tableData.find(d => {
+        const isBlank = this.$systemUtils.isBlank(d.inPrice)
+        const isNull = d.inPrice === null || d.inPrice === undefined || d.inPrice === ''
+        const isNan = isNaN(d.inPrice)
+        return isNull || isNan || isBlank
+      })
+      if(w) {
+        this.$message.warning('您有单价没有正确输出, 请重新填写')
+        return false
+      }
+      return true
     }
   }
 }

src/page/contractsManagement/components/planDetailTableOut.vue

@@ -72,7 +72,7 @@
         <el-button
           type="primary"
           size="small"
-          @click="del(scope)"
+          @click="del(scope.row)"
         >删除</el-button>
       </template>
     </el-table-column>
@@ -182,6 +182,7 @@ export default {
     del(data) {
       if(this.readonly) return
       this.tableData = this.tableData.filter(d => d.key !== data.key)
+      this.calTotal()
       // const index = data.$index
       // this.$emit('on-del', data)
     },
@@ -193,6 +194,19 @@ export default {
     },
     calOutTotal(data) {
       return calOutTotal(data)
+    },
+    checkInput() {
+      const w = this.tableData.find(d => {
+        const isBlank = this.$systemUtils.isBlank(d.outPrice)
+        const isNull = d.outPrice === null || d.outPrice === undefined || d.outPrice === ''
+        const isNan = isNaN(d.outPrice)
+        return isNull || isNan || isBlank
+      })
+      if(w) {
+        this.$message.warning('您有单价没有正确输出, 请重新填写')
+        return false
+      }
+      return true
     }
   }
 }

src/page/deviceManagement/components/deviceGetEdit.vue

@@ -206,9 +206,10 @@ export default {
       }
       d.model = d.sbggxh
       this.$systemUtils.deleteField(d, ['ssfl', 'sbsl', 'sbyqmc', 'sbggxh'])
-      return {
-        deviceGetJson: JSON.stringify(d)
-      }
+      // return {
+      //   deviceGetJson: JSON.stringify(d)
+      // }
+      return d
     },
     beforeSaveCheck() {
       if(this.form.getCount > this.form.sbsl) return Promise.reject('领用数量不能超过可用数量')

src/page/deviceManagement/components/deviceGetReturn.vue

@@ -100,9 +100,10 @@ export default {
       }
       d.id = this.editData.id
       this.$systemUtils.parseField2Float(d, ['backCount', 'brokenCount'])
-      return {
-        deviceBackJson: JSON.stringify(d)
-      }
+      // return {
+      //   deviceBackJson: JSON.stringify(d)
+      // }
+      return d
     },
     beforeSaveCheck() {
       if(this.form.brokenCount > this.form.backCount) return Promise.reject('损坏数量不能大于归还数量')

src/page/deviceManagement/components/inventoryEdit.vue

@@ -1,7 +1,6 @@
 <template>
   <el-dialog :visible.sync="show" width="70%" append-to-body>
     <div v-loading="loading">
-      <div style="text-align: center;"><h1>季度详情</h1></div>
       <el-form ref="editForm" :model="form" :rules="rules" label-width="150px">
         <el-divider>基本信息</el-divider>
         <el-row type="flex" align="middle" justify="center" class="row">
@@ -26,8 +25,8 @@
         </el-row>
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="12">
-            <el-form-item label="设备编号" prop="check_number">
-              <el-select v-model="form.check_number" clearable placeholder="请选择" @change="noChange" :disabled="readonly">
+            <el-form-item label="设备编号" prop="checkNumber">
+              <el-select v-model="form.checkNumber" clearable placeholder="请选择" @change="noChange" :disabled="readonly">
                 <el-option
                   v-for="item in noOptions"
                   :key="item.value"
@@ -38,8 +37,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="负责人" prop="check_person">
-              <el-input v-model="form.check_person" :readonly="readonly"/>
+            <el-form-item label="负责人" prop="checkPerson">
+              <el-input v-model="form.checkPerson" :readonly="readonly"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -73,20 +72,20 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            prop="really_count"
+            prop="reallyCount"
             label="实际库存数量"
           >
             <template v-slot="scope">
-              <el-input v-model="form.really_count" :readonly="readonly" />
+              <el-input v-model="form.reallyCount" :readonly="readonly" />
             </template>
           </el-table-column>
           <el-table-column
             align="center"
-            prop="check_result"
+            prop="checkResult"
             label="盘点情况"
           >
             <template v-slot="scope">
-              <el-select v-model="form.check_result" clearable placeholder="请选择" :disabled="readonly">
+              <el-select v-model="form.checkResult" clearable placeholder="请选择" :disabled="readonly">
                 <el-option
                   v-for="(item, index) in ['盘盈', '盘亏', '账实相符']"
                   :key="index"
@@ -158,7 +157,7 @@ export default {
       const enumId = n === '1' ? 5476 : 5475
       this.options = []
       this.deviceEnumId = null
-      this.form.device_name = null
+      this.form.deviceName = null
       this.$enumUtils.getTreeDataByEnumId(enumId).then(opts => {
         this.options = opts
       }).finally(() => {
@@ -226,14 +225,16 @@ export default {
       }
     },
     resetForm() {
+      this.ssfl = null
+      this.deviceEnumId = null
       this.form = {
-        device_name: null,
-        check_number: null,
-        store_count: null,
-        really_count: null,
-        check_result: null,
+        deviceName: null,
+        checkNumber: null,
+        storeCount: null,
+        reallyCount: null,
+        checkResult: null,
         reason: null,
-        check_person: null,
+        checkPerson: null,
         model: null,
       }
     },
@@ -241,7 +242,7 @@ export default {
       const opt = this.getOption(id, this.options)
       console.log('名称变化', id, opt, this.options)
       this.noOptions = []
-      this.form.device_name = opt.label
+      this.form.deviceName = opt.label
       if(opt) {
         this.loading = true
         getDeviceName({orgId: this.orgId, sbyqmc: opt.label}).then(list => {
@@ -261,7 +262,7 @@ export default {
       this.loading = true
       getByDeviceCode({orgId: this.orgId, sbbh: id}).then(resp => {
         this.form.model = resp.sbggxh
-        this.form.store_count = resp.sbsl
+        this.form.storeCount = resp.sbsl
 
         this.tableData = [
           {
@@ -279,10 +280,11 @@ export default {
         ... this.form,
         orgId: this.orgId,
       }
-      return {
-        deviceCheckJson: JSON.stringify(data),
-        type: 'add'
-      }
+      // return {
+      //   deviceCheckJson: JSON.stringify(data),
+      //   type: 'add'
+      // }
+      return data
     },
     getOption(id, items) {
       for (let i = 0; i < items.length; i++) {

src/page/deviceManagement/components/maintenanceEdit.vue

@@ -162,9 +162,10 @@ export default {
         ... this.form,
         orgId: this.orgId,
       }
-      return {
-        deviceAddJson: JSON.stringify(d)
-      }
+      // return {
+      //   deviceAddJson: JSON.stringify(d)
+      // }
+      return d
     },
     getSaveFun() {
       return deviceKeepSave

src/page/deviceManagement/components/repairEdit.vue

@@ -178,9 +178,10 @@ export default {
         orgId: this.orgId,
       }
       this.$systemUtils.parseField2Float(d, ['repairNumber', 'repairSumnumber'])
-      return {
-        deviceRepairJson: JSON.stringify(d)
-      }
+      // return {
+      //   deviceRepairJson: JSON.stringify(d)
+      // }
+      return d
     },
     getSaveFun() {
       return deviceRepairSave

src/page/deviceManagement/deviceGet.vue

@@ -83,10 +83,12 @@
       ></el-table-column>
       <el-table-column
         align="center"
+        prop="bookKeeper"
         label="记账人"
       ></el-table-column>
       <el-table-column
         align="center"
+        prop="handler"
         label="经手人"
       ></el-table-column>
       <el-table-column label="操作" align="center" width="80">

src/page/deviceManagement/inventory.vue

@@ -78,11 +78,11 @@
         prop="checkDate"
         label="盘点时间"
       ></el-table-column>
-      <el-table-column label="操作" align="center" width="80">
-        <template slot-scope="scope">
+<!--      <el-table-column label="操作" align="center" width="80">-->
+<!--        <template slot-scope="scope">-->
 
-        </template>
-      </el-table-column>
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <!-- 分页开始 -->
     <div class="pag-right clearFix">
@@ -111,7 +111,7 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import edit from "./components/inventoryEdit.vue";
-import {deviceCheckList, getCheckListNoPage} from "@/api/deviceManagement";
+import {deviceCheckList, getCheckListNoPage, checkListRemove} from "@/api/deviceManagement";
 import {mapGetters} from "vuex";
 
 
@@ -181,7 +181,7 @@ export default {
       this.addShow = true
     },
     del(data) {
-      removeAgentTemperature(data.id).then(resp => {
+      checkListRemove(data.id).then(resp => {
         if(resp.status === 'success') {
           this.$message.success('删除成功')
           this.getList()

src/page/deviceManagement/maintenance.vue

@@ -87,6 +87,7 @@
             icon="el-icon-video-pause"
           >查看</el-button>
           <el-button
+            v-if="!scope.row.keepEnd"
             type="primary"
             @click="end(scope.row)"
             size="small"
@@ -226,10 +227,13 @@ export default {
       })
     },
     end(data) {
+      // const d = {
+      //   deviceListJson: JSON.stringify({
+      //     id: data.id
+      //   })
+      // }
       const d = {
-        deviceListJson: JSON.stringify({
-          id: data.id
-        })
+        id: data.id
       }
       deviceKeepEnd(d).then(resp => {
         if(resp.status === 'success') {

src/page/deviceManagement/repair.vue

@@ -215,10 +215,13 @@ export default {
       })
     },
     end(data) {
+      // const d = {
+      //   deviceListJson: JSON.stringify({
+      //     id: data.id
+      //   })
+      // }
       const d = {
-        deviceListJson: JSON.stringify({
-          id: data.id
-        })
+        id: data.id
       }
       deviceRepairEnd(d).then(resp => {
         if(resp.status === 'success') {

src/page/granaryComprehensiveExhibition/granaryLive.vue

@@ -7,7 +7,7 @@
 <script>
 
 import commonSelect from "@/components/common/commonSelect"
-import live from "@/components/common/player/live"
+import live from "@/components/common/player/live_v2.vue"
 
 export default {
   name: "granaryLive",

src/page/granaryComprehensiveExhibition/granaryReplay.vue

@@ -0,0 +1,75 @@
+<template>
+  <div class="content-main">
+    <replay :show-camera-control="true"></replay>
+  </div>
+</template>
+
+<script>
+
+import commonSelect from "@/components/common/commonSelect"
+import replay from "@/components/common/player/playback_v2.vue"
+
+export default {
+  name: "granaryReplay",
+  components: {
+    replay,
+    commonSelect,
+  },
+  data() {
+    return {
+      limit: {
+        page: 1,
+        size: 10,
+        total: 0
+      },
+      tableData: [],
+      form: {
+        type: null,
+        status: null,
+        name: null,
+      },
+      paginationShow: true,
+      listLoading: false,
+      inOutType: 'in',
+      notificationType: 'grain',
+      addShow: false,
+      addShowCookingOil: false,
+    }
+  },
+  computed: {
+
+  },
+  methods: {
+    search() {
+
+    },
+    reset(formName) {
+      if(this.$refs[formName]) {
+        this.$refs[formName].resetFields()
+      }
+    },
+    add() {
+      this.addShow = true
+
+    },
+    manage(data) {
+
+    },
+    handleCurrentChangeTask() {
+
+    },
+    handleSizeChangeTask() {
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.small-field {
+  width: 150px;
+}
+.small-date {
+  width: 250px;
+}
+</style>

src/page/home.vue

@@ -1,12 +1,14 @@
 <template>
-  <div class="content-main multi-column">
+  <div class="content-main multi-column" v-if="$store.state.flag == 2">
     <div class="column aside-column full-column">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
           <span>待办事项</span>
         </div>
         <div class="text item">
-          <span class="todoTips" @click="goTodo">智能粮库待办事项 <span style="color: red;">0</span> 条</span>
+          <span class="todoTips" @click="goTodo"
+            >智能粮库待办事项 <span style="color: red">0</span> 条</span
+          >
         </div>
       </el-card>
       <el-card class="box-card">
@@ -28,40 +30,50 @@
     </div>
     <div class="column main-column full-column">
       <div class="main-top">
-        <div class="left" style="height: auto;display: flex;flex-direction: column">
+        <div
+          class="left"
+          style="height: auto; display: flex; flex-direction: column"
+        >
           <div class="welcome">
             <el-card class="box-card">
-              <div class="welcome-title"> {{ welcome }} <span style="margin-left: 5px;"> {{ $dateUtils.formatNow() }} </span></div>
+              <div class="welcome-title">
+                {{ welcome }}
+                <span style="margin-left: 5px">
+                  {{ $dateUtils.formatNow() }}
+                </span>
+              </div>
             </el-card>
           </div>
           <el-image
             v-if="birdsEye"
             :src="birdsEye"
-            style="max-height:520px;flex: 1"
-            fit="fill"></el-image>
-<!--          <el-tabs type="border-card" style="min-height: 500px;">-->
-<!--            <el-tab-pane label="粮情">-->
-<!--              <div style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;">-->
-<!--              -->
-<!--              </div>-->
-<!--            </el-tab-pane>-->
-<!--&lt;!&ndash;            <el-tab-pane label="监控"></el-tab-pane>&ndash;&gt;-->
-<!--          </el-tabs>-->
+            style="max-height: 520px; flex: 1"
+            fit="fill"
+          ></el-image>
+          <!--          <el-tabs type="border-card" style="min-height: 500px;">-->
+          <!--            <el-tab-pane label="粮情">-->
+          <!--              <div style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;">-->
+          <!--              -->
+          <!--              </div>-->
+          <!--            </el-tab-pane>-->
+          <!--&lt;!&ndash;            <el-tab-pane label="监控"></el-tab-pane>&ndash;&gt;-->
+          <!--          </el-tabs>-->
         </div>
         <div class="right">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>当前作业</span>
             </div>
-            <div class="text item">
-            </div>
+            <div class="text item"></div>
           </el-card>
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>库存/库容比</span>
             </div>
             <div class="text item">
-              <el-image :src="require('@/assets/wisdom_images/chart1.png')"></el-image>
+              <el-image
+                :src="require('@/assets/wisdom_images/chart1.png')"
+              ></el-image>
             </div>
           </el-card>
           <el-card class="box-card">
@@ -69,7 +81,9 @@
               <span>储粮等级(单位: 吨)</span>
             </div>
             <div class="text item">
-              <el-image :src="require('@/assets/wisdom_images/chart2.png')"></el-image>
+              <el-image
+                :src="require('@/assets/wisdom_images/chart2.png')"
+              ></el-image>
             </div>
           </el-card>
         </div>
@@ -80,7 +94,9 @@
             <span>五温曲线图</span>
           </div>
           <div class="text item">
-            <el-image :src="require('@/assets/wisdom_images/chart3.png')"></el-image>
+            <el-image
+              :src="require('@/assets/wisdom_images/chart3.png')"
+            ></el-image>
           </div>
         </el-card>
         <el-card class="box-card">
@@ -88,32 +104,40 @@
             <span>粮食品种(单位: 吨)</span>
           </div>
           <div class="text item">
-            <el-image :src="require('@/assets/wisdom_images/chart3.png')"></el-image>
+            <el-image
+              :src="require('@/assets/wisdom_images/chart3.png')"
+            ></el-image>
           </div>
         </el-card>
       </div>
     </div>
   </div>
+  <div v-else class="content-wrap" style="width: 100vw; height: 86vh">
+    <iframe
+      id="iframeContainer"
+      :src="url"
+      style="width: 100%; height: 100%"
+    ></iframe>
+  </div>
 </template>
 
 <script>
-
-import commonSelect from "@/components/common/commonSelect"
-import { mapGetters } from 'vuex'
-import {depotImageList} from "@/api/system";
+import commonSelect from "@/components/common/commonSelect";
+import { mapGetters } from "vuex";
+import { depotImageList } from "@/api/system";
 export default {
   name: "home",
   components: {
-    commonSelect
+    commonSelect,
   },
   data() {
     return {
-      welcome: '',
-      desc: '',
+      welcome: "",
+      desc: "",
       limit: {
         page: 1,
         size: 10,
-        total: 0
+        total: 0,
       },
       depotImages: [],
       tableData: [],
@@ -125,33 +149,46 @@ export default {
       listLoading: false,
       addShow: false,
       birdsEye: null,
+      url: "",
+    };
+  },
+  created() {
+    const u = localStorage.getItem("_userName");
+    const p = localStorage.getItem("_password");
+    const isProd = process.env.NODE_ENV === "production";
+    // let url;
+    if (!isProd) {
+      // this.url = `http://101.36.160.210:31055/crk/#/welcome/?username=${u}&password=${p}`;
+       this.url = `http://101.36.160.210:31055/crk/?k_username=${u}&k_password=${p}`;
+    } else {
+      this.url = `http://172.18.93.228:80/#/welcome?username=${u}&password=${p}`;
     }
   },
   computed: {
-    ...mapGetters(['orgName', 'orgId']),
+    ...mapGetters(["orgName", "orgId"]),
   },
   mounted() {
-    this.welcome = this.orgName + '欢迎您'
-    this.desc = this.$store.state.user.orgInfo.briefIntroduction
-    const orgInfo = JSON.parse(sessionStorage.getItem('orgInfo'))
-    console.log('orgInfo', orgInfo)
-    this.birdsEye = orgInfo.birdsEye
-    this.getDeopImages()
+    this.welcome = this.orgName + "欢迎您";
+    this.desc = this.$store.state.user.orgInfo.briefIntroduction;
+    const orgInfo = JSON.parse(sessionStorage.getItem("orgInfo"));
+    console.log("orgInfo", orgInfo);
+    this.birdsEye = orgInfo.birdsEye;
+    this.getDeopImages();
   },
   methods: {
     getDeopImages() {
-      depotImageList({orgId: this.orgId}).then(resp => {
-        const list = resp || []
-        this.depotImages = list
-        console.log('轮播图片', list)
-      })
+      depotImageList({ orgId: this.orgId }).then((resp) => {
+        const list = resp || [];
+        this.depotImages = list;
+        console.log("轮播图片", list);
+      });
     },
     goTodo() {
-      this.$store.commit('SET_TOP_MENU_INDEX', 1)
-      this.$router.push({ path: '/toDoNav/toDoThings' })
-    }
-  }
-}
+      this.$store.commit("SET_TOP_MENU_INDEX", 1);
+      this.$router.push({ path: "/toDoNav/toDoThings" });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
@@ -167,7 +204,7 @@ export default {
   }
 
   .main-column {
-    margin-left:5px;
+    margin-left: 5px;
     width: 76%;
   }
 }
@@ -182,7 +219,6 @@ export default {
 }
 
 .welcome {
-
 }
 
 .welcome-title {
@@ -224,5 +260,4 @@ export default {
 //.el-carousel__item:nth-child(2n+1) {
 //  background-color: #d3dce6;
 //}
-
 </style>

src/page/intelligentStorage/components/quantityDetectionDeviceConfigEdit.vue

@@ -142,8 +142,8 @@ export default {
       this.initHouseOptions();
     },
     beforeAll() {
-      if(this.isAdd) {
-        this.form.updatePerson = this.realName
+      if(this.isAdd || this.isEdit) {
+        this.form.updatePerson = this.userId
       }
     },
     getDataFun() {

src/page/mixin/legacyUpload.js

@@ -0,0 +1,60 @@
+import {uploadUrl_2} from "@/api/settlementManagement";
+import {downloadBase} from "@/api/inventoryQualityTraceability";
+import {basicUploadUrl, getFileList} from "@/api/base";
+export default {
+  data() {
+    return {
+      uploadUrl_2,
+      downloadBase,
+      fileList: [],
+      fileIds: [],
+      deleteFileIds: [],
+    }
+  },
+  methods: {
+    getFileListById(dataId) {
+      getFileList({bid: dataId, orgId: this.orgId}).then(resp => {
+
+        this.fileList = resp.map(d => {
+          return {
+            id: d.id,
+            name: d.originalFileName,
+            url: `${downloadBase}/${d.filePath}`
+          }
+        })
+        console.log('文件列表', resp, this.fileList)
+      })
+    },
+    onUploadSuccess(resp, file, fileList) {
+      console.log('上传文件 resp', resp, file, fileList)
+      this.fileList = fileList.map(f => {
+        let url
+        let id
+        if(f.response) {
+          url = f.response.filePath
+          id = f.response.id
+        }else {
+          url = f.url
+          id = f.id
+        }
+        return {
+          name: f.name,
+          url: url,
+          id: id,
+        }
+      })
+    },
+    onUploadRemove(fileList) {
+      const removeFiles = []
+      for(const f of this.fileList) {
+        const file = fileList.find(temp => temp.id === f.id)
+        if(! file) {
+          removeFiles.push(f)
+        }
+      }
+      this.fileList = fileList
+      this.deleteFileIds.push(... removeFiles.map(f => f.id))
+      console.log('删除文件 ', fileList, removeFiles)
+    }
+  }
+}

src/page/monitoringChannel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="content-main">
-    <live :show-live-control="false" :show-camera-control="true"></live>
+    <live_v2 :show-live-control="false" :show-camera-control="true"></live_v2>
   </div>
 </template>
 
@@ -8,11 +8,13 @@
 
 import commonSelect from "@/components/common/commonSelect"
 import live from "@/components/common/player/live"
+import live_v2 from "@/components/common/player/live_v2.vue"
 
 export default {
   name: "monitoringChannel",
   components: {
     live,
+    live_v2,
     commonSelect,
   },
   data() {

src/page/purchaseOfFinished/components/monthlyReport.vue

@@ -331,7 +331,7 @@ export default {
         orgName: "",
         id: "",
         createdate: "",
-        planName:'',
+        planName: "",
         updatename: "",
         updatedate: "",
         orgId: "",
@@ -350,11 +350,17 @@ export default {
       houseOptions: [],
       rules: {
         planCode: [
-          { required: true, message: "输入计划编号", trigger: "change" },
+          { required: true, message: "请输入计划编号", trigger: "change" },
         ],
         planType: [
           { required: true, message: "请选择计划类型", trigger: "change" },
         ],
+        planStartTime: [
+          { required: true, message: "请输入计划开始时间", trigger: "change" },
+        ],
+        planEndTime: [
+          { required: true, message: "请输入计划结束时间", trigger: "change" },
+        ],
       },
     };
   },

src/page/purchaseOfFinished/purchaseOfFinished.vue

@@ -22,12 +22,12 @@
             <el-input placeholder="请输入内容" v-model="searchData.unitName" />
           </el-form-item>
           <el-form-item label="年度:" prop="lspzName">
-              <el-date-picker
-                v-model="searchData.year"
-                value-format="yyyy"
-                type="year"
-                placeholder="日期"
-              />
+            <el-date-picker
+              v-model="searchData.year"
+              value-format="yyyy"
+              type="year"
+              placeholder="日期"
+            />
           </el-form-item>
           <!-- <el-form-item label="粮食性质:" prop="lsxzName">
             <el-input
@@ -78,22 +78,16 @@
         prop="dwmc"
         label="企业名称"
       ></el-table-column>
-      </el-table-column>
       <el-table-column
         align="center"
         prop="planCode"
         label="计划编号"
       ></el-table-column>
-      <el-table-column
-        align="center"
-        prop="planType"
-        label="计划类型"
-      >
- <template v-slot="scope">
-<div v-if="scope.row.planType == 1">销售计划 </div>
-<div v-if="scope.row.planType == 2">收购计划 </div>
+      <el-table-column align="center" prop="planType" label="计划类型">
+        <template v-slot="scope">
+          <div v-if="scope.row.planType == 1">销售计划</div>
+          <div v-if="scope.row.planType == 2">收购计划</div>
         </template>
-      
       </el-table-column>
       <el-table-column
         align="center"
@@ -182,7 +176,7 @@
 </template>
 <script>
 import MonthlyReport from "./components/monthlyReport.vue";
-import {  CPLGXIAOJIHAOlist ,CPLGXIAOJIHAOdel} from "@/api/base/rotationApi.js";
+import { CPLGXIAOJIHAOlist, CPLGXIAOJIHAOdel } from "@/api/base/rotationApi.js";
 export default {
   components: { MonthlyReport },
   data() {
@@ -194,7 +188,7 @@ export default {
         titleText: "",
         showLock: false,
         isType: "",
-        lengthACC:0
+        lengthACC: 0,
       },
       searchData: {
         unitName: "",
@@ -216,10 +210,10 @@ export default {
 
   methods: {
     getList() {
-    const userInfoJSON = JSON.parse(sessionStorage.getItem("userInfo"));
+      const userInfoJSON = JSON.parse(sessionStorage.getItem("userInfo"));
       const obj = {
         ...this.searchData,
-        orgId:userInfoJSON.orgId,
+        orgId: userInfoJSON.orgId,
         current: this.limit.page,
         size: this.limit.size,
       };
@@ -244,7 +238,7 @@ export default {
     // 新增
     addData() {
       this.dataObj.isType = "1";
-      this.dataObj.lengthACC = this.tableData.length + 1
+      this.dataObj.lengthACC = this.tableData.length + 1;
       this.dataObj.titleText = "新增购销计划管理";
       this.dataObj.visible = true;
       this.dataObj.showLock = false;

src/page/receiptConfirmation/entryPriceCheckn/details.vue

@@ -141,16 +141,19 @@
                   prop="zjbgdh"
                   label="报告单号"
                   align="center"
+                  show-overflow-tooltip
                 />
                 <el-table-column
                   prop="storehouseName"
                   label="仓号"
                   align="center"
+                  show-overflow-tooltip
                 />
                 <el-table-column
                   prop="warehouseName"
                   label="货位名称"
                   align="center"
+                  show-overflow-tooltip
                 />
                 <el-table-column prop="sf" label="水分" align="center" />
                 <el-table-column prop="zz" label="杂质" align="center" />
@@ -184,12 +187,12 @@
                 />
                 <el-table-column
                   align="center"
-                  label="其中：等量补库"
+                  label="其中：等量补库（公斤）"
                   prop="equalQuantitySupplement"
                 />
                 <el-table-column
                   align="center"
-                  label="保管账数量"
+                  label="保管账数量（公斤）"
                   prop="custodyAccountQuantity"
                 />
                 <el-table-column
@@ -252,7 +255,7 @@
                 </el-table-column>
                 <el-table-column
                   align="center"
-                  label="确认数量"
+                  label="确认数量（公斤）"
                   prop="totalSettleQuantity"
                 />
                 <el-table-column
@@ -272,11 +275,13 @@
                   align="center"
                   label="凭证号"
                   prop="voucherNumber"
+                  show-overflow-tooltip
                 />
                 <el-table-column
                   align="center"
                   label="单位"
                   prop="payerUnitName"
+                  show-overflow-tooltip
                 />
                 <el-table-column
                   label="已付粮款（元）"
@@ -320,15 +325,18 @@
                 align="center"
                 label="对方单位"
                 prop="wcmCostMainUnit"
+                show-overflow-tooltip
               />
               <el-table-column
                 align="center"
                 label="费用名称"
                 prop="wcmCostName"
+                show-overflow-tooltip
               />
               <el-table-column
                 align="center"
                 label="会计凭证号"
+                show-overflow-tooltip
                 prop="wcmAccountingVoucherNumber"
               />
               <el-table-column
@@ -573,8 +581,6 @@ export default {
     },
     // 下载文件
     downloadEvent(data) {
-      data =
-        "https://image.baidu.com/search/down?tn=download&word=download&ie=utf8&fr=detail&url=https%3A%2F%2Fphoto.669pic.com%2Fshow_photos%2F84%2F82%2F29%2F45%2F54729df1d8df72d6a006fd0fdd4a89a3.jpg&thumburl=https%3A%2F%2Fimg1.baidu.com%2Fit%2Fu%3D2829212510%2C1692384975%26fm%3D253%26fmt%3Dauto%26app%3D138%26f%3DJPEG%3Fw%3D500%26h%3D750";
       downloadFile(data, "合同附件");
     },
     // 入库明细、会计凭证明细弹框打开事件
@@ -610,8 +616,10 @@ export default {
   .el-card {
     margin-bottom: 15px;
     .el-card__header {
-      font-size: 16px;
-      font-weight: bold;
+      span {
+        font-size: 16px;
+        font-weight: bold;
+      }
       .el-select {
         float: right;
       }

src/page/receiptConfirmation/entryPriceCheckn/detailsModule.vue

@@ -11,6 +11,7 @@
     :visible.sync="moduleData.show"
   >
     <el-table
+      border
       show-summary
       :data="tableData"
       :summary-method="getSummaries"
@@ -25,9 +26,9 @@
       <el-table-column prop="storehouseName" align="center" label="仓房名称" />
       <el-table-column prop="warehouseName" align="center" label="货位名称" />
       <el-table-column prop="qcph" label="车牌号" align="center" />
-      <el-table-column prop="mzzl" align="center" label="毛重" />
-      <el-table-column prop="pz" align="center" label="皮重" />
-      <el-table-column prop="bzwkl" align="center" label="扣量" />
+      <el-table-column prop="mzzl" align="center" label="毛重（公斤）" />
+      <el-table-column prop="pz" align="center" label="皮重（公斤）" />
+      <el-table-column prop="bzwkl" align="center" label="扣量（公斤）" />
       <el-table-column
         width="160"
         prop="cpzsj"
@@ -37,6 +38,7 @@
     </el-table>
     <el-table
       v-else
+      border
       show-summary
       :data="tableData"
       :summary-method="getSummaries"

src/page/receiptConfirmation/revenueContributionModule/addDataModule.vue

@@ -0,0 +1,358 @@
+<template>
+  <el-dialog
+    top="0"
+    width="66%"
+    :limit="1"
+    class="dialog-box"
+    :append-to-body="true"
+    :title="addModuleData.title"
+    :before-close="closeModule"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :visible.sync="addModuleData.show"
+  >
+    <div class="queryBox">
+      <el-form
+        :rules="rules"
+        ref="ruleForm"
+        label-width="160px"
+        :model="searchData"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="仓房：" prop="basicStorehouseId">
+              <el-select
+                size="small"
+                style="width: 340px"
+                placeholder="请选择仓房"
+                @change="selectStoreHouse"
+                v-model="searchData.basicStorehouseId"
+              >
+                <el-option
+                  v-for="item in dictList.storehouseList"
+                  :key="item.storehouseId"
+                  :value="item.storehouseId"
+                  :label="item.storehouseName"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="货位：" prop="warehouseId">
+              <el-select
+                size="small"
+                style="width: 340px"
+                placeholder="请选择货位"
+                v-model="searchData.warehouseId"
+                :disabled="!searchData.basicStorehouseId"
+              >
+                <el-option
+                  v-for="item in dictList.warehouseList"
+                  :key="item.warehouseId"
+                  :value="item.warehouseId"
+                  :label="item.warehouseName"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button
+                size="small"
+                type="primary"
+                @click="queryData"
+                class="iconfont iconchaxun"
+                >查询</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="formBox">
+      <el-form
+        :model="formData"
+        label-width="160px"
+        v-if="addModuleData.type == 'ZJSYXX'"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入仓水分">
+              <el-input disabled v-model="formData.sfOut" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="出仓水分">
+              <el-input disabled v-model="formData.sfOut" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入仓杂质">
+              <el-input disabled v-model="formData.zzIn" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="出仓杂质">
+              <el-input disabled v-model="formData.zzOut" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="实际损耗量（公斤）">
+              <el-input disabled v-model="formData.actualLossQuantity" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="定额损耗小计（公斤）">
+              <el-input disabled v-model="formData.quotaLoss" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="保管损耗（公斤）">
+              <el-input disabled v-model="formData.naturalLoss" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="水分减量（公斤）">
+              <el-input disabled v-model="formData.moistureLoss" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="杂质减量（公斤）">
+              <el-input disabled v-model="formData.impurityReductionQuality" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="超耗数量（公斤）">
+              <el-input disabled v-model="formData.excessLossQuantity" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="超耗原因">
+              <el-input
+                disabled
+                type="textarea"
+                v-model="formData.lossProfitReason"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form
+        v-else
+        ref="priceForm"
+        :model="formData"
+        label-width="160px"
+        :rules="priceRules"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入库数量（公斤）" prop="lssl">
+              <el-input disabled v-model="formData.lssl" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="核定单价（元）" prop="inNinancialVerification">
+              <el-input disabled v-model="formData.inNinancialVerification" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入库金额（元）" prop="storageAmount">
+              <el-input disabled v-model="formData.storageAmount" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文件号">
+              <el-input disabled v-model="formData.documentNumber" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文档上传" prop="fileList">
+              <el-upload
+                :action="actionUrl"
+                class="upload-demo"
+                :on-remove="handleRemove"
+                :on-success="handleSuccess"
+                :file-list="formData.fileList"
+              >
+                <el-button size="small" type="primary" icon="el-icon-upload"
+                  >点击上传</el-button
+                >
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button size="large" class="successBtn" @click="saveData"
+          >保存</el-button
+        >
+        <el-button size="large" @click="closeModule">关闭</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { depot_smart_storage } from "@/api";
+import * as api from "@/api/revenueContributionModule/index.js";
+
+export default {
+  props: {
+    dictList: {
+      type: Object,
+      default: () => {},
+    },
+    addModuleData: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      formData: {
+        fileList: [],
+      },
+      showDialog: true,
+      warehouseList: [],
+      searchData: {
+        warehouseId: 100042,
+        basicStorehouseId: "",
+        orgId: this.$store.state.user.orgInfo.orgId,
+      },
+      actionUrl: `${depot_smart_storage}/dev/file/uploadMinioReturnUrl`,
+      rules: {
+        warehouseId: [
+          { required: true, message: "请选择货位", trigger: "change" },
+        ],
+        basicStorehouseId: [
+          { required: true, message: "请选择仓房", trigger: "change" },
+        ],
+      },
+      priceRules: {
+        lssl: [{ required: true, message: "请输入入库数量", trigger: "blur" }],
+        storageAmount: [
+          { required: true, message: "请输入入库金额", trigger: "blur" },
+        ],
+        fileList: [
+          { required: true, message: "请上传文档", trigger: "change" },
+        ],
+        inNinancialVerification: [
+          { required: true, message: "请输入核定单价", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  mounted() {
+    if (this.addModuleData.data) {
+      Object.assign(this.formData, this.addModuleData.data);
+      this.searchData.warehouseId = this.formData.warehouseId;
+      this.searchData.basicStorehouseId =
+        this.formData.basicStorehouseId || this.formData.storehouseId;
+      if (this.formData.fileList.length < 1) {
+        this.formData.fileList = [];
+        this.formData.fileList.push({
+          status: "success",
+          name: this.formData.documentNumber,
+          response: this.formData.documentUpload,
+        });
+      }
+    }
+  },
+  methods: {
+    queryData() {
+      let apiFun = "";
+      if (this.addModuleData.type == "YHDRKJG") {
+        //原核定入库价格
+        apiFun = api.getCardInfo;
+      } else {
+        // 质检损益信息
+        apiFun = api.getConsistenceAccountInfo;
+      }
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          apiFun(this.searchData).then((res) => {
+            this.formData = res.data;
+            this.formData.fileList = [];
+          });
+        }
+      });
+    },
+    saveData() {
+      this.formData.warehouseId = this.searchData.warehouseId;
+      this.formData.basicStorehouseId = this.searchData.basicStorehouseId;
+      let obj = {
+        data: this.formData,
+        type: this.addModuleData.type,
+      };
+      if (this.addModuleData.type == "YHDRKJG") {
+        this.formData.fileList.map((item) => {
+          obj.data.documentUpload = item.response;
+        });
+        this.$refs.priceForm.validate((valid) => {
+          if (valid) {
+            this.formData = {};
+            this.$emit("closeAddModule", obj);
+          }
+        });
+      } else {
+        if (this.formData.zjbgdhIn && this.formData.zjbgdhOut) {
+          this.formData = {};
+          this.$emit("closeAddModule", obj);
+        } else {
+          this.$message.warning("请选择质检损益信息");
+        }
+      }
+    },
+    // 联动仓房
+    selectStoreHouse(data) {
+      this.warehouseList = [];
+      this.searchData.warehouseId = "";
+      this.dictList.warehouseList.map((item) => {
+        if (item.storehouseId == data) {
+          this.warehouseList.push(item);
+        }
+      });
+    },
+    // 文件上传成功
+    handleSuccess(response, file, fileList) {
+      if (file.status == "success") {
+        this.formData.documentNumber = file.name;
+        this.formData.fileList.push(file);
+      }
+    },
+    // 移除文件
+    handleRemove(file, fileList) {
+      this.formData.fileList = [];
+      this.formData.documentUpload = "";
+    },
+    closeModule() {
+      this.formData = {};
+      this.$emit("closeAddModule", null);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-dialog {
+  .el-dialog__footer {
+    .dialog-footer {
+      display: flex;
+      justify-content: flex-end;
+      .successBtn {
+        color: #fff;
+        background: #67c23a;
+      }
+    }
+  }
+  .queryBox {
+    padding-top: 20px;
+    box-shadow: 5px 10px 20px #e4e7ed;
+  }
+  .formBox {
+    margin-top: 30px;
+    padding: 30px 15px;
+    height: calc(100% - 180px);
+  }
+}
+</style>

src/page/receiptConfirmation/revenueContributionModule/details.vue

@@ -0,0 +1,875 @@
+<template>
+  <div class="entryPriceCheckn">
+    <el-dialog
+      top="0"
+      width="86%"
+      class="dialog-box"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="sendData.visible"
+      :before-close="handleDialogClose"
+      :title="sendData.titleText + '省级储备差价上缴表'"
+    >
+      <el-form
+        :rules="rules"
+        ref="ruleForm"
+        :model="pageData"
+        label-width="100px"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="上报库区:">
+              <el-input
+                disabled
+                v-model="pageData.orgName"
+                placeholder="自动带出"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="上报时间:" prop="reportTime">
+              <el-date-picker
+                type="date"
+                style="width: 100%"
+                v-model="pageData.reportTime"
+                placeholder="请选择上报时间"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled="sendData.type == 'look'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划类型:">
+              <el-input disabled v-model="pageData.planType" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="销往单位:" prop="salesUnit">
+              <el-input
+                v-model="pageData.salesUnit"
+                placeholder="请填写销往单位"
+                :disabled="sendData.type == 'look'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合同编号:" prop="contractId">
+              <el-select
+                placeholder="请选择合同编号"
+                @change="selectContract"
+                v-model="pageData.contractId"
+                :disabled="sendData.type == 'look'"
+              >
+                <el-option
+                  v-for="item in dictList.contractDetails"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.contractTitle"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"> </el-col>
+          <!---------------------------------------------- 合同信息 ----------------------------------------------->
+          <el-card class="box-card">
+            <span slot="header">合同信息</span>
+            <el-table
+              show-summary
+              :data="cacheData.contractDetails"
+              :summary-method="getSummaries"
+            >
+              <el-table-column align="center" label="合同签订情况">
+                <el-table-column prop="houseName" label="仓房" align="center" />
+                <el-table-column
+                  prop="warehouseName"
+                  label="货位"
+                  align="center"
+                />
+                <el-table-column
+                  prop="grainKindName"
+                  label="品种"
+                  align="center"
+                />
+                <el-table-column
+                  prop="inCount"
+                  label="数量（吨）"
+                  align="center"
+                />
+                <el-table-column
+                  prop="inPrice"
+                  label="单价（元/吨）"
+                  align="center"
+                />
+                <el-table-column
+                  prop="inDetailTotalPrice"
+                  label="金额（元）"
+                  align="center"
+                />
+              </el-table-column>
+            </el-table>
+          </el-card>
+          <!---------------------------------------------- 质检损益信息 ----------------------------------------------->
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>质检损益信息</span>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-plus"
+                v-if="sendData.type != 'look'"
+                @click="openAddModule('ZJSYXX')"
+                >添加</el-button
+              >
+            </div>
+            <el-table :data="pageData.inspectionLossList">
+              <el-table-column align="center" label="分仓出入库质检报告">
+                <el-table-column
+                  label="报告单号"
+                  align="center"
+                  show-overflow-tooltip
+                >
+                  <el-table-column
+                    label="入库单号"
+                    show-overflow-tooltip
+                    prop="zjbgdhIn"
+                  />
+                  <el-table-column
+                    label="出库单号"
+                    show-overflow-tooltip
+                    prop="zjbgdhOut"
+                  />
+                </el-table-column>
+                <el-table-column
+                  prop="storehouseName"
+                  label="仓号"
+                  align="center"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  prop="warehouseName"
+                  label="货位名称"
+                  align="center"
+                  show-overflow-tooltip
+                />
+                <el-table-column prop="sfIn" label="入仓水分" align="center" />
+                <el-table-column prop="sfOut" label="出仓水分" align="center" />
+                <el-table-column prop="zzIn" label="入仓杂质" align="center" />
+                <el-table-column prop="zzOut" label="出仓杂质" align="center" />
+              </el-table-column>
+              <el-table-column align="center" label="分仓损耗">
+                <el-table-column
+                  prop="actualLossQuantity"
+                  label="实际损耗量（公斤）"
+                  align="center"
+                />
+                <el-table-column
+                  prop="quotaLoss"
+                  label="定额损耗小计（公斤）"
+                  align="center"
+                />
+                <el-table-column prop="sf" label="其中：" align="center">
+                  <el-table-column
+                    prop="naturalLoss"
+                    label="保管损耗（公斤）"
+                    align="center"
+                  />
+                  <el-table-column
+                    prop="moistureLoss"
+                    label="水分减量（公斤）"
+                    align="center"
+                  />
+                  <el-table-column
+                    prop="impurityReductionQuality"
+                    label="杂质减量（公斤）"
+                    align="center"
+                  />
+                </el-table-column>
+                <el-table-column
+                  prop="excessLossQuantity"
+                  label="超耗数量（公斤）"
+                  align="center"
+                />
+                <el-table-column
+                  prop="lossProfitReason"
+                  label="超耗原因"
+                  align="center"
+                  show-overflow-tooltip
+                />
+              </el-table-column>
+              <el-table-column
+                align="center"
+                label="操作"
+                v-if="sendData.type != 'look'"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    @click="deleteData('ZJSYXX', scope.$index)"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+
+          <!---------------------------------------------- 三账一致性 ----------------------------------------------->
+          <el-card class="box-card">
+            <span slot="header">三账一致性</span>
+            <el-table :data="pageData.threeConsistenceAccountList">
+              <el-table-column label="会计账" align="center">
+                <el-table-column label="月份" align="center" prop="month" />
+                <el-table-column label="凭证号" align="center" prop="id" />
+                <el-table-column
+                  label="销售数量（公斤）"
+                  align="center"
+                  prop="provinceAccountingQuantity"
+                />
+                <el-table-column
+                  label="销售单价（元）"
+                  align="center"
+                  prop="provinceAccountingUnitPrice"
+                />
+                <el-table-column
+                  label="销售金额（元）"
+                  align="center"
+                  prop="provinceAccountingAmount"
+                />
+              </el-table-column>
+            </el-table>
+            <el-table
+              show-summary
+              :summary-method="getSummaries"
+              :data="pageData.threeConsistenceList"
+            >
+              <el-table-column label="实际出库情况" align="center">
+                <el-table-column label="月份" align="center" prop="month" />
+                <el-table-column
+                  label="仓房"
+                  align="center"
+                  prop="storehouseName"
+                />
+                <el-table-column
+                  label="货位"
+                  align="center"
+                  prop="warehouseName"
+                />
+                <el-table-column
+                  label="其中：损耗"
+                  align="center"
+                  prop="loss"
+                />
+                <el-table-column
+                  label="保管账数量（公斤）"
+                  align="center"
+                  prop="provinceCustodyAccountQuantity"
+                />
+                <el-table-column
+                  label="统计账数量（公斤）"
+                  align="center"
+                  prop="provinceStatisticalAccountQuantity"
+                />
+                <el-table-column
+                  label="完成时间"
+                  align="center"
+                  prop="completeTime"
+                />
+                <el-table-column label="查看出库明细" align="center">
+                  <el-button
+                    link
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-view"
+                    @click="moduleData.show = true"
+                    >查看</el-button
+                  >
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </el-card>
+
+          <!---------------------------------------------- 结算信息 ----------------------------------------------->
+          <el-card class="box-card">
+            <span slot="header">结算信息</span>
+            <el-table
+              show-summary
+              :data="pageData.revenueSettleList"
+              :summary-method="getSummaries"
+            >
+              <el-table-column label="出库验收确认" align="center">
+                <el-table-column
+                  label="单位"
+                  align="center"
+                  prop="orgName"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  align="center"
+                  label="数量（吨）"
+                  prop="provinceTotalSettleQuantity"
+                />
+                <el-table-column
+                  align="center"
+                  label="金额（元）"
+                  prop="provinceTotalSettleAmount"
+                />
+              </el-table-column>
+              <el-table-column label="贷款收回情况" align="center">
+                <el-table-column
+                  label="日期"
+                  align="center"
+                  width="160"
+                  prop="loanReturnTime"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  align="center"
+                  label="数量"
+                  prop="provinceLoanRecoveryQuantity"
+                />
+                <el-table-column
+                  label="金额（元）"
+                  align="center"
+                  prop="provinceLoanRecoveryAmount"
+                />
+              </el-table-column>
+              <el-table-column label="销售发票情况" align="center">
+                <el-table-column
+                  align="center"
+                  label="单位"
+                  prop="provinceInvoiceUnit"
+                />
+                <el-table-column
+                  width="100"
+                  align="center"
+                  label="发票数量"
+                  prop="provinceInvoiceQuantity"
+                />
+                <el-table-column
+                  align="center"
+                  label="发票单价（元）"
+                  prop="provinceInvoiceUnitPrice"
+                />
+                <el-table-column
+                  align="center"
+                  label="发票金额（元）"
+                  prop="provinceInvoiceAmount"
+                />
+              </el-table-column>
+              <el-table-column label="贷款归还" align="center">
+                <el-table-column
+                  align="center"
+                  label="日期"
+                  show-overflow-tooltip
+                  prop="provinceLoanReturnTime"
+                />
+                <el-table-column
+                  align="center"
+                  label="金额（元）"
+                  prop="provinceLoanReturnAmount"
+                />
+              </el-table-column>
+            </el-table>
+          </el-card>
+          <!---------------------------------------------- 原核定入库价格 ----------------------------------------------->
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>原核定入库价格</span>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-plus"
+                v-if="sendData.type != 'look'"
+                @click="openAddModule('YHDRKJG')"
+                >添加</el-button
+              >
+            </div>
+            <el-table :data="pageData.approvalPriceList">
+              <el-table-column align="center" label="原核定入库价格">
+                <el-table-column
+                  align="center"
+                  label="仓房名称"
+                  prop="storehouseName"
+                />
+                <el-table-column
+                  align="center"
+                  label="货位名称"
+                  prop="warehouseName"
+                />
+                <el-table-column align="center" label="入库数量" prop="lssl" />
+                <el-table-column
+                  align="center"
+                  label="核定单价（元）"
+                  prop="inNinancialVerification"
+                />
+                <el-table-column
+                  align="center"
+                  label="入库金额（元）"
+                  prop="storageAmount"
+                />
+                <el-table-column
+                  align="center"
+                  label="文件号"
+                  prop="documentNumber"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  align="center"
+                  label="附件"
+                  show-overflow-tooltip
+                >
+                  <template slot-scope="scope">
+                    <el-link
+                      type="primary"
+                      @click="downloadEvent(scope.row.documentUpload)"
+                      >{{ scope.row.documentUpload }}</el-link
+                    >
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  label="操作"
+                  v-if="sendData.type != 'look'"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      @click="openAddModule('YHDRKJG', scope.row)"
+                      >编辑</el-button
+                    >
+                    <el-button
+                      size="mini"
+                      type="danger"
+                      @click="deleteData('YHDRKJG', scope.$index)"
+                      >删除</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </el-card>
+          <el-card class="box-card">
+            <span slot="header">差价上缴</span>
+            <el-table :data="pageData.diffPriceList">
+              <el-table-column align="center" label="差价上缴">
+                <el-table-column align="center" label="项目">
+                  <template slot-scope="scope">
+                    {{ filtrData(scope.row.projectType) }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  label="数量（公斤）"
+                  prop="totalQuantity"
+                />
+                <el-table-column
+                  align="center"
+                  label="金额（元）"
+                  prop="totalAmount"
+                />
+              </el-table-column>
+            </el-table>
+          </el-card>
+          <el-col :span="24">
+            <el-form-item disabled label="附件:">
+              <el-link
+                type="primary"
+                v-if="pageData.contractDetails.length"
+                @click="downloadEvent(pageData.contractDetails[0].attachment)"
+                >{{ pageData.contractDetails[0].attachment }}</el-link
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button
+            size="large"
+            class="successBtn"
+            @click="btnEven('save', 0)"
+            v-if="sendData.type != 'look'"
+            >保存</el-button
+          >
+          <el-button
+            size="large"
+            type="primary"
+            @click="btnEven('save', 1)"
+            v-if="sendData.type != 'look'"
+            >上报</el-button
+          >
+          <el-button size="large" @click="btnEven('close')">关闭</el-button>
+        </div>
+      </template>
+      <addDataModule
+        :dictList="dictList"
+        v-if="addModuleData.show"
+        :addModuleData="addModuleData"
+        @closeAddModule="closeAddModule"
+      />
+      <detailsModule
+        v-if="moduleData.show"
+        :moduleData="moduleData"
+        @closDetailsModule="moduleData.show = false"
+      />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import addDataModule from "./addDataModule.vue";
+import detailsModule from "./detailsModule.vue";
+import { downloadFile } from "@/utils/downloadFile.js";
+import { getStorehouseList, getWarehouse } from "@/api/base";
+import * as api from "@/api/revenueContributionModule/index.js";
+export default {
+  props: {
+    sendData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  components: { detailsModule, addDataModule },
+  data() {
+    return {
+      dictList: {
+        warehouseList: [],
+        storehouseList: [],
+        contractDetails: [],
+        projectTypeList: [
+          {
+            value: 1,
+            label: "销售",
+          },
+          {
+            value: 2,
+            label: "损耗",
+          },
+          {
+            value: 3,
+            label: "入库（用负数表示）",
+          },
+          {
+            value: 4,
+            label: "交易手续费（用负数表示）",
+          },
+          {
+            value: 5,
+            label: "应上缴价差合计",
+          },
+        ],
+      },
+      addModuleData: {
+        type: "",
+        title: "",
+        show: false,
+      },
+      cacheData: {
+        contractDetails: [],
+        inspectionLossList: [],
+      },
+      moduleData: {
+        show: false,
+        type: "",
+        contractNumber: "",
+        orgId: this.$store.state.user.orgInfo.orgId,
+      },
+      pageData: {
+        contractId: "",
+        planType: "轮换计划",
+        diffPriceList: [], // 差价上缴
+        contractDetails: [], // 合同信息
+        revenueSettleList: [], // 结算信息
+        approvalPriceList: [], // 原核定入库价格
+        inspectionLossList: [], // 质检信息
+        threeConsistenceList: [], // 三账一致性-实际出库情况
+        threeConsistenceAccountList: [], // 三账一致性-会计账
+        orgId: this.$store.state.user.orgInfo.orgId,
+      },
+      rules: {
+        reportTime: [
+          { required: true, message: "请选择上报时间", trigger: "change" },
+        ],
+        salesUnit: [
+          { required: true, message: "请填写采购单位", trigger: "blur" },
+        ],
+        contractId: [
+          { required: true, message: "请选择合同编号", trigger: "change" },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.getDictList();
+    this.getPageData();
+  },
+  methods: {
+    async getPageData() {
+      if (this.sendData.type != "add") {
+        api.getDetails(this.sendData.id).then((res) => {
+          if (res.retCode == 200) {
+            this.pageData = res.data;
+            this.cacheData.contractDetails = res.data.contractDetails; // 合同信息
+            this.dictList.contractDetails.map((item) => {
+              if (item.id == this.pageData.contractId) {
+                this.pageData.contractDetails.map((el) => {
+                  el.attachment = item.attachment;
+                });
+              }
+            });
+          }
+        });
+      }
+      this.pageData.orgName = this.$store.state.user.orgInfo.orgName;
+    },
+    // 获取合同列表
+    getDictList() {
+      let obj = { unitId: this.pageData.orgId, libraryType: 0 };
+      // 获取合同下拉表;
+      api.getContractInfo(this.pageData.orgId).then((res) => {
+        if (res.retCode == 200) {
+          this.dictList.contractDetails = res.data;
+        }
+      });
+      // 仓房
+      getWarehouse(obj).then((res) => {
+        this.dictList.warehouseList = res.wareList;
+      });
+      // 货位
+      getStorehouseList(obj).then((res) => {
+        this.dictList.storehouseList = res.houseList;
+      });
+    },
+    // 加载合同信息
+    selectContract(data) {
+      let obj = {
+        orgId: this.pageData.orgId,
+      };
+      this.pageData.contractDetails = [];
+      this.dictList.contractDetails.map((item) => {
+        if (data == item.id) {
+          this.moduleData.contractNumber = item.contractNumber;
+          this.pageData.contractDetails.push(item);
+        }
+      });
+      // 获取合同详情;
+      api.getContractInfoById(data).then((res) => {
+        if (res.retCode == 200) {
+          this.cacheData.contractDetails = res.data;
+        }
+      });
+      if (this.sendData.type == "add") {
+        // 三账一致性-会计账
+        api.accountingBooks(this.moduleData.contractNumber).then((res) => {
+          if (res.retCode == 200) {
+            this.pageData.threeConsistenceAccountList = res.data;
+          }
+        });
+        // 三账一致性-实际出库情况
+        api.getOutStorageInfo(this.moduleData.contractNumber).then((res) => {
+          if (res.retCode == 200) {
+            this.pageData.threeConsistenceList = res.data;
+          }
+        });
+        // 结算信息
+        api.getSettlementInfo(this.moduleData.contractNumber).then((res) => {
+          if (res.retCode == 200) {
+            this.pageData.revenueSettleList = res.data;
+          }
+        });
+        // 差价上缴
+        api.getDiffPriceInfo(this.moduleData.contractNumber).then((res) => {
+          if (res.retCode == 200 && res.data.length) {
+            let obj = {
+              projectType: 5,
+              totalAmount: 0,
+              totalQuantity: 0,
+            };
+
+            res.data.map((item) => {
+              if (item.totalAmount) {
+                obj.totalAmount = item.totalAmount + obj.totalAmount;
+              }
+              if (item.totalQuantity) {
+                obj.totalQuantity = item.totalQuantity + obj.totalQuantity;
+              }
+            });
+            this.pageData.diffPriceList = res.data;
+            this.pageData.diffPriceList.push(obj);
+          }
+        });
+      }
+    },
+    // 合计
+    getSummaries(param) {
+      const sums = [];
+      const { columns, data } = param;
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (
+          column.property == "loss" ||
+          column.property == "inCount" ||
+          column.property == "inDetailTotalPrice" ||
+          column.property == "provinceInvoiceAmount" ||
+          column.property == "provinceLoanReturnAmount" ||
+          column.property == "provinceInvoiceQuantity" ||
+          column.property == "provinceLoanRecoveryAmount" ||
+          column.property == "provinceTotalSettleAmount" ||
+          column.property == "provinceTotalSettleQuantity" ||
+          column.property == "provinceTotalSettleQuantity" ||
+          column.property == "provinceLoanRecoveryQuantity" ||
+          column.property == "provinceCustodyAccountQuantity" ||
+          column.property == "provinceStatisticalAccountQuantity"
+        ) {
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = "";
+          }
+        }
+      });
+      return sums;
+    },
+    // 保存 上报
+    btnEven(type, code) {
+      if (type == "save") {
+        let apiFun = this.sendData.type == "add" ? api.saveData : api.update;
+        this.$refs.ruleForm.validate((valid) => {
+          if (valid) {
+            this.pageData.status = code;
+            if (this.pageData.inspectionLossList.length) {
+              if (this.pageData.approvalPriceList.length) {
+                apiFun(this.pageData).then((res) => {
+                  if (res.retCode == 200) {
+                    this.$message.success("操作成功");
+                    this.handleDialogClose(true);
+                  }
+                });
+              } else {
+                this.$message.warning("请添加原核定入库价格");
+              }
+            } else {
+              this.$message.warning("请添加质检损益信息");
+            }
+          } else {
+            this.$message.warning("请完善必填项");
+          }
+        });
+      } else {
+        this.handleDialogClose();
+      }
+    },
+    // 下载文件
+    downloadEvent(data) {
+      downloadFile(data, "合同附件");
+    },
+    // 过滤字段
+    filtrData(data) {
+      let str = "";
+      this.dictList.projectTypeList.map((item) => {
+        if (data == item.value) {
+          str = item.label;
+        }
+      });
+      return str;
+    },
+    // 打开添加框
+    openAddModule(type, data) {
+      this.addModuleData.show = true;
+      this.addModuleData.type = type;
+      this.addModuleData.title =
+        type == "ZJSYXX" ? "添加质检损益信息" : "添加原核定入库价格";
+      if (data) {
+        this.addModuleData.title = "修改原核定入库价格";
+        this.addModuleData.data = data;
+      }
+    },
+    // 删除
+    deleteData(type, index) {
+      if (type == "YHDRKJG") {
+        this.pageData.approvalPriceList.splice(index, 1);
+      } else {
+        this.pageData.inspectionLossList.splice(index, 1);
+      }
+    },
+    // 关闭添加弹窗
+    closeAddModule(val) {
+      this.addModuleData.type = "";
+      this.addModuleData.title = "";
+      this.addModuleData.show = false;
+      if (val) {
+        // 原核定入库价格
+        if (val.type == "YHDRKJG") {
+          let index = this.pageData.approvalPriceList.findIndex(
+            (item) =>
+              item.warehouseId === val.data.warehouseId &&
+              item.basicStorehouseId === val.data.basicStorehouseId
+          );
+          if (index > 0) {
+            // 编辑
+            this.pageData.approvalPriceList[index] = val.data;
+          } else {
+            // 添加
+            this.pageData.approvalPriceList.push(val.data);
+          }
+        } else {
+          // 质检损益信息
+          this.pageData.inspectionLossList.push(val.data);
+        }
+      }
+    },
+    // 关闭
+    handleDialogClose(data) {
+      this.$emit("closeDialog", data);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-dialog {
+  .el-dialog__footer {
+    .dialog-footer {
+      display: flex;
+      justify-content: flex-end;
+      .successBtn {
+        color: #fff;
+        background: #67c23a;
+      }
+    }
+  }
+  .el-card {
+    width: 100%;
+    margin-bottom: 15px;
+    .el-card__header {
+      span {
+        font-size: 16px;
+        font-weight: bold;
+      }
+      .el-button {
+        float: right;
+      }
+    }
+    .el-table {
+      width: 100%;
+      margin-bottom: 30px;
+      .el-button--primary {
+        width: 56px;
+        height: 28px;
+      }
+    }
+  }
+}
+</style>

src/page/receiptConfirmation/revenueContributionModule/detailsModule.vue

@@ -0,0 +1,99 @@
+<template>
+  <el-dialog
+    top="0"
+    width="66%"
+    title="出库明细"
+    class="dialog-box"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :before-close="handleDialogClose"
+    :visible.sync="moduleData.show"
+  >
+    <el-table
+      border
+      show-summary
+      :data="tableData"
+      :summary-method="getSummaries"
+    >
+      <el-table-column
+        prop="htbh"
+        width="220"
+        label="合同编号"
+        align="center"
+      />
+      <el-table-column prop="storehouseName" align="center" label="仓房名称" />
+      <el-table-column prop="warehouseName" align="center" label="货位名称" />
+      <el-table-column prop="qcph" label="车牌号" align="center" />
+      <el-table-column prop="mzzl" align="center" label="毛重（公斤）" />
+      <el-table-column prop="pz" align="center" label="皮重（公斤）" />
+      <el-table-column prop="bzwkl" align="center" label="扣量（公斤）" />
+      <el-table-column
+        width="160"
+        prop="cpzsj"
+        align="center"
+        label="出入库时间"
+      />
+    </el-table>
+  </el-dialog>
+</template>
+<script>
+import * as api from "@/api/revenueContributionModule/index.js";
+export default {
+  props: {
+    moduleData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      tableData: [],
+    };
+  },
+  mounted() {
+    this.getPageData();
+  },
+  methods: {
+    getPageData() {
+      api.getOutStorageDetailed(this.moduleData.contractNumber).then((res) => {
+        if (res.retCode == 200) {
+          this.tableData = res.data;
+        }
+      });
+    },
+    // 合计
+    getSummaries(param) {
+      const sums = [];
+      const { columns, data } = param;
+
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        if (column.property != "contractNumber" && column.property != "qcph") {
+          const values = data.map((item) => Number(item[column.property]));
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = "";
+          }
+        }
+      });
+
+      return sums;
+    },
+    handleDialogClose() {
+      this.$emit("closDetailsModule");
+    },
+  },
+};
+</script>

src/page/receiptConfirmation/revenueContributionModule/index.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="content-main">
+    <div class="search-bm-boder">
+      <el-row>
+        <el-form
+          :inline="true"
+          ref="searchForm"
+          label-width="120px"
+          :model="searchData"
+          class="demo-form-inline search-form"
+        >
+          <el-form-item label="合同编号:" prop="contractNumber">
+            <el-input
+              v-model="searchData.contractNumber"
+              placeholder="请输入合同编号"
+            />
+          </el-form-item>
+          <div class="search-button">
+            <span class="search-line"></span>
+            <el-button
+              size="small"
+              type="primary"
+              @click="btnEvent('query')"
+              class="iconfont iconchaxun"
+              >查询</el-button
+            >
+            <el-button
+              size="small"
+              type="primary"
+              @click="btnEvent('reset')"
+              class="iconfont iconzhongzhi"
+              >重置</el-button
+            >
+            <el-button
+              size="small"
+              type="primary"
+              @click="btnEvent('add')"
+              class="iconfont iconxinzeng"
+              >新增</el-button
+            >
+          </div>
+        </el-form>
+      </el-row>
+    </div>
+    <el-table
+      border
+      stripe
+      :data="tableData"
+      highlight-current-row
+      v-loading="listLoading"
+      style="width: 100%"
+    >
+      <el-table-column label="序号" type="index" align="center" width="60" />
+      <el-table-column align="center" prop="contractNumber" label="合同编号" />
+      <el-table-column align="center" prop="grainQuantity" label="数量" />
+      <el-table-column align="center" prop="moneyQuantity" label="金额（元）" />
+      <el-table-column
+        align="center"
+        label="确认数量"
+        prop="performanceQuantity"
+      />
+      <el-table-column align="center" prop="createdate" label="创建日期" />
+      <el-table-column align="center" label="状态">
+        <template slot-scope="scope">
+          {{
+            scope.row.status == 0
+              ? "保存"
+              : scope.row.status == 1
+              ? "上报"
+              : "已核定"
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="240">
+        <template slot-scope="scope">
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-edit"
+            v-if="scope.row.status == 0"
+            @click="btnEvent('edit', scope.row.id)"
+            >修改</el-button
+          >
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-delete"
+            v-if="scope.row.status == 0"
+            @click="btnEvent('delete', scope.row.id)"
+            >删除</el-button
+          >
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-view"
+            @click="btnEvent('look', scope.row.id)"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页开始 -->
+    <div class="pag-right clearFix">
+      <el-pagination
+        class="right"
+        :total="searchData.total"
+        :page-size="searchData.size"
+        :page-sizes="[10, 20, 30, 40]"
+        :current-page.sync="searchData.current"
+        @current-change="handleCurrentChangeTask"
+        @size-change="handleSizeChangeTask"
+        layout="total, sizes, prev, pager, next, jumper"
+      />
+    </div>
+    <detailsModule
+      :sendData="sendData"
+      @closeDialog="closeDialog"
+      v-if="sendData.visible"
+    />
+  </div>
+</template>
+<script>
+import detailsModule from "./details.vue";
+import * as api from "@/api/revenueContributionModule/index.js";
+export default {
+  components: { detailsModule },
+  data() {
+    return {
+      searchData: {
+        size: 10,
+        total: 0,
+        current: 1,
+        orgId: this.$store.state.user.userInfo.orgId,
+      },
+      sendData: {
+        visible: false,
+      },
+      tableData: [],
+      listLoading: false,
+    };
+  },
+  mounted() {
+    this.btnEvent("query");
+  },
+  methods: {
+    btnEvent(type, id) {
+      if (type == "query") {
+        this.listLoading = true;
+        this.listLoading = false;
+        api.getPageList(this.searchData).then((res) => {
+          if (res.retCode == 200) {
+            this.listLoading = false;
+            this.tableData = res.data.records;
+            this.searchData.size = res.data.size;
+            this.searchData.total = res.data.total;
+            this.searchData.current = res.data.current;
+          }
+        });
+      } else if (type == "add") {
+        this.sendData.type = type;
+        this.sendData.visible = true;
+        this.sendData.titleText = "新增";
+      } else if (type == "edit") {
+        this.sendData.id = id;
+        this.sendData.type = type;
+        this.sendData.visible = true;
+        this.sendData.titleText = "编辑";
+      } else if (type == "look") {
+        this.sendData.id = id;
+        this.sendData.type = type;
+        this.sendData.visible = true;
+        this.sendData.titleText = "查看";
+      } else if (type == "delete") {
+        this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          api.deleteData(id).then((res) => {
+            if (res.retCode == 200) {
+              this.btnEvent("query");
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+      } else {
+        this.$refs.searchForm.resetFields();
+        this.btnEvent("query");
+      }
+    },
+    // 改变显示条数
+    handleSizeChangeTask(size) {
+      this.searchData.current = size;
+      this.btnEvent("query");
+    },
+    // 改变显示页数
+    handleCurrentChangeTask(current) {
+      this.searchData.current = current;
+      this.btnEvent("query");
+    },
+    closeDialog(data) {
+      if (data) {
+        this.btnEvent("query");
+      }
+      this.sendData.type = "";
+      this.sendData.visible = false;
+      this.sendData.titleText = "";
+    },
+  },
+};
+</script>

src/page/spillageLeakageLossCollection/components/spillageLeakageLossCollectionEdit.vue

@@ -5,7 +5,7 @@
       <el-form ref="editForm" :model="form" :rules="rules" label-width="150px">
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="损益单号" prop="sydh">
+            <el-form-item label="损溢单号" prop="sydh">
               <el-input v-model="form.sydh" placeholder="选择仓房/货位后生成" readonly />
             </el-form-item>
           </el-col>
@@ -182,7 +182,7 @@
 
         <el-row type="flex" align="middle" justify="center" class="row">
           <el-col :span="8">
-            <el-form-item label="损益原因" prop="lossProfitReason">
+            <el-form-item label="损溢原因" prop="lossProfitReason">
               <el-input v-model="form.lossProfitReason" :readonly="readonly"/>
             </el-form-item>
           </el-col>
@@ -280,7 +280,7 @@ export default {
         impurityOut: null, // number 出库杂质
         isNormalLoss: null, // integer($int32) 损溢是否正常 1：正常；2:不正常；
         leadershipAuditor: null, // string 领导审核人
-        lossProfitReason: null, // string 损益原因
+        lossProfitReason: null, // string 损溢原因
         moistureImpurityLoss: null, // number 水杂减量
         moistureIn: null, // number 入库水分
         moistureLoss: null, // number 水分减量
@@ -295,7 +295,7 @@ export default {
         storageLoss: null, // number 存储损耗
         storageTime: null, // string($date-time) 入库时间
         storageYears: null, // integer($int32) 存储年限
-        sydh: null, // string 损益单号
+        sydh: null, // string 损溢单号
         updatedate: null, // string($date-time) 更新日期
         updatename: null, // string 更新人
         warehouseAuditor: null, // string 仓储审核人

src/page/storehouseManagement/components/hazardControlEdit.vue

@@ -163,8 +163,10 @@ import {simple_required} from "@/utils/ruleDatas";
 import upload from '@/components/upload/v2.vue'
 import {basicUploadUrl, getFileList, minioUrl} from "@/api/base";
 import {downloadBase} from "@/api/inventoryQualityTraceability";
+import legacyUpload from "@/page/mixin/legacyUpload";
 
 export default {
+  mixins: [legacyUpload, ],
   props: {
     visible: {
       type: Boolean,
@@ -220,9 +222,6 @@ export default {
       uploadUrl_2,
       show: this.visible,
       form: { },
-      fileList: [],
-      fileIds: [],
-      deleteFileIds: [],
       rules: {
         sbr: simple_required, fxxx: simple_required, hjbw: simple_required,
         fxlx: simple_required, fxfj: simple_required, fxglcs: simple_required,
@@ -240,17 +239,7 @@ export default {
       if(this.isAdd) {
       }else {
         console.log('查看 id', this.dataId)
-        getFileList({bid: this.dataId, orgId: this.orgId}).then(resp => {
-
-          this.fileList = resp.map(d => {
-            return {
-              id: d.id,
-              name: d.originalFileName,
-              url: `${basicUploadUrl}${d.filePath}`
-            }
-          })
-          console.log('文件列表', resp, this.fileList)
-        })
+        this.getFileListById(this.dataId)
         StorageSafeManageControllerEdit(this.dataId).then(resp  => {
           this.form = resp.storageSafeManageWithBLOBs
           // const fl = resp.fileList || []
@@ -331,37 +320,6 @@ export default {
         }
       })
     },
-    onUploadSuccess(resp, file, fileList) {
-      console.log('上传文件 resp', resp, file, fileList)
-      this.fileList = fileList.map(f => {
-        let url
-        let id
-        if(f.response) {
-          url = f.response.filePath
-          id = f.response.id
-        }else {
-          url = f.url
-          id = f.id
-        }
-        return {
-          name: f.name,
-          url: url,
-          id: id,
-        }
-      })
-    },
-    onUploadRemove(fileList) {
-      const removeFiles = []
-      for(const f of this.fileList) {
-        const file = fileList.find(temp => temp.id === f.id)
-        if(! file) {
-          removeFiles.push(f)
-        }
-      }
-      this.fileList = fileList
-      this.deleteFileIds.push(... removeFiles.map(f => f.id))
-      console.log('删除文件 ', fileList, removeFiles)
-    }
   }
 
 }

src/page/system/functionManagement.vue

@@ -13,8 +13,8 @@
             <el-button type="primary" size="small" icon="el-icon-plus" @click="add">新增</el-button>
             <el-divider direction="vertical"></el-divider>
           </el-form-item>
-          <el-form-item label="功能名称:" prop="name">
-            <el-input></el-input>
+          <el-form-item label="功能名称:" prop="funcName">
+            <el-input v-model="form.funcName"></el-input>
           </el-form-item>
 
           <div class="search-button">
@@ -129,9 +129,7 @@ export default {
       },
       tableData: [],
       form: {
-        type: null,
-        status: null,
-        name: null,
+        funcName: null,
       },
       paginationShow: false,
       listLoading: false,
@@ -148,7 +146,27 @@ export default {
   },
   methods: {
     search() {
-      this.getList()
+      if(this.form.funcName) {
+        this.tableData = this.searchByName(this.tableData, this.form.funcName)
+      }else {
+        this.getList()
+      }
+    },
+    searchByName(data, name) {
+      let results = [];
+      for (let item of data) {
+        let copy = {...item};
+        if (item.funcName.indexOf(name) >= 0) {
+          results.push(copy);
+        }
+        if (item.children && item.children.length > 0) {
+          copy.children = this.searchByName(item.children, name);
+          if (copy.children.length > 0) {
+            results.push(copy);
+          }
+        }
+      }
+      return results;
     },
     reset(formName) {
       if(this.$refs[formName]) {
@@ -185,6 +203,7 @@ export default {
     getList() {
       this.listLoading = true
       getFunc({
+        ... this.form
       }).then(resp => {
         this.tableData = this.$systemUtils.buildFuncTree(resp)
       }).finally(_ => {

src/router/index.js

@@ -166,7 +166,7 @@ export default new Router({
         transferManagementModule,
         // settlementManagementModule,
         // statisticsManagementModule,
-        // financialManagementModule,
+        financialManagementModule,
         progressManagementModule,
         consumerManagementModule,
         alertingModule,

src/router/system/financeModule.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: chenghanbin chenghanbin@foxmail.com
+ * @Date: 2024-07-22 18:17:22
+ * @LastEditors: chenghanbin chenghanbin@foxmail.com
+ * @LastEditTime: 2024-07-23 14:41:03
+ * @FilePath: \depot-vue-qinghai\src\router\system\financeModule.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 export default {
   path: "/financeModule",
   name: "financeModule",
@@ -39,6 +47,17 @@ export default {
       },
     },
     {
+      path: "/financial/revenueContributionModule",
+      name: "revenueContributionModule",
+      component: () =>
+        import(
+          "@/page/receiptConfirmation/revenueContributionModule/index.vue"
+        ),
+      meta: {
+        title: "销售收入上缴",
+      },
+    },
+    {
       path: "/financial/receiptConfirmation",
       name: "receiptConfirmation",
       component: () =>

src/router/system/financialManagementModule.js

@@ -11,8 +11,8 @@ export default {
       path: "/financialManagementNav",
       name: "financialManagementNav",
       component: {
-        render(c) {
-          return c("router-view");
+        render (c) {
+          return c("router-view")
         },
       },
       children: [
@@ -41,6 +41,22 @@ export default {
           },
         },
         {
+          path: "/financialManagement/Amaintenance",
+          name: "Amaintenance",
+          component: () => import("@/page/Amaintenance/index.vue"),
+          meta: {
+            title: "利息维护",
+          },
+        },
+        {
+          path: "/financialManagement/APayment",
+          name: "APayment",
+          component: () => import("@/page/APayment/index.vue"),
+          meta: {
+            title: "出库验收确认",
+          },
+        },
+        {
           path: "/financialManagement/CostStandard",
           name: "CostStandard",
           component: () => import("@/page/CostStandard/index.vue"),
@@ -51,4 +67,4 @@ export default {
       ],
     },
   ],
-};
+}

src/router/system/granaryComprehensiveExhibitionModule.js

@@ -39,6 +39,14 @@ export default {
       }
     },
     {
+      path: "/granaryComprehensiveExhibition/granaryReplay",
+      name: "granaryLive",
+      component: () => import("@/page/granaryComprehensiveExhibition/granaryReplay"),
+      meta: {
+        title: "视频回放"
+      }
+    },
+    {
       path: "/granaryComprehensiveExhibition/storehouseWorkRecord",
       name: "storehouseWorkRecord",
       component: () => import("@/page/granaryComprehensiveExhibition/storehouseWorkRecord"),

src/style/common/variables.scss

@@ -26,4 +26,5 @@ $dialog-header:#006bd5!default;
 $dialog-tit-color:#ffffff!default;
 $dialog-con-color:#525357!default;
 $breadcrumb-bg:#49a2fa!default;
-$breadcrumb-color:#ffffff!default;
+// $breadcrumb-bg:#f5f9fe!default;
+$breadcrumb-color:#ffffff!default;

src/style/style.scss

@@ -11,10 +11,10 @@ body {
 }
 
 .el-button--default {
-  height: 34px;
-  padding: 0 10px;
-  border-radius: 4px;
-  vertical-align: middle;
+	height: 34px;
+	padding: 0 10px;
+	border-radius: 4px;
+	vertical-align: middle;
 }
 
 .el-table thead {
@@ -271,38 +271,41 @@ body {
 	margin-left: 136px;
 }
 
-.el-dialog{
-  top: 25px;
-  overflow: hidden;
-  height: calc(100vh - 60px);
+.el-dialog {
+	top: 25px;
+	overflow: hidden;
+	height: calc(100vh - 60px);
 }
+
 //普通弹窗样式
 .el-dialog .el-dialog__header {
 	background-color: $dialog-header;
 	padding: 20px 10px 9px;
 }
+
 .el-dialog .el-dialog__body {
-  height: calc(100% - 170px);
-  overflow: auto;
+	height: calc(100% - 170px);
+	overflow: auto;
 }
+
 /* 整个滚动条 */
 .el-dialog .el-dialog__body::-webkit-scrollbar {
-  width: 8px;
-  /* 设置滚动条的宽度 */
+	width: 8px;
+	/* 设置滚动条的宽度 */
 }
 
 /* 滚动条轨道 */
 .el-dialog .el-dialog__body::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  border-radius: 4px;
-  /* 设置轨道的背景颜色 */
+	background: #f1f1f1;
+	border-radius: 4px;
+	/* 设置轨道的背景颜色 */
 }
 
 /* 滚动条的滑块 */
 .el-dialog .el-dialog__body::-webkit-scrollbar-thumb {
-  background: #888;
-  border-radius: 4px;
-  /* 设置滑块的背景颜色 */
+	background: #888;
+	border-radius: 4px;
+	/* 设置滑块的背景颜色 */
 }
 
 .el-dialog .el-dialog__title {
@@ -419,36 +422,40 @@ body {
 }
 
 .static-table {
-  width: 100%;
-  //border: 1px solid #dddddd;
-  border-collapse: collapse;
-  td {
-    border: 1px solid #dddddd;
-    height: 51px;
-    text-align: center;
-    vertical-align: middle;
-  }
-  tr:nth-child(odd) {
-    background-color: #f9f9f9;
-  }
-  tr:nth-child(even) {
-    background-color: #ffffff;
-  }
-  tr:hover {
-    background-color: #ecf3f8;
-  }
+	width: 100%;
+	//border: 1px solid #dddddd;
+	border-collapse: collapse;
+
+	td {
+		border: 1px solid #dddddd;
+		height: 51px;
+		text-align: center;
+		vertical-align: middle;
+	}
+
+	tr:nth-child(odd) {
+		background-color: #f9f9f9;
+	}
+
+	tr:nth-child(even) {
+		background-color: #ffffff;
+	}
+
+	tr:hover {
+		background-color: #ecf3f8;
+	}
 }
 
 .store-static-table {
-  td {
-    height: 75px;
+	td {
+		height: 75px;
 
-    .el-form-item {
-      margin: 5px 5px;
-    }
-  }
+		.el-form-item {
+			margin: 5px 5px;
+		}
+	}
 
-  /deep/ .el-form-item__error {
-    width: 100%;
-  }
+	/deep/ .el-form-item__error {
+		width: 100%;
+	}
 }

src/style/theme.scss

@@ -0,0 +1,95 @@
+$blueColor: #295dac;
+$blueHoverColor: #3866ab;
+$whiteColor: #ffffff;
+
+$menuText: #ffffff;
+$menuActiveText: #295dac;
+$menuBg: rgba(0, 0, 0, 0);
+$subMenuActiveText: #ffffff;
+
+:export {
+    menuText: $menuText;
+    menuActiveText: $menuActiveText;
+    menuBg: $menuBg;
+    subMenuActiveText: $subMenuActiveText;
+    blueColor: $blueColor;
+}
+
+
+.menuList-wrap {
+    background: url(./../assets/theme/leftbg.png);
+
+    .el-menu-item.is-active {
+        background-color: $whiteColor !important;
+        color: $menuActiveText !important;
+    }
+
+    .router-link-active .el-menu-item {
+        color: $blueColor !important;
+        background-color: $whiteColor !important;
+    }
+
+    .navbar {
+        color: $whiteColor;
+    }
+
+    .el-menu-item {
+        font-size: 16px;
+    }
+
+    //menu
+    .el-submenu__title {
+        font-size: 16px !important;
+
+    }
+
+    .el-submenu__title i {
+        background: transparent !important;
+        color: $whiteColor;
+    }
+
+    .el-submenu__title i {
+        font-size: 16px;
+        margin-left: 13px !important;
+    }
+
+    .live-scrollbar .el-submenu .el-menu-item:hover {
+        background-color: $whiteColor !important;
+        color: $blueColor !important;
+    }
+
+    .router-link-active .el-menu-item .is-active {
+        background-color: $whiteColor !important;
+        color: $blueColor !important;
+    }
+
+    .router-link-active .el-menu-item:hover {
+        color: $blueColor !important;
+        background-color: $whiteColor !important;
+    }
+
+    // menu hover
+    .submenu-title-noDropdown,
+    .el-submenu__title {
+        background: transparent !important;
+
+        &:hover {
+            background-color: rgba(20, 74, 156, 0.4) !important;
+        }
+    }
+
+    .is-active>.el-submenu__title {
+        background: transparent !important;
+        color: $whiteColor !important;
+
+    }
+
+    .el-submenu .is-active .is-opened {
+        color: $blueColor !important;
+        background-color: $whiteColor !important;
+    }
+
+    .el-submenu .el-menu-item:hover {
+        background-color: rgba(20, 74, 156, 0.4) !important;
+    }
+}

src/utils/loginStatusChecker.js

@@ -1,7 +1,11 @@
 import {getCurrUserDetails} from "@/api/login/login";
+import axios from "axios";
+import service from '@/utils/require'
 import router from '@/router'
 let worker = null
 
+const whiteList = ['/userInfo/getCode', '/userInfo/login', '/userInfo/getLoginInfo']
+
 const isWhiteList = () => {
   if(! router) return false
   if(! router.currentRoute) return false
@@ -25,6 +29,26 @@ export const startCheck = (delay = 30000) => {
   }, delay)
 }
 
+export const startCheckPreApi = () => {
+  service.interceptors.request.use(async (config) => {
+    const url = config.url
+    console.log('拦截器 1', url)
+    if(whiteList.some(u => url.includes(u))) {
+      return config
+    }
+    // const api = require('../api/login/login')
+    const online = await getCurrUserDetails()
+    if(isInvalidLogin(online)) {
+      clearCacheAndGotoLogin()
+      return Promise.reject(new axios.Cancel('请重新登录'))
+      // Promise.resolve(config)
+    }
+    return Promise.resolve(config)
+  }, err => {
+    Promise.reject(err)
+  })
+}
+
 export const stopCheck = () => {
   if(! worker) {
     window.clearInterval(this.worker)

src/utils/menuMock.js

@@ -100,7 +100,7 @@ const modules1 = [
   transferManagementModule,
   // settlementManagementModule,
   // statisticsManagementModule,
-  // financialManagementModule,
+  financialManagementModule,
   progressManagementModule,
   consumerManagementModule,
   alertingModule,

src/utils/require.js

@@ -24,7 +24,9 @@ const service = axios.create({
 
 // request拦截器
 if (!window.flag) {
+
 	service.interceptors.request.use(config => {
+    console.log('拦截器 2')
 		if (config.method === 'get') {
 		config.params = {
 			_t: Date.parse(new Date()) / 1000,
@@ -75,7 +77,7 @@ if (!window.flag) {
 
 		return config
 	}, error => {
-		Promise.reject(error)
+		return Promise.reject(error)
 	})
 }
 

src/utils/ruleDatas.js

@@ -1,5 +1,5 @@
 
-export const required_data = { required: true, message: '必须填写', trigger: 'blur' }
+export const required_data = { required: true, message: '必须填写', trigger: ['blur', 'change'] }
 
 export const number_data_del = { pattern: /^\d{3}$/, message: '长度为三位,数字', trigger: 'blur' }
 export const number_data_del_tw = { required: true, pattern: /^\d{2}$/, message: '长度为二位,数字', trigger: 'blur' }

static/js/h5player/playctrl1/DecodeWorker.js

@@ -0,0 +1,642 @@
+/**
+ * Created by wangweijie5 on 2016/12/5.
+ */
+(function (event) {
+    const AUDIO_TYPE = 0;	// 音频
+    const VIDEO_TYPE = 1;   // 视频
+    const PRIVT_TYPE = 2;  // 私有帧
+
+    const PLAYM4_AUDIO_FRAME = 100; // 音频帧
+    const PLAYM4_VIDEO_FRAME = 101; // 视频帧
+
+    const PLAYM4_OK = 1;
+    const PLAYM4_ORDER_ERROR = 2;
+    const PLAYM4_DECODE_ERROR = 44 	// 解码失败
+    const PLAYM4_NOT_KEYFRAME = 48; 	// 非关键帧
+    const PLAYM4_NEED_MORE_DATA = 31;   // 需要更多数据才能解析
+    const PLAYM4_NEED_NEET_LOOP = 35; //丢帧需要下个循环
+    const PLAYM4_SYS_NOT_SUPPORT = 16; 	// 不支持
+
+    importScripts('Decoder.js');
+    Module.addOnPostRun(function () {
+        postMessage({ 'function': "loaded" });
+    });
+
+    var iStreamMode = 0;  // 流模式
+
+    var bOpenMode = false;
+    var bOpenStream = false;
+
+    var funGetFrameData = null;
+    var funGetAudFrameData = null;
+
+    var bWorkerPrintLog = false;//worker层log开关
+
+    var g_nPort = -1;
+    var pInputData = null;
+    var inputBufferSize = 40960;
+
+    self.JSPlayM4_RunTimeInfoCallBack = function (nPort, pstRunTimeInfo, pUser) {
+        let port = nPort;
+        let user = pUser;
+        let nRunTimeModule = Module.HEAP32[pstRunTimeInfo >> 2];
+        let nStrVersion = Module.HEAP32[pstRunTimeInfo + 4 >> 2];
+        let nFrameTimeStamp = Module.HEAP32[pstRunTimeInfo + 8 >> 2];
+        let nFrameNum = Module.HEAP32[pstRunTimeInfo + 12 >> 2];
+        let nErrorCode = Module.HEAP32[pstRunTimeInfo + 16 >> 2];
+        // console.log("nRunTimeModule:"+nRunTimeModule+",nFrameNum:"+nFrameNum+",nErrorCode:"+nErrorCode);
+        postMessage({ 'function': "RunTimeInfoCallBack", 'nRunTimeModule': nRunTimeModule, 'nStrVersion': nStrVersion, 'nFrameTimeStamp': nFrameTimeStamp, 'nFrameNum': nFrameNum, 'nErrorCode': nErrorCode });
+    }
+
+    onmessage = function (event) {
+        var eventData = event.data;
+        var res = 0;
+        switch (eventData.command) {
+            case "printLog":
+                let downloadFlag = eventData.data;
+                if (downloadFlag === true) {
+                    bWorkerPrintLog = true;
+                    res = Module._SetPrintLogFlag(g_nPort, downloadFlag);
+                }
+                else {
+                    bWorkerPrintLog = false;
+                    res = Module._SetPrintLogFlag(g_nPort, downloadFlag);
+                }
+
+                if (res !== PLAYM4_OK) {
+                    console.log("DecodeWorker.js: PlayerSDK print log failed,res" + res);
+                    postMessage({ 'function': "printLog", 'errorCode': res });
+                }
+                break;
+            case "SetPlayPosition":
+                let nFrameNumOrTime = eventData.data;
+                let enPosType = eventData.type;
+                // res = Module._SetPlayPosition(nFrameNumOrTime,enPosType);
+                // if (res !== PLAYM4_OK)
+                // {
+                //     postMessage({'function': "SetPlayPosition", 'errorCode': res});
+                //     return;
+                // }
+                // //有没有buffer需要清除
+
+                break;
+            case "SetStreamOpenMode":
+                //获取端口号
+                g_nPort = Module._GetPort();
+                //设置流打开模式
+                iStreamMode = eventData.data;
+                res = Module._SetStreamOpenMode(g_nPort, iStreamMode);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "SetStreamOpenMode", 'errorCode': res });
+                    return;
+                }
+                bOpenMode = true;
+                break;
+
+            case "OpenStream":
+                // 接收到的数据
+                var iHeadLen = eventData.dataSize;
+                var pHead = Module._malloc(iHeadLen + 4);
+                if (pHead === null) {
+                    return;
+                }
+                var aHead = Module.HEAPU8.subarray(pHead, pHead + iHeadLen);
+                aHead.set(new Uint8Array(eventData.data));
+                res = Module._OpenStream(g_nPort, pHead, iHeadLen, eventData.bufPoolSize);
+                postMessage({ 'function': "OpenStream", 'errorCode': res });
+                if (res !== PLAYM4_OK) {
+                    //释放内存
+                    Module._free(pHead);
+                    pHead = null;
+                    return;
+                }
+                bOpenStream = true;
+                break;
+            case "Play":
+                let resP = Module._Play(g_nPort);
+                if (resP !== PLAYM4_OK) {
+                    return;
+                }
+                break;
+            case "InputData":
+                // 接收到的数据
+                var iLen = eventData.dataSize;
+                if (iLen > 0) {
+                    if (pInputData == null || iLen > inputBufferSize) {
+                        if (pInputData != null) {
+                            Module._free(pInputData);
+                            pInputData = null;
+                        }
+                        if (iLen > inputBufferSize) {
+                            inputBufferSize = iLen;
+                        }
+
+                        pInputData = Module._malloc(inputBufferSize);
+                        if (pInputData === null) {
+                            return;
+                        }
+                    }
+
+                    var inputData = new Uint8Array(eventData.data);
+                    // var aInputData = Module.HEAPU8.subarray(pInputData, pInputData + iLen);
+                    // aInputData.set(inputData);
+                    Module.writeArrayToMemory(inputData, pInputData);
+                    inputData = null;
+                    res = Module._InputData(g_nPort, pInputData, iLen);
+                    if (res !== PLAYM4_OK) {
+                        let errorCode = Module._GetLastError(g_nPort);
+                        let sourceRemain = Module._GetSourceBufferRemain(g_nPort);
+                        postMessage({ 'function': "InputData", 'errorCode': errorCode, "sourceRemain": sourceRemain });
+                    }
+                    //Module._free(pInputData);
+                    //pInputData = null;
+                } else {
+                    let sourceRemain = Module._GetSourceBufferRemain(g_nPort);
+                    if (sourceRemain == 0) {
+                        postMessage({ 'function': "InputData", 'errorCode': PLAYM4_NEED_MORE_DATA });
+                        return;
+                    }
+                }
+
+                /////////////////////
+                // if (funGetFrameData === null) {
+                //     funGetFrameData = Module.cwrap('GetFrameData', 'number');
+                // }
+
+                while (bOpenMode && bOpenStream) {
+
+                    var ret = getFrameData();
+                    // 直到获取视频帧或数据不足为止
+                    if (PLAYM4_VIDEO_FRAME === ret || PLAYM4_NEED_MORE_DATA === ret || PLAYM4_ORDER_ERROR === ret)//PLAYM4_VIDEO_FRAME === ret ||  || PLAYM4_NEED_NEET_LOOP === ret
+                    {
+                        break;
+                    }
+                }
+                break;
+
+            case "SetSecretKey":
+                var keyLen = eventData.nKeyLen;
+                var pKeyData = Module._malloc(keyLen);
+                if (pKeyData === null) {
+                    return;
+                }
+                var nKeySize = eventData.data.length
+                var bufData = stringToBytes(eventData.data);
+                var aKeyData = Module.HEAPU8.subarray(pKeyData, pKeyData + keyLen);
+                let u8array = new Uint8Array(keyLen);
+                aKeyData.set(u8array, 0);
+                aKeyData.set(new Uint8Array(bufData));
+                aKeyData = null;
+                u8array = null;
+
+                res = Module._SetSecretKey(g_nPort, eventData.nKeyType, pKeyData, keyLen);//, nKeySize
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "SetSecretKey", 'errorCode': res });
+                    Module._free(pKeyData);
+                    pKeyData = null;
+                    return;
+                }
+
+                Module._free(pKeyData);
+                pKeyData = null;
+                break;
+
+            case "GetBMP":
+                var nBMPWidth = eventData.width;
+                var nBMPHeight = eventData.height;
+                var pYUVData = eventData.data;
+                var nYUVSize = nBMPWidth * nBMPHeight * 3 / 2;
+                var oJpegCropRect = {
+                    left: eventData.left,
+                    top: eventData.top,
+                    right: eventData.right,
+                    bottom: eventData.bottom
+                };
+
+                var pDataYUV = Module._malloc(nYUVSize);
+                if (pDataYUV === null) {
+                    return;
+                }
+
+                Module.writeArrayToMemory(new Uint8Array(pYUVData, 0, nYUVSize), pDataYUV);
+
+                // 分配BMP空间
+                var nBmpSize = nBMPWidth * nBMPHeight * 4 + 60;
+                var pBmpData = Module._malloc(nBmpSize);
+                var pBmpSize = Module._malloc(4);
+                if (pBmpData === null || pBmpSize === null) {
+                    Module._free(pDataYUV);
+                    pDataYUV = null;
+
+                    if (pBmpData != null) {
+                        Module._free(pBmpData);
+                        pBmpData = null;
+                    }
+
+                    if (pBmpSize != null) {
+                        Module._free(pBmpSize);
+                        pBmpSize = null;
+                    }
+                    return;
+                }
+
+                //Module._memset(pBmpSize, nBmpSize, 4); // 防止bmp截图出现输入数据过大的错误码
+                Module.setValue(pBmpSize, nBmpSize, "i32");
+                res = Module._GetBMP(g_nPort, pDataYUV, nYUVSize, pBmpData, pBmpSize,
+                    oBMPCropRect.left, oBMPCropRect.top, oBMPCropRect.right, oBMPCropRect.bottom);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "GetBMP", 'errorCode': res });
+                    Module._free(pDataYUV);
+                    pDataYUV = null;
+                    Module._free(pBmpData);
+                    pBmpData = null;
+                    Module._free(pBmpSize);
+                    pBmpSize = null;
+                    return;
+                }
+
+                // 获取BMP图片大小
+                var nBmpDataSize = Module.getValue(pBmpSize, "i32");
+
+                // 获取BMP图片数据
+                var aBmpData = new Uint8Array(nBmpDataSize);
+                aBmpData.set(Module.HEAPU8.subarray(pBmpData, pBmpData + nBmpDataSize));
+
+                postMessage({ 'function': "GetBMP", 'data': aBmpData, 'errorCode': res }, [aBmpData.buffer]);
+                aBmpData = null;
+                if (pDataYUV != null) {
+                    Module._free(pDataYUV);
+                    pDataYUV = null;
+                }
+                if (pBmpData != null) {
+                    Module._free(pBmpData);
+                    pBmpData = null;
+                }
+                if (pBmpSize != null) {
+                    Module._free(pBmpSize);
+                    pBmpSize = null;
+                }
+                break;
+
+            case "GetJPEG":
+                var nJpegWidth = eventData.width;
+                var nJpegHeight = eventData.height;
+                var pYUVData1 = eventData.data;
+                var nYUVSize1 = nJpegWidth * nJpegHeight * 3 / 2;
+                var oJpegCropRect = {
+                    left: eventData.left,
+                    top: eventData.top,
+                    right: eventData.right,
+                    bottom: eventData.bottom
+                };
+
+                var pDataYUV1 = Module._malloc(nYUVSize1);
+                if (pDataYUV1 === null) {
+                    return;
+                }
+
+                Module.writeArrayToMemory(new Uint8Array(pYUVData1, 0, nYUVSize1), pDataYUV1);
+
+                // 分配JPEG空间
+                var pJpegData = Module._malloc(nYUVSize1);
+                var pJpegSize = Module._malloc(4);
+                if (pJpegData === null || pJpegSize === null) {
+                    if (pJpegData != null) {
+                        Module._free(pJpegData);
+                        pJpegData = null;
+                    }
+
+                    if (pJpegSize != null) {
+                        Module._free(pJpegSize);
+                        pJpegSize = null;
+                    }
+
+                    if (pDataYUV1 != null) {
+                        Module._free(pDataYUV1);
+                        pDataYUV1 = null;
+                    }
+                    return;
+                }
+
+                Module.setValue(pJpegSize, nJpegWidth * nJpegHeight * 2, "i32");    // JPEG抓图，输入缓冲长度不小于当前帧YUV大小
+
+                res = Module._GetJPEG(g_nPort, pDataYUV1, nYUVSize1, pJpegData, pJpegSize,
+                    oJpegCropRect.left, oJpegCropRect.top, oJpegCropRect.right, oJpegCropRect.bottom);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "GetJPEG", 'errorCode': res });
+                    if (pJpegData != null) {
+                        Module._free(pJpegData);
+                        pJpegData = null;
+                    }
+
+                    if (pJpegSize != null) {
+                        Module._free(pJpegSize);
+                        pJpegSize = null;
+                    }
+
+                    if (pDataYUV1 != null) {
+                        Module._free(pDataYUV1);
+                        pDataYUV1 = null;
+                    }
+                    return;
+                }
+
+                // 获取JPEG图片大小
+                var nJpegSize = Module.getValue(pJpegSize, "i32");
+
+                // 获取JPEG图片数据
+                var aJpegData = new Uint8Array(nJpegSize);
+                aJpegData.set(Module.HEAPU8.subarray(pJpegData, pJpegData + nJpegSize));
+
+                postMessage({ 'function': "GetJPEG", 'data': aJpegData, 'errorCode': res }, [aJpegData.buffer]);
+
+                nJpegSize = null;
+                aJpegData = null;
+
+                if (pDataYUV1 != null) {
+                    Module._free(pDataYUV1);
+                    pDataYUV1 = null;
+                }
+                if (pJpegData != null) {
+                    Module._free(pJpegData);
+                    pJpegData = null;
+                }
+                if (pJpegSize != null) {
+                    Module._free(pJpegSize);
+                    pJpegSize = null;
+                }
+                break;
+
+            case "SetDecodeFrameType":
+                var nFrameType = eventData.data;
+                res = Module._SetDecodeFrameType(g_nPort, nFrameType);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "SetDecodeFrameType", 'errorCode': res });
+                    return;
+                }
+                break;
+            case "CloseStream":
+                //stop
+                let resS = Module._Stop(g_nPort);
+                if (resS !== PLAYM4_OK) {
+                    postMessage({ 'function': "Stop", 'errorCode': res });
+                    return;
+                }
+                //closeStream
+                res = Module._CloseStream(g_nPort);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "CloseStream", 'errorCode': res });
+                    return;
+                }
+                //freePort
+                let resF = Module._FreePort(g_nPort);
+                if (resF !== PLAYM4_OK) {
+                    postMessage({ 'function': "FreePort", 'errorCode': res });
+                    return;
+                }
+                if (pInputData != null) {
+                    Module._free(pInputData);
+                    pInputData = null;
+                }
+                break;
+            case "PlaySound":
+                let resPS = Module._PlaySound(g_nPort);
+                if (resPS !== PLAYM4_OK) {
+                    console.log("PlaySound failed");
+                    return;
+                }
+                break;
+            case "StopSound":
+                let resSS = Module._StopSound();
+                if (resSS !== PLAYM4_OK) {
+                    console.log("StopSound failed");
+                    return;
+                }
+                break;
+            case "SetVolume":
+                let resSV = Module._SetVolume(g_nPort, eventData.volume);
+                if (resSV !== PLAYM4_OK) {
+                    console.log("Audio SetVolume failed");
+                    return;
+                }
+                break;
+            case "GetVolume":
+                let volume = Module._GetVolume();
+                if (volume > 0) {
+                    postMessage({ 'function': "GetVolume", 'volume': volume });
+                }
+                else {
+                    console.log("Audio GetVolume failed");
+                    return;
+                }
+                break;
+            case "OnlyPlaySound":
+                let resOPS = Module._OnlyPlaySound(g_nPort);
+                if (resOPS !== PLAYM4_OK) {
+                    console.log("OnlyPlaySound failed");
+                    return;
+                }
+                break;
+            case "Pause":
+                let resPa = Module._Pause(g_nPort, eventData.bPlay);
+                if (resPa !== PLAYM4_OK) {
+                    console.log("Pause failed");
+                    return;
+                }
+            case "PlayRate":
+                Module._SetPlayRate(g_nPort, eventData.playRate);
+                break;
+            case "SetIFrameDecInterval":
+                Module._SetIFrameDecInterval(g_nPort, eventData.data);
+                break;
+            case "SetLostFrameMode":
+                Module._SetLostFrameMode(g_nPort, eventData.data, 0);
+                break;
+            case "SetDemuxModel":
+                Module._SetDemuxModel(g_nPort, eventData.nIdemuxType, eventData.bTrue);
+                break;
+            case "SkipErrorData":
+                Module._SkipErrorData(g_nPort, eventData.bSkip);
+                break;
+            case "SetDecodeERC":
+                Module._SetDecodeERC(g_nPort, eventData.nLevel);
+                break;
+            case "SetANRParam":
+                Module._SetANRParam(g_nPort, eventData.nEnable, eventData.nANRLevel);
+                break;
+            case "SetResampleValue":
+                Module._SetResampleValue(g_nPort, eventData.nEnable, eventData.resampleValue);
+                break;
+            case "GetLastError":
+                let errorCode = Module._GetLastError(g_nPort);
+                postMessage({ 'function': "GetLastError", 'errorCode': errorCode });
+                break;
+            case "SetGlobalBaseTime":
+                Module._SetGlobalBaseTime(g_nPort, eventData.year, eventData.month, eventData.day, eventData.hour, eventData.min, eventData.sec, eventData.ms);
+                break;
+            case "SetRunTimeInfoCB":
+                Module._SetRunTimeInfoCallBackEx(g_nPort, eventData.nModuleType, 0);
+                break;
+            default:
+                break;
+        }
+    };
+
+    function getOSDTime(oFrameInfo) {
+        var iYear = oFrameInfo.year;
+        var iMonth = oFrameInfo.month;
+        var iDay = oFrameInfo.day;
+        var iHour = oFrameInfo.hour;
+        var iMinute = oFrameInfo.minute;
+        var iSecond = oFrameInfo.second;
+
+        if (iMonth < 10) {
+            iMonth = "0" + iMonth;
+        }
+        if (iDay < 10) {
+            iDay = "0" + iDay;
+        }
+        if (iHour < 10) {
+            iHour = "0" + iHour;
+        }
+        if (iMinute < 10) {
+            iMinute = "0" + iMinute;
+        }
+        if (iSecond < 10) {
+            iSecond = "0" + iSecond;
+        }
+
+        return iYear + "-" + iMonth + "-" + iDay + " " + iHour + ":" + iMinute + ":" + iSecond;
+    }
+    // 获取帧数据
+    function getFrameData() {
+        // function getFrameData() {
+        // 获取帧数据
+        var res = Module._GetFrameData();
+        //var res = fun();
+        if (res === PLAYM4_OK) {
+            var oFrameInfo = Module._GetFrameInfo();
+            switch (oFrameInfo.frameType) {
+                case AUDIO_TYPE:
+                    var iSize = oFrameInfo.frameSize;
+                    if (0 === iSize) {
+                        return -1;
+                    }
+                    var pPCM = Module._GetFrameBuffer();
+                    // var audioBuf = new ArrayBuffer(iSize);
+                    var aPCMData = new Uint8Array(iSize);
+                    aPCMData.set(Module.HEAPU8.subarray(pPCM, pPCM + iSize));
+                    if (bWorkerPrintLog) {
+                        console.log("<<<Worker: audio media Info: nSise:" + oFrameInfo.frameSize + ",nSampleRate:" + oFrameInfo.samplesPerSec + ',channel:' + oFrameInfo.channels + ',bitsPerSample:' + oFrameInfo.bitsPerSample);
+                    }
+                    postMessage({
+                        'function': "GetFrameData", 'type': "audioType", 'data': aPCMData.buffer,
+                        'frameInfo': oFrameInfo, 'errorCode': res
+                    }, [aPCMData.buffer]);
+
+                    oFrameInfo = null;
+                    pPCM = null;
+                    aPCMData = null;
+                    return PLAYM4_AUDIO_FRAME;
+
+                case VIDEO_TYPE:
+                    var szOSDTime = getOSDTime(oFrameInfo);
+
+                    var iWidth = oFrameInfo.width;
+                    var iHeight = oFrameInfo.height;
+
+                    var iYUVSize = iWidth * iHeight * 3 / 2;
+                    if (0 === iYUVSize) {
+                        return -1;
+                    }
+
+                    var pYUV = Module._GetFrameBuffer();
+
+                    // 图像数据渲染后压回，若从主码流切到子码流，存在数组大小与图像大小不匹配现象
+                    var aYUVData = new Uint8Array(iYUVSize);
+                    aYUVData.set(Module.HEAPU8.subarray(pYUV, pYUV + iYUVSize));
+                    if (bWorkerPrintLog) {
+                        console.log("<<<Worker: video media Info: Width:" + oFrameInfo.width + ",Height:" + oFrameInfo.height + ",timeStamp:" + oFrameInfo.timeStamp);
+                    }
+
+                    postMessage({
+                        'function': "GetFrameData", 'type': "videoType", 'data': aYUVData.buffer,
+                        'dataLen': aYUVData.length, 'osd': szOSDTime, 'frameInfo': oFrameInfo, 'errorCode': res
+                    }, [aYUVData.buffer]);
+
+                    oFrameInfo = null;
+                    pYUV = null;
+                    aYUVData = null;
+                    return PLAYM4_VIDEO_FRAME;
+
+                case PRIVT_TYPE:
+                    postMessage({
+                        'function': "GetFrameData", 'type': "", 'data': null,
+                        'dataLen': -1, 'osd': 0, 'frameInfo': null, 'errorCode': PLAYM4_SYS_NOT_SUPPORT
+                    });
+                    return PLAYM4_SYS_NOT_SUPPORT;
+
+                default:
+                    postMessage({
+                        'function': "GetFrameData", 'type': "", 'data': null,
+                        'dataLen': -1, 'osd': 0, 'frameInfo': null, 'errorCode': PLAYM4_SYS_NOT_SUPPORT
+                    });
+                    return PLAYM4_SYS_NOT_SUPPORT;
+            }
+        }
+        else {
+            let errorCode = Module._GetLastError(g_nPort);
+            //解码失败返回裸数据
+            if (PLAYM4_DECODE_ERROR === errorCode) {
+                var rawInfo = Module._GetRawDataInfo();
+                var pRawData = Module._GetRawDataBuffer();
+                var aRawData = new Uint8Array(rawInfo.isize);
+                aRawData.set(Module.HEAPU8.subarray(pRawData, pRawData + rawInfo.isize));
+                postMessage({
+                    'function': "GetRawData", 'type': "", 'data': aRawData.buffer,
+                    'rawDataLen': rawInfo.isize, 'osd': 0, 'frameInfo': null, 'errorCode': errorCode
+                });
+                rawInfo = null;
+                pRawData = null;
+                aRawData = null;
+            }
+            //需要更多数据
+            if (PLAYM4_NEED_MORE_DATA === errorCode || PLAYM4_SYS_NOT_SUPPORT === errorCode || PLAYM4_NEED_NEET_LOOP === errorCode) {
+                postMessage({
+                    'function': "GetFrameData", 'type': "", 'data': null,
+                    'dataLen': -1, 'osd': 0, 'frameInfo': null, 'errorCode': errorCode
+                });
+            }
+            return errorCode;
+        }
+    }
+
+    // 开始计算时间
+    function startTime() {
+        return new Date().getTime();
+    }
+
+    // 结束计算时间
+    function endTime() {
+        return new Date().getTime();
+    }
+
+    // 字母字符串转byte数组
+    function stringToBytes(str) {
+        var ch, st, re = [];
+        for (var i = 0; i < str.length; i++) {
+            ch = str.charCodeAt(i);  // get char
+            st = [];                 // set up "stack"
+            do {
+                st.push(ch & 0xFF);  // push byte to stack
+                ch = ch >> 8;          // shift value down by 1 byte
+            }
+            while (ch);
+            // add stack contents to result
+            // done because chars have "wrong" endianness
+            re = re.concat(st.reverse());
+        }
+        // return an array of bytes
+        return re;
+    }
+})();

static/js/h5player/playctrl1simd/DecodeWorker.js

@@ -0,0 +1,642 @@
+/**
+ * Created by wangweijie5 on 2016/12/5.
+ */
+(function (event) {
+    const AUDIO_TYPE = 0;	// 音频
+    const VIDEO_TYPE = 1;   // 视频
+    const PRIVT_TYPE = 2;  // 私有帧
+
+    const PLAYM4_AUDIO_FRAME = 100; // 音频帧
+    const PLAYM4_VIDEO_FRAME = 101; // 视频帧
+
+    const PLAYM4_OK = 1;
+    const PLAYM4_ORDER_ERROR = 2;
+    const PLAYM4_DECODE_ERROR = 44 	// 解码失败
+    const PLAYM4_NOT_KEYFRAME = 48; 	// 非关键帧
+    const PLAYM4_NEED_MORE_DATA = 31;   // 需要更多数据才能解析
+    const PLAYM4_NEED_NEET_LOOP = 35; //丢帧需要下个循环
+    const PLAYM4_SYS_NOT_SUPPORT = 16; 	// 不支持
+
+    importScripts('Decoder.js');
+    Module.addOnPostRun(function () {
+        postMessage({ 'function': "loaded" });
+    });
+
+    var iStreamMode = 0;  // 流模式
+
+    var bOpenMode = false;
+    var bOpenStream = false;
+
+    var funGetFrameData = null;
+    var funGetAudFrameData = null;
+
+    var bWorkerPrintLog = false;//worker层log开关
+
+    var g_nPort = -1;
+    var pInputData = null;
+    var inputBufferSize = 40960;
+
+    self.JSPlayM4_RunTimeInfoCallBack = function (nPort, pstRunTimeInfo, pUser) {
+        let port = nPort;
+        let user = pUser;
+        let nRunTimeModule = Module.HEAP32[pstRunTimeInfo >> 2];
+        let nStrVersion = Module.HEAP32[pstRunTimeInfo + 4 >> 2];
+        let nFrameTimeStamp = Module.HEAP32[pstRunTimeInfo + 8 >> 2];
+        let nFrameNum = Module.HEAP32[pstRunTimeInfo + 12 >> 2];
+        let nErrorCode = Module.HEAP32[pstRunTimeInfo + 16 >> 2];
+        // console.log("nRunTimeModule:"+nRunTimeModule+",nFrameNum:"+nFrameNum+",nErrorCode:"+nErrorCode);
+        postMessage({ 'function': "RunTimeInfoCallBack", 'nRunTimeModule': nRunTimeModule, 'nStrVersion': nStrVersion, 'nFrameTimeStamp': nFrameTimeStamp, 'nFrameNum': nFrameNum, 'nErrorCode': nErrorCode });
+    }
+
+    onmessage = function (event) {
+        var eventData = event.data;
+        var res = 0;
+        switch (eventData.command) {
+            case "printLog":
+                let downloadFlag = eventData.data;
+                if (downloadFlag === true) {
+                    bWorkerPrintLog = true;
+                    res = Module._SetPrintLogFlag(g_nPort, downloadFlag);
+                }
+                else {
+                    bWorkerPrintLog = false;
+                    res = Module._SetPrintLogFlag(g_nPort, downloadFlag);
+                }
+
+                if (res !== PLAYM4_OK) {
+                    console.log("DecodeWorker.js: PlayerSDK print log failed,res" + res);
+                    postMessage({ 'function': "printLog", 'errorCode': res });
+                }
+                break;
+            case "SetPlayPosition":
+                let nFrameNumOrTime = eventData.data;
+                let enPosType = eventData.type;
+                // res = Module._SetPlayPosition(nFrameNumOrTime,enPosType);
+                // if (res !== PLAYM4_OK)
+                // {
+                //     postMessage({'function': "SetPlayPosition", 'errorCode': res});
+                //     return;
+                // }
+                // //有没有buffer需要清除
+
+                break;
+            case "SetStreamOpenMode":
+                //获取端口号
+                g_nPort = Module._GetPort();
+                //设置流打开模式
+                iStreamMode = eventData.data;
+                res = Module._SetStreamOpenMode(g_nPort, iStreamMode);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "SetStreamOpenMode", 'errorCode': res });
+                    return;
+                }
+                bOpenMode = true;
+                break;
+
+            case "OpenStream":
+                // 接收到的数据
+                var iHeadLen = eventData.dataSize;
+                var pHead = Module._malloc(iHeadLen + 4);
+                if (pHead === null) {
+                    return;
+                }
+                var aHead = Module.HEAPU8.subarray(pHead, pHead + iHeadLen);
+                aHead.set(new Uint8Array(eventData.data));
+                res = Module._OpenStream(g_nPort, pHead, iHeadLen, eventData.bufPoolSize);
+                postMessage({ 'function': "OpenStream", 'errorCode': res });
+                if (res !== PLAYM4_OK) {
+                    //释放内存
+                    Module._free(pHead);
+                    pHead = null;
+                    return;
+                }
+                bOpenStream = true;
+                break;
+            case "Play":
+                let resP = Module._Play(g_nPort);
+                if (resP !== PLAYM4_OK) {
+                    return;
+                }
+                break;
+            case "InputData":
+                // 接收到的数据
+                var iLen = eventData.dataSize;
+                if (iLen > 0) {
+                    if (pInputData == null || iLen > inputBufferSize) {
+                        if (pInputData != null) {
+                            Module._free(pInputData);
+                            pInputData = null;
+                        }
+                        if (iLen > inputBufferSize) {
+                            inputBufferSize = iLen;
+                        }
+
+                        pInputData = Module._malloc(inputBufferSize);
+                        if (pInputData === null) {
+                            return;
+                        }
+                    }
+
+                    var inputData = new Uint8Array(eventData.data);
+                    // var aInputData = Module.HEAPU8.subarray(pInputData, pInputData + iLen);
+                    // aInputData.set(inputData);
+                    Module.writeArrayToMemory(inputData, pInputData);
+                    inputData = null;
+                    res = Module._InputData(g_nPort, pInputData, iLen);
+                    if (res !== PLAYM4_OK) {
+                        let errorCode = Module._GetLastError(g_nPort);
+                        let sourceRemain = Module._GetSourceBufferRemain(g_nPort);
+                        postMessage({ 'function': "InputData", 'errorCode': errorCode, "sourceRemain": sourceRemain });
+                    }
+                    //Module._free(pInputData);
+                    //pInputData = null;
+                } else {
+                    let sourceRemain = Module._GetSourceBufferRemain(g_nPort);
+                    if (sourceRemain == 0) {
+                        postMessage({ 'function': "InputData", 'errorCode': PLAYM4_NEED_MORE_DATA });
+                        return;
+                    }
+                }
+
+                /////////////////////
+                // if (funGetFrameData === null) {
+                //     funGetFrameData = Module.cwrap('GetFrameData', 'number');
+                // }
+
+                while (bOpenMode && bOpenStream) {
+
+                    var ret = getFrameData();
+                    // 直到获取视频帧或数据不足为止
+                    if (PLAYM4_VIDEO_FRAME === ret || PLAYM4_NEED_MORE_DATA === ret || PLAYM4_ORDER_ERROR === ret)//PLAYM4_VIDEO_FRAME === ret ||  || PLAYM4_NEED_NEET_LOOP === ret
+                    {
+                        break;
+                    }
+                }
+                break;
+
+            case "SetSecretKey":
+                var keyLen = eventData.nKeyLen;
+                var pKeyData = Module._malloc(keyLen);
+                if (pKeyData === null) {
+                    return;
+                }
+                var nKeySize = eventData.data.length
+                var bufData = stringToBytes(eventData.data);
+                var aKeyData = Module.HEAPU8.subarray(pKeyData, pKeyData + keyLen);
+                let u8array = new Uint8Array(keyLen);
+                aKeyData.set(u8array, 0);
+                aKeyData.set(new Uint8Array(bufData));
+                aKeyData = null;
+                u8array = null;
+
+                res = Module._SetSecretKey(g_nPort, eventData.nKeyType, pKeyData, keyLen);//, nKeySize
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "SetSecretKey", 'errorCode': res });
+                    Module._free(pKeyData);
+                    pKeyData = null;
+                    return;
+                }
+
+                Module._free(pKeyData);
+                pKeyData = null;
+                break;
+
+            case "GetBMP":
+                var nBMPWidth = eventData.width;
+                var nBMPHeight = eventData.height;
+                var pYUVData = eventData.data;
+                var nYUVSize = nBMPWidth * nBMPHeight * 3 / 2;
+                var oJpegCropRect = {
+                    left: eventData.left,
+                    top: eventData.top,
+                    right: eventData.right,
+                    bottom: eventData.bottom
+                };
+
+                var pDataYUV = Module._malloc(nYUVSize);
+                if (pDataYUV === null) {
+                    return;
+                }
+
+                Module.writeArrayToMemory(new Uint8Array(pYUVData, 0, nYUVSize), pDataYUV);
+
+                // 分配BMP空间
+                var nBmpSize = nBMPWidth * nBMPHeight * 4 + 60;
+                var pBmpData = Module._malloc(nBmpSize);
+                var pBmpSize = Module._malloc(4);
+                if (pBmpData === null || pBmpSize === null) {
+                    Module._free(pDataYUV);
+                    pDataYUV = null;
+
+                    if (pBmpData != null) {
+                        Module._free(pBmpData);
+                        pBmpData = null;
+                    }
+
+                    if (pBmpSize != null) {
+                        Module._free(pBmpSize);
+                        pBmpSize = null;
+                    }
+                    return;
+                }
+
+                //Module._memset(pBmpSize, nBmpSize, 4); // 防止bmp截图出现输入数据过大的错误码
+                Module.setValue(pBmpSize, nBmpSize, "i32");
+                res = Module._GetBMP(g_nPort, pDataYUV, nYUVSize, pBmpData, pBmpSize,
+                    oBMPCropRect.left, oBMPCropRect.top, oBMPCropRect.right, oBMPCropRect.bottom);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "GetBMP", 'errorCode': res });
+                    Module._free(pDataYUV);
+                    pDataYUV = null;
+                    Module._free(pBmpData);
+                    pBmpData = null;
+                    Module._free(pBmpSize);
+                    pBmpSize = null;
+                    return;
+                }
+
+                // 获取BMP图片大小
+                var nBmpDataSize = Module.getValue(pBmpSize, "i32");
+
+                // 获取BMP图片数据
+                var aBmpData = new Uint8Array(nBmpDataSize);
+                aBmpData.set(Module.HEAPU8.subarray(pBmpData, pBmpData + nBmpDataSize));
+
+                postMessage({ 'function': "GetBMP", 'data': aBmpData, 'errorCode': res }, [aBmpData.buffer]);
+                aBmpData = null;
+                if (pDataYUV != null) {
+                    Module._free(pDataYUV);
+                    pDataYUV = null;
+                }
+                if (pBmpData != null) {
+                    Module._free(pBmpData);
+                    pBmpData = null;
+                }
+                if (pBmpSize != null) {
+                    Module._free(pBmpSize);
+                    pBmpSize = null;
+                }
+                break;
+
+            case "GetJPEG":
+                var nJpegWidth = eventData.width;
+                var nJpegHeight = eventData.height;
+                var pYUVData1 = eventData.data;
+                var nYUVSize1 = nJpegWidth * nJpegHeight * 3 / 2;
+                var oJpegCropRect = {
+                    left: eventData.left,
+                    top: eventData.top,
+                    right: eventData.right,
+                    bottom: eventData.bottom
+                };
+
+                var pDataYUV1 = Module._malloc(nYUVSize1);
+                if (pDataYUV1 === null) {
+                    return;
+                }
+
+                Module.writeArrayToMemory(new Uint8Array(pYUVData1, 0, nYUVSize1), pDataYUV1);
+
+                // 分配JPEG空间
+                var pJpegData = Module._malloc(nYUVSize1);
+                var pJpegSize = Module._malloc(4);
+                if (pJpegData === null || pJpegSize === null) {
+                    if (pJpegData != null) {
+                        Module._free(pJpegData);
+                        pJpegData = null;
+                    }
+
+                    if (pJpegSize != null) {
+                        Module._free(pJpegSize);
+                        pJpegSize = null;
+                    }
+
+                    if (pDataYUV1 != null) {
+                        Module._free(pDataYUV1);
+                        pDataYUV1 = null;
+                    }
+                    return;
+                }
+
+                Module.setValue(pJpegSize, nJpegWidth * nJpegHeight * 2, "i32");    // JPEG抓图，输入缓冲长度不小于当前帧YUV大小
+
+                res = Module._GetJPEG(g_nPort, pDataYUV1, nYUVSize1, pJpegData, pJpegSize,
+                    oJpegCropRect.left, oJpegCropRect.top, oJpegCropRect.right, oJpegCropRect.bottom);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "GetJPEG", 'errorCode': res });
+                    if (pJpegData != null) {
+                        Module._free(pJpegData);
+                        pJpegData = null;
+                    }
+
+                    if (pJpegSize != null) {
+                        Module._free(pJpegSize);
+                        pJpegSize = null;
+                    }
+
+                    if (pDataYUV1 != null) {
+                        Module._free(pDataYUV1);
+                        pDataYUV1 = null;
+                    }
+                    return;
+                }
+
+                // 获取JPEG图片大小
+                var nJpegSize = Module.getValue(pJpegSize, "i32");
+
+                // 获取JPEG图片数据
+                var aJpegData = new Uint8Array(nJpegSize);
+                aJpegData.set(Module.HEAPU8.subarray(pJpegData, pJpegData + nJpegSize));
+
+                postMessage({ 'function': "GetJPEG", 'data': aJpegData, 'errorCode': res }, [aJpegData.buffer]);
+
+                nJpegSize = null;
+                aJpegData = null;
+
+                if (pDataYUV1 != null) {
+                    Module._free(pDataYUV1);
+                    pDataYUV1 = null;
+                }
+                if (pJpegData != null) {
+                    Module._free(pJpegData);
+                    pJpegData = null;
+                }
+                if (pJpegSize != null) {
+                    Module._free(pJpegSize);
+                    pJpegSize = null;
+                }
+                break;
+
+            case "SetDecodeFrameType":
+                var nFrameType = eventData.data;
+                res = Module._SetDecodeFrameType(g_nPort, nFrameType);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "SetDecodeFrameType", 'errorCode': res });
+                    return;
+                }
+                break;
+            case "CloseStream":
+                //stop
+                let resS = Module._Stop(g_nPort);
+                if (resS !== PLAYM4_OK) {
+                    postMessage({ 'function': "Stop", 'errorCode': res });
+                    return;
+                }
+                //closeStream
+                res = Module._CloseStream(g_nPort);
+                if (res !== PLAYM4_OK) {
+                    postMessage({ 'function': "CloseStream", 'errorCode': res });
+                    return;
+                }
+                //freePort
+                let resF = Module._FreePort(g_nPort);
+                if (resF !== PLAYM4_OK) {
+                    postMessage({ 'function': "FreePort", 'errorCode': res });
+                    return;
+                }
+                if (pInputData != null) {
+                    Module._free(pInputData);
+                    pInputData = null;
+                }
+                break;
+            case "PlaySound":
+                let resPS = Module._PlaySound(g_nPort);
+                if (resPS !== PLAYM4_OK) {
+                    console.log("PlaySound failed");
+                    return;
+                }
+                break;
+            case "StopSound":
+                let resSS = Module._StopSound();
+                if (resSS !== PLAYM4_OK) {
+                    console.log("StopSound failed");
+                    return;
+                }
+                break;
+            case "SetVolume":
+                let resSV = Module._SetVolume(g_nPort, eventData.volume);
+                if (resSV !== PLAYM4_OK) {
+                    console.log("Audio SetVolume failed");
+                    return;
+                }
+                break;
+            case "GetVolume":
+                let volume = Module._GetVolume();
+                if (volume > 0) {
+                    postMessage({ 'function': "GetVolume", 'volume': volume });
+                }
+                else {
+                    console.log("Audio GetVolume failed");
+                    return;
+                }
+                break;
+            case "OnlyPlaySound":
+                let resOPS = Module._OnlyPlaySound(g_nPort);
+                if (resOPS !== PLAYM4_OK) {
+                    console.log("OnlyPlaySound failed");
+                    return;
+                }
+                break;
+            case "Pause":
+                let resPa = Module._Pause(g_nPort, eventData.bPlay);
+                if (resPa !== PLAYM4_OK) {
+                    console.log("Pause failed");
+                    return;
+                }
+            case "PlayRate":
+                Module._SetPlayRate(g_nPort, eventData.playRate);
+                break;
+            case "SetIFrameDecInterval":
+                Module._SetIFrameDecInterval(g_nPort, eventData.data);
+                break;
+            case "SetLostFrameMode":
+                Module._SetLostFrameMode(g_nPort, eventData.data, 0);
+                break;
+            case "SetDemuxModel":
+                Module._SetDemuxModel(g_nPort, eventData.nIdemuxType, eventData.bTrue);
+                break;
+            case "SkipErrorData":
+                Module._SkipErrorData(g_nPort, eventData.bSkip);
+                break;
+            case "SetDecodeERC":
+                Module._SetDecodeERC(g_nPort, eventData.nLevel);
+                break;
+            case "SetANRParam":
+                Module._SetANRParam(g_nPort, eventData.nEnable, eventData.nANRLevel);
+                break;
+            case "SetResampleValue":
+                Module._SetResampleValue(g_nPort, eventData.nEnable, eventData.resampleValue);
+                break;
+            case "GetLastError":
+                let errorCode = Module._GetLastError(g_nPort);
+                postMessage({ 'function': "GetLastError", 'errorCode': errorCode });
+                break;
+            case "SetGlobalBaseTime":
+                Module._SetGlobalBaseTime(g_nPort, eventData.year, eventData.month, eventData.day, eventData.hour, eventData.min, eventData.sec, eventData.ms);
+                break;
+            case "SetRunTimeInfoCB":
+                Module._SetRunTimeInfoCallBackEx(g_nPort, eventData.nModuleType, 0);
+                break;
+            default:
+                break;
+        }
+    };
+
+    function getOSDTime(oFrameInfo) {
+        var iYear = oFrameInfo.year;
+        var iMonth = oFrameInfo.month;
+        var iDay = oFrameInfo.day;
+        var iHour = oFrameInfo.hour;
+        var iMinute = oFrameInfo.minute;
+        var iSecond = oFrameInfo.second;
+
+        if (iMonth < 10) {
+            iMonth = "0" + iMonth;
+        }
+        if (iDay < 10) {
+            iDay = "0" + iDay;
+        }
+        if (iHour < 10) {
+            iHour = "0" + iHour;
+        }
+        if (iMinute < 10) {
+            iMinute = "0" + iMinute;
+        }
+        if (iSecond < 10) {
+            iSecond = "0" + iSecond;
+        }
+
+        return iYear + "-" + iMonth + "-" + iDay + " " + iHour + ":" + iMinute + ":" + iSecond;
+    }
+    // 获取帧数据
+    function getFrameData() {
+        // function getFrameData() {
+        // 获取帧数据
+        var res = Module._GetFrameData();
+        //var res = fun();
+        if (res === PLAYM4_OK) {
+            var oFrameInfo = Module._GetFrameInfo();
+            switch (oFrameInfo.frameType) {
+                case AUDIO_TYPE:
+                    var iSize = oFrameInfo.frameSize;
+                    if (0 === iSize) {
+                        return -1;
+                    }
+                    var pPCM = Module._GetFrameBuffer();
+                    // var audioBuf = new ArrayBuffer(iSize);
+                    var aPCMData = new Uint8Array(iSize);
+                    aPCMData.set(Module.HEAPU8.subarray(pPCM, pPCM + iSize));
+                    if (bWorkerPrintLog) {
+                        console.log("<<<Worker: audio media Info: nSise:" + oFrameInfo.frameSize + ",nSampleRate:" + oFrameInfo.samplesPerSec + ',channel:' + oFrameInfo.channels + ',bitsPerSample:' + oFrameInfo.bitsPerSample);
+                    }
+                    postMessage({
+                        'function': "GetFrameData", 'type': "audioType", 'data': aPCMData.buffer,
+                        'frameInfo': oFrameInfo, 'errorCode': res
+                    }, [aPCMData.buffer]);
+
+                    oFrameInfo = null;
+                    pPCM = null;
+                    aPCMData = null;
+                    return PLAYM4_AUDIO_FRAME;
+
+                case VIDEO_TYPE:
+                    var szOSDTime = getOSDTime(oFrameInfo);
+
+                    var iWidth = oFrameInfo.width;
+                    var iHeight = oFrameInfo.height;
+
+                    var iYUVSize = iWidth * iHeight * 3 / 2;
+                    if (0 === iYUVSize) {
+                        return -1;
+                    }
+
+                    var pYUV = Module._GetFrameBuffer();
+
+                    // 图像数据渲染后压回，若从主码流切到子码流，存在数组大小与图像大小不匹配现象
+                    var aYUVData = new Uint8Array(iYUVSize);
+                    aYUVData.set(Module.HEAPU8.subarray(pYUV, pYUV + iYUVSize));
+                    if (bWorkerPrintLog) {
+                        console.log("<<<Worker: video media Info: Width:" + oFrameInfo.width + ",Height:" + oFrameInfo.height + ",timeStamp:" + oFrameInfo.timeStamp);
+                    }
+
+                    postMessage({
+                        'function': "GetFrameData", 'type': "videoType", 'data': aYUVData.buffer,
+                        'dataLen': aYUVData.length, 'osd': szOSDTime, 'frameInfo': oFrameInfo, 'errorCode': res
+                    }, [aYUVData.buffer]);
+
+                    oFrameInfo = null;
+                    pYUV = null;
+                    aYUVData = null;
+                    return PLAYM4_VIDEO_FRAME;
+
+                case PRIVT_TYPE:
+                    postMessage({
+                        'function': "GetFrameData", 'type': "", 'data': null,
+                        'dataLen': -1, 'osd': 0, 'frameInfo': null, 'errorCode': PLAYM4_SYS_NOT_SUPPORT
+                    });
+                    return PLAYM4_SYS_NOT_SUPPORT;
+
+                default:
+                    postMessage({
+                        'function': "GetFrameData", 'type': "", 'data': null,
+                        'dataLen': -1, 'osd': 0, 'frameInfo': null, 'errorCode': PLAYM4_SYS_NOT_SUPPORT
+                    });
+                    return PLAYM4_SYS_NOT_SUPPORT;
+            }
+        }
+        else {
+            let errorCode = Module._GetLastError(g_nPort);
+            //解码失败返回裸数据
+            if (PLAYM4_DECODE_ERROR === errorCode) {
+                var rawInfo = Module._GetRawDataInfo();
+                var pRawData = Module._GetRawDataBuffer();
+                var aRawData = new Uint8Array(rawInfo.isize);
+                aRawData.set(Module.HEAPU8.subarray(pRawData, pRawData + rawInfo.isize));
+                postMessage({
+                    'function': "GetRawData", 'type': "", 'data': aRawData.buffer,
+                    'rawDataLen': rawInfo.isize, 'osd': 0, 'frameInfo': null, 'errorCode': errorCode
+                });
+                rawInfo = null;
+                pRawData = null;
+                aRawData = null;
+            }
+            //需要更多数据
+            if (PLAYM4_NEED_MORE_DATA === errorCode || PLAYM4_SYS_NOT_SUPPORT === errorCode || PLAYM4_NEED_NEET_LOOP === errorCode) {
+                postMessage({
+                    'function': "GetFrameData", 'type': "", 'data': null,
+                    'dataLen': -1, 'osd': 0, 'frameInfo': null, 'errorCode': errorCode
+                });
+            }
+            return errorCode;
+        }
+    }
+
+    // 开始计算时间
+    function startTime() {
+        return new Date().getTime();
+    }
+
+    // 结束计算时间
+    function endTime() {
+        return new Date().getTime();
+    }
+
+    // 字母字符串转byte数组
+    function stringToBytes(str) {
+        var ch, st, re = [];
+        for (var i = 0; i < str.length; i++) {
+            ch = str.charCodeAt(i);  // get char
+            st = [];                 // set up "stack"
+            do {
+                st.push(ch & 0xFF);  // push byte to stack
+                ch = ch >> 8;          // shift value down by 1 byte
+            }
+            while (ch);
+            // add stack contents to result
+            // done because chars have "wrong" endianness
+            re = re.concat(st.reverse());
+        }
+        // return an array of bytes
+        return re;
+    }
+})();

static/js/h5player/transform/systemTransform-worker.js

@@ -0,0 +1,120 @@
+importScripts('libSystemTransform.js');
+    const RECORDRTP = 0;  //录制一份未经过转封装的码流原始数据，用于定位问题
+    let dataType = 1;
+    
+    // 转封装库回调函数
+    self.STCallBack = function (fileIndex,indexLen, data, dataLen)
+    {
+        //stFrameInfo的类型见DETAIL_FRAME_INFO
+		let stFrameInfo = Module._GetDetialFrameInfo();
+        let nIsMp4Index = stFrameInfo.nIsMp4Index;
+		//console.log("FrameType is " , stFrameInfo);	
+		//console.log("nIsMp4Index is " + nIsMp4Index);
+        //debugger
+        var pData = null;
+        pData = new Uint8Array(dataLen);
+        pData.set(Module.HEAPU8.subarray(data, data + dataLen));
+        if (dataType === 1) {
+            if (pData[0] == 0x49 && pData[1] == 0x4d && pData[2] == 0x4b && pData[3] == 0x48) {//码流头丢掉
+                return;
+            }
+            postMessage({type: "outputData", buf: pData, dType: 1});
+            dataType = 2;
+        } else {
+            if (nIsMp4Index) {
+                postMessage({type: "outputData", buf: pData, dType: 6}); //6：索引类型
+            } else {
+                postMessage({type: "outputData", buf: pData, dType: 2}); //2:码流
+            }
+        }
+
+        //stFrameInfo的类型见DETAIL_FRAME_INFO
+		//let stFrameInfo = Module._GetDetialFrameInfo();
+		//let stFrameType = stFrameInfo.nFrameType;
+		//let nFrameNum = stFrameInfo.nFrameNum;
+		//let nTimeStamp = stFrameInfo.nTimeStamp;
+        //let nIsMp4Index = stFrameInfo.nIsMp4Index;
+		
+		//console.log("FrameType is " + stFrameType);	
+		//console.log("nIsMp4Index is " + nIsMp4Index);	
+        
+    }
+
+    // self.Module = { memoryInitializerRequest: loadMemInitFile(), TOTAL_MEMORY: 128*1024*1024 };
+    // importScripts('SystemTransform.js');
+
+    self.Module['onRuntimeInitialized'] = function (){
+        postMessage({type: "loaded"});
+    }
+    onmessage = function (e) {
+        var data = e.data;
+        if ("create" === data.type) {
+            if (RECORDRTP) {
+                postMessage({type: "created"});
+                postMessage({type: "outputData", buf: data.buf, dType: 1});
+            } else {
+                var iHeadLen = data.len;
+                var pHead = Module._malloc(iHeadLen);
+    
+                self.writeArrayToMemory(new Uint8Array(data.buf), pHead);
+                var iTransType = data.packType;//目标格式
+                var iRet = Module._CreatHandle(pHead, iTransType, 4096);
+                if (iRet != 0) {
+                    console.log("_CreatHandle failed!" + iRet);
+                } else {
+                    iRet = Module._SysTransRegisterDataCallBack();			
+                    if(iRet != 0)
+                    {
+                        console.log("_SysTransRegisterDataCallBack Failed:" + iRet);
+                    }
+
+                    iRet = Module._SysTransStart(null, null);
+                    if(iRet != 0)
+                    {
+                        console.log("_SysTransStart Failed:" + iRet);
+                    }
+                    postMessage({type: "created"});
+                }
+            }
+
+        } else if ("inputData" === data.type) {
+            if (RECORDRTP) {
+                var aFileData = new Uint8Array(data.buf);  // 拷贝一份
+                var iBufferLen = aFileData.length;
+                var szBufferLen = iBufferLen.toString(16);
+                if (szBufferLen.length === 1) {
+                    szBufferLen = "000" + szBufferLen;
+                } else if (szBufferLen.length === 2) {
+                    szBufferLen = "00" + szBufferLen;
+                } else if (szBufferLen.length === 3) {
+                    szBufferLen = "0" + szBufferLen;
+                }
+                var aData = [0, 0, parseInt(szBufferLen.substring(0, 2), 16), parseInt(szBufferLen.substring(2, 4), 16)];
+                for(var iIndex = 0, iDataLength = aFileData.length; iIndex < iDataLength; iIndex++) {
+                    aData[iIndex + 4] = aFileData[iIndex]
+                }
+                var dataUint8 = new Uint8Array(aData);
+                postMessage({type: "outputData", buf: dataUint8.buffer, dType: 2});
+            } else {
+                let pInputDataBuf = Module._malloc(data.len);
+                var idataLen = data.len;
+                self.writeArrayToMemory(new Uint8Array(data.buf), pInputDataBuf);
+                    // 输入数据，每次最多2m
+                let pp = Module._SysTransInputData(0, pInputDataBuf, idataLen);
+                if(pp != 0) {
+                    //console.log("InputData Failed:" + pp);
+                }
+                Module._free(pInputDataBuf);
+            }
+        } else if ("release" === data.type) {
+            var iRet = Module._SysTransStop();
+            if (iRet != 0) {
+                console.log("_SysTransStop Failed:", iRet);
+            }
+            Module._SysTransRelease();
+            if (iRet != 0) {
+                console.log("_SysTransRelease Failed:", iRet);
+            }
+            close();
+        }
+    };