浏览代码

Merge branch 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf

* 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf:
  UI调整
温红权 3 年之前
父节点
当前提交
fb7d2b49bf
共有 1 个文件被更改,包括 168 次插入112 次删除
  1. 168 112
      ruoyi-ui/src/views/components/table/liuTable.vue

+ 168 - 112
ruoyi-ui/src/views/components/table/liuTable.vue

@@ -1,122 +1,172 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-      <el-form-item label="开始时间">
-        <el-date-picker
-          v-model="queryParams.startTime"
-          type="date"
-          placeholder="选择日期时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间">
-        <el-date-picker
-          v-model="queryParams.endTime"
-          type="date"
-          placeholder="选择日期时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="船舶名" prop="name">
-        <el-input
-          v-model="queryParams.shipName"
-          placeholder="船舶名"
-          clearable
-          size="small"
-          style="width: 100rem"
-        />
-      </el-form-item>
-      <el-form-item label="MMSI" prop="mmsi">
-        <el-input
-          v-model="queryParams.mmsi"
-          placeholder="请输入MMSI"
-          clearable
-          size="small"
-          style="width: 100rem"
-        />
-      </el-form-item>
-
-      <br/>
-      <el-form-item label="海船/内河船" prop="name">
-        <el-select v-model="queryParams.shipRegionType" clearable placeholder="请选择">
-          <el-option
-            v-for="item in shipTypeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="监测点" prop="monitorPointName">
-        <el-select v-model="queryParams.monitorPointName" clearable placeholder="请选择">
-          <el-option
-            v-for="item in jianceOptions"
-            :key="item.dictValue"
-            :label="item.dictLabel"
-            :value="item.dictValue">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="目的港" prop="name">
-        <el-input
-          v-model="queryParams.destination"
-          placeholder="目的港"
-          clearable
-          size="small"
-          style="width: 100rem"
-        />
-      </el-form-item>
+     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
+     <el-row type="flex">
+                <el-col :span="2" >
+                     <el-form-item label="开始时间" style="float:right">
+                    </el-form-item>
+                </el-col>
+                <el-col :span="3">
+                  <el-date-picker
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        placeholder="选择日期时间">
+                      </el-date-picker>
+                </el-col>
+                <el-col :span="2">
+                    <el-form-item label="结束时间" style="float:right">
+                    </el-form-item>
+                </el-col>
+                 <el-col :span="3">
+                    <el-date-picker
+                            v-model="queryParams.endTime"
+                            type="datetime"
+                            placeholder="选择日期时间">
+                          </el-date-picker>
+                </el-col>
+                <el-col :span="2">
+                    <el-form-item label="船名" prop="shipName" style="float:right">
+                    </el-form-item> 
+                </el-col>
+                 <el-col :span="3">
+                 <el-input
+                        v-model="queryParams.shipName"
+                        placeholder="船舶名"
+                        clearable
+                        size="small"
+                        style="width: 80rem"
+                        @keyup.enter.native="handleQuery"
+                      />
+                 </el-col>
+                <el-col :span="2">
+                      <el-form-item label="MMSI" prop="mmsi" style="float:right">
+                        </el-form-item>
+                </el-col>
+                  <el-col :span="3">
+                     <el-input
+                            v-model="queryParams.mmsi"
+                            placeholder="请输入关键字"
+                            clearable
+                            size="small"
+                            style="width: 100rem"
+                            @keyup.enter.native="handleQuery"
+                          />
+                  </el-col>
+              </el-row>
+
+
+              <el-row type="flex"> 
+                 <el-col :span="2">
+                       <el-form-item label="海船/内河船" prop="name" style="float:right">
+                        </el-form-item>
+                 </el-col>
+                  <el-col :span="3">
+                         <el-select v-model="queryParams.shipRegionType" clearable placeholder="请选择">
+                              <el-option
+                                v-for="item in shipTypeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                              </el-option>
+                            </el-select>
+                 </el-col>
+                   <el-col :span="2">
+                       <el-form-item label="监测点" prop="monitorPointName" style="float:right">
+                       </el-form-item>
+                 </el-col>
+                  <el-col :span="3">
+                        <el-select v-model="queryParams.monitorPointName" clearable placeholder="请选择">
+                            <el-option
+                              v-for="item in jianceOptions"
+                              :key="item.dictValue"
+                              :label="item.dictLabel"
+                              :value="item.dictValue">
+                            </el-option>
+                          </el-select>
+                 </el-col>
+                
+                  <el-col :span="2">
+                       <el-form-item label="目的港" prop="destination" style="float:right">
+                       </el-form-item>
+                 </el-col>
+                  <el-col :span="3">
+                        <el-input
+                          v-model="queryParams.destination"
+                          placeholder="目的港"
+                          clearable
+                          size="small"
+                          style="width: 80rem"
+                        />
+                 </el-col>
+                  <el-col :span="2">
+                         <el-form-item label="管辖机构" prop="orgName" style="float:right">
+                        </el-form-item>
+                 </el-col>
+                  <el-col :span="3">
+                         <el-select v-model="queryParams.orgName" clearable placeholder="请选择">
+                              <el-option
+                                v-for="item in orgOptions"
+                                :key="item.dictValue"
+                                :label="item.dictLabel"
+                                :value="item.dictValue">
+                              </el-option>
+                            </el-select>
+                 </el-col>
+           </el-row>
+
+          <el-row type="flex"> 
+                 <el-col :span="2">
+                      <el-form-item label="处置结果" prop="name" style="float:right"> 
+                      </el-form-item>
+                 </el-col>
+                  <el-col :span="3">
+                         <el-select v-model="queryParams.dealResult" clearable placeholder="请选择">
+                            <el-option
+                              v-for="item in options"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                            </el-option>
+                          </el-select>
+                 </el-col>
+                   <el-col :span="2">
+                         <el-form-item label="快检结果" prop="fastResult" style="float:right">
+                         </el-form-item>
+                 </el-col>
+                  <el-col :span="3">
+                        <el-select v-model="queryParams.fastResult" clearable placeholder="请选择">
+                            <el-option
+                              v-for="item in options"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                            </el-option>
+                          </el-select>
+                 </el-col>
+                
+                  <el-col :span="2">
+                         <el-form-item label="送检结果" prop="uploadResult" style="float:right">
+                         </el-form-item>
+                 </el-col>
+                  <el-col :span="3">
+                      <el-select v-model="queryParams.uploadResult" clearable placeholder="请选择">
+                        <el-option
+                          v-for="item in options"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                 </el-col>
+           </el-row>
+
+    
 
       <!--      <el-form-item label="受否中国国籍" prop="name">-->
       <!--          <el-radio v-model="queryParams.radio" label="1">是</el-radio>-->
       <!--          <el-radio v-model="queryParams.radio" label="2">否</el-radio>-->
       <!--       </el-form-item>-->
 
-      <el-form-item label="管辖机构" prop="name">
-        <el-select v-model="queryParams.orgName" clearable placeholder="请选择">
-          <el-option
-            v-for="item in orgOptions"
-            :key="item.dictValue"
-            :label="item.dictLabel"
-            :value="item.dictValue">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <br/>
-      <el-form-item label="处置结果" prop="name">
-        <el-select v-model="queryParams.dealResult" clearable placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="快检结果" prop="name">
-        <el-select v-model="queryParams.fastResult" clearable placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="送检结果" prop="name">
-        <el-select v-model="queryParams.uploadResult" clearable placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <br/>
 
       <el-form-item style="margin-left:10rem">
         <el-button icon="el-icon-search" size="mini" @click="getLiuLists" class="search">查询</el-button>
@@ -137,7 +187,13 @@
     <el-table
       :data="tableData"
       :header-cell-style="{ background: 'linear-gradient(white, #ccebf9)'}"
-      style="width: 100%">
+      style="width: 100%"
+      height=400>
+       <el-table-column
+        label='序号'
+        type="index"
+        width="50">
+      </el-table-column>
       <el-table-column
         prop="shipName"
         label="船名"