From c8ec73b4b4ea9513789d8aa72d721ee7445d12cb Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 13 八月 2020 15:12:46 +0800
Subject: [PATCH] 修复card查看大图功能
---
src/pages/cameraAccess/components/scene/Editor.vue | 22 +++++++++++-----------
src/pages/cameraVideo/index/main.ts | 8 +++++++-
package.json | 3 ++-
src/pages/search/index/main.ts | 13 +++++++++----
4 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/package.json b/package.json
index eae4781..05893c4 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"vue": "^2.6.11",
"vue-awesome-swiper": "^3.1.3",
"vue-js-toggle-button": "^1.3.3",
+ "vue-photo-preview": "^1.1.3",
"vue-qrcode-component": "^2.1.1",
"vuex": "^3.5.1"
},
@@ -80,4 +81,4 @@
"keywords": [],
"author": "",
"license": "ISC"
-}
\ No newline at end of file
+}
diff --git a/src/pages/cameraAccess/components/scene/Editor.vue b/src/pages/cameraAccess/components/scene/Editor.vue
index 0278baa..7ddb8a9 100644
--- a/src/pages/cameraAccess/components/scene/Editor.vue
+++ b/src/pages/cameraAccess/components/scene/Editor.vue
@@ -23,7 +23,7 @@
:class="{ init: index == 0 }"
v-cloak
v-for="(sdkItem, index) in sdkGroup"
- :key="index"
+ :key="sdkItem.id"
>
<div class="connection" v-if="index !== 0">
<el-select
@@ -423,7 +423,7 @@
// }
},
mounted() {
- this.TaskMange.findAllSdk({installed:true})
+ this.TaskMange.findAllSdk({ installed: true })
//this.TaskMange.list1 = sdkJson.data;
//this.editHandle(this.ruleList)
@@ -545,10 +545,10 @@
this.selectPolygonOption(itemTemp)
this.sdkGroup.splice(index, 1, itemTemp)
} else {
- if(this.sdkGroup[index+1] && this.sdkGroup[index+1].rule_with_pre){
- this.sdkGroup[index+1].rule_with_pre = '';
+ if (this.sdkGroup[index + 1] && this.sdkGroup[index + 1].rule_with_pre) {
+ this.sdkGroup[index + 1].rule_with_pre = '';
}
-
+
this.sdkGroup.splice(index, 1);
}
},
@@ -1170,7 +1170,7 @@
optNames = []
sdkObj = this.TaskMange.list1.find(sdk => sdk.id == rule.sdk_id)
-
+
argDef = JSON.parse(sdkObj.argDef)
defaultArg = argDef.filter(arg => !arg.config.isOptional)
optionalArg = argDef.filter(arg => arg.config.isOptional)
@@ -1350,15 +1350,15 @@
return false
}
//鏍￠獙鍖洪棿宸︿晶鍊兼槸鍚﹀皬浜庡彸渚у��
- let illegalRange = this.sdkGroup.some((sdk,index)=>{
- let rangeArg = sdk.defaultArg.find(arg=>arg.operator=='range');
- if(rangeArg){
+ let illegalRange = this.sdkGroup.some((sdk, index) => {
+ let rangeArg = sdk.defaultArg.find(arg => arg.operator == 'range');
+ if (rangeArg) {
if (Number(rangeArg.max) <= Number(rangeArg.min)) {
return sdk
}
}
});
- if(illegalRange){
+ if (illegalRange) {
this.$notify({
type: 'error',
message: '鍖洪棿宸︿晶涓嶈兘澶т簬鎴栫瓑浜庡尯闂村彸渚х殑鍊�'
@@ -1555,7 +1555,7 @@
</script>
<style lang="scss">
-body{
+body {
font-size: 12px;
}
.edit-rules-box {
diff --git a/src/pages/cameraVideo/index/main.ts b/src/pages/cameraVideo/index/main.ts
index a542b20..475fb71 100644
--- a/src/pages/cameraVideo/index/main.ts
+++ b/src/pages/cameraVideo/index/main.ts
@@ -1,4 +1,7 @@
import Vue from 'vue';
+import App from './App.vue'
+import "../../../assets/css/common.scss"
+
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
import "@/assets/css/element-variables.scss";
@@ -9,7 +12,10 @@
import Mixin from "./mixins";
-import App from './App.vue'
+
+import preview from 'vue-photo-preview'
+import 'vue-photo-preview/dist/skin.css'
+Vue.use(preview)
Vue.use(ElementUI)
Vue.use(VueAwesomeSwiper as any);
diff --git a/src/pages/search/index/main.ts b/src/pages/search/index/main.ts
index d7dc64d..40f7ec6 100644
--- a/src/pages/search/index/main.ts
+++ b/src/pages/search/index/main.ts
@@ -1,17 +1,22 @@
import Vue from 'vue';
-import ElementUI from 'element-ui';
-import 'element-ui/lib/theme-chalk/index.css';
-import "@/assets/css/element-variables.scss";
-
import App from './App.vue'
+import "../../../assets/css/common.scss"
+
import moment from "moment";
Vue.prototype.$moment = moment;
import Mixin from "./mixins";
Vue.mixin(Mixin);
+import ElementUI from 'element-ui';
+import "@/assets/css/element-variables.scss";
+import 'element-ui/lib/theme-chalk/index.css';
Vue.use(ElementUI)
+import preview from 'vue-photo-preview'
+import 'vue-photo-preview/dist/skin.css'
+Vue.use(preview)
+
import * as VueWindow from "@hscmap/vue-window";
Vue.use(VueWindow);
--
Gitblit v1.8.0