From 5ac82205a9ef90ce96fad417ec6e545a899132e5 Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Tue, 16 Aug 2022 15:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application-dev.yml    |  2 +-
 acs/qd/src/components/Crud/RR.operation.vue          | 10 +++++++++-
 acs/qd/src/components/Crud/UD.operation.vue          |  5 +++--
 acs/qd/src/main.js                                   | 12 +++++++-----
 acs/qd/src/views/acs/device/index.vue                |  2 +-
 acs/qd/src/views/acs/produceshiftorder/index.vue     |  4 ++--
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml b/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml
index f9ff10b..cc612a8 100644
--- a/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -8,7 +8,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:llsh_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:rljn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rljn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
 #      password: ${DB_PWD:P@ssw0rd}
diff --git a/acs/qd/src/components/Crud/RR.operation.vue b/acs/qd/src/components/Crud/RR.operation.vue
index df2c138..6bcfcbb 100644
--- a/acs/qd/src/components/Crud/RR.operation.vue
+++ b/acs/qd/src/components/Crud/RR.operation.vue
@@ -1,8 +1,16 @@
 <!--搜索与重置-->
 <template>
   <span>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
+    <!-- <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
     <el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
+    -->
+    <el-dropdown split-button type="primary" class="filter-item" @click="crud.toQuery">
+      <i class="el-icon-search el-icon--left" />查询
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">重置</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+
   </span>
 </template>
 <script>
diff --git a/acs/qd/src/components/Crud/UD.operation.vue b/acs/qd/src/components/Crud/UD.operation.vue
index 55a452a..686247d 100644
--- a/acs/qd/src/components/Crud/UD.operation.vue
+++ b/acs/qd/src/components/Crud/UD.operation.vue
@@ -1,14 +1,15 @@
 <template>
   <div>
-    <el-button v-if="isVisiableEdit" v-permission="permission.edit" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" />
+    <el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)">修改</el-button>
     <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
       <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
         <el-button size="mini" type="text" @click="doCancel">取消</el-button>
         <el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
       </div>
-      <el-button v-if="isVisiableDel" slot="reference" :disabled="disabledDle" type="danger" icon="el-icon-delete" size="mini" @click="toDelete" />
+      <el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete">删除</el-button>
     </el-popover>
+
   </div>
 </template>
 <script>
diff --git a/acs/qd/src/main.js b/acs/qd/src/main.js
index ef22503..b614873 100644
--- a/acs/qd/src/main.js
+++ b/acs/qd/src/main.js
@@ -5,10 +5,10 @@ import Cookies from 'js-cookie'
 import 'normalize.css/normalize.css'
 
 import Element from 'element-ui'
-//列自适应宽度:https://github.com/legendJaden/AFTableColumn
+// 列自适应宽度:https://github.com/legendJaden/AFTableColumn
 import AFTableColumn from 'af-table-column'
 
-//可编辑grid插件
+// 可编辑grid插件
 import 'xe-utils'
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'
@@ -22,7 +22,6 @@ import 'mavon-editor/dist/css/index.css'
 // 数据字典
 import dict from './components/Dict'
 
-
 import scroll from 'vue-seamless-scroll'
 Vue.use(scroll)
 
@@ -52,13 +51,16 @@ Vue.use(AFTableColumn)
 Vue.use(VXETable)
 Vue.prototype.$XModal = VXETable.modal
 
-
 Vue.use(VueHighlightJS)
 Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
+
+// 全局设置控件样式https://codeantenna.com/a/0IN5FMJk5h
+Element.Table.props.border = { type: Boolean, default: true }
+Element.TableColumn.props.align = { type: String, default: 'center' }
 Vue.use(Element, {
-  size: Cookies.get('size') || 'small' // set element-ui default size
+  size: Cookies.get('size') || 'mini' // set element-ui default size
 })
 
 Vue.config.productionTip = false
diff --git a/acs/qd/src/views/acs/device/index.vue b/acs/qd/src/views/acs/device/index.vue
index afacc39..7fe28d5 100644
--- a/acs/qd/src/views/acs/device/index.vue
+++ b/acs/qd/src/views/acs/device/index.vue
@@ -119,7 +119,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="device_id" label="设备标识" />
-        <el-table-column sortable prop="device_code" label="设备编码" />
+        <el-table-column sortable prop="device_code" label="设备编码" min-width="100" show-overflow-tooltip/>
         <af-table-column sortable label="设备名字">
           <template slot-scope="scope">
             <div>{{ scope.row.device_name }}</div>
diff --git a/acs/qd/src/views/acs/produceshiftorder/index.vue b/acs/qd/src/views/acs/produceshiftorder/index.vue
index 5e93990..8f5c598 100644
--- a/acs/qd/src/views/acs/produceshiftorder/index.vue
+++ b/acs/qd/src/views/acs/produceshiftorder/index.vue
@@ -71,7 +71,7 @@
             </el-dropdown>
           </template>
         </el-table-column>
-        <el-table-column prop="order_code" label="工单编码" />
+        <el-table-column prop="order_code" label="工单编码" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="device_code" label="设备编码" />
         <el-table-column prop="order_status_name" label="工单状态" />
         <el-table-column prop="qty" label="下料数量" />
@@ -83,7 +83,7 @@
         <el-table-column prop="molten_pool" label="熔池" />
         <el-table-column prop="weight" label="重量" />
         <el-table-column prop="create_by" label="创建者" />
-        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip/>
         <el-table-column v-permission="['admin','produceshiftorder:edit','produceshiftorder:del']" label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation