Переглянути джерело

解决打包后动态修改json配置问题

liuwei 4 роки тому
батько
коміт
2129dab800

+ 5 - 0
.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "globals": {
+    "EnityLogin":true
+  }
+}

+ 16 - 0
src/index.ejs

@@ -16,5 +16,21 @@
     <script>
       if (process.env.NODE_ENV !== 'development') window.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
     </script>
+    <script src="../static/json/EnityLogin.js"></script>
+    <script src="../static/json/EnityBigScreen.js"></script>
+    <script src="../static/json/EnityButton.js"></script>
+    <script src="../static/json/EnityDevice.js"></script>
+    <script src="../static/json/EnityIcon.js"></script>
+    <script src="../static/json/EnityImage.js"></script>
+    <script src="../static/json/EnityLable.js"></script>
+    <script src="../static/json/EnityMemory.js"></script>
+    <script src="../static/json/EnitySignalPreviewList.js"></script>
+    <script src="../static/json/EnitySlider.js"></script>
+    <script src="../static/json/EnitySystem.js"></script>
+    <script src="../static/json/EnityTimer.js"></script>
+    <script src="../static/json/EnityTopology.js"></script>
+    <script src="../static/json/EnityTopologyConnection.js"></script>
+    <script src="../static/json/EnityView.js"></script>
+    <script src="../static/json/EnityWindow.js"></script>
   </body>
 </html>

+ 20 - 6
src/renderer/App.vue

@@ -8,21 +8,35 @@
   import fs from 'fs'
   import path from 'path'
 
-  import {reqBigScreen, reqDevice, reqImportConfigFiles, reqPreviewSourceList} from "./api"
+  import {
+    reqBigScreen,
+    reqConfigBigScreen,
+    reqConfigDevice,
+    reqDevice,
+    reqImportConfigFiles,
+    reqPreviewSourceList
+  } from "./api"
 
   export default {
     name: 'vedio_app',
 
     async mounted() {
       // 将配置文件传给服务器
-      const formData = new FormData()
-      let device = fs.readFileSync(path.join(__static, '/EnityDevice.json'), 'utf8')
-      let bigscreen = fs.readFileSync(path.join(__static, '/EnityBigScreen.json'), 'utf8')
-      formData.append('device',device)
-      formData.append('bigscreen',bigscreen)
+      /*const formData = new FormData()
+      let device = fs.readFileSync(path.join(__static, '/json/EnityDevice.js'), 'utf8')
+      let bigscreen = fs.readFileSync(path.join(__static, '/json/EnityBigScreen.js'), 'utf8')
+      formData.append('device',EnityDevice)
+      formData.append('bigscreen',EnityBigScreen)
       const res = await reqImportConfigFiles(formData)
       if(!res){
         console.log('上传配置文件成功!')
+      }*/
+
+      // 单独上传配置文件
+      const res = await reqConfigBigScreen(EnityBigScreen)
+      const res2 = await reqConfigDevice(EnityDevice)
+      if(res[0].ID && res2[0].ID){
+        console.log('上传大屏和设备配置文件成功!')
       }
 
       // 获取大屏,信号源,设备数据并保存到vuex中

+ 10 - 20
src/renderer/store/state.js

@@ -1,14 +1,5 @@
 /*状态对象模块*/
 
-import loginJson from '../../../static/EnityLogin'
-import windowJson from '../../../static/EnityWindow'
-import buttonJson from '../../../static/EnityButton'
-import labelJson from '../../../static/EnityLable'
-import imageJson from '../../../static/EnityImage'
-import sliderJson from '../../../static/EnitySlider'
-import systemJson from '../../../static/EnitySystem'
-import signalBorder from '../../../static/EnitySignalPreviewList'
-
 export default {
   // 用户信息
   user: {},
@@ -26,33 +17,32 @@ export default {
   signalListJson:[],
 
   // 信号源外壳
-  signalBorder,
+  signalBorder:EnitySignalPreviewList,
 
   // 设备数据
   deviceJson:[],
 
   // 登录
-  loginJson,
+  loginJson:EnityLogin,
 
   // window窗口
-  windowJson,
+  windowJson:EnityWindow,
 
   // button按钮
-  buttonJson,
+  buttonJson:EnityButton,
 
   // label标签
-  labelJson,
+  labelJson:EnityLable,
 
   // 图片
-  imageJson,
+  imageJson:EnityImage,
 
   // 滑块组件
-  sliderJson,
+  sliderJson:EnitySlider,
 
   // ip 端口
-  systemJson,
+  systemJson:EnitySystem,
 
-  // 主页宽高比例
-  // Scale:screen.getPrimaryDisplay().workAreaSize.height/windowJson[0].Height
-  Scale:window.screen.height/windowJson[0].Height
+  // 缩放比例
+  Scale:window.screen.height/EnityWindow[0].Height
 }

+ 0 - 1
static/EnityView.json

@@ -1 +0,0 @@
-[]

+ 1 - 1
static/EnityBigScreen.json

@@ -1,4 +1,4 @@
-[
+const EnityBigScreen = [
     {
         "BindList":[
             {

+ 1 - 1
static/EnityButton.json

@@ -1,4 +1,4 @@
-[
+const EnityButton = [
   {
     "Name":"V0--Btn6",
     "MouseDownActionList":[

+ 1 - 1
static/EnityDevice.json

@@ -1,4 +1,4 @@
-[
+const EnityDevice = [
   {
     "DeviceModelID":"0400001",
     "DeviceModelName":"DY-Audio",

+ 1 - 1
static/EnityIcon.json

@@ -1,4 +1,4 @@
-[
+const EnityIcon = [
   {
     "ID":"1",
     "Name":"1.png",

+ 2 - 1
static/EnityImage.json

@@ -1,4 +1,5 @@
-[
+const EnityImage
+    = [
   {
     "BackIcon":"161.png",
     "ResourceID":"161",

+ 1 - 1
static/EnityLable.json

@@ -1,4 +1,4 @@
-[
+const EnityLable = [
   {
     "Code":"9f2f47a0-6c7c-428f-ae6f-1a4d2101520b",
     "ActionType":5,

+ 1 - 1
static/EnityLogin.json

@@ -1,4 +1,4 @@
-[
+const EnityLogin = [
     {
         "IsBorder":true,
         "BorderStr":"#FFFFFFFF",

+ 1 - 1
static/EnityMemory.json

@@ -1,4 +1,4 @@
-[
+const EnityMemory = [
   {
     "ID":"01",
     "Code":"01",

+ 1 - 1
static/EnitySignalPreviewList.json

@@ -1,4 +1,4 @@
-[
+const EnitySignalPreviewList = [
   {
     "ForegroundStr":"#FF000000",
     "FontSize":12,

+ 1 - 1
static/EnitySlider.json

@@ -1,4 +1,4 @@
-[
+const EnitySlider = [
   {
     "BackIcon":"77.png",
     "SliderIcon":"76.png",

+ 1 - 1
static/EnitySystem.json

@@ -1,4 +1,4 @@
-{
+const EnitySystem = {
   "ServerIP":"http://112.74.78.188",
   "ServerPort":8080,
   "Users":[

+ 1 - 1
static/EnityTimer.json

@@ -1,4 +1,4 @@
-[
+const EnityTimer = [
   {
     "ID":"f5f1217e-f606-4372-8650-4363931fa8e1",
     "Code":"f5f1217e-f606-4372-8650-4363931fa8e1",

+ 1 - 1
static/EnityTopology.json

@@ -1,4 +1,4 @@
-[
+const EnityTopology = [
   {
     "ID":"2c0d93d3-32db-48cb-8a81-ca119264dc61",
     "DeviceID":"fb9bf45d-1ef9-4759-87bd-68aeb43f90bf",

+ 1 - 1
static/EnityTopologyConnection.json

@@ -1,4 +1,4 @@
-[
+const EnityTopologyConnection = [
   {
     "ID":"df81e3a0-045f-4f83-9ffe-4e36813ee41a",
     "SourceID":"2c0d93d3-32db-48cb-8a81-ca119264dc61",

+ 1 - 0
static/json/EnityView.js

@@ -0,0 +1 @@
+const EnityView = []

+ 1 - 1
static/EnityWindow.json

@@ -1,4 +1,4 @@
-[
+const EnityWindow = [
   {
     "ID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
     "IsVisibility":true,