Merge branch 'master' of http://gitlab.pubdata.cn/liangyibo/CameraMachine

electron/config/app.config.json

@@ -1,4 +1,4 @@
 {
   "digiCamControl": "C:\\Program Files (x86)\\digiCamControl",
-  "pyapp": "localhost"
+  "pyapp": "127.0.0.1"
 }

electron/config/config.default.js

@@ -12,7 +12,7 @@ module.exports = (appInfo) => {
   /**
    * 开发者工具
    */
-  config.openDevTools = true;
+  config.openDevTools = false;
 
   /**
    * 应用程序顶部菜单
@@ -64,7 +64,7 @@ module.exports = (appInfo) => {
    * 远程模式-web地址
    */
   config.remoteUrl = {
-    enable: true,
+    enable: false,
     url: 'http://localhost:3000'
   };
 

electron/controller/socket.js

@@ -61,7 +61,6 @@ class SocketController extends Controller {
       // 监听错误事件
       socket.on('error', (err) => {
         console.log('socket error');
-        console.log(error);
         win.webContents.send('controller.socket.disconnect', null);
         reject(true);
 

frontend/src/views/Photography/detail.vue

@@ -33,11 +33,7 @@
         <div class="template-list">
           <div v-for="(template, index) in visibleTemplates" :key="index" class="template-item"
             @click="form.templateId = template.id">
-            <el-image :src="ossResize(test_image_url, {
-              m: 'lfit',
-              h: 360,
-              w: 500
-            })" fit="contain" class="cur-p" style="width: 100%; display: block;" />
+            <el-image :src="test_image_url" fit="contain" class="cur-p" style="width: 100%; display: block;" />
             <div class="select-warp" :class="form.templateId == template.id ? 'active' : ''">
               <el-icon color="#FFFFFF">
                 <Select />
@@ -94,7 +90,6 @@
 
 import { ref, computed, reactive } from 'vue';
 import { Select } from '@element-plus/icons-vue'
-import { ossResize } from '@/utils/appfun'
 import upload from '@/components/upload'
 import client from "@/stores/modules/client";
 import icpList from '@/utils/ipc'

package.json

@@ -61,7 +61,6 @@
     "dayjs": "1.10.7",
     "ee-core": "2.12.0",
     "electron-updater": "5.3.0",
-    "electron-window-manager": "^1.0.6",
     "lodash": "4.17.21",
     "ws": "8.18.1"
   }