2023-08-29 设备和质量修改2

src/views/modules/eam/eamWorkOrderForCheck.vue

@@ -293,13 +293,15 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="取消工单" :close-on-click-modal="false" v-drag :visible.sync="cancelModelFlag" width="375px">
+    <el-dialog title="取消工单" :close-on-click-modal="false" v-drag :visible.sync="cancelModelFlag" width="350px">
       <el-form :inline="true" label-position="top">
         <el-form-item :label="' '">
           <h>是否取消选定工单?</h>
         </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top">
         <el-form-item :label="' '">
-          <input type="checkbox" value="Y" name="addWorkOrderRule" v-model="cancelData.cancelAll"/>
+          <input type="checkbox" value="Y" name="addWorkOrderRule" v-model="cancelData.cancelAll"/>&nbsp;删除该计划下当前设备的所有工单
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">

src/views/modules/eam/eamWorkOrderForMaintenance.vue

@@ -16,7 +16,7 @@
         <el-input v-model="searchData.planOperator" style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
-        <el-select filterable v-model="searchData.status" style="width: 130px">
+        <el-select v-model="searchData.status" style="width: 130px">
           <el-option label="全部" value=""></el-option>
           <el-option label="未开工" value="未开工"></el-option>
           <el-option label="已完工" value="已完工"></el-option>
@@ -278,8 +278,10 @@
         <el-form-item :label="' '">
           <h>是否取消选定工单?</h>
         </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top">
         <el-form-item :label="' '">
-          <input type="checkbox" value="Y" name="addWorkOrderRule" v-model="cancelData.cancelAll"/>
+          <input type="checkbox" value="Y" name="addWorkOrderRule" v-model="cancelData.cancelAll"/>&nbsp;删除该计划下当前设备的所有工单
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">

src/views/modules/sys/sceneDynamicControlModel.vue

@@ -222,7 +222,7 @@ export default {
         {
           columnProp: 'controlNo',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '编码',
           columnHidden: false,
           columnImage: false,
@@ -234,7 +234,7 @@ export default {
         {
           columnProp: 'baseDesc',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '控制内容',
           columnHidden: false,
           columnImage: false,
@@ -246,7 +246,7 @@ export default {
         {
           columnProp: 'controlStyle',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '控制方式',
           columnHidden: false,
           columnImage: false,
@@ -258,7 +258,7 @@ export default {
         {
           columnProp: 'baseData',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '状态',
           columnHidden: false,
           columnImage: false,
@@ -270,7 +270,7 @@ export default {
         {
           columnProp: 'thirdType',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '参数1',
           columnHidden: false,
           columnImage: false,
@@ -282,7 +282,7 @@ export default {
         {
           columnProp: 'secondType',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '参数2',
           columnHidden: false,
           columnImage: false,
@@ -294,7 +294,7 @@ export default {
         {
           columnProp: 'remark',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '备注',
           columnHidden: false,
           columnImage: false,
@@ -306,7 +306,7 @@ export default {
         {
           columnProp: 'updateDate',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '更新时间',
           columnHidden: false,
           columnImage: false,
@@ -318,7 +318,7 @@ export default {
         {
           columnProp: 'updateBy',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '更新人',
           columnHidden: false,
           columnImage: false,