From aa0f44a36fe3cf6f012edefd9f9bf856acb78b5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 19 Aug 2022 16:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addMachineAuth/addMachineAuth.html        | 21 +++----
 .../addMachineType/addMachineType.html        | 14 ++---
 .../editMachineType/editMachineType.html      | 60 +++++++++----------
 .../property/machineManage/machineManage.html |  2 +-
 .../machineTypeManage/machineTypeManage.html  |  6 +-
 .../newOaWorkflowManage.html                  | 14 +++--
 public/vcCore/vcFramework.js                  |  6 +-
 7 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/public/components/property/addMachineAuth/addMachineAuth.html b/public/components/property/addMachineAuth/addMachineAuth.html
index adb4ae07f..f4d35df20 100755
--- a/public/components/property/addMachineAuth/addMachineAuth.html
+++ b/public/components/property/addMachineAuth/addMachineAuth.html
@@ -1,5 +1,4 @@
-<div id="addMachineAuthModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-    aria-hidden="true">
+<div id="addMachineAuthModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -11,7 +10,7 @@
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备" namespace="addMachineAuth"></vc:i18n></span></label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addMachineAuthInfo.machineId">
-                                        <option selected disabled value="">{{vc.i18n('必填','addMachineAuth')}}，请选择设备</option>
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择设备','addMachineAuth')}}</option>
                                         <option value="6666">{{vc.i18n('最美员工','addMachineAuth')}}</option>
                                     </select>
                                 </div>
@@ -20,7 +19,7 @@
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="员工" namespace="addMachineAuth"></vc:i18n></span></label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addMachineAuthInfo.personId">
-                                        <option selected disabled value="">{{vc.i18n('必填','addMachineAuth')}}，请选择员工</option>
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择员工','addMachineAuth')}}</option>
                                         <option value="6666">{{vc.i18n('最美员工','addMachineAuth')}}</option>
                                     </select>
                                 </div>
@@ -28,23 +27,19 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="开始时间" namespace="addMachineAuth"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMachineAuthInfo.startTime" type="text" :placeholder="vc.i18n('必填，请填写开始时间','addMachineAuth')"
-                                        class="form-control">
+                                    <input v-model="addMachineAuthInfo.startTime" type="text" :placeholder="vc.i18n('必填，请填写开始时间','addMachineAuth')" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="结束时间" namespace="addMachineAuth"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMachineAuthInfo.endTime" type="text" :placeholder="vc.i18n('必填，请填写结束时间','addMachineAuth')"
-                                        class="form-control">
+                                    <input v-model="addMachineAuthInfo.endTime" type="text" :placeholder="vc.i18n('必填，请填写结束时间','addMachineAuth')" class="form-control">
                                 </div>
                             </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button"
-                                    v-on:click="saveMachineAuthInfo()"><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                    data-dismiss="modal"><span><vc:i18n name="取消" namespace="addMachineAuth"></vc:i18n></span></button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveMachineAuthInfo()"><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal"><span><vc:i18n name="取消" namespace="addMachineAuth"></vc:i18n></span></button>
                             </div>
                         </div>
                     </div>
@@ -52,4 +47,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/addMachineType/addMachineType.html b/public/components/property/addMachineType/addMachineType.html
index ea586241c..f890166e6 100644
--- a/public/components/property/addMachineType/addMachineType.html
+++ b/public/components/property/addMachineType/addMachineType.html
@@ -6,7 +6,12 @@
                 <div class="ibox-content">
                     <div>
                         <div>
-
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备类型名称" namespace="addMachineType"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <input v-model="addMachineTypeInfo.machineTypeName" type="text" :placeholder="vc.i18n('必填，请填写设备类型名称','addMachineType')" class="form-control">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备大类" namespace="addMachineType"></vc:i18n></span></label>
                                 <div class="col-sm-10">
@@ -17,12 +22,7 @@
                   </select>
                                 </div>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备类型名称" namespace="addMachineType"></vc:i18n></span></label>
-                                <div class="col-sm-10">
-                                    <input v-model="addMachineTypeInfo.machineTypeName" type="text" :placeholder="vc.i18n('必填，请填写设备类型名称','addMachineType')" class="form-control">
-                                </div>
-                            </div>
+
 
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button" v-on:click="saveMachineTypeInfo()"><i
diff --git a/public/components/property/editMachineType/editMachineType.html b/public/components/property/editMachineType/editMachineType.html
index 3b6dd17b1..0c490de1c 100644
--- a/public/components/property/editMachineType/editMachineType.html
+++ b/public/components/property/editMachineType/editMachineType.html
@@ -1,39 +1,37 @@
-<div id="editMachineTypeModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-  aria-hidden="true">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-body">
-        <h3 class="m-t-none m-b "><span><vc:i18n name="修改设备类型" namespace="editMachineType"></vc:i18n></span></h3>
-        <div class="ibox-content">
-          <div>
-            <div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备大类" namespace="editMachineType"></vc:i18n></span></label>
-                <div class="col-sm-10">
-                  <select class="custom-select" v-model="editMachineTypeInfo.machineTypeCd">
+<div id="editMachineTypeModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b "><span><vc:i18n name="修改设备类型" namespace="editMachineType"></vc:i18n></span></h3>
+                <div class="ibox-content">
+                    <div>
+                        <div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备类型名称" namespace="editMachineType"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <input v-model="editMachineTypeInfo.machineTypeName" type="text" :placeholder="vc.i18n('必填，请填写设备类型名称','editMachineType')" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备大类" namespace="editMachineType"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editMachineTypeInfo.machineTypeCd">
                     <option selected disabled value="">{{vc.i18n('必填','editMachineType')}}，请选择设备类型</option>
                     <option v-for="(item,index) in editMachineTypeInfo.machine" :key="index" :value="item.statusCd">
                       {{item.name}}</option>
                   </select>
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备类型名称" namespace="editMachineType"></vc:i18n></span></label>
-                <div class="col-sm-10">
-                  <input v-model="editMachineTypeInfo.machineTypeName" type="text" :placeholder="vc.i18n('必填，请填写设备类型名称','editMachineType')"
-                    class="form-control">
-                </div>
-              </div>
-              <div class="ibox-content">
-                <button class="btn btn-primary float-right" type="button" v-on:click="editMachineType()"><i
+                                </div>
+                            </div>
+
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="editMachineType()"><i
                     class="fa fa-check"></i>&nbsp;保存</button>
-                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                  data-dismiss="modal"><span><vc:i18n name="取消" namespace="editMachineType"></vc:i18n></span></button>
-              </div>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal"><span><vc:i18n name="取消" namespace="editMachineType"></vc:i18n></span></button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/machineManage/machineManage.html b/public/pages/property/machineManage/machineManage.html
index 2f677679b..5fa8f5df3 100755
--- a/public/pages/property/machineManage/machineManage.html
+++ b/public/pages/property/machineManage/machineManage.html
@@ -58,7 +58,7 @@
                                     <span><vc:i18n name="设备名称" namespace="machineManage"></vc:i18n></span>
                                 </th>
                                 <th class="text-center">
-                                    <span><vc:i18n name="设备类型" namespace="machineManage"></vc:i18n></span>
+                                    <span><vc:i18n name="分类名称" namespace="machineManage"></vc:i18n></span>
                                 </th>
                                 <th class="text-center">
                                     <span><vc:i18n name="设备位置" namespace="machineManage"></vc:i18n></span>
diff --git a/public/pages/property/machineTypeManage/machineTypeManage.html b/public/pages/property/machineTypeManage/machineTypeManage.html
index 642173f43..5507945e8 100644
--- a/public/pages/property/machineTypeManage/machineTypeManage.html
+++ b/public/pages/property/machineTypeManage/machineTypeManage.html
@@ -32,7 +32,7 @@
                                 <i class="fa fa-repeat"></i> <span><vc:i18n name="重置" namespace="machineTypeManage"></vc:i18n></span>
                             </button>
                         </div>
-                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -56,7 +56,7 @@
                             <tr>
                                 <th class="text-center"><span><vc:i18n name="类型编号" namespace="machineTypeManage"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="设备大类" namespace="machineTypeManage"></vc:i18n></span></th>
-                                <th class="text-center"><span><vc:i18n name="设备名称" namespace="machineTypeManage"></vc:i18n></span></th>
+                                <th class="text-center"><span><vc:i18n name="设备类型名称" namespace="machineTypeManage"></vc:i18n></span></th>
                                 <th class="text-center"><span><vc:i18n name="操作" namespace="machineTypeManage"></vc:i18n></span></th>
                             </tr>
                         </thead>
@@ -97,4 +97,4 @@
     <vc:create path="property/editMachineType"></vc:create>
     <vc:create path="property/deleteMachineType"></vc:create>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/newOaWorkflowManage/newOaWorkflowManage.html b/public/pages/property/newOaWorkflowManage/newOaWorkflowManage.html
index d2d84b2e6..1e2a4bcfa 100644
--- a/public/pages/property/newOaWorkflowManage/newOaWorkflowManage.html
+++ b/public/pages/property/newOaWorkflowManage/newOaWorkflowManage.html
@@ -1,14 +1,16 @@
 <div>
-    <div class="row white-bg padding margin-xs" style="min-height: 400px; ">
-        <div class="col-md-2 text-center margin-top" style="cursor:pointer"
-             v-for="(item,index) in newOaWorkflowManageInfo.newOaWorkflows"
-             @click="newFlow(item)">
+    <div class="row white-bg padding margin-xs" style="min-height: 400px; " v-if="newOaWorkflowManageInfo.newOaWorkflows && newOaWorkflowManageInfo.newOaWorkflows.length>0">
+        <div class="col-md-2 text-center margin-top" style="cursor:pointer" v-for="(item,index) in newOaWorkflowManageInfo.newOaWorkflows" @click="newFlow(item)">
             <div>
-                <img src="/img/flow.png" width="80px"/>
+                <img src="/img/flow.png" width="80px" />
             </div>
             <div class="margin-top">
                 <span style="color: #333333;">{{item.flowName}}</span>
             </div>
         </div>
+
     </div>
-</div>
+    <div class="row white-bg padding margin-xs" style="min-height: 400px; " v-else>
+        <span>您还没有发布流程，请先到流程实例中发布流程</span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js
index 894e33d15..9b327a2bb 100755
--- a/public/vcCore/vcFramework.js
+++ b/public/vcCore/vcFramework.js
@@ -1630,7 +1630,11 @@
                     return;
                 }
 
-                let _data = _systemInfo.data[0]
+                let _data = _systemInfo.data[0];
+
+                if (!window.lang) {
+                    return;
+                }
 
                 window.lang.systemName = _data.systemTitle;
                 window.lang.subSystemName = _data.subSystemTitle;