设备管理优化

src/views/module_tpm/Tag/DeviceList.vue

@@ -28,6 +28,7 @@
 <script>
   import { getAction } from '@api/manage'
   export default({
+    name: 'DeviceList',
     components: {
     },
     data () {

src/views/module_tpm/Tag/TagList.vue

@@ -113,8 +113,10 @@
       </a-table>
     </div>
 
-    <tpm-tag-modal ref="modalForm" @ok="modalFormOk"></tpm-tag-modal>
-    <TpmTagModalPL ref="modalFormPL" @ok="modalFormOk"></TpmTagModalPL>
+    <!-- <tpm-tag-modal ref="modalForm" @ok="modalFormOk"></tpm-tag-modal> -->
+    <tag-modal ref="modalForm" @ok="modalFormOk"></tag-modal>
+    <tag-modal-pl  ref="modalFormPL" @ok="modalFormOk"></tag-modal-pl>
+    <!-- <TpmTagModalPL ref="modalFormPL" @ok="modalFormOk"></TpmTagModalPL> -->
   </a-card>
 </template>
 
@@ -123,16 +125,16 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TpmTagModal from './modules/TpmTagModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import TpmTagModalPL from './modulesPL/TpmTagModalPL.vue'
+import TagModal from './modules/TagModal.vue'
+import TagModalPL from './modulesPL/TagModalPL.vue'
 
   export default {
-    name: 'TpmTagList',
+    name: 'TagList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      TpmTagModal,
-      TpmTagModalPL
+        TagModal,
+        TagModalPL
     },
     data () {
       return {

src/views/module_tpm/Tag/index.vue

@@ -1,22 +1,24 @@
 <template>
     <div class="all">
         <div class="left">
-            <tpm-device-list></tpm-device-list>
+            <!-- <tpm-device-list></tpm-device-list> -->
+            <device-list></device-list>
         </div>
         <div class="right">
-            <tpm-tag-list></tpm-tag-list>
+            <!-- <tpm-tag-list></tpm-tag-list> -->
+            <tag-list></tag-list>
         </div>
     </div>
 </template>
 
 <script>
-import TpmTagList from './TpmTagList.vue';
-import TpmDeviceList from './TpmDeviceList.vue';
+import TagList from './TagList.vue';
+import DeviceList from './DeviceList.vue';
 
     export default({
         components: {
-            TpmTagList,
-            TpmDeviceList
+            TagList,
+            DeviceList
         },
         data () {
             return {

src/views/module_tpm/Tag/modules/TagForm.vue

@@ -93,7 +93,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'TpmTagForm',
+    name: 'TagForm',
     components: {
     },
     props: {

src/views/module_tpm/Tag/modules/TagModal.Style#Drawer.vue

@@ -7,7 +7,8 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <tpm-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tpm-tag-form>
+    <!-- <tpm-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tpm-tag-form> -->
+    <tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tag-form>
     <div class="drawer-footer">
       <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
@@ -16,13 +17,13 @@
 </template>
 
 <script>
+import TagForm from './TagForm.vue'
 
-  import TpmTagForm from './TpmTagForm'
 
   export default {
-    name: 'TpmTagModal',
+    name: 'TagModal',
     components: {
-      TpmTagForm
+        TagForm
     },
     data () {
       return {

src/views/module_tpm/Tag/modules/TagModal.vue

@@ -8,17 +8,18 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <tpm-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tpm-tag-form>
+    <!-- <tpm-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tpm-tag-form> -->
+    <tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tag-form>
   </j-modal>
 </template>
 
 <script>
+import TagForm from './TagForm.vue'
 
-  import TpmTagForm from './TpmTagForm'
   export default {
-    name: 'TpmTagModal',
+    name: 'TagModal',
     components: {
-      TpmTagForm
+        TagForm
     },
     data () {
       return {

src/views/module_tpm/Tag/modulesPL/TagFormPL1.vue

@@ -92,7 +92,7 @@
 import { httpAction, getAction } from '@/api/manage'
 
 export default {
-    name: 'TpmTagFormPL1',
+    name: 'TagFormPL1',
     components: {
     },
     data () {

src/views/module_tpm/Tag/modulesPL/TagModalPL.vue

@@ -7,18 +7,19 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <TpmTagFormPL1 ref="realForm" @ok="submitCallback"></TpmTagFormPL1>
+    <!-- <TpmTagFormPL1 ref="realForm" @ok="submitCallback"></TpmTagFormPL1> -->
+    <tag-form-pl-1 ref="realForm" @ok="submitCallback"></tag-form-pl-1>
   </u-modal>
 </template>
 
 <script>
 import UModal from '../../../../components/module_ems/UModal/UModal.vue';
-  import TpmTagFormPL1 from './TpmTagFormPL1'
+import TagFormPL1 from './TagFormPL1.vue';
   export default {
-    name: 'TpmTagModalPL',
+    name: 'TagModalPL',
     components: {
-      TpmTagFormPL1,
-        UModal
+        UModal,
+        TagFormPL1
     },
     data () {
       return {