commit

src/App.vue

@@ -1,7 +1,6 @@
 <template>
   <div id="app">
     <router-view />
-
   </div>
 </template>
 

src/layout/Main/index.vue

@@ -81,9 +81,10 @@ export default {
     background-color: var(--main-color);
     position: relative;
     padding: 0px !important;
-    height: calc(100vh - 90px);
     overflow: hidden;
     display: flex;
+    color: white !important;
+    height: calc(100vh - 130px);
 }
 .left-container{
   width: 100%;
@@ -91,6 +92,7 @@ export default {
 .right-container{
   position:fixed;
   right: 30px;
+  top:120px;
   width: 20%;
   height: calc(100% - 150px);
   z-index: 999;
@@ -177,5 +179,20 @@ background-color: #212e3e !important;
 }
 
 
+
+/deep/input::-webkit-input-placeholder {
+  color: #17a1e5;
+  font-size: 15px;
+}
+
+/deep/.el-input__inner {
+  background-color: transparent !important;
+  border: 1px solid #1296db;
+  color: #ffffff;
+}
+
+/deep/.el-form-item__label{
+  color: white !important;
+}
 </style>
 

src/layout/index.vue

@@ -36,6 +36,6 @@
   }
   .center-container{
     overflow: hidden;
-    height: calc(100vh - 90px);
+    height: calc(100vh - 130px);
   }
   </style>

src/views/radarInvestigation/index.vue

@@ -5,77 +5,37 @@
             <el-col :span="6">
 
                 <el-row>
-                    <span>
-                        <p>当前传感器：</p>
-                        <el-select v-model="currentSensor" placeholder="选择传感器" @change="instanceChange" size="mini">
-                            <el-option v-for="item in instancetable" :key="item.instanceID" :label="item.instanceName"
-                                :value="item.instanceID">
-                            </el-option>
-                        </el-select>
+                    <span class="select">
+                            <span style="width:40%;text-align: center;">当前传感器：</span>
+                            <el-select style="width:60%;" v-model="currentSensor" placeholder="选择传感器" @change="instanceChange" size="mini">
+                                <el-option v-for="item in instancetable" :key="item.instanceID" :label="item.instanceName"
+                                    :value="item.instanceID">
+                                </el-option>
+                            </el-select>
                     </span>
-                    <!-- <el-card class="tableHeight">
-                    <div slot="header" class="clearfix">
-                        <span>实例状态表</span>
-                    </div>
-                    <el-table :data="instancetable" @current-change="instanceChange">
-                        <el-table-column prop="instanceID" label="实例ID"></el-table-column>
-                        <el-table-column prop="instanceName" label="实例名称"></el-table-column>
-                        <el-table-column prop="instanceState" label="工作类型"></el-table-column>
-                    </el-table>
-                </el-card> -->
+                    
                 </el-row>
-                <!-- <el-row>
-                <el-card class="tableHeight">
-                    <div slot="header" class="clearfix">
-                        <span>性能参数</span>
-                    </div>
-                    <el-table :data="propertyinittable" :row-style="{ height: '20px' }" :cell-style="{ padding: '0px' }"
-                        style="font-size: 10px;width: 100%;" height="150px" highlight-current-row border>
-                        <el-table-column prop="key" label="属性"></el-table-column>
-                        <el-table-column prop="value" label="值"></el-table-column>
-                    </el-table>
-                </el-card>
-            </el-row> -->
                 <el-row>
                     <el-card class="tableHeight">
                         <div slot="header" class="clearfix">
                             <span>工作参数</span>
                         </div>
-                        <!-- <div>
-                        频率范围：
-                        <el-select :change="frequenceChange()" v-model="frequencevalue" placeholder="请选择">
-                            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </div>
-                    <div v-if="frequenceAverageShow" style="padding-top:5px;display:flex;">
-                        <div style="flex:1;">
-                            <span>频率下限：</span>
-                            <el-input-number v-model="num9" :precision="2" :step="0.1" :max="10"></el-input-number>
-                        </div>
-                        <div style="flex:1;">
-                            <span style="padding-left:10px;"> 频率上限：</span>
-                            <el-input-number v-model="num9" :precision="2" :step="0.1" :max="10"></el-input-number>
-                        </div>
-                    </div> -->
-                        <div style="padding-top:5px;">
-                            工作模式：
-                            <el-select size="mini" v-model="workvalue" placeholder="请选择">
-                                <el-option v-for="item in options1" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </div>
-                        <div style="padding-top:5px;height: 530px;overflow:auto;">
-                            <template v-for="item in propertycontroltable">
-                                {{ item.key }}
-                                <el-input size="mini" v-model="item.value" placeholder="请输入内容"></el-input>
-                            </template>
-                        </div>
+                        <el-form  label-width="80px">
+                        `   <el-form-item label="工作模式">
+                                <el-input v-model="model"></el-input>
+                            </el-form-item>
+                            <el-form-item label="开关">
+                                <el-switch v-model="Switch"></el-switch>
+                            </el-form-item>
+                            <el-form-item>
+                                <el-button type="primary" @click="onSubmit">变更</el-button>
+                                <el-button>撤消</el-button>
+                            </el-form-item>
+                        </el-form>`
                     </el-card>
                 </el-row>
             </el-col>
-            <el-col :span="18" style="height:50%;">
+            <el-col :span="12" style="height:50%;">
                 <el-card class="radar">
                     <div slot="header" class="clearfix">
                         <span>雷侦状态显示</span>
@@ -85,6 +45,18 @@
                     </div>
                 </el-card>
             </el-col>
+            <el-col :span="6" style="height:50%;">
+                <el-card class="tableHeight">
+                    <div slot="header" class="clearfix">
+                        <span>实例状态表</span>
+                    </div>
+                    <el-table :data="instancetable" @current-change="instanceChange">
+                        <el-table-column prop="instanceID" label="实例ID"></el-table-column>
+                        <el-table-column prop="instanceName" label="实例名称"></el-table-column>
+                        <el-table-column prop="instanceState" label="工作类型"></el-table-column>
+                    </el-table>
+                </el-card>
+            </el-col>
         </el-row>
         <el-row gutter="20">
             <el-card>
@@ -314,7 +286,9 @@ export default {
 }
 </script>
 <style scoped>
-.tableHeight {}
+.tableHeight {
+    
+}
 
 .echarts-box {
     height: 100%;
@@ -334,4 +308,8 @@ export default {
     height: calc(100% - 100px);
 
 }
+
+.select{
+   display: flex;
+}
 </style>