岗位

public/config/config.json

@@ -344,8 +344,7 @@
       },
       {
         "pid": 40,
-        "name": "单张图片 (本地离线)",
-        "icon": "http://mars3d.cn/example/img/basemaps/offline.png",
+        "name": "本地高清图 (本地离线)",
         "type": "image",
         "url": "/dianziweilan/dianziweilan.jpg",
         "rectangle": {

src/assets/js/common.js

-
-import request from '@/utils/request';
+import request from '@/utils/request'
+import qs from 'qs'
 var baseAPI2 = process.env.VUE_APP_LOCAL_API2 + '/';
 
 var HttpReq = function(){
@@ -3171,8 +3171,20 @@ var HttpReq = function(){
           params:param,
         })
       },
-
-
+      //开采管理-获取文件列表
+      scFindAllExcelInfo: function(params){
+        return request({
+          url: '/api/miningManagement/findAllExcelInfo?' + qs.stringify(params, { indices: false }),
+          method: 'get'
+        })
+      },
+      //开采管理-查看excel报表
+      scReadExcel: function(params){
+        return request({
+          url: '/api/miningManagement/readExcel?' + qs.stringify(params, { indices: false }),
+          method: 'get'
+        })
+      },
 
 
 		},

src/components/CustomTable/column.vue

+<template>
+  <el-table-column :prop="col.prop" :label="col.label">
+    <template v-if="col.children">
+      <custom-column v-for="(item, index) in col.children" :key="index" :col="item" />
+    </template>
+  </el-table-column>
+</template>
+
+<script>
+export default {
+  name: 'CustomColumn',
+  props: {
+    col: {
+      type: Object
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

src/components/CustomTable/index.vue

+<template>
+  <div class="my-table">
+    <el-table :data="data" :span-method="spanMethod">
+      <custom-column v-for="(item,index) in col" :key="index" :col="item" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import CustomColumn from './column'
+export default {
+  components: {
+    CustomColumn
+  },
+  props: {
+    col: {
+      type: Array,
+      required: true,
+      default: () => { return [] }
+    },
+    data: {
+      type: Array,
+      required: true,
+      default: () => { return [] }
+    },
+    spanMethod: {
+      type: Function,
+      required: false,
+      default: function() { }
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

src/views/personnelPositioning/peopleLocation/index.vue

@@ -253,7 +253,7 @@ export default {
       });
       //获取用于选择的岗位
       HttpReq.truckDispatching.getAllPostQuery({size:9999}).then((res) => {
-        this.allPostData = res.content;
+        this.allPostData = res.content.filter((item)=>{return item.enabled});
       });
       this.loadData();
     })

src/views/personnelPositioning/peopleLogData/index.vue

@@ -67,7 +67,7 @@
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
           range-separator="至"
-          :default-time="['00:00:00', '23:59:59']">
+          :default-time="['00:00:00', '23:59:59']"
           start-placeholder="查询开始时间"
           end-placeholder="查询结束时间">
         </el-date-picker>

src/views/productionPlanManagement/mineFile/index.vue

+<template>
+  <div class="common-page device-manage">
+
+    <div class="option page-row">
+      <!--工具栏-->
+      <div class="head-container">
+        <!-- 搜索 -->
+        <label class="el-form-item-label" style="font-weight: 500;">文件名</label>
+        <el-input v-model="query.fileName" clearable size="small" placeholder="请输入安全帽MAC" style="width:180px;"/>
+        <label class="el-form-item-label" style="font-weight: 500;">上传时间</label>
+        <el-date-picker
+          v-model="query.modificationTime"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          :default-time="['00:00:00', '23:59:59']"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+        <el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
+        <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
+      </div>
+    </div>
+
+    <!-- 表格 -->
+    <div class="panel-bottom page-row">
+      <div class="ctin-box">
+        <div class="content-within">
+          <div class="content-fix">
+            <div class="toolbar"></div>
+            <div class="content">
+              <el-table :data="tableData" v-loading="loading" border style="width:auto">
+                <el-table-column prop="fileName" label="文件名" align="center"></el-table-column>
+                <el-table-column prop="url" label="文件路由" align="center"></el-table-column>
+                <el-table-column prop="modificationTime" label="上传时间" align="center"></el-table-column>
+                <el-table-column label="操作" align="center" fixed="right">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-view" @click="viewTable(scope.row)">在线预览</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <!--分页组件-->
+              <el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange"/>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 表单渲染 -->
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="visible" :title="title" width="1400px" top="8vh">
+      <el-tabs v-model="activeTab" type="border-card" style="margin:0;width:1360px;" @tab-click="handleTabClick">
+        <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item" :name="item"></el-tab-pane>
+        <div v-html="tableHtml" style="width:1328px;max-height:66vh;overflow:auto;"/>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button @click="cancelForm">关闭</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {Tools, HttpReq, Dates} from '@/assets/js/common.js';
+
+export default {
+  name: 'visitPeople',
+  data() {
+    return {
+      title: '',
+      visible: false,
+      loading: false,
+      query: {},
+      page: 1,
+      size: 10,
+      total: 0,
+      tableData: [],
+      tabList: ['Sheet1'],
+      activeTab: 'Sheet1',
+      tableHtml: ''
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.loadData();
+    })
+  },
+  methods: {
+    handleTabClick(tab, event) {
+      console.log(tab, event);
+    },
+    viewTable (item) {
+      this.visible = true
+      this.title = item.fileName
+      this.tableHtml = ``
+      HttpReq.truckDispatching.scReadExcel({url:item.url}).then((res) => {
+        this.$notify({
+          title: res.msg,
+          type: res.code === 200 ? 'success' : 'error',
+          duration: 2500
+        })
+        if (res.code == 200) {
+          let data = res.data
+          this.tableHtml+=`<table border="1" bordercolor="black" cellspacing="0" cellpadding="5" style="margin: 0 auto">`
+          data.forEach(rowArr=>{
+            this.tableHtml+=`<tr>`
+            rowArr.forEach(cell=>{
+              this.tableHtml+=`<td rowspan="${cell.rowspan}" colspan="${cell.colspan}" style="min-width:150px;text-align:center;">${cell.text}</td>`
+            })
+            this.tableHtml+=`</tr>`
+          })
+          this.tableHtml+=`</table>`
+        }
+      })
+    },
+    loadData() {
+      Object.keys(this.query).length !== 0 && Object.keys(this.query).forEach(item => {
+        if (this.query[item] === null || this.query[item] === '') this.query[item] = undefined
+      })
+      HttpReq.truckDispatching.scFindAllExcelInfo(this.query).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.data;
+        }
+      })
+    },
+    cancelForm() {
+      this.visible = false;
+    },
+    // 点击搜索
+    toSearch() {
+      this.page = 1;
+      this.loadData();
+    },
+    // 重置搜索
+    clearLimit() {
+      this.query = {};
+      this.loadData()
+    },
+    pageChange(e) {
+      this.page = e
+      this.loadData()
+    },
+    sizeChange(e) {
+      this.page = 1
+      this.size = e
+      this.loadData()
+    }
+  },
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-table .warning-row {
+  background: oldlace;
+}
+
+.el-table .success-row {
+  background: #f0f9eb;
+}
+
+.cell-input {
+  //min-width: 220px;
+}
+
+.form-cell {
+  margin: 0 !important;
+  width: 100%;
+}
+
+.grid-content {
+  //border: 1px solid rgba(100, 100, 100, 0.1);
+  padding: 5px 30px;
+}
+.cell-box {
+  min-width: 120px;
+}
+.cell-box .el-input__inner {
+  border: 1px solid rgba(100, 100, 100, 0.1);
+}
+
+.cell-box .el-input.is-disabled .el-input__inner {
+  border: 1px solid rgba(100, 100, 100, 0.1);
+  background: white;
+  cursor: text;
+}
+
+.cell-box .el-input.is-disabled .el-input__icon {
+  cursor: text;
+}
+
+.cell-box .el-icon-arrow-up:before {
+  content: '';
+}
+
+.mapcontainer {
+  height: 30vh;
+  width: 680px;
+  overflow: hidden;
+}
+</style>