diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEDURE001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEDURE001.wql
index 4553e6b2..73ab160d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEDURE001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEDURE001.wql
@@ -68,7 +68,7 @@
         	classstandard.class_name,
         	device.device_code,
         	device.device_name,
-        	user.nick_name as jockey_name
+        	user.person_name as jockey_name
         FROM
         	MPS_BD_ProduceShiftOrder ShiftOrder
         	left join pdm_bi_device device on ShiftOrder.device_id = device.device_id
@@ -182,7 +182,7 @@
         	record.*,
         	device.device_code,
         	device.device_name,
-        	user.nick_name
+        	user.person_name
         FROM
         	MPS_BD_MacOperateRecord record
         	LEFT JOIN PDM_BI_Device device ON record.device_id = device.device_id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
index 72568015..7b1e96fc 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls
deleted file mode 100644
index e7dbf5c6..00000000
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls and /dev/null differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/SCH_Point_01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/SCH_Point_01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls
new file mode 100644
index 00000000..eb67fe9f
Binary files /dev/null and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ
diff --git a/mes/qd/src/views/monitor/eslog/view/index.vue b/mes/qd/src/views/monitor/eslog/view/index.vue
new file mode 100644
index 00000000..79507bc6
--- /dev/null
+++ b/mes/qd/src/views/monitor/eslog/view/index.vue
@@ -0,0 +1,405 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <!--工具栏-->
+      <el-form :inline="true" class="demo-form-inline" label-suffix=":" label-width="90px">
+        <el-form-item label="标签">
+          <el-select
+            v-model="system"
+            clearable
+            style="width: 100px; height: 35px;top: -5px;"
+            placeholder="所属标签"
+          >
+            <el-option
+              v-for="item in systemOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="级别">
+          <el-select
+            v-model="logLevelValue"
+            clearable
+            style="width: 100px; height: 35px;top: -5px;"
+            placeholder="日志级别"
+          >
+            <el-option
+              v-for="item in labelsOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键字">
+          <el-input
+            v-model="message"
+            size="mini"
+            placeholder="请输入内容"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="链路追踪">
+          <el-input
+            v-model="traceId"
+            size="mini"
+            placeholder="请输入链路id"
+            clearable
+          />
+        </el-form-item>
+
+        <el-form-item label="SQL日志" prop="filterSql">
+          <el-switch
+            v-model="filterSql"
+            active-color="#F56C6C"
+            inactive-color="#409EFF"
+            active-value="1"
+            inactive-valu="0"
+          />
+        </el-form-item>
+        <el-form-item label="HTTP日志" prop="isRequest">
+          <el-switch
+            v-model="isRequest"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+            active-value="1"
+            inactive-valu="0"
+          />
+        </el-form-item>
+
+        <el-form-item v-show="!showOptions" label="时间范围">
+          <el-date-picker
+            v-model="timeRange"
+            size="mini"
+            clearable
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            align="right"
+            @change="queryData"
+            @blur="queryData"
+          />
+        </el-form-item>
+        <el-form-item v-show="showOptions" label="时间段">
+          <el-select v-model="timeZoneValue" filterable placeholder="请选择标签" size="mini" @change="queryData">
+            <el-option
+              v-for="item in timeZoneOptions"
+              :key="item.index"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-tooltip class="item" effect="dark" content="切换查询条件" placement="top">
+            <span class="el-icon-sort" @click="changeShow" />
+          </el-tooltip>
+        </el-form-item>
+        <el-form-item label="显示条数">
+          <el-input-number
+            v-model="size"
+            size="mini"
+            controls-position="right"
+            :min="20"
+            :max="5000"
+            :step="10"
+          />
+        </el-form-item>
+        <el-form-item label="当前页">
+          <el-input-number
+            v-model="page"
+            size="mini"
+            controls-position="right"
+            :min="1"
+            :max="2000"
+            :step="1"
+          />
+        </el-form-item>
+        <el-form-item label="总条数">
+          <el-input
+            v-model="total"
+            size="small"
+            disabled
+            style="width: 110px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-dropdown split-button type="primary" size="mini" @click="queryData">
+            查询
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item v-for="(item, index) in runStatuOptions" :key="index" @click.native="startInterval(item)">{{ item.label }}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="clearLogs">清空日志</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!--  <div style="margin: 3px; min-height: 80vh;">
+      <el-table :data="logs">
+        <el-table-column label="ip" prop="requestIp" />
+        <el-table-column label="所属系统" prop="system" />
+        <el-table-column label="请求时间" prop="requestTime" />
+        <el-table-column label="traceId" prop="traceId" />
+        <el-table-column label="请求时间" prop="requestTime" />
+        <el-table-column label="请求接口" prop="requestMethod" />
+        <el-table-column label="logger" prop="logger" />
+        <el-table-column label="thread" prop="thread" />
+        <el-table-column label="message" prop="message" show-overflow-tooltip/>
+      </el-table>
+    </div>
+-->
+    <div style="margin: 3px; min-height: 80vh;">
+      <!--数据判空-->
+      <el-empty v-if="showEmpty" :description="emptyText" />
+      <!--数据加载-->
+      <el-card v-else shadow="hover" style="width: 100%;overflow-x: scroll" class="log-warpper">
+        <div style="width: 100%">
+          <div v-for="(log, index) in logs" :key="index">
+            <div>
+              <span style="color: #6c0a99;font-weight: 700">{{ log.system }}</span>
+              <span style="color: #13ce66">{{ log.thread }}</span>
+              <span :style="fontType(log.logLevel)">{{ log.logLevel }}</span>
+              <span>{{ log.requestIp }}</span>
+              <span style="color: #7c8db0">{{ log.requestTime }}</span>
+              <span style="color: chocolate">{{ log.traceId }}</span>
+              <span style="color: #7a6df0">{{ log.requestMethod }}</span>
+              <span style="margin: 5px;font-size: 15px" v-html="log.message">{{ log.message }}</span>
+            </div>
+          </div>
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import logOperation from '@/views/monitor/eslog/view/loki'
+
+let queryParam = {
+  logLevel: null,
+  system: null,
+  startTime: null,
+  endTime: null,
+  traceId: null,
+  message: null,
+  filterSql: true,
+  isRequest: true,
+  page: null,
+  total: 0,
+  size: 20
+}
+export default {
+  name: 'ES',
+  data() {
+    return {
+      labelsOptions: [], // 所有标签和对应所有值数据
+      systemOptions: [], // 所有标签和对应所有值数据
+      logLevelValue: '',
+      system: '',
+      timeRange: [],
+      message: '',
+      traceId: '',
+      size: 20,
+      logData: [],
+      filterSql: '1',
+      isRequest: '1',
+      logs: [], // 所有日志
+      showEmpty: true,
+      emptyText: '请选择标签',
+      page: 1,
+      runStatu: 'off',
+      runStatuOptions: [{
+        label: 'off',
+        value: 0
+      }, {
+        label: '5s',
+        value: 5000
+      }, {
+        label: '10s',
+        value: 10000
+      }, {
+        label: '1m',
+        value: 60000
+      }, {
+        label: '5m',
+        value: 300000
+      }, {
+        label: '30m',
+        value: 1800000
+      }],
+      timeZoneOptions: [{
+        label: '最近5分钟',
+        value: 300 * 1000
+      }, {
+        label: '最近15分钟',
+        value: 900 * 1000
+      }, {
+        label: '最近30分钟',
+        value: 1800 * 1000
+      }, {
+        label: '最近1小时',
+        value: 3600 * 1000
+      }, {
+        label: '最近3小时',
+        value: 3600 * 1000 * 3
+      }, {
+        label: '最近6小时',
+        value: 3600 * 1000 * 6
+      }, {
+        label: '最近12小时',
+        value: 3600 * 1000 * 12
+      }, {
+        label: '最近24小时',
+        value: 3600 * 1000 * 24
+      }, {
+        label: '最近2天',
+        value: 3600 * 1000 * 24 * 2
+      }, {
+        label: '最近7天',
+        value: 3600 * 1000 * 24 * 7
+      }, {
+        label: '最近15天',
+        value: 3600 * 1000 * 24 * 15
+      }],
+      timeZoneValue: '',
+      showOptions: true
+    }
+  },
+  created() {
+    this.initLabelsValues('logLevel')
+    this.initLabelsValues('system')
+  },
+  methods: {
+    fontType(level) {
+      if (level === 'INFO') {
+        return { 'color': '#1b6cc4' }
+      }
+      if (level === 'ERROR') {
+        return { 'color': '#e30a0a' }
+      }
+      if (level === 'DEBUG') {
+        return { 'color': '#1e2022' }
+      }
+      return { 'color': '#a74dc6' }
+    },
+    initLabelsValues(type) {
+      logOperation.labelsValues(type).then(res => {
+        if (type === 'logLevel') {
+          this.labelsOptions = res
+        }
+        if (type === 'system') {
+          this.systemOptions = res
+        }
+      })
+    },
+    queryData() {
+      // 清空查询数据
+      this.clearParam()
+      queryParam.logLevel = this.logLevelValue
+      const time = new Date()
+      if (this.timeZoneValue !== '') {
+        queryParam.startTime = new Date(((time.getTime() - this.timeZoneValue)))
+      }
+      if (this.timeRange !== '' && this.timeRange.length > 0) {
+        queryParam.startTime = this.timeRange[0]
+        queryParam.endTime = this.timeRange[1]
+      }
+      queryParam.message = this.message.replace(/^\s*|\s*$/g, '')
+      queryParam.filterSql = this.filterSql === '1'
+      queryParam.isRequest = this.filterSql === '1'
+      queryParam.traceId = this.traceId
+      queryParam.size = this.size
+      queryParam.page = this.page
+      queryParam.system = this.system
+
+      logOperation.getLogData(queryParam).then(res => {
+        this.showEmpty = false
+        this.total = res.total
+        // 清空
+        this.logs = []
+        for (const j in res.records) { // 用push的方式将所有日志数组添加进去
+          this.logs.push(res.records[j])
+        }
+      })
+    },
+    clearLogs() {
+      var message = '您确定要清空'
+      if (this.system !== '' && this.system !== null) {
+        message += '标签为:' + this.system + ' '
+      }
+      message += '10天前的日志吗 ?'
+      this.$confirm(message, '确认信息', {
+        distinguishCancelAndClose: true,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+        .then(() => {
+          // 清空查询数据
+          this.clearParam()
+          queryParam.logLevel = this.logLevelValue
+          const time = new Date()
+          if (this.timeZoneValue !== '') {
+            queryParam.startTime = new Date(((time.getTime() - this.timeZoneValue)))
+          }
+          if (this.timeRange !== '' && this.timeRange.length > 0) {
+            queryParam.startTime = this.timeRange[0]
+            queryParam.endTime = this.timeRange[1]
+          }
+          queryParam.message = this.message.replace(/^\s*|\s*$/g, '')
+          queryParam.traceId = this.traceId
+          queryParam.system = this.system
+
+          logOperation.clearLogs(queryParam).then(res => {
+            this.queryData()
+            this.$message({
+              type: 'info',
+              message: '清除成功'
+            })
+          })
+        })
+        .catch(action => {
+          this.$message({
+            type: 'info',
+            message: action === 'cancel'
+              ? '已取消'
+              : '已取消'
+          })
+        })
+    },
+    changetype() {
+
+    },
+    clearParam() {
+      queryParam = {
+        logLevel: null,
+        startTime: null,
+        endTime: null,
+        message: null,
+        traceId: null,
+        isRequest: true,
+        filterSql: true,
+        size: 20
+      }
+    },
+    changeShow() {
+      // 清空数据
+      this.timeZoneValue = ''
+      this.timeRange = []
+      this.showOptions = !this.showOptions
+    }
+  }
+}
+</script>
+
+<style scoped>
+.log-warpper {
+  white-space: nowrap;
+  word-break: break-word;
+}
+</style>
diff --git a/mes/qd/src/views/monitor/eslog/view/loki.js b/mes/qd/src/views/monitor/eslog/view/loki.js
new file mode 100644
index 00000000..8cc509d5
--- /dev/null
+++ b/mes/qd/src/views/monitor/eslog/view/loki.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+export function getLogData(param) {
+  return request({
+    url: '/api/esLog/query',
+    method: 'post',
+    data: param
+  })
+}
+
+export function labelsValues(type) {
+  return request({
+    url: '/api/esLog/labels/' + type,
+    method: 'get'
+  })
+}
+
+export function clearLogs(param) {
+  return request({
+    url: '/api/esLog/clearLogs',
+    method: 'delete',
+    data: param
+  })
+}
+
+export default { getLogData, labelsValues, clearLogs }