npm - vue2-client - Versions diffs - 1.8.320 → 1.8.321 - Mend

vue2-client 1.8.320 → 1.8.321

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json +1 -1
package/src/base-client/components/common/XSimpleDescriptions/XSimpleDescriptions.vue +17 -1
package/src/pages/Example/index.vue +18 -127
package/vue.config.js +6 -0

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.320",
+  "version": "1.8.321",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XSimpleDescriptions/XSimpleDescriptions.vue CHANGED Viewed

@@ -23,6 +23,8 @@
 <script>
+import { getConfigByName } from '@/services/api/common'
 export default {
   name: 'XSimpleDescriptions',
   props: {
@@ -35,6 +37,16 @@ export default {
     dataContent: {
       type: Object,
       default: undefined
+    },
+    // 配置名
+    dataConfigName: {
+      type: String,
+      default: undefined
+    },
+    // 服务名
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
     }
   },
   data () {
@@ -42,13 +54,17 @@ export default {
       // 配置
       config: [],
       // 数据
-      data: {}
+      data: {},
     }
   },
   mounted () {
     // 初始化配置
     if (this.dataConfig) {
       this.config = this.dataConfig
+    } else if (this.dataConfigName) {
+      getConfigByName(this.dataConfigName, this.serviceName, (res) => {
+        this.config = res.config
+      }, true)
     } else {
       this.config = [
         {

package/src/pages/Example/index.vue CHANGED Viewed

@@ -2,7 +2,10 @@
   <a-card id="test">
     <!--    <XFormTable query-params-name="planMangeV4TestCRUD" service-name="af-safecheck" style="margin-bottom: 5%"/>-->
     <!--  修改 import 路径展示不同的组件 Demo  -->
-    <Demo />
+    <Demo1
+      :data-content="dataContent"
+      data-config-name="planManagementSimpleDescConfig"
+      service-name="af-safecheck"/>
   </a-card>
 </template>
@@ -10,7 +13,7 @@
 import XReport from '@vue2-client/base-client/components/common/XReport'
 // import Demo from '@vue2-client/base-client/components/common/XFormGroup/demo.vue'
 // import Demo from '@vue2-client/base-client/components/common/XDescriptions/demo.vue'
-import Demo from '@vue2-client/base-client/components/common/AddressSearchCombobox/demo.vue'
+// import Demo from '@vue2-client/base-client/components/common/AddressSearchCombobox/demo.vue'
 // import Demo from '@vue2-client/base-client/components/common/XFormTable/demo.vue'
 // import Demo from '@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'
 import Demo1 from '@vue2-client/base-client/components/common/XSimpleDescriptions/XSimpleDescriptions.vue'
@@ -19,7 +22,6 @@ import XFormTable from '@vue2-client/base-client/components/common/XFormTable'
 export default {
   name: 'Example',
   components: {
-    Demo,
     Demo1,
     XReport,
     XFormTable
@@ -28,130 +30,6 @@ export default {
   },
   data () {
     return {
-      testData: [
-        {
-            userType: '民用',
-            planType: '安检册计划',
-            belongTo: '安检员0222',
-            planTotal: '322户',
-            doneNum: '3321312户',
-            ratio: 5
-        },
-        {
-          userType: '民用',
-          planType: '安检册计划',
-          belongTo: '安检员0222',
-          planTotal: '322户',
-          doneNum: '3321312户',
-          ratio: 15
-        },
-        {
-          userType: '非民用',
-          planType: '安检册计划',
-          belongTo: '安检员01、安检员02',
-          planTotal: '1户',
-          doneNum: '4223户',
-          ratio: 25
-        },
-        {
-          userType: '民用',
-          planType: '安检册计划',
-          belongTo: '安检员01、安检员02',
-          planTotal: '11户',
-          doneNum: '42户',
-          ratio: 35
-        },
-        {
-          userType: '民用',
-          planType: '安检册计划',
-          belongTo: '安检员01、安检员02',
-          planTotal: '11户',
-          doneNum: '42户',
-          ratio: 45
-        },
-        {
-          userType: '民用',
-          planType: '安检册计划',
-          belongTo: '安检员01、安检员02',
-          planTotal: '11户',
-          doneNum: '42户',
-          ratio: 55
-        },
-        {
-          userType: '民用',
-          planType: '安检册计划',
-          belongTo: '安检员1111、安检员222',
-          planTotal: '22222户',
-          doneNum: '12312户',
-          ratio: 65
-        },
-        {
-          userType: '民用',
-          planType: '安检册计划',
-          belongTo: '安检员1111、安检员222',
-          planTotal: '22222户',
-          doneNum: '12312户',
-          ratio: 75
-        },
-        {
-          userType: '民用',
-          planType: '安检册计划',
-          belongTo: '安检员1111、安检员222',
-          planTotal: '22222户',
-          doneNum: '12312户',
-          ratio: 85
-        },
-        {
-          userType: '民用',
-          planType: '安检册计划',
-          belongTo: '安检员1111、安检员222',
-          planTotal: '22222户',
-          doneNum: '12312户',
-          ratio: 95
-        },
-      ],
-      dataCardConfig: {
-        title: '安检计划名称：测试01',
-        content: [
-          {
-            label: '用户类型',
-            key: 'userType'
-          },
-          {
-            label: '计划类型',
-            key: 'planType'
-          },
-          {
-            label: '所属人员',
-            key: 'belongTo'
-          },
-          {
-            label: '计划总数',
-            key: 'planTotal'
-          },
-          {
-            label: '已检',
-            key: 'doneNum'
-          },
-          {
-            label: '安检率',
-            key: 'ratio',
-            type: 'progress'
-          }
-        ],
-        footer: [
-          {
-            icon: 'edit',
-            label: '计划修改',
-            emit: 'planEdit'
-          },
-          {
-            icon: 'user',
-            label: '册内用户',
-            emit: 'user'
-          }
-        ]
-      },
       descConfig: [
         {
           label: '计划用户总数',
@@ -181,6 +59,19 @@ export default {
         doneNum: 800,
         todoNum: 200,
         ratio: 80
+      },
+      dataContent: {
+        c_id: '1240d022903c46c8a510b1f9e61f1ca2',
+        c_usertype: '民用',
+        c_plantype: '预约计划',
+        c_checker: 'wd7',
+        c_total: 2,
+        c_done: 1,
+        c_ratio: 50,
+        c_planname: '状态测试',
+        c_month: 8,
+        todoNum: 1,
+        totalResidentArea: 1
       }
     }
   },

package/vue.config.js CHANGED Viewed

@@ -62,6 +62,12 @@ module.exports = {
         target: revenue,
         changeOrigin: true
       },
+      '/devApi': {
+        // v3用
+        // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
+        target: revenue,
+        changeOrigin: true
+      },
       '/resource': {
         // pathRewrite: { '^/resource': '/' },
         target: testUpload,