Merge branch 'dev' into vite

# Conflicts:
#	examples/main.js
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/List.vue
#	packages/bigscreen/designer/components/SourceData.vue
#	packages/bigscreen/designer/components/form/DataConfig.vue
#	packages/bigscreen/designer/config.js
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	packages/conv/creditScore/scoreManage/scoreChange.vue
#	packages/index.js
#	project/dv/apps/AppGridDV.vue
#	project/dvui/components/AiMonitor/dhVideo.vue
#	project/dvui/components/AiSwiper.vue
#	project/dvui/layout/AiDvBackground.vue
#	project/dvui/layout/AiDvSummary/AiDvSummary.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
#	project/dvui/package.json
#	public/index.html
#	vue.config.js

project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue

@@ -69,24 +69,7 @@
             <span class="form_value">{{ dialogInfo.changeIntegral >= 0 ? '增加' : '减少' }}<span
                 style="color:#2266FF">{{ Math.abs(dialogInfo.changeIntegral) }}</span>分</span>
           </div>
-          <!-- <div>
-            <span class="form_label">途径：</span>
-          <span class="form_value">{{dict.getLabel("integralDetailBizType", dialogInfo.bizType)}}</span>
-          </div> -->
         </div>
-        <!-- <div class="form_info">
-          <span class="form_label">{{dialogInfo.bizType == 1 ? '申诉' : '申报'}}说明：</span>
-          <span
-            class="form_value"
-          >{{dialogInfo.description}}</span>
-        </div>
-        <div class="form_info">
-          <span class="form_label">照片：</span>
-          <span class="form_value" v-if="dialogInfo.fileList && dialogInfo.fileList.length">
-            <ai-uploader  :disabled="true" :instance="instance" v-model="dialogInfo.fileList" :limit="9" ></ai-uploader>
-          </span>
-          <span class="form_value" v-else>-</span>
-        </div> -->
       </div>
       <div class="dialog-footer" slot="footer">
         <el-button @click="dialog.visible=false" size="medium">关闭</el-button>
@@ -160,7 +143,6 @@ export default {
         "integralDoType",
         "integralDeclareDoType",
         "integralDetailType",
-        "integralDetailBizType",
     ).then(() => {
       this.getList();
     });

project/xiushan/apps/creditScore/scorePersonal/detail.vue

@@ -11,7 +11,7 @@
         </div>
         <div class="detail-info__item">
           <h2>获取积分</h2>
-          <span style="color: #2266FF;">{{ info.personalIntegral || 0 }}</span>
+          <span style="color: #2266FF;">{{ (info.personalIntegral + info.personalUsedIntegral) || 0 }}</span>
         </div>
         <div class="detail-info__item">
           <h2>已用积分</h2>
@@ -32,7 +32,6 @@
                     :total="page.total"
                     :current.sync="page.current"
                     :size.sync="page.size"
-                    :isShowPagination="false"
                     tableSize="small"
                     :border="true"
                     :dict="dict"

project/xiushan/apps/creditScore/scorePersonal/spList.vue

@@ -87,9 +87,10 @@ export default {
           label: '用户账号',
         },
         {
-          prop: 'personalIntegral',
+          // prop: 'personalIntegral',
           align: 'center',
           label: '获取积分',
+          render: (h, {row}) => h('span',null, row.personalIntegral + row.personalUsedIntegral)
         },
         {
           prop: 'personalUsedIntegral',
@@ -97,9 +98,10 @@ export default {
           label: '已用积分',
         },
         {
+          prop: 'personalIntegral',
           align: 'center',
           label: '剩余积分',
-          render: (h, {row}) => h('span', null, row.personalIntegral - row.personalUsedIntegral)
+          // render: (h, {row}) => h('span', null, row.personalIntegral - row.personalUsedIntegral)
         }
       ]
     },