Explorar o código

资阳ui发布

wuyunfeng %!s(int64=2) %!d(string=hai) anos
pai
achega
4e31fb1056

+ 1 - 1
src/router/index.js

@@ -482,7 +482,7 @@ export const partRoutes = [
     children: [
       {
         path: 'index/:id?',
-        component: () => import('@/views/custom-infoboard/infoboard-designer'),
+        component: () => import('@/views/custom-infoboard/screen-designer'),//自定义看板 component: () => import('@/views/custom-infoboard/infoboard-designer'),资阳 component: () => import('@/views/custom-infoboard/infoboard-designer')
         name: 'BoardDesigner',
         meta: { title: i18n.t('tab.customBoardDesigner'), icon: 'el-icon-data-board', noCache: true }
       }

+ 1 - 1
src/views/custom-infoboard/infoboard-designer.vue

@@ -313,7 +313,7 @@
             getDefaultBoardTitle() {
                 API_BoardTitle.getDefault(this.titleId, {}).then(
                     res => {
-                        this.titleData = {...res,id:this.titleId}
+                        this.titleData = {...res,id:this.titleId,part_id:this.$store.getters.partId}
                         if (res.content_config !== null && res.content_config !== '') {
                             this.floorList = JSON.parse(res.content_config)
                         } else {

+ 10 - 10
src/views/custom-infoboard/templates/common/index.js

@@ -10,14 +10,14 @@ import row_container from './row-container'
 import column_container from './cloumn-container'
 
 export default {
-    // 1: tpl_one_cloum,
-    // 2: tpl_two_cloum,
-    // 3: tpl_three_cloum,
-    // 4:tpl_header,
-    5:tpl_beds_grid,
-    6:tpl_bed_unit,
-    9:row_container,
-    10:column_container,
-    7:text_display,
-    8:text_display2
+    1: tpl_one_cloum, //资阳ui 123 ,其他5 6 7 8 9 10
+    2: tpl_two_cloum,
+    3: tpl_three_cloum,
+    /// // 4:tpl_header,
+    // 5:tpl_beds_grid,
+    // 6:tpl_bed_unit,
+    // 9:row_container,
+    // 10:column_container,
+    // 7:text_display,
+    // 8:text_display2
 }

+ 3 - 3
src/views/hospitalFrame/frameTreeView.vue

@@ -277,14 +277,14 @@ export default {
       rules: {
         name: [
           this.MixinRequired(this.$t('frameManage.inputFrameName')),
-          { min: 2, max: 20, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
+          { min: 1, max: 20, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ],
         alias: [
-          { min: 2, max: 20, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
+          { min: 1, max: 20, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ],
         full_name: [
           this.MixinRequired(this.$t('frameManage.inputFrameFullName')),
-          { min: 2, max: 20, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
+          { min: 1, max: 20, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ]
       },
       /** 快速创建空间结构弹窗 **/