sr 4 years ago
parent
commit
62d539086e

+ 3 - 3
ruoyi-ui/src/components/ItemComponent/index.vue

@@ -188,7 +188,7 @@ export default {
       // const item = this.items;
       item.props = Object.assign(
         {},
-        // dataProp[item.type].props,
+        dataProp[item.type].props,
         this.items.props
       );
       item.event = Object.assign({}, this.items.event);
@@ -215,7 +215,7 @@ export default {
       }else{
          this.$emit("inputChange", this._items.value, this._items);
       }
-
+     
       // this.$emit("inputChange", this._items.value, this._items);
     },
     // Switch
@@ -630,7 +630,7 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
+<style lang="less" scoped>
 .ItemComponentRoot {
   width: 100%;
   height: 100%;

+ 8 - 8
ruoyi-ui/src/components/ParameterConfiguration/index.vue

@@ -417,9 +417,9 @@
         getTabList({
           DESCRIPTION: value
         }).then(res => {
-          if (res.data.code === 0) {
-            this.row = res.data.data.row.concat([])
-            this.formLists[1].item.props.AutoData = res.data.data.row.reduce((arr, item) => {
+          if (res.code === 0) {
+            this.row = res.data.row.concat([])
+            this.formLists[1].item.props.AutoData = res.data.row.reduce((arr, item) => {
               arr.push({
                 value: item.NAME.val,
                 id: item.ID.val,
@@ -436,9 +436,9 @@
           pageSize: instance.pageSize,
           page: currentPage ? currentPage : 1
         }).then(res => {
-          if (res.data.code === 0) {
-            this.row = res.data.data.row.concat([])
-            res.data.data.tabth.forEach(item => {
+          if (res.code === 0) {
+            this.row = res.data.row.concat([])
+            res.data.tabth.forEach(item => {
               if (item.colname === 'DESCRIPTION') {
                 item.isak = true
               }
@@ -448,8 +448,8 @@
             //   item.ID.val = item.NAME.val
             //   return item
             // })
-            this.formLists[1].item.props.data = res.data.data;
-            this.formLists[1].item.props.totalRowCount = res.data.data.totalRowCount;
+            this.formLists[1].item.props.data = res.data;
+            this.formLists[1].item.props.totalRowCount = res.data.totalRowCount;
           }
 
         })

+ 2 - 2
ruoyi-ui/src/main.js

@@ -37,7 +37,7 @@ import 'burgeon-ui/dist/styles/bjIconfonts/iconfont.css';
 import BigPicture from "@/components/BigPicture";
 Vue.component('BigPicture', BigPicture)
 import BurgeonUi from 'burgeon-ui';
-Vue.use(BurgeonUi);
+
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
@@ -85,7 +85,7 @@ Vue.use(permission)
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size
 })
-
+Vue.use(BurgeonUi);
 Vue.config.productionTip = false
 
 new Vue({