+
+ {{ props.name }}
+
+
+
![预览图]()
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ @touchend="moveCamera('stop')"
+ @touchstart="moveCamera('right')"
+ @contextmenu.prevent
+ >
+
+
+
+
+
+
@@ -531,11 +646,19 @@ watch(playbackFlvUrl, async (url, oldUrl) => {
left: 0;
top: 0;
+ .snapshot {
+ position: absolute;
+ left: 20px;
+ top: 50%;
+ transform: translateY(-50%);
+ display: flex;
+ }
+
.close-button {
position: absolute;
top: 6px;
right: 6px;
- color: #fff;
+ color: #e7f5ee;
font-size: 48px;
border-radius: 50%;
}
@@ -623,16 +746,16 @@ watch(playbackFlvUrl, async (url, oldUrl) => {
\ No newline at end of file
diff --git a/src/components/CameraList.vue b/src/components/CameraList.vue
index 79a8936..d56a877 100644
--- a/src/components/CameraList.vue
+++ b/src/components/CameraList.vue
@@ -95,58 +95,55 @@ const queryParams = reactive({
// const activeIndex = ref(0);
const loadProjectList = async () => {
// const resp = await axios.get(`http://localhost:3000/project-list`);
- // TODO:test
- // const resp = await axios.get(
- // "/api/portal/r/jd?cmd=com.awspaas.user.apps.cmp_screen_getProjectList&sid=b9e99f78-2f6e-4d1c-aea9-4364f4191d30"
- // );
- // const resp = {
- // data: [{
- // "SUPERVISORID": "",
- // "MAP": "40.763291,111.971932",
- // "PROID": "HT6YXM-202303232023030010",
- // "PROTYPE": "",
- // "UPDATEDATE": 1679559863000,
- // "SUPERVISOR": "",
- // "DESIGNERID": "",
- // "STCV": 800000,
- // "PROOWNER": "六院本部/资产运营部/",
- // "SURVEY": "",
- // "UPDATEUSER": "13088880001",
- // "SURVEYID": "",
- // "APPENDIX": "",
- // "PROCOST": 800000,
- // "PRICELEADERID": "13088880004",
- // "PRODEPTLEADERID": "13088880003",
- // "PROLEADERID": "13088880002",
- // "PROLEADER": "建设单位项目管理人员",
- // "CONTRACTOR": "",
- // "FLOORAREA": 2000,
- // "CREATEUSER": "13088880001",
- // "ISEND": 0,
- // "RSTATUS": "1",
- // "LEADERID": "13088880007",
- // "PRICELEADER": "工程造价主管部门领导",
- // "PROSTATUS": "1",
- // "CBDATE": 1677600000000,
- // "CONTRACTORID": "",
- // "LEADER": "主要领导",
- // "PRODEPTLEADER": "建设单位项目管理部门领导",
- // "PRONAME": "A区科创园",
- // "ASSETLEADER": "固定资产投资主管领导",
- // "BINDID": "47856a34-afa4-4a9b-ae28-ba450a4ab798",
- // "ORGID": "d8ee92f8-c80f-4741-b92c-cbc60c91d754",
- // "PROADDRESS": "内蒙古自治区呼和浩特市赛罕区黄合少镇南地村",
- // "DESIGNER": "",
- // "PROCESSDEFID": "obj_a48ef53d7a2f4492bf440174e32bef3a",
- // "PROPIC": "",
- // "CREATEDATE": 1679559863000,
- // "ASSETLEADERID": "13088880005",
- // "CEDATE": 1703260800000,
- // "PROFILE": "",
- // "ACCDATE": 1703260800000,
- // "ID": "a0fb6df5-48e4-442f-8b9d-da5861c1bf41"q
- // }]
- // }
+ // FIXME:test
+ /*const resp = {
+ data: [{
+ "SUPERVISORID": "",
+ "MAP": "40.763291,111.971932",
+ "PROID": "HT6YXM-202303232023030010",
+ "PROTYPE": "",
+ "UPDATEDATE": 1679559863000,
+ "SUPERVISOR": "",
+ "DESIGNERID": "",
+ "STCV": 800000,
+ "PROOWNER": "六院本部/资产运营部/",
+ "SURVEY": "",
+ "UPDATEUSER": "13088880001",
+ "SURVEYID": "",
+ "APPENDIX": "",
+ "PROCOST": 800000,
+ "PRICELEADERID": "13088880004",
+ "PRODEPTLEADERID": "13088880003",
+ "PROLEADERID": "13088880002",
+ "PROLEADER": "建设单位项目管理人员",
+ "CONTRACTOR": "",
+ "FLOORAREA": 2000,
+ "CREATEUSER": "13088880001",
+ "ISEND": 0,
+ "RSTATUS": "1",
+ "LEADERID": "13088880007",
+ "PRICELEADER": "工程造价主管部门领导",
+ "PROSTATUS": "1",
+ "CBDATE": 1677600000000,
+ "CONTRACTORID": "",
+ "LEADER": "主要领导",
+ "PRODEPTLEADER": "建设单位项目管理部门领导",
+ "PRONAME": "A区科创园",
+ "ASSETLEADER": "固定资产投资主管领导",
+ "BINDID": "47856a34-afa4-4a9b-ae28-ba450a4ab798",
+ "ORGID": "d8ee92f8-c80f-4741-b92c-cbc60c91d754",
+ "PROADDRESS": "内蒙古自治区呼和浩特市赛罕区黄合少镇南地村",
+ "DESIGNER": "",
+ "PROCESSDEFID": "obj_a48ef53d7a2f4492bf440174e32bef3a",
+ "PROPIC": "",
+ "CREATEDATE": 1679559863000,
+ "ASSETLEADERID": "13088880005",
+ "CEDATE": 1703260800000,
+ "PROFILE": "",
+ "ACCDATE": 1703260800000,
+ "ID": "a0fb6df5-48e4-442f-8b9d-da5861c1bf41"
+ }]
+ }*/
const resp = await axios.get(
"./jd?cmd=com.awspaas.user.apps.cmp_screen_getProjectList&sid=" + sid
);
@@ -164,54 +161,48 @@ const projectClicked = () => {
const loadCameraList = async () => {
cameraLoading.value = true;
- // TODO:test
- // const resp = await axios(`/api/portal/r/jd`, {
- // params: queryParams,
- // });
- // const resp = {
- // data: {
- // "code": 0,
- // "rows": [{
- // "address": "A区-科创园南门内",
- // "flvUrl": "http://106.74.152.123:10000/sms/34020000002020000001/flv/hls/34020000001320000009_34020000001320000009.flv",
- // "id": "2e627e9a-afe8-4065-9196-423467396401",
- // "projectId": "HT6YXM-202303232023030010",
- // "projectName": "A区科创园"
- // }, {
- // "address": "A区科创园东门内",
- // "flvUrl": "http://106.74.152.123:10000/sms/34020000002020000001/flv/hls/34020000001320000008_34020000001320000008.flv",
- // "id": "7ff7ba05-05e4-48e6-a43a-a0983ff1aa2b",
- // "projectId": "HT6YXM-202303232023030010",
- // "projectName": "A区科创园"
- // }, {
- // "address": "A区科创园东塔吊东北角球机",
- // "flvUrl": "http://106.74.152.123:10000/sms/34020000002020000001/flv/hls/34020000001320000010_34020000001320000010.flv",
- // "id": "e410e322-cceb-40b9-899b-4f3d2e8215eb",
- // "projectId": "HT6YXM-202303232023030010",
- // "projectName": "A区科创园"
- // }, {
- // "address": "A区科创园东塔吊西南角球机",
- // "flvUrl": "http://106.74.152.123:10000/sms/34020000002020000001/flv/hls/34020000001320000011_34020000001320000011.flv",
- // "id": "ff3e0079-068c-49f0-b1fe-3fa8544d91f2",
- // "projectId": "HT6YXM-202303232023030010",
- // "projectName": "A区科创园"
- // }],
- // "total": 4
- // }
- // }
- const resp = await axios.get("./jd", {
- params: queryParams,
- });
+ // FIXME:test
+ /*const resp = {
+ data: {
+ "code": 0,
+ "rows": [{
+ "address": "A区-科创园南门内",
+ // "flvUrl": "http://106.74.152.123:10000/sms/34020000002020000001/flv/hls/34020000001320000009_34020000001320000009.flv",
+ flvUrl: "https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-720p.flv",
+ "id": "2e627e9a-afe8-4065-9196-423467396401",
+ "projectId": "HT6YXM-202303232023030010",
+ "projectName": "A区科创园"
+ }, {
+ "address": "A区科创园东门内",
+ "flvUrl": "http://106.74.152.123:10000/sms/34020000002020000001/flv/hls/34020000001320000008_34020000001320000008.flv",
+ "id": "7ff7ba05-05e4-48e6-a43a-a0983ff1aa2b",
+ "projectId": "HT6YXM-202303232023030010",
+ "projectName": "A区科创园"
+ }, {
+ "address": "A区科创园东塔吊东北角球机",
+ "flvUrl": "http://106.74.152.123:10000/sms/34020000002020000001/flv/hls/34020000001320000010_34020000001320000010.flv",
+ "id": "e410e322-cceb-40b9-899b-4f3d2e8215eb",
+ "projectId": "HT6YXM-202303232023030010",
+ "projectName": "A区科创园"
+ }, {
+ "address": "A区科创园东塔吊西南角球机",
+ "flvUrl": "http://106.74.152.123:10000/sms/34020000002020000001/flv/hls/34020000001320000011_34020000001320000011.flv",
+ "id": "ff3e0079-068c-49f0-b1fe-3fa8544d91f2",
+ "projectId": "HT6YXM-202303232023030010",
+ "projectName": "A区科创园"
+ }],
+ "total": 4
+ }
+ }*/
+ const resp = await axios.get("./jd", {
+ params: queryParams,
+ });
cameraList.value = resp.data.rows;
total.value = resp.data.total;
cameraLoading.value = false;
};
const loadImageList = async () => {
- // const resp = await axios.get(
- // `./jd?cmd=com.awspaas.user.apps.cmp_photo_list&sid=${sid}&proId=${queryParams.query}`
- // ); // 摄像头列表为空时,获取图片列表
- // TODO:test
const resp = await axios.get(
`./jd?cmd=com.awspaas.user.apps.cmp_photo_list&sid=${sid}&proId=${queryParams.query}`
); // 摄像头列表为空时,获取图片列表
diff --git a/src/main.js b/src/main.js
index ac0a227..ab708d0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,7 @@ import "./assets/fonts/iconfont.css";
import { createPinia } from "pinia";
// const Home = { template: "
Home
" };
// const About = { template: "
About
" };
+console.log('load end')
const pinia = createPinia();
// 2. 定义一些路由
// 每个路由都需要映射到一个组件。
@@ -25,5 +26,6 @@ const pinia = createPinia();
// history: createWebHashHistory(),
// routes, // `routes: routes` 的缩写
// });
-
+console.log('create pinia')
createApp(App).use(pinia).mount("#app");
+console.log('create app')
diff --git a/vue.config.js b/vue.config.js
index e6fa7a7..9bf6bab 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -20,6 +20,7 @@ module.exports = defineConfig({
}
},
},
+ // FIXME
publicPath: "./",
assetsDir: "../apps/com.awspaas.user.apps.cmp/monitor",
});
diff --git a/yarn.lock b/yarn.lock
index c02700e..cd6003e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3888,6 +3888,11 @@ ignore@^5.2.0:
resolved "https://registry.npmmirror.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+immediate@~3.0.5:
+ version "3.0.6"
+ resolved "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+ integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
+
immutable@^4.0.0:
version "4.1.0"
resolved "https://registry.npmmirror.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
@@ -4173,6 +4178,16 @@ jsonfile@^6.0.1:
optionalDependencies:
graceful-fs "^4.1.6"
+jszip@^3.10.1:
+ version "3.10.1"
+ resolved "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
+ integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
+ dependencies:
+ lie "~3.3.0"
+ pako "~1.0.2"
+ readable-stream "~2.3.6"
+ setimmediate "^1.0.5"
+
kind-of@^6.0.2:
version "6.0.3"
resolved "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
@@ -4206,6 +4221,13 @@ levn@^0.4.1:
prelude-ls "^1.2.1"
type-check "~0.4.0"
+lie@~3.3.0:
+ version "3.3.0"
+ resolved "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+ integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+ dependencies:
+ immediate "~3.0.5"
+
lilconfig@^2.0.3:
version "2.0.6"
resolved "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
@@ -4779,6 +4801,11 @@ p-try@^2.0.0:
resolved "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+pako@~1.0.2:
+ version "1.0.11"
+ resolved "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+ integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
param-case@^3.0.4:
version "3.0.4"
resolved "https://registry.npmmirror.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
@@ -5357,6 +5384,19 @@ readable-stream@^3.0.6, readable-stream@^3.4.0:
string_decoder "^1.1.1"
util-deprecate "^1.0.1"
+readable-stream@~2.3.6:
+ version "2.3.8"
+ resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+ integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.3"
+ isarray "~1.0.0"
+ process-nextick-args "~2.0.0"
+ safe-buffer "~5.1.1"
+ string_decoder "~1.1.1"
+ util-deprecate "~1.0.1"
+
readdirp@~3.6.0:
version "3.6.0"
resolved "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -5657,6 +5697,11 @@ serve-static@1.15.0:
parseurl "~1.3.3"
send "0.18.0"
+setimmediate@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+ integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
+
setprototypeof@1.1.0:
version "1.1.0"
resolved "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"