页面调整6

src/views/daily/nroa/index.vue

-<template>
-  <div class="min_full" style="height: 140vh;">
-
-    <div class="min_full" style="height: 40%;">
-
-      <!-- 查询条件-->
-      <div class="search" v-condition>
-        <SearchButton :app='app'></SearchButton>
-        <el-row :gutter="20" class="search-row-1">
-          <el-col :span="6" class="search-col">
-            <div class="search-item">
-              <span class="search-span">日期:</span>
-              <el-date-picker v-model="queryParams.date" ></el-date-picker>
-            </div>
-          </el-col>
-          <el-col :span="6" class="search-col">
-            <div class="search-item">
-              <span class="search-span">作业类型:</span>
-              <RelSelect  src='/aqgl/rcgl/fcgzy/init/zylx'  clearable :match="{value:'id',label:'name'}" v-model='queryParams.flid' ></RelSelect>
-            </div>
+<template>
+  <div class="min_full" style="height: 140vh;">
+
+    <div class="min_full" style="height: 40%;">
+
+      <!-- 查询条件-->
+      <div class="search" v-condition>
+        <SearchButton :app='app'></SearchButton>
+        <el-row :gutter="20" class="search-row-1">
+         <el-col :span="6" class="search-col">
+             <div class="search-item">
+               <span class="search-span">开始日期:</span>
+               <el-date-picker v-model="queryParams.ksrq"></el-date-picker>
+             </div>
+            </el-col>
+            <el-col :span="6" class="search-col">
+             <div class="search-item">
+               <span class="search-span">结束日期:</span>
+               <el-date-picker v-model="queryParams.jsrq"></el-date-picker>
+             </div>
+         </el-col>
+          <el-col :span="6" class="search-col">
+            <div class="search-item">
+              <span class="search-span">作业类型:</span>
+              <RelSelect  src='/aqgl/rcgl/fcgzy/init/zylx'  clearable :match="{value:'id',label:'name'}" v-model='queryParams.flid' ></RelSelect>
+            </div>
           </el-col>
           <el-col :span="6" class="search-col">
             <div class="search-item">
               <span class="search-span">风险级别:</span>
              <RelSelect  src='aqgl/fxyk/fxpc/init/wxdj'  clearable :match="{value:'id',label:'name'}" v-model='queryParams.fxjb' ></RelSelect>
             </div>
-          </el-col>
-
-        </el-row>
-      </div>
-      <!-- 按钮操作-->
-      <el-row class="tool-bar">
-        <PrintButton :app='app'></PrintButton>
-        <ViewButton ref="view" :app='app'></ViewButton>
-        <AddButton ref="add" :app='app'></AddButton>
-        <CopyButton ref="copy" :app='app'></CopyButton>
-        <EditButton ref="edit" :app='app'></EditButton>
-        <AttachFileButton :app='app'></AttachFileButton>
-        <FieldButton :app='app'></FieldButton>
-        <ExcelButton :app='app'></ExcelButton>
-        <!-- 额外按钮-->
-        <!-- 表头设置 -->
-
-        <!-- 权限-->
-      </el-row>
-      <!-- 表格-->
-      <div class="tablePagers">
-        <TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
-          @getRow='getRow'>
-
-        </TablePager>
-      </div>
-    </div>
-    <div class="min_full" style="height: 60%;padding: 10px;">
-      <!-- tabs -->
-      <el-tabs v-model="activeName" @tab-click="handleClick"  >
+          </el-col>
+
+        </el-row>
+      </div>
+      <!-- 按钮操作-->
+      <el-row class="tool-bar">
+        <PrintButton :app='app'></PrintButton>
+        <ViewButton ref="view" :app='app'></ViewButton>
+        <AddButton ref="add" :app='app'></AddButton>
+        <CopyButton ref="copy" :app='app'></CopyButton>
+        <EditButton ref="edit" :app='app'></EditButton>
+        <AttachFileButton :app='app'></AttachFileButton>
+        <FieldButton :app='app'></FieldButton>
+        <ExcelButton :app='app'></ExcelButton>
+        <!-- 额外按钮-->
+        <!-- 表头设置 -->
+
+        <!-- 权限-->
+      </el-row>
+      <!-- 表格-->
+      <div class="tablePagers">
+        <TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
+          @getRow='getRow'>
+
+        </TablePager>
+      </div>
+    </div>
+    <div class="min_full" style="height: 60%;padding: 10px;">
+      <!-- tabs -->
+      <el-tabs v-model="activeName" @tab-click="handleClick"  >
     <el-tab-pane v-if="sqxList.indexOf('DZ')!=-1"  label="吊装作业" name="DZ" >
-           <Exposure />
-    </el-tab-pane>
+           <Exposure />
+    </el-tab-pane>
         <el-tab-pane v-if="sqxList.indexOf('DL')!=-1" label="断路作业" name="DL">
          <!-- <SafetyCourse /> -->
-        </el-tab-pane>
+        </el-tab-pane>
         <el-tab-pane v-if="sqxList.indexOf('YXKJ')!=-1" label="有限空间作业" name="YXKJ">
          <!--  <Reflect /> -->
-        </el-tab-pane>
+        </el-tab-pane>
         <el-tab-pane v-if="sqxList.indexOf('DHZY')!=-1" label="动火作业" name="DHZY">
           <!-- <Leadership /> -->
         </el-tab-pane>
@@ -77,56 +83,58 @@
         </el-tab-pane>
         <el-tab-pane v-if="sqxList.indexOf('MQMB')!=-1" label="煤气盲板抽堵作业" name="MQMB">
          <!--  <Family /> -->
-        </el-tab-pane>
-      </el-tabs>
-  </div>
-
-  </div>
-</template>
-
-<script>
-  /* 引入需要的接口*/
+        </el-tab-pane>
+      </el-tabs>
+  </div>
+
+  </div>
+</template>
+
+<script>
+  /* 引入需要的接口*/
  import {
  	doQuery,
  	doAdd,
  	doUpdate,
  	doDelete
- } from  '@/api/daily/nroa.js';
-  /* edit页面*/
-  import Edit from './edit'
+ } from  '@/api/daily/nroa.js';
+  /* edit页面*/
+  import Edit from './edit'
   import Exposure from './exposure.vue'
   import SafetyCourse from './safetyCourse.vue'
-  import Reflect from './reflect.vue'
   import Leadership from './leadership.vue'
-   import Family from './family.vue'
-  import {
-    tableMixin
-  } from 'common'
-  export default {
-    mixins: [tableMixin],
-    name: 'appVersion',
-
-    /* 初始额外赋值*/
-    async mounted() {
-      this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
-    },
-    data() {
+  import Reflect from './reflect.vue'
+   import Leadership from './leadership.vue'
+   import Family from './family.vue'
+  import {
+    tableMixin
+  } from 'common'
+  export default {
+    mixins: [tableMixin],
+    name: 'appVersion',
+
+    /* 初始额外赋值*/
+    async mounted() {
+      this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
+    },
+    data() {
       return {
-        sqxList:[],
-        activeName: '',
-        /*需要的额外参数 */
-        showDialog: false,
-        DialogName: '',
-        type: '',
-        DialogTitle: '',
-        /* 基础url*/
-        baseUrl: '/aqgl/rcgl/fcgzy',
-        /* 查询参数*/
-        queryParams: {
-          date: new Date().getTime(),
+        sqxList:[],
+        activeName: '',
+        /*需要的额外参数 */
+        showDialog: false,
+        DialogName: '',
+        type: '',
+        DialogTitle: '',
+        /* 基础url*/
+        baseUrl: '/aqgl/rcgl/fcgzy',
+        /* 查询参数*/
+        queryParams: {
+          ksrq: '',
+          jsrq: '',
           flid: '',
-          fxjb:''
-        },
-        /* 表格标题对应参数*/
+          fxjb:''
+        },
+        /* 表格标题对应参数*/
         tableTitle: [
           {label: "申请单号", prop: "djid", fieldType: "ftString",width:120},
           {label: "申请日期", prop: "sqrq", fieldType: "ftDateTime"},
@@ -148,10 +156,10 @@
           {label: "创建人", prop: "cjr", fieldType: "ftString"},
           {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
           {label: "状态", prop: "zt", fieldType: "ftString",width:6},
-          {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
-        ]
-      }
-    },
+          {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
+        ]
+      }
+    },
     methods: {
       /* 获取当前点击的数据*/
       getRow: function(e) {
@@ -162,40 +170,40 @@
         }else{
            this.activeName=""
         }
-      },
+      },
       handleClick(val){
         console.log(val,'val')
-      },
+      },
      query: doQuery,
      		/* 基础增*/
      		apiAdd: doAdd,
      		/* 基础更新*/
      		apiUpdate: doUpdate,
      		/* 删除操作*/
-     		apiDelete: doDelete,
-      /* 初始化赋值操作*/
-      init() {
-
-      }
-      /* 启用停用*/
-
-    },
-    components: {
-      Edit,
+     		apiDelete: doDelete,
+      /* 初始化赋值操作*/
+      init() {
+
+      }
+      /* 启用停用*/
+
+    },
+    components: {
+      Edit,
       Exposure,
       SafetyCourse,
       Leadership,
       Reflect,
-      Family
-    }
-
-
-  }
-</script>
-
-<style scoped>
-  /deep/.el-tabs__item {
-    font-size: 13px;
-    color: #666;
-  }
+      Family
+    }
+
+
+  }
+</script>
+
+<style scoped>
+  /deep/.el-tabs__item {
+    font-size: 13px;
+    color: #666;
+  }
 </style>

src/views/daily/nrtm/index.vue

@@ -74,9 +74,9 @@
 			},
 			/* 表格标题对应参数*/
 			tableTitle: [
-				{label: "序号", prop: "xh", fieldType: "int"},
 				{label: "名称", prop: "name", fieldType: "ftString",width:300},
 				{label: "备注", prop: "bz", fieldType: "ftString",width:300},
+				{label: "序号", prop: "xh", fieldType: "int",width:100},
 				{label: "维护人", prop: "whr", fieldType: "ftString"},
 				{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}
 			]