xiongchao hace 3 años
padre
commit
8c4df864d3

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 59 - 0
public/hitch-screen/index.html


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 34 - 0
public/hitch-screen/static/echarts.min.js


BIN
public/hitch-screen/static/green.png


+ 14 - 0
public/hitch-screen/static/index.css

@@ -0,0 +1,14 @@
+body{padding:0px;margin:0px;width:1920px;height:1080px;}
+.echart{float:left;width:1334px;height:1080px;}
+.data{float:right;width:586px;height:1080px;background:url("right.png") no-repeat;}
+.data>div:nth-child(1){margin-top:240px;width:100%;font-size:40px;color:#ffffff;text-align:center;}
+.data>div:nth-child(2){margin-top:30px;width:100%;font-size:16px;color:#ffffff;text-align:center;}
+.data>div:nth-child(2)>span:nth-child(1){padding-left:22px;background:url("red.png") no-repeat 5px 5px;}
+.data>div:nth-child(2)>span:nth-child(2){padding-left:22px;background:url("green.png") no-repeat 5px 5px;}
+.data>div:nth-child(3){margin-top:70px;color:#ffffff;}
+.data .item{float:left;clear:both;padding-left:50px;}
+.data .item>span{float:left;line-height:30px;text-align:center;}
+.data .item>span:nth-child(1){width:190px;}
+.data .item>span:nth-child(2){width:150px;}
+.data .item>span:nth-child(3){width:150px;}
+.data .title{color:#2495bf;}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
public/hitch-screen/static/jquery-3.3.1.min.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 0
public/hitch-screen/static/plug-in.min.js


BIN
public/hitch-screen/static/red.png


BIN
public/hitch-screen/static/right.png


+ 13 - 0
src/router/generator-platform-routers.js

@@ -384,6 +384,19 @@ export const constantRouterMap = [
     ]
   },
 
+  {
+    path: '/repairScreen',
+    component: BlankLayout,
+    redirect: '/screen/repair',
+    children: [
+      {
+        path: 'RepairScreen',
+        name: 'RepairScreen',
+        component: () => import('@/views/big-screen/RepairScreen')
+      }
+    ]
+  },
+
   {
     path: '/404',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')

+ 22 - 0
src/views/big-screen/RepairScreen.vue

@@ -0,0 +1,22 @@
+<template>
+  <iframe
+    :src="url"
+    id="mobsf"
+    scrolling="no"
+    frameborder="0"
+    allowtransparency="true"
+    width="100%"
+    :height="clientHeight"></iframe>
+</template>
+
+<script>
+
+export default {
+  data () {
+    return {
+      url: '/hitch-screen/index.html',
+      clientHeight: '1000px'
+    }
+  }
+}
+</script>

+ 14 - 24
src/views/sb/info/modules/BaseForm.vue

@@ -226,7 +226,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="childChange" v-decorator="['isChild', {initialValue:3, rules: [{required: true, message: '是否子设备不能为空'}]}]" placeholder="请选择">
+            <a-select @change="childChange" v-decorator="['isChild', { rules: [{required: true, message: '是否子设备不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in isChildMap"
                 :key="value"
@@ -256,7 +256,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="isShow=!isShow" v-decorator="['isShow', {initialValue:0, rules: [{required: true, message: '是否显示不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['isShow', { rules: [{required: true, message: '是否显示不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in isShowMap"
                 :key="value"
@@ -270,24 +270,30 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="大屏水平位置"
+            label="水平位置"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input
+            <a-input-number
+              :step="1"
+              :min="85"
+              style="width:100%"
               v-decorator="['zjm']"
-              placeholder="请输入水平位置,如300"/>
+              placeholder="请输入离屏幕左上角的右方距离,最低85"/>
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="大屏垂直位置"
+            label="垂直位置"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input
+            <a-input-number
+              :step="1"
+              :min="340"
+              style="width:100%"
               v-decorator="['jbdh']"
-              placeholder="请输入垂直位置,如200"/>
+              placeholder="请输入离屏幕左上角的下方位置,最低340"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -970,22 +976,6 @@ export default {
         record.no = null
         this.clearFileList()
       }
-      if (record.isChild === 1) {
-        record.isChild = '1'
-      }
-      if (record.isChild === 2) {
-        record.isChild = '2'
-      }
-      if (record.isChild === 3) {
-        record.isChild = '3'
-      }
-
-      if (record.isShow === 0) {
-        record.isShow = '0'
-      }
-      if (record.isShow === 1) {
-        record.isShow = '1'
-      }
 
       const { form: { setFieldsValue } } = this
       // 日期处理

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio