Browse Source

公共组件按需引入

ming 7 months ago
parent
commit
a60b538f0c

+ 24 - 24
src/main.js

@@ -5,43 +5,43 @@ import plugins from "./plugins"; // plugins
 import "./permission"; // permission
 
 // 引入json导出组件
-import JsonExcel from "vue-json-excel";
+// import JsonExcel from "vue-json-excel";
 
 // 引入UI组件
 import uviewPlus from "@/uni_modules/uview-plus";
-import oaCalendar from "@/components/oa-calendar/uni-calendar";
-import oaTabbar from "@/components/oa-tabbar/index";
-import oaTimeLine from "@/components/oa-timeLine/index"
-import oaTimeLineItem from "@/components/oa-timeLine-item/index"
-import oaUpload from "@/components/oa-upload/index"
+// import oaCalendar from "@/components/oa-calendar/uni-calendar";
+// import oaTabbar from "@/components/oa-tabbar/index";
+// import oaTimeLine from "@/components/oa-timeLine/index"
+// import oaTimeLineItem from "@/components/oa-timeLine-item/index"
+// import oaUpload from "@/components/oa-upload/index"
 import oaScroll from "@/components/oa-scroll/index"
-import oaTouch from "@/components/oa-touch/index"
-import oaDropdown from "@/components/oa-dropdown/index"
-import oaUpgrade from "@/components/oa-upgrade/index"
-import oaTransForm from "@/components/oa-transForm/index"
-import oaTtsAudio from "@/components/oa-ttsAudio/index"
-import oaWeather from "@/components/oa-weather/index"
+// import oaTouch from "@/components/oa-touch/index"
+// import oaDropdown from "@/components/oa-dropdown/index"
+// import oaUpgrade from "@/components/oa-upgrade/index"
+// import oaTransForm from "@/components/oa-transForm/index"
+// import oaTtsAudio from "@/components/oa-ttsAudio/index"
+// import oaWeather from "@/components/oa-weather/index"
 
 export function createApp() {
   const app = createSSRApp(App);
 
   //挂载全局组件
-  app.component('oa-calendar', oaCalendar)
-  app.component('oa-tabbar', oaTabbar)
-  app.component('oa-timeLine', oaTimeLine)
-  app.component('oa-timeLine-item', oaTimeLineItem)
-  app.component('oa-upload', oaUpload)
+  // app.component('oa-calendar', oaCalendar)
+  // app.component('oa-tabbar', oaTabbar)
+  // app.component('oa-timeLine', oaTimeLine)
+  // app.component('oa-timeLine-item', oaTimeLineItem)
+  // app.component('oa-upload', oaUpload)
   app.component('oa-scroll', oaScroll)
-  app.component('oa-touch', oaTouch)
-  app.component('oa-dropdown', oaDropdown)
-  app.component('oa-upgrade', oaUpgrade)
-  app.component('oa-transForm', oaTransForm)
-  app.component('oa-ttsAudio', oaTtsAudio)
-  app.component('oa-weather', oaWeather)
+  // app.component('oa-touch', oaTouch)
+  // app.component('oa-dropdown', oaDropdown)
+  // app.component('oa-upgrade', oaUpgrade)
+  // app.component('oa-transForm', oaTransForm)
+  // app.component('oa-ttsAudio', oaTtsAudio)
+  // app.component('oa-weather', oaWeather)
   
 
   // 挂载全局json导出
-  app.component("downloadExcel", JsonExcel);
+  // app.component("downloadExcel", JsonExcel);
   // 添加全局变量
   app.provide("$store", store);
   app.config.globalProperties.$store = store;

+ 2 - 1
src/pages/business/common/projectMange/list/index.vue

@@ -108,7 +108,7 @@
     </template>
   </oa-scroll>
 
-  <oa-tabbar :tabbarValue="2" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oa-tabbar>
+  <oaTabbar :tabbarValue="2" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oaTabbar>
 
   <u-popup :show="popup.show" mode="bottom" bgColor="#fff" :round="10" @close="popup.show = false">
     <view
@@ -213,6 +213,7 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject, watchEffec
 import { projectApi } from "@/api/business/project.js";
 import { dUserList } from "@/api/system/user.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaTabbar from "@/components/oa-tabbar/index";
 /*----------------------------------store引入-----------------------------------*/
 import { useStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 2 - 1
src/pages/business/common/projectMange/record/index.vue

@@ -89,7 +89,7 @@
     </template>
   </oa-scroll>
 
-  <oa-tabbar :tabbarValue="0" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oa-tabbar>
+  <oaTabbar :tabbarValue="0" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oaTabbar>
 
   <u-popup :show="popup.show" mode="bottom" bgColor="#fff" :round="10" @close="popup.show = false">
     <view
@@ -182,6 +182,7 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaTabbar from "@/components/oa-tabbar/index";
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 2 - 1
src/pages/business/common/projectMange/write/components/template1.vue

@@ -68,7 +68,7 @@
     <view class="content-area-item mt10 p10 bg-white">
       <view class="font14 weight mb10">图片上传</view>
       <view style="color:#f56c6c;font-size:11px;margin-bottom:10px">( 注:不可同步钉钉,最多上传5张 )</view>
-      <oa-upload :uploadCount="5" :uploadList="reportImage1" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+      <oaUpload :uploadCount="5" :uploadList="reportImage1" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oaUpload>
     </view>
     <view class="content-area-item mt10 p10 bg-white">
       <view class="font14 weight mb10">附件上传</view>
@@ -215,6 +215,7 @@ import { projectApi } from "@/api/business/project.js";
 import { dUserList } from "@/api/system/user.js";
 /*----------------------------------组件引入-----------------------------------*/
 import avatarList from "../../components/avatarList.vue";
+import oaUpload from "@/components/oa-upload/index"
 /*----------------------------------store引入-----------------------------------*/
 import { systemStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 2 - 1
src/pages/business/common/projectMange/write/index.vue

@@ -49,7 +49,7 @@
     </template>
   </oa-scroll>
 
-  <oa-tabbar :tabbarValue="1" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oa-tabbar>
+  <oaTabbar :tabbarValue="1" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oaTabbar>
 </template>
 
 <script setup>
@@ -59,6 +59,7 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaTabbar from "@/components/oa-tabbar/index";
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/

+ 3 - 2
src/pages/business/fireIot/customManage/index.vue

@@ -28,13 +28,13 @@
         <view class="search-area-buttom ml10" @click="dropdownShow = !dropdownShow">筛选</view>
       </view>
 
-      <oa-dropdown :dropdownShow="dropdownShow" :closeOnClickOverlay="true" @close="dropdownShow = false">
+      <oaDropdown :dropdownShow="dropdownShow" :closeOnClickOverlay="true" @close="dropdownShow = false">
         <template #content>
           <u-radio-group v-model="radioValue" placement="column" iconPlacement="right" @change="radioChange">
             <u-radio v-for="ra in radioList" :key="ra" :activeColor="proxy.$settingStore.themeColor.color" :label="ra.label" :name="ra.value"></u-radio>
           </u-radio-group>
         </template>
-      </oa-dropdown>
+      </oaDropdown>
 
       <view class="content-area menu-list mlr0" v-for="data in dataList" :key="data">
         <view class="list-cell" style="color: #666666; line-height: 30px">
@@ -73,6 +73,7 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 /*----------------------------------接口引入-----------------------------------*/
 import { crmCustomInfo } from "@/api/business/fireIot/customManage.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaDropdown from "@/components/oa-dropdown/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 3 - 3
src/pages/business/fireIot/deviceManage/components/deviceDetailsList.vue

@@ -29,13 +29,13 @@
           <view class="ml10" style="margin-top: auto; margin-bottom: auto; white-space: nowrap" @click="dropdownShow = !dropdownShow">筛选</view>
         </view>
 
-        <oa-dropdown :dropdownShow="dropdownShow" :closeOnClickOverlay="true" @close="dropdownShow = false">
+        <oaDropdown :dropdownShow="dropdownShow" :closeOnClickOverlay="true" @close="dropdownShow = false">
           <template #content>
             <u-radio-group v-model="radioValue" placement="column" iconPlacement="right" @change="radioChange">
               <u-radio v-for="ra in radioList" :key="ra" :activeColor="proxy.$settingStore.themeColor.color" :label="ra.label" :name="ra.value"></u-radio>
             </u-radio-group>
           </template>
-        </oa-dropdown>
+        </oaDropdown>
 
         <view class="menu-list m0">
           <view class="list-cell list-cell-arrow" v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base)">
@@ -64,7 +64,7 @@
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 import { useStores, commonStores } from "@/store/modules/index";
-
+import oaDropdown from "@/components/oa-dropdown/index"
 import { dmpDeviceInfo } from "@/api/business/fireIot/deviceManage.js";
 
 const { proxy } = getCurrentInstance();

+ 2 - 2
src/pages/business/fireIot/facilitiesGather/index.vue

@@ -58,7 +58,7 @@
                 <u-input v-model="form.contactPhone" placeholder="请输入联系电话" border="none" maxlength="11" />
               </u-form-item>
               <u-form-item label="设备图片" prop="imagesUrl" :borderBottom="true">
-                <oa-upload :uploadCount="1" :uploadImage="form.imagesUrl" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+                <oaUpload :uploadCount="1" :uploadImage="form.imagesUrl" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oaUpload>
               </u-form-item>
               <u-form-item label="备注" prop="facilityDesc" :borderBottom="true">
                 <u-textarea v-model="form.facilityDesc" placeholder="请输入" border="none" maxlength="30" style="padding: 0px"></u-textarea>
@@ -119,7 +119,7 @@
 import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstance } from "vue";
 import { useStores, commonStores } from "@/store/modules/index";
-
+import oaUpload from "@/components/oa-upload/index"
 import { typeSelect, add, uploadAvatar, treeselect } from "@/api/business/fireIot/facilitiesGather.js";
 
 const { proxy } = getCurrentInstance();

+ 2 - 1
src/pages/business/fireIot/repairReport/index.vue

@@ -40,7 +40,7 @@
                 <u--textarea v-model="form.repairContent" border="none" placeholder="请填写问题描述" maxlength="100" style="padding: 0"></u--textarea>
               </u-form-item>
               <u-form-item label="上传图片" prop="repairPicture" :borderBottom="true">
-                <oa-upload :uploadCount="1" :uploadImage="form.repairPicture" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+                <oaUpload :uploadCount="1" :uploadImage="form.repairPicture" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oaUpload>
                 <view style="color: #666666">图片支持png、jpg</view>
               </u-form-item>
             </view>
@@ -78,6 +78,7 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 /*----------------------------------接口引入-----------------------------------*/
 import { add, getAddHistoryInfo } from "@/api/business/fireIot/repairReport.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaUpload from "@/components/oa-upload/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 3 - 2
src/pages/business/mhxf/deviceManage/index.vue

@@ -24,7 +24,7 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-      <oa-touch class="deviceManage" @change="touchChange">
+      <oaTouch class="deviceManage" @change="touchChange">
         <template #content>
           <uni-swipe-action>
             <uni-swipe-action-item class="bg-white">
@@ -82,7 +82,7 @@
             </uni-swipe-action-item>
           </uni-swipe-action>
         </template>
-      </oa-touch>
+      </oaTouch>
     </template>
   </oa-scroll>
 </template>
@@ -94,6 +94,7 @@ import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentIn
 /*----------------------------------接口引入-----------------------------------*/
 import { dataRtList } from "@/api/business/mhxf/deviceManage";
 /*----------------------------------组件引入-----------------------------------*/
+import oaTouch from "@/components/oa-touch/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 3 - 2
src/pages/business/mhxf/informationSelect/index.vue

@@ -23,7 +23,7 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-      <oa-touch class="informationSelect" @change="touchChange">
+      <oaTouch class="informationSelect" @change="touchChange">
         <template #content>
           <uni-swipe-action>
             <uni-swipe-action-item>
@@ -48,7 +48,7 @@
             </uni-swipe-action-item>
           </uni-swipe-action>
         </template>
-      </oa-touch>
+      </oaTouch>
     </template>
   </oa-scroll>
 </template>
@@ -60,6 +60,7 @@ import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentIn
 /*----------------------------------接口引入-----------------------------------*/
 import { dataList } from "@/api/business/mhxf/informationSelect";
 /*----------------------------------组件引入-----------------------------------*/
+import oaTouch from "@/components/oa-touch/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 3 - 2
src/pages/business/mhxf/needMatter/index.vue

@@ -23,7 +23,7 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-      <oa-touch class="needMatter" @change="touchChange">
+      <oaTouch class="needMatter" @change="touchChange">
         <template #content>
           <u-empty v-if="classifyData.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
 
@@ -197,7 +197,7 @@
             </u-modal>
           </view>
         </template>
-      </oa-touch>
+      </oaTouch>
     </template>
   </oa-scroll>
 </template>
@@ -209,6 +209,7 @@ import { ref, toRefs, onMounted, inject, shallowRef, reactive, watchEffect, getC
 /*----------------------------------接口引入-----------------------------------*/
 import { mobileScheduleList, updateMobileReformStatus, uploadAvatar, addReformMaterial } from "@/api/business/mhxf/needMatter";
 /*----------------------------------组件引入-----------------------------------*/
+import oaTouch from "@/components/oa-touch/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 2 - 1
src/pages/business/zhaf/xunJian/error/errorDisposition.vue

@@ -16,7 +16,7 @@
             <view style="color: #666666">{{ form.eventName }}</view>
           </u-form-item>
           <u-form-item label="处置图片" :borderBottom="true">
-            <oa-upload :uploadCount="5" :uploadList="form.imageList" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+            <oaUpload :uploadCount="5" :uploadList="form.imageList" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oaUpload>
           </u-form-item>
           <u-form-item label="备注" prop="remark" :borderBottom="true">
             <u--textarea v-model="form.handleContent" placeholder="备注信息,最多可输入50个字" :count="true" border="none" maxlength="50"></u--textarea>
@@ -41,6 +41,7 @@ import { reactive, toRefs, getCurrentInstance } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { errorApi } from "@/api/business/zhaf/xunJian/index.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaUpload from "@/components/oa-upload/index"
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();

+ 2 - 1
src/pages/business/zhaf/xunJian/error/index.vue

@@ -28,7 +28,7 @@
             <u-input v-model="form.eventLevelName" placeholder="事件类型(必选)" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
           </u-form-item>
           <u-form-item label="现场图片" prop="pictureUrl" :borderBottom="true">
-            <oa-upload :uploadCount="5" :uploadList="form.imageList" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+            <oaUpload :uploadCount="5" :uploadList="form.imageList" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oaUpload>
           </u-form-item>
           <u-form-item label="备注" prop="remark" :borderBottom="true">
             <u--textarea v-model="form.remark" placeholder="备注信息,最多可输入50个字" :count="true" border="none" maxlength="50"></u--textarea>
@@ -66,6 +66,7 @@ import { ref, onMounted, inject, shallowRef, reactive, toRefs, getCurrentInstanc
 /*----------------------------------接口引入-----------------------------------*/
 import { errorApi } from "@/api/business/zhaf/xunJian/index.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaUpload from "@/components/oa-upload/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 3 - 1
src/pages/business/zhaf/xunJian/plan/components/content.vue

@@ -83,7 +83,7 @@
       <u-modal ref="uModal" :show="show" :title="title" :content="content" @confirm="confirm"></u-modal>
 
       <!-- 巡检完成提示 -->
-      <oa-ttsAudio v-if="audioUrl" :audioUrl="audioUrl" :audioBool="true"></oa-ttsAudio>
+      <oaTtsAudio v-if="audioUrl" :audioUrl="audioUrl" :audioBool="true"></oaTtsAudio>
     </template>
   </oa-scroll>
 </template>
@@ -95,6 +95,8 @@ import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject,
 /*----------------------------------接口引入-----------------------------------*/
 import { updatePlan } from "@/api/business/zhaf/xunJian/plan.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaTtsAudio from "@/components/oa-ttsAudio/index"
+
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 3 - 2
src/pages/business/zhaf/xunJian/plan/components/siteDetails.vue

@@ -30,7 +30,7 @@
         <view class="bg-white p15 mb15">
           <uni-section class="block mb10" title="上报现场" type="line"></uni-section>
 
-          <oa-upload
+          <oaUpload
             :uploadCount="5"
             :uploadList="siteList.recordPictureList"
             :uploadListSrc="'pictureUrl'"
@@ -41,7 +41,7 @@
             :uploadCloseStatus="xunJianStore.inspectionStatus == 2"
             @uploadSuccessChange="uploadSuccessChange"
             @uploadDeleteChange="uploadDeleteChange"
-          ></oa-upload>
+          ></oaUpload>
         </view>
 
         <view class="bg-white p15 mb15" style="height: 170px; max-height: 170px">
@@ -77,6 +77,7 @@ import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject,
 /*----------------------------------接口引入-----------------------------------*/
 import { recordList, recordOption, siteDetails } from "@/api/business/zhaf/xunJian/plan.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaUpload from "@/components/oa-upload/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 10 - 7
src/pages/business/zhaf/xunJian/plan/index.vue

@@ -11,7 +11,7 @@
   >
     <template #default>
       <!-- 日历组件 -->
-      <oa-calendar class="uni-calendar--hook" :selected="info.selected" :showMonth="false" @change="change" @monthSwitch="monthSwitch" :currentDate="currentDateList" />
+      <oaCalendar class="uni-calendar--hook" :selected="info.selected" :showMonth="false" @change="change" @monthSwitch="monthSwitch" :currentDate="currentDateList" />
 
       <!-- 分段器组件 -->
       <view class="app-subsection">
@@ -19,8 +19,8 @@
       </view>
 
       <!-- 内容 -->
-      <oa-timeLine v-if="activities.length > 0" :fontColor="proxy.$settingStore.themeColor.color" :sort="activitiesSort" @activitiesSortChange="activitiesSortChange">
-        <oa-timeLine-item
+      <oaTimeLine v-if="activities.length > 0" :fontColor="proxy.$settingStore.themeColor.color" :sort="activitiesSort" @activitiesSortChange="activitiesSortChange">
+        <oaTimeLineItem
           v-for="(ac, index) in activities"
           :key="index"
           :titleValue="ac.planName"
@@ -73,9 +73,9 @@
               <c-progress-circle style="margin: auto" :progress="ac.completion / 100" :color="proxy.$settingStore.themeColor.color" size="100rpx" boderWidth="100rpx"></c-progress-circle>
             </view>
           </view>
-        </oa-timeLine-item>
+        </oaTimeLineItem>
 
-        <oa-timeLine-item
+        <oaTimeLineItem
           v-for="(ac, index) in activities"
           :key="index"
           :titleValue="ac.siteName"
@@ -96,8 +96,8 @@
               </view>
             </view>
           </view>
-        </oa-timeLine-item>
-      </oa-timeLine>
+        </oaTimeLineItem>
+      </oaTimeLine>
 
       <view id="planTimeline" style="text-align: center; color: #bdbdbd; font-size: 14px" v-else> 暂无数据 </view>
 
@@ -122,6 +122,9 @@ import { recordList, recordOption, planList, patrolInspectionPlan, appPlanStatis
 /*----------------------------------组件引入-----------------------------------*/
 import drawer from "./components/drawer.vue"; // 引入组件
 import oaMovable from "@/components/oa-movable/index.vue"; // 引入组件
+import uviewPlus from "@/uni_modules/uview-plus";
+import oaTimeLine from "@/components/oa-timeLine/index"
+import oaTimeLineItem from "@/components/oa-timeLine-item/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 2 - 1
src/pages/common/invoicing/index.vue

@@ -101,7 +101,7 @@
                   <u-input v-model="form.sendAddress" placeholder="请填写邮寄地址" border="none" />
                 </u-form-item>
                 <u-form-item label="付款回执" prop="paymentReceipt" :borderBottom="true">
-                  <oa-upload :uploadCount="1" :uploadImage="form.paymentReceipt" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+                  <oaUpload :uploadCount="1" :uploadImage="form.paymentReceipt" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oaUpload>
                   <view style="color: #666666">图片支持png、jpg</view>
 
                   <!-- <view>
@@ -182,6 +182,7 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 /*----------------------------------接口引入-----------------------------------*/
 import { crmInvoiceInfo, page } from "@/api/common/invoicing.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaUpload from "@/components/oa-upload/index"
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/

+ 2 - 1
src/pages/index.vue

@@ -49,7 +49,7 @@
 
         <!-- 天气 -->
         <!-- #ifdef APP-PLUS || H5 -->
-        <oa-weather ref="oaWeatherRef"></oa-weather>
+        <oaWeather ref="oaWeatherRef"></oaWeather>
         <!-- #endif -->
 
         <!-- 最近使用宫格 -->
@@ -87,6 +87,7 @@ import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRef
 /*----------------------------------接口引入-----------------------------------*/
 import { scan_push, getHomePageData, getFunctionalModuleStatistics, getAppRouters, qrCodeSend, getMobileBanner } from "@/api/index";
 /*----------------------------------组件引入-----------------------------------*/
+import oaWeather from "@/components/oa-weather/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 2 - 1
src/pages/info.vue

@@ -55,7 +55,7 @@
     </template>
   </oa-scroll>
 
-  <oa-tabbar :tabbarValue="1" :tabbarList="proxy.$constData.homeTabbar"></oa-tabbar>
+  <oaTabbar :tabbarValue="1" :tabbarList="proxy.$constData.homeTabbar"></oaTabbar>
 </template>
 
 <script setup>
@@ -65,6 +65,7 @@ import { reactive, getCurrentInstance, toRefs } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { getMceReceiveStatic, updateMceReceiveStatus } from "@/api/mine/info.js";
 /*----------------------------------组件引入-----------------------------------*/
+import oaTabbar from "@/components/oa-tabbar/index";
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
 import { storageSystem } from "@/utils/storage";

+ 7 - 4
src/pages/mine.vue

@@ -31,7 +31,7 @@
         <view class="vip-card-box"> </view>
       </view>
 
-      <oa-transForm>
+      <oaTransForm>
         <template #content>
           <view class="menu-list">
             <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleToEditInfo()">
@@ -147,7 +147,7 @@
             </view>
           </view> -->
         </template>
-      </oa-transForm>
+      </oaTransForm>
     </template>
   </oa-scroll>
 
@@ -171,9 +171,9 @@
     </view>
   </view>
 
-  <oa-upgrade ref="oaUpgradeRef" :themesColor="proxy.$settingStore.themeColor.color" />
+  <oaUpgrade ref="oaUpgradeRef" :themesColor="proxy.$settingStore.themeColor.color" />
 
-  <oa-tabbar :tabbarValue="2" :tabbarList="proxy.$constData.homeTabbar"></oa-tabbar>
+  <oaTabbar :tabbarValue="2" :tabbarList="proxy.$constData.homeTabbar"></oaTabbar>
 </template>
 
 <script setup>
@@ -182,6 +182,9 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, on
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 /*----------------------------------组件引入-----------------------------------*/
+import oaTransForm from "@/components/oa-transForm/index"
+import oaUpgrade from "@/components/oa-upgrade/index"
+import oaTabbar from "@/components/oa-tabbar/index";
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/