Browse Source

样式及页面

钞小赢 3 years ago
parent
commit
6dc3cd17a6

+ 2 - 23
src/App.vue

@@ -25,28 +25,7 @@ export default {
25 25
 
26 26
 <style lang="scss">
27 27
 @import '~@/assets/style/public-class.scss';
28
-//分页整体样式
29
-.el-pagination{
30
-  margin-top: 20px;
31
-  display:flex;
32
-justify-content: flex-end;
33
-}
34
-//分页总共几页样式
35
-.el-pagination__total {
36
-  color:#FFF !important
37
-}
38
-//label样式
39
-.el-form-item__label{
40
-  color:#fff !important
41
-}
42
-//树形节点选中后的颜色
43
- .el-tree-node:focus>.el-tree-node__content {
44
-    background-color:#0064b9 !important;
45
-    border-radius:20px;
46
-}
47
-//树形节点鼠标移上去的颜色
48
-.el-tree-node__content:hover {
49
-     background-color:#91a8bc !important;
50
-}
28
+
29
+
51 30
 
52 31
 </style>

+ 10 - 0
src/api/paramManage/hardParam/index.js

@@ -0,0 +1,10 @@
1
+import request from '../../service.js'
2
+
3
+//机械通风列表
4
+export function list(data) {
5
+    return request({
6
+      url: `hdParemeter/getPage`,
7
+      method: 'post',
8
+      data
9
+    })
10
+  }

BIN
src/assets/images/logo.png


+ 16 - 0
src/assets/style/public-class.scss

@@ -153,3 +153,19 @@ $sizes: (0, 5, 10, 15, 20);
153 153
 .el-table__body tr.hover-row>td.el-table__cell{
154 154
   background:hsl(204, 66%, 23%) !important;
155 155
 }
156
+//弹框样式
157
+#dialogStyle .el-dialog{
158
+  background: #092a51;
159
+}
160
+#dialogStyle .el-dialog__header{
161
+  background:#3a8ee6;
162
+}
163
+#dialogStyle .el-dialog__title,#dialogStyle .el-form-item__label{
164
+  // color:#9bbbe3;
165
+  color:#fff;
166
+}
167
+// #dialogStyle .el-input__inner{
168
+//   background:#1d3b6b;
169
+//   border:1px solid #345684;
170
+//   opacity: 12.5;
171
+// }

+ 52 - 1
src/views/demo/parameManagement/dataDictionary/index.vue

@@ -115,6 +115,30 @@
115 115
         </div>
116 116
       </div>
117 117
     </d2-container>
118
+
119
+
120
+    <!-- //字典弹框 -->
121
+    <el-dialog title="新建字典" :visible.sync="dicDialog" id="dialogStyle">
122
+  <el-form :model="form" id="dialogForm" :rules="rules">
123
+    <el-form-item label="字典标识:" :label-width="formLabelWidth" prop="kkk">
124
+      <el-input v-model="form.kkk" autocomplete="off"></el-input>
125
+    </el-form-item>
126
+     <el-form-item label="字典名称:" :label-width="formLabelWidth" prop="name">
127
+      <el-input v-model="form.name" autocomplete="off"></el-input>
128
+    </el-form-item>
129
+     <el-form-item label="描述:" :label-width="formLabelWidth" prop="name">
130
+      <el-input v-model="form.name" autocomplete="off"></el-input>
131
+    </el-form-item>
132
+     <el-form-item label="字典状态:" :label-width="formLabelWidth" prop="name">
133
+      <el-input v-model="form.name" autocomplete="off"></el-input>
134
+    </el-form-item>
135
+   
136
+  </el-form>
137
+  <div slot="footer" class="dialog-footer">
138
+    <el-button @click="dicDialog = false">取 消</el-button>
139
+    <el-button type="primary" @click="defined()">确 定</el-button>
140
+  </div>
141
+</el-dialog>
118 142
   </div>
119 143
 </template>
120 144
 <script>
@@ -125,6 +149,11 @@ export default {
125 149
   components: { Pagination },
126 150
   data() {
127 151
     return {
152
+    
153
+      //初始化弹框状态时关闭的
154
+      dicDialog:false,
155
+      //label宽度
156
+      formLabelWidth:"120px",
128 157
       //options
129 158
       options: [
130 159
         {
@@ -222,6 +251,18 @@ export default {
222 251
         type: undefined,
223 252
         sort: "+id",
224 253
       },
254
+      //弹框初始化数据
255
+      form:{
256
+        kkk:"",
257
+        name:"",
258
+      },
259
+      //验证规则
260
+      rules:{
261
+        kkk:[ {required:true,message:"请输入字典数据名称",trigger:"blur"}],
262
+        name:[ {required:true,message:"请输入字典数据名称",trigger:"blur"}]
263
+      }
264
+       
265
+     
225 266
     };
226 267
   },
227 268
   methods: {
@@ -264,7 +305,13 @@ export default {
264 305
       }, 1000);
265 306
     },
266 307
     //新建字典
267
-    addDic() {},
308
+    addDic() {
309
+      this.dicDialog=true;
310
+    },
311
+    //点击弹框确定按钮
312
+    defined(){
313
+     this.dicDialog=false;
314
+    }
268 315
   },
269 316
 };
270 317
 </script>
@@ -279,4 +326,8 @@ export default {
279 326
   display: flex;
280 327
   justify-content: space-between;
281 328
 }
329
+// #dialogForm .el-form-item .el-form-item_label{
330
+//   color:#000;
331
+// }
332
+
282 333
 </style>

+ 186 - 107
src/views/demo/parameManagement/hardwareParame/index.vue

@@ -3,7 +3,7 @@
3 3
     <d2-container>
4 4
       <!-- <template slot="header">首页/硬件参数</template> -->
5 5
       <div class="main">
6
-       <div class="left">
6
+        <div class="left">
7 7
           <el-input placeholder="输入关键字进行过滤" v-model="filterText">
8 8
           </el-input>
9 9
 
@@ -17,115 +17,155 @@
17 17
             ref="tree"
18 18
           >
19 19
             <span class="custom-tree-node" slot-scope="{ node, data }">
20
-              <span v-if="node.level==1"> <i :class="node.icon"></i>{{ node.label }} </span>
21
-               <span v-if="node.level==2"> <i :class="node.icon"></i>{{ node.label }} </span>
22
-                <span v-if="node.level==3"> <i :class="node.icon"></i>{{ node.label }} </span>
23
-                 <span v-if="node.level==4"> <i></i>{{ node.label }} </span>
20
+              <span v-if="node.level == 1">
21
+                <i :class="node.icon"></i>{{ node.label }}
22
+              </span>
23
+              <span v-if="node.level == 2">
24
+                <i :class="node.icon"></i>{{ node.label }}
25
+              </span>
26
+              <span v-if="node.level == 3">
27
+                <i :class="node.icon"></i>{{ node.label }}
28
+              </span>
29
+              <span v-if="node.level == 4"> <i></i>{{ node.label }} </span>
24 30
             </span>
25 31
           </el-tree>
26 32
         </div>
27 33
         <div class="right">
28 34
           <div class="nav">当前所在位置:首页>硬件参数</div>
29 35
           <div class="right_main">
30
-            <div class="right_title"><i class="fa fa-cog" aria-hidden="true" style="padding-right:5px"></i>硬件参数</div>
36
+            <div class="right_title">
37
+              <i
38
+                class="fa fa-cog"
39
+                aria-hidden="true"
40
+                style="padding-right: 5px"
41
+              ></i
42
+              >硬件参数
43
+            </div>
31 44
             <div class="right_table">
32
-          <el-form :inline="true" :model="formInline" class="demo-form-inline" id="formLabel">
33
-            <el-form-item label="设备名称:">
34
-              <el-input
35
-                v-model="formInline.sbName"
36
-                placeholder="请输入"
37
-              ></el-input>
38
-            </el-form-item>
39
-            <el-form-item>
40
-              <el-button type="primary" icon="el-icon-search" @click="search"
41
-                >查询</el-button
45
+              <el-form
46
+                :inline="true"
47
+                :model="formInline"
48
+                class="demo-form-inline"
49
+                id="formLabel"
42 50
               >
43
-            </el-form-item>
51
+                <el-form-item label="设备名称:">
52
+                  <el-input
53
+                    v-model="formInline.deviceName"
54
+                    placeholder="请输入"
55
+                  ></el-input>
56
+                </el-form-item>
57
+                <el-form-item>
58
+                  <el-button
59
+                    type="primary"
60
+                    icon="el-icon-search"
61
+                    @click="search"
62
+                    >查询</el-button
63
+                  >
64
+                </el-form-item>
44 65
 
45
-            <el-form-item>
46
-              <el-button
47
-                type="primary"
48
-                icon="el-icon-refresh-left"
49
-                @click="reset"
50
-                >重置</el-button
66
+                <el-form-item>
67
+                  <el-button
68
+                    type="primary"
69
+                    icon="el-icon-refresh-left"
70
+                    @click="reset"
71
+                    >重置</el-button
72
+                  >
73
+                </el-form-item>
74
+              </el-form>
75
+              <div class="addBtn">
76
+                <el-button type="primary" icon="el-icon-plus" @click="addTantou"
77
+                  >新增激光探头</el-button
78
+                >
79
+              </div>
80
+              <el-table
81
+                :data="hardwareList"
82
+                border
83
+                style="width: 100%"
84
+                :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }"
51 85
               >
52
-            </el-form-item>
53
-          </el-form>
54
-          <div class="addBtn">
55
-            <el-button type="primary" icon="el-icon-plus" @click="addTantou"
56
-              >新增激光探头</el-button
57
-            >
58
-          </div>
59
-          <el-table :data="hardwareList" border style="width: 100%" :header-cell-style="{background:'#0064b9',color:'#c9f5fa'}">
60
-            <el-table-column
61
-              align="center"
62
-              label="序号"
63
-              type="index"
64
-              width="100px"
65
-              :index="indexMethod"
66
-              show-overflow-tooltip
67
-            ></el-table-column>
86
+                <el-table-column
87
+                  align="center"
88
+                  label="序号"
89
+                  type="index"
90
+                  width="100px"
91
+                  :index="indexMethod"
92
+                  show-overflow-tooltip
93
+                ></el-table-column>
68 94
 
69
-            <el-table-column
70
-              prop="directLibrary"
71
-              label="设备名称"
72
-              align="center"
73
-            >
74
-            </el-table-column>
75
-            <el-table-column prop="subTreasury" label="设备编号" align="center">
76
-            </el-table-column>
77
-            <el-table-column prop="cfName" label="设备IP" align="center">
78
-            </el-table-column>
79
-            <el-table-column align="center" label="操作" width="180">
80
-              <template slot-scope="scope">
81
-                <el-button type="text" size="small" icon="el-icon-edit"
82
-                  >编辑</el-button
95
+                <el-table-column
96
+                  prop="deviceName"
97
+                  label="设备名称"
98
+                  align="center"
83 99
                 >
84
-                <el-button type="text" size="small" icon="el-icon-delete"
85
-                  >删除</el-button
100
+                </el-table-column>
101
+                <el-table-column
102
+                  prop="port"
103
+                  label="设备编号"
104
+                  align="center"
86 105
                 >
87
-              </template>
88
-            </el-table-column>
89
-          </el-table>
90
-          </div>
106
+                </el-table-column>
107
+                <el-table-column prop="ipAdress" label="设备IP" align="center">
108
+                </el-table-column>
109
+                <el-table-column align="center" label="操作" width="180">
110
+                  <template slot-scope="scope">
111
+                    <el-button type="text" size="small" icon="el-icon-edit"
112
+                      >编辑</el-button
113
+                    >
114
+                    <el-button type="text" size="small" icon="el-icon-delete"
115
+                      >删除</el-button
116
+                    >
117
+                  </template>
118
+                </el-table-column>
119
+              </el-table>
120
+              <el-pagination
121
+                @size-change="handleSizeChange"
122
+                @current-change="handleCurrentChange"
123
+                :page-sizes="[10, 20, 30, 40]"
124
+                :page-size="pagination.pageSize"
125
+                layout="total, sizes, prev, pager, next, jumper"
126
+                :total="pagination.total"
127
+              >
128
+              </el-pagination>
129
+            </div>
91 130
           </div>
92 131
         </div>
93 132
       </div>
94 133
     </d2-container>
95 134
 
96
-
97
-
98
-
99 135
     <!-- //弹框 -->
100
-    <el-dialog title="新增探头" :visible.sync="dialogTantou">
101
-  <el-form :model="dialog">
102
-    <el-form-item label="设备名称:" :label-width="formLabelWidth">
103
-      <el-input v-model="dialog.name" autocomplete="off"></el-input>
104
-    </el-form-item>
105
-    <el-form-item label="设备IP:" :label-width="formLabelWidth">
106
-      <el-input v-model="dialog.name" autocomplete="off"></el-input>
107
-    </el-form-item>
108
-     <el-form-item label="设备编码:" :label-width="formLabelWidth">
109
-      <el-input v-model="dialog.name" autocomplete="off"></el-input>
110
-    </el-form-item>
111
-  </el-form>
112
-  <div slot="footer" class="dialog-footer">
113
-    <el-button @click="dialogTantou = false">取 消</el-button>
114
-    <el-button type="primary" @click="determine()">确 定</el-button>
115
-  </div>
116
-</el-dialog>
117
-
136
+    <el-dialog title="新增探头" :visible.sync="dialogTantou" id="dialogStyle">
137
+      <el-form :model="dialog">
138
+        <el-form-item label="设备名称:" :label-width="formLabelWidth">
139
+          <el-input v-model="dialog.name" autocomplete="off"></el-input>
140
+        </el-form-item>
141
+        <el-form-item label="设备IP:" :label-width="formLabelWidth">
142
+          <el-input v-model="dialog.name" autocomplete="off"></el-input>
143
+        </el-form-item>
144
+        <el-form-item label="设备编码:" :label-width="formLabelWidth">
145
+          <el-input v-model="dialog.name" autocomplete="off"></el-input>
146
+        </el-form-item>
147
+      </el-form>
148
+      <div slot="footer" class="dialog-footer">
149
+        <el-button @click="dialogTantou = false">取 消</el-button>
150
+        <el-button type="primary" @click="determine()">确 定</el-button>
151
+      </div>
152
+    </el-dialog>
118 153
   </div>
119 154
 </template>
120 155
 <script>
156
+import { list } from "@/api/paramManage/hardParam";
121 157
 export default {
122 158
   name: "hardwareParame",
123 159
   data() {
124 160
     return {
161
+      //仓房id
162
+      houseId: "",
163
+      //设备名称
164
+      deviceName: "",
125 165
       // label宽度
126
-      formLabelWidth: '120px',
166
+      formLabelWidth: "120px",
127 167
       // 弹框默认关闭
128
-      dialogTantou:false,
168
+      dialogTantou: false,
129 169
       filterText: "",
130 170
       //默认展开的节点
131 171
       defaultProps: {
@@ -188,24 +228,31 @@ export default {
188 228
       //
189 229
 
190 230
       formInline: {
191
-        sbNames: "",
231
+        deviceNames: "",
192 232
       },
193 233
       //表格字段
194 234
       hardwareList: [
195 235
         {
196
-          directLibrary: "",
197
-          subTreasury: "",
198
-          cfName: "",
199
-          scanStart: "",
200
-          scanEnd: "",
201
-
202
-          cfState: "",
236
+          deviceName: "",
237
+          port:"",
238
+          ipAdress: "",
239
+         
203 240
         },
204 241
       ],
205 242
       //弹框字段
206
-      dialog:{
207
-        name:""
208
-      }
243
+      dialog: {
244
+        name: "",
245
+      },
246
+      //分页
247
+
248
+      pagination: {
249
+        //当前页数
250
+        curPage: 1,
251
+        //每页显示的条数
252
+        pageSize: 10,
253
+        //总条数
254
+        total: 0,
255
+      },
209 256
     };
210 257
   },
211 258
   watch: {
@@ -214,6 +261,31 @@ export default {
214 261
     },
215 262
   },
216 263
   methods: {
264
+    //获取列表数据
265
+    getList() {
266
+      var condition = {
267
+        houseId: null,
268
+        deviceName: "",
269
+      };
270
+      condition = JSON.stringify(condition);
271
+      var data = {
272
+        pageIndex: this.pagination.curPage,
273
+        pageSize: this.pagination.pageSize,
274
+        condition: condition,
275
+      };
276
+      list(data)
277
+      .then((res) => {
278
+        if (res.code == 200) {
279
+          this.hardwareList = res.data.records;
280
+          this.pagination.pageSize = res.data.size;
281
+          this.pagination.total = res.data.total;
282
+        }
283
+      })
284
+      .catch(err=>{
285
+        console.log(err)
286
+      });
287
+    },
288
+
217 289
     filterNode(value, data) {
218 290
       if (!value) return true;
219 291
       return data.label.indexOf(value) !== -1;
@@ -222,16 +294,26 @@ export default {
222 294
     reset() {},
223 295
     //新增
224 296
     addTantou() {
225
-      this.dialogTantou=true;
297
+      this.dialogTantou = true;
226 298
     },
227 299
     //表格序号
228 300
     indexMethod(index) {
229
-      // return (
230
-      //   (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
231
-      // );
301
+      return (
302
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
303
+      );
304
+    },
305
+    //当前页改变时
306
+    handleCurrentChange(val) {
307
+      this.pagination.curPage=val;
308
+      this.getList();
309
+    },
310
+    //每页显示的页数改变时
311
+    handleSizeChange(val) {
312
+            this.pagination.pageSize = val
313
+      this.getList()
232 314
     },
233 315
     //弹框确定按钮
234
-    determine(){}
316
+    determine() {},
235 317
   },
236 318
 };
237 319
 </script>
@@ -242,22 +324,19 @@ export default {
242 324
   .left {
243 325
     width: 250px;
244 326
     height: 100%;
245
-   background: #163d79;
246
-
327
+    background: #163d79;
247 328
   }
248
- .right {
329
+  .right {
249 330
     margin-left: 20px;
250
-    width:calc(100% - 250px);
331
+    width: calc(100% - 250px);
251 332
     .nav {
252 333
       padding: 10px 0 10px 10px;
253
-      color:#FFF;
334
+      color: #fff;
335
+
336
+      font-size: 14px;
254 337
 
255
-      font-size:14px;
256
-  
257 338
       background: #004a93;
258 339
     }
259
- 
260
-
261 340
   }
262 341
   .addBtn {
263 342
     margin-bottom: 20px;

+ 231 - 215
src/views/demo/warehouseShow/warehouseInfo/warehouseInfo-check.vue

@@ -1,197 +1,204 @@
1 1
 <template>
2 2
   <div>
3 3
     <d2-container>
4
-      <template slot="header">
5
-        <div class="title">
6
-          <div class="titleLeft">首页/仓房详情</div>
7
-          <div>
8
-            <el-button
9
-              type="primary"
10
-              icon="el-icon-arrow-left"
11
-              @click="goBack()"
12
-              >返回</el-button
13
-            >
14
-          </div>
15
-        </div>
16
-      </template>
4
+      <!-- <template slot="header"
5
+        ><div class="nav">当前所在位置:首页>仓房信息</div></template
6
+      > -->
17 7
       <div class="main">
18
-        <div class="head">
19
-          <div class="backImg"></div>
20
-          <div>保管员信息</div>
21
-        </div>
22
-
23
-        <el-form :inline="true" :model="form" class="demo-form-inline">
24
-          <div class="middle">
25
-            <el-form-item label="姓名:">
26
-              <el-select v-model="form.name" placeholder="请选择">
27
-                <el-option
28
-                  v-for="item in nameList"
29
-                  :key="item.value"
30
-                  :label="item.label"
31
-                  :value="item.value"
32
-                >
33
-                </el-option>
34
-              </el-select>
35
-            </el-form-item>
36
-            <el-form-item label="联系方式">
37
-              <el-input v-model="form.lxfs"></el-input>
38
-            </el-form-item>
39
-          </div>
40
-          <div class="head">
41
-            <div class="backImg"></div>
42
-            <div>仓房信息</div>
43
-          </div>
44
-          <div class="middle">
45
-            <el-form-item label="仓房状态">
46
-              <el-radio-group v-model="form.cfState">
47
-                <el-radio :label="0">入库</el-radio>
48
-                <el-radio :label="1">出库</el-radio>
49
-                <el-radio :label="2">库存</el-radio>
50
-                <el-radio :label="3">空仓</el-radio>
51
-              </el-radio-group>
52
-            </el-form-item>
53
-            <el-row>
54
-              <el-col :span="12">
55
-                <el-form-item label="所属仓库:">
56
-                  <el-select v-model="form.warehouse" placeholder="请选择">
57
-                    <el-option label="区域一" value="shanghai"></el-option>
58
-                    <el-option label="区域二" value="beijing"></el-option>
59
-                  </el-select>
60
-                </el-form-item>
61
-              </el-col>
62
-              <el-col :span="12">
63
-                <el-form-item label="仓房名称:">
64
-                  <el-input v-model="form.cfName"></el-input>
65
-                </el-form-item>
66
-              </el-col>
67
-            </el-row>
68
-            <el-row>
69
-              <el-col :span="12">
70
-                <el-form-item label="仓房类型:">
71
-                  <el-select v-model="form.cfType" placeholder="请选择">
72
-                    <el-option label="区域一" value="shanghai"></el-option>
73
-                    <el-option label="区域二" value="beijing"></el-option>
8
+        <div class="right_main">
9
+          <!-- <div class="right_title">
10
+            <i
11
+              class="fa fa-university"
12
+              aria-hidden="true"
13
+              style="padding-right: 5px"
14
+            ></i
15
+            >仓房信息
16
+          </div> -->
17
+          <div class="right_table">
18
+            <div class="head">
19
+              <div class="backImg"></div>
20
+              <div>保管员信息</div>
21
+            </div>
22
+            <el-form :inline="true" :model="form" class="demo-form-inline">
23
+              <div class="middle">
24
+                <el-form-item label="姓名:">
25
+                  <el-select v-model="form.name" placeholder="请选择">
26
+                    <el-option
27
+                      v-for="item in nameList"
28
+                      :key="item.value"
29
+                      :label="item.label"
30
+                      :value="item.value"
31
+                    >
32
+                    </el-option>
74 33
                   </el-select>
75 34
                 </el-form-item>
76
-              </el-col>
77
-              <el-col :span="12">
78
-                <el-form-item label="创建时间:">
79
-                  <el-input v-model="form.creatTime"></el-input>
80
-                </el-form-item>
81
-              </el-col>
82
-            </el-row>
83
-            <el-row>
84
-              <el-col :span="12">
85
-                <el-form-item label="装粮线高度:">
86
-                  <el-input v-model="form.sjcr">
87
-                    <template slot="append">米</template>
88
-                  </el-input>
35
+                <el-form-item label="联系方式:">
36
+                  <el-input v-model="form.lxfs"></el-input>
89 37
                 </el-form-item>
90
-              </el-col>
91
-              <el-col :span="12">
92
-                <el-form-item label="设计仓容:">
93
-                  <el-input v-model="form.sjcr">
94
-                    <template slot="append">吨</template>
95
-                  </el-input>
38
+              </div>
39
+              <div class="head">
40
+                <div class="backImg"></div>
41
+                <div>仓房信息</div>
42
+              </div>
43
+              <div class="middle">
44
+                <el-form-item label="仓房状态">
45
+                  <el-radio-group v-model="form.cfState">
46
+                    <el-radio :label="0">入库</el-radio>
47
+                    <el-radio :label="1">出库</el-radio>
48
+                    <el-radio :label="2">库存</el-radio>
49
+                    <el-radio :label="3">空仓</el-radio>
50
+                  </el-radio-group>
96 51
                 </el-form-item>
97
-              </el-col>
98
-            </el-row>
99
-            <el-row>
100
-              <el-col :span="12">
101
-                <el-form-item label="长:">
102
-                  <el-input v-model="form.sjcr">
103
-                    <template slot="append">米</template>
104
-                  </el-input>
105
-                </el-form-item>
106
-              </el-col>
107
-              <el-col :span="12">
108
-                <el-form-item label="宽:">
109
-                  <el-input v-model="form.sjcr">
110
-                    <template slot="append">米</template>
111
-                  </el-input>
112
-                </el-form-item>
113
-              </el-col>
114
-            </el-row>
52
+                <el-row>
53
+                  <el-col :span="12">
54
+                    <el-form-item label="所属仓库:">
55
+                      <el-select v-model="form.warehouse" placeholder="请选择">
56
+                        <el-option label="区域一" value="shanghai"></el-option>
57
+                        <el-option label="区域二" value="beijing"></el-option>
58
+                      </el-select>
59
+                    </el-form-item>
60
+                  </el-col>
61
+                  <el-col :span="12">
62
+                    <el-form-item label="仓房名称:">
63
+                      <el-input v-model="form.cfName"></el-input>
64
+                    </el-form-item>
65
+                  </el-col>
66
+                </el-row>
67
+                <el-row>
68
+                  <el-col :span="12">
69
+                    <el-form-item label="仓房类型:">
70
+                      <el-select v-model="form.cfType" placeholder="请选择">
71
+                        <el-option label="区域一" value="shanghai"></el-option>
72
+                        <el-option label="区域二" value="beijing"></el-option>
73
+                      </el-select>
74
+                    </el-form-item>
75
+                  </el-col>
76
+                  <el-col :span="12">
77
+                    <el-form-item label="创建时间:">
78
+                      <el-input v-model="form.creatTime"></el-input>
79
+                    </el-form-item>
80
+                  </el-col>
81
+                </el-row>
82
+                <el-row>
83
+                  <el-col :span="12">
84
+                    <el-form-item label="装粮线高度:">
85
+                      <el-input v-model="form.sjcr">
86
+                        <template slot="append">米</template>
87
+                      </el-input>
88
+                    </el-form-item>
89
+                  </el-col>
90
+                  <el-col :span="12">
91
+                    <el-form-item label="设计仓容:">
92
+                      <el-input v-model="form.sjcr">
93
+                        <template slot="append">吨</template>
94
+                      </el-input>
95
+                    </el-form-item>
96
+                  </el-col>
97
+                </el-row>
98
+                <el-row>
99
+                  <el-col :span="12">
100
+                    <el-form-item label="长:">
101
+                      <el-input v-model="form.sjcr">
102
+                        <template slot="append">米</template>
103
+                      </el-input>
104
+                    </el-form-item>
105
+                  </el-col>
106
+                  <el-col :span="12">
107
+                    <el-form-item label="宽:">
108
+                      <el-input v-model="form.sjcr">
109
+                        <template slot="append">米</template>
110
+                      </el-input>
111
+                    </el-form-item>
112
+                  </el-col>
113
+                </el-row>
115 114
 
116
-            <el-row>
117
-              <el-col :span="12">
118
-                <el-form-item label="仓内体积:">
119
-                  <el-input v-model="form.sjcr">
120
-                    <template slot="append">立方米</template>
121
-                  </el-input>
122
-                </el-form-item>
123
-              </el-col>
124
-              <el-col :span="12">
125
-                <el-form-item label="最近一次修改时间:">
126
-                  <el-input v-model="form.sjcr"> </el-input>
127
-                </el-form-item>
128
-              </el-col>
129
-            </el-row>
130
-          </div>
131
-        </el-form>
132
-        <div class="bottom">
133
-          <div class="bottomHead">
134
-            <div class="backImg"></div>
135
-            <div>粮食信息</div>
136
-          </div>
137
-          <div>
138
-            <el-button type="primary" icon="el-icon-plus" @click="add()">添加</el-button>
139
-          </div>
140
-        </div>
141
-        <el-table :data="lsxxList" border style="width: 100%; margin-top: 10px" :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }">
142
-          <el-table-column prop="varieties" label="品种" align="center">
143
-            <template slot-scope="scope">
144
-              <el-select
145
-                v-model="scope.row.varieties"
146
-                placeholder="请选择"
147
-              >
148
-                <el-option label="小麦" value="xiaomai"></el-option>
149
-                <el-option label="大豆" value="dadou"></el-option>
115
+                <el-row>
116
+                  <el-col :span="12">
117
+                    <el-form-item label="仓内体积:">
118
+                      <el-input v-model="form.sjcr">
119
+                        <template slot="append">立方米</template>
120
+                      </el-input>
121
+                    </el-form-item>
122
+                  </el-col>
123
+                  <el-col :span="12">
124
+                    <el-form-item label="最近一次修改时间:">
125
+                      <el-input v-model="form.sjcr"> </el-input>
126
+                    </el-form-item>
127
+                  </el-col>
128
+                </el-row>
129
+              </div>
130
+            </el-form>
131
+            <div class="bottom">
132
+              <div class="bottomHead">
133
+                <div class="backImg"></div>
134
+                <div>粮食信息</div>
135
+              </div>
136
+              <div>
137
+                <el-button type="primary" icon="el-icon-plus" @click="add()"
138
+                  >添加</el-button
139
+                >
140
+              </div>
141
+            </div>
142
+            <el-table
143
+            id="table"
144
+              :data="lsxxList"
145
+              border
146
+              style="width: 100%; margin-top: 10px"
147
+              :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }"
148
+            >
149
+              <el-table-column prop="varieties" label="品种" align="center">
150
+                <template slot-scope="scope">
151
+                  <el-select v-model="scope.row.varieties" placeholder="请选择" class="tableInput">
152
+                    <el-option label="小麦" value="xiaomai"></el-option>
153
+                    <el-option label="大豆" value="dadou"></el-option>
150 154
 
151
-                <el-option label="粳稻" value="jingdao"></el-option>
152
-                <el-option label="籼稻" value="xiandao"></el-option>
153
-                <el-option label="玉米" value="yumi"></el-option>
154
-              </el-select>
155
-            </template>
156
-          </el-table-column>
157
-          <el-table-column
158
-            prop="cnlsrz"
159
-            label="仓内粮食容重(公斤/立方米)"
160
-            align="center"
161
-          >
162
-          <template slot-scope="scope">
163
-              <el-input v-model="scope.row.cnlsrz" placeholder="请输入"></el-input>
164
-            </template>
165
-          </el-table-column>
166
-          <el-table-column prop="grade" label="等级" align="center">
167
-                 <template slot-scope="scope">
168
-              <el-select
169
-                v-model="scope.row.grade"
170
-                placeholder="请选择"
155
+                    <el-option label="粳稻" value="jingdao"></el-option>
156
+                    <el-option label="籼稻" value="xiandao"></el-option>
157
+                    <el-option label="玉米" value="yumi"></el-option>
158
+                  </el-select>
159
+                </template>
160
+              </el-table-column>
161
+              <el-table-column
162
+                prop="cnlsrz"
163
+                label="仓内粮食容重(公斤/立方米)"
164
+                align="center"
171 165
               >
172
-                <el-option label="一等" value="first"></el-option>
173
-                <el-option label="二等" value="second"></el-option>
166
+                <template slot-scope="scope">
167
+                  <el-input
168
+                    v-model="scope.row.cnlsrz"
169
+                    placeholder="请输入"
170
+                    class="tableInput"
171
+                  ></el-input>
172
+                </template>
173
+              </el-table-column>
174
+              <el-table-column prop="grade" label="等级" align="center">
175
+                <template slot-scope="scope">
176
+                  <el-select v-model="scope.row.grade" placeholder="请选择" class="tableInput">
177
+                    <el-option label="一等" value="first"></el-option>
178
+                    <el-option label="二等" value="second"></el-option>
174 179
 
175
-                <el-option label="三等" value="third"></el-option>
176
-                <el-option label="四等" value="fourth"></el-option>
177
-                <el-option label="五等" value="fifth"></el-option>
178
-                <el-option label="等外" value="other"></el-option>
179
-              </el-select>
180
-            </template>
181
-          </el-table-column>
182
-          <el-table-column prop="rksj" label="首次入库时间" align="center">
183
-          </el-table-column>
184
-          <el-table-column align="center" label="操作">
185
-            <template slot-scope="scope">
186
-              <el-button type="text" size="small" icon="el-icon-edit"
187
-                >编辑</el-button
188
-              >
189
-              <el-button type="text" size="small" icon="el-icon-delete"
190
-                >删除</el-button
191
-              >
192
-            </template>
193
-          </el-table-column>
194
-        </el-table>
180
+                    <el-option label="三等" value="third"></el-option>
181
+                    <el-option label="四等" value="fourth"></el-option>
182
+                    <el-option label="五等" value="fifth"></el-option>
183
+                    <el-option label="等外" value="other"></el-option>
184
+                  </el-select>
185
+                </template>
186
+              </el-table-column>
187
+              <el-table-column prop="rksj" label="首次入库时间" align="center">
188
+              </el-table-column>
189
+              <el-table-column align="center" label="操作">
190
+                <template slot-scope="scope">
191
+                  <el-button type="text" size="small" icon="el-icon-edit"
192
+                    >编辑</el-button
193
+                  >
194
+                  <el-button type="text" size="small" icon="el-icon-delete"
195
+                    >删除</el-button
196
+                  >
197
+                </template>
198
+              </el-table-column>
199
+            </el-table>
200
+          </div>
201
+        </div>
195 202
       </div>
196 203
     </d2-container>
197 204
   </div>
@@ -217,32 +224,25 @@ export default {
217 224
         lxfs: "",
218 225
       },
219 226
       //粮食信息表格列表
220
-      lsxxList:[
221
-          {
222
-              varieties:"",
223
-              cnlsrz:"",
224
-              grade:"",
225
-              rksj:""
226
-
227
-          }
228
-      ]
229
-
227
+      lsxxList: [
228
+        {
229
+          varieties: "",
230
+          cnlsrz: "",
231
+          grade: "",
232
+          rksj: "",
233
+        },
234
+      ],
230 235
     };
231 236
   },
232 237
   methods: {
233
-      //返回按钮
238
+    //返回按钮
234 239
     goBack() {
235 240
       window.history.go(-1);
236 241
     },
237 242
     //粮食信息添加
238
-    add(){
239
-        this.lsxxList.push(
240
-            {varieties:"",
241
-              cnlsrz:"",
242
-              grade:"",
243
-              rksj:""}
244
-              )
245
-    }
243
+    add() {
244
+      this.lsxxList.push({ varieties: "", cnlsrz: "", grade: "", rksj: "" });
245
+    },
246 246
   },
247 247
 };
248 248
 </script>
@@ -255,7 +255,7 @@ export default {
255 255
   }
256 256
 }
257 257
 .main {
258
-  color: #fff;
258
+color: #9bbbe3;
259 259
   .head,
260 260
   .bottomHead {
261 261
     height: 25px;
@@ -264,9 +264,10 @@ export default {
264 264
     display: flex;
265 265
 
266 266
     .backImg {
267
-      width: 10px;
268
-      height: 20px;
269
-      background: blue;
267
+      width: 5px;
268
+      height: 15px;
269
+      background: rgb(59, 103, 213);
270
+      border-radius:3px;
270 271
       margin-right: 10px;
271 272
     }
272 273
   }
@@ -280,14 +281,29 @@ export default {
280 281
     display: flex;
281 282
     justify-content: space-between;
282 283
   }
283
-  ::v-deep .el-form--inline .el-form-item__label{
284
-      width:130px;
285
-      color:#fff
286
-      }
287
-      .el-select,.el-input{
288
-  width: 300px;
289
-}
290
- 
291
-}
292
-</style>
284
+  ::v-deep .el-form--inline .el-form-item__label {
285
+    width: 130px;
286
+    color: #9bbbe3;
287
+  }
288
+  .el-select,
289
+  .el-input {
290
+    width:300px;
291
+  }
292
+  ::v-deep .el-input__inner{
293
+    background:#1d3b6b;
294
+    border:1px solid #345684;
295
+    opacity: 12.5;
296
+  }
297
+   ::v-deep .el-input-group__append{
298
+     background:#1d3b6b;
299
+    border:1px solid #345684;
300
+    opacity: 12.5;
301
+  }
302
+ #table .tableInput{
303
+    width: 100%;
304
+   
305
+  }
293 306
 
307
+
308
+}
309
+</style>