ming 7 months ago
parent
commit
808a45a419

+ 1 - 1
src/pages/business/fireIot/customManage/index.vue

@@ -73,7 +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"
+import oaDropdown from "../oa-dropdown/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

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

@@ -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 oaDropdown from "../../oa-dropdown/index"
 import { dmpDeviceInfo } from "@/api/business/fireIot/deviceManage.js";
 
 const { proxy } = getCurrentInstance();

+ 0 - 0
src/components/oa-dropdown/index.vue → src/pages/business/fireIot/oa-dropdown/index.vue


+ 1 - 1
src/pages/business/mhxf/deviceManage/index.vue

@@ -94,7 +94,7 @@ import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentIn
 /*----------------------------------接口引入-----------------------------------*/
 import { dataRtList } from "@/api/business/mhxf/deviceManage";
 /*----------------------------------组件引入-----------------------------------*/
-import oaTouch from "@/components/oa-touch/index"
+import oaTouch from "../oa-touch/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 1 - 1
src/pages/business/mhxf/informationSelect/index.vue

@@ -60,7 +60,7 @@ import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentIn
 /*----------------------------------接口引入-----------------------------------*/
 import { dataList } from "@/api/business/mhxf/informationSelect";
 /*----------------------------------组件引入-----------------------------------*/
-import oaTouch from "@/components/oa-touch/index"
+import oaTouch from "../oa-touch/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 1 - 1
src/pages/business/mhxf/needMatter/index.vue

@@ -209,7 +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"
+import oaTouch from "../oa-touch/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

+ 0 - 0
src/components/oa-touch/index.vue → src/pages/business/mhxf/oa-touch/index.vue


+ 0 - 0
src/components/oa-movable/index.vue → src/pages/business/zhaf/oa-movable/index.vue


+ 115 - 0
src/pages/business/zhaf/oa-timeLine-item/index.vue

@@ -0,0 +1,115 @@
+<template>
+  <view class="oa-timeLine-item">
+    <view class="oa-timeLine-item-header">
+      <view class="oa-timeLine-item-header-icon">
+        <u-icon name="info-circle-fill" :color="iconColor" size="18"></u-icon>
+      </view>
+      <view class="oa-timeLine-item-header-cont">
+        <view class="title">
+          {{ titleValue }}
+        </view>
+        <!-- <view style="margin: auto"> </view> -->
+        <view class="time">
+          {{ timeValue }}
+        </view>
+      </view>
+    </view>
+
+    <view class="oa-timeLine-item-content">
+      <view class="oa-timeLine-item-content-icon">
+        <view class="icon"></view>
+      </view>
+      <view class="oa-timeLine-item-content-cont">
+        <slot class="content"></slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { toRefs } from "vue";
+
+const props = defineProps({
+  titleValue: {
+    type: String,
+    default: "",
+  },
+  timeValue: {
+    type: String,
+    default: "",
+  },
+  iconColor: {
+    type: String,
+    default: "#149eff",
+  },
+});
+
+const { titleValue, timeValue, iconColor } = toRefs(props);
+</script>
+
+<style lang="scss" scoped>
+.oa-timeLine-item {
+  .oa-timeLine-item-header {
+    display: flex;
+    height: 25px;
+    line-height: 25px;
+
+    .oa-timeLine-item-header-icon {
+      margin: auto 0;
+    }
+
+    .oa-timeLine-item-header-cont {
+      display: flex;
+      width: calc(100% - 18px - 15px);
+      margin-left: 15px;
+
+      .title {
+        font-size: 15px;
+        color: #000000;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; // 默认不换行;
+      }
+
+      .time {
+        font-size: 14px;
+        color: #b5b5b5;
+        margin-left: auto;
+      }
+    }
+  }
+
+  .oa-timeLine-item-content {
+    display: flex;
+
+    .oa-timeLine-item-content-icon {
+      width: 18px;
+      display: flex;
+
+      .icon {
+        width: 2px;
+        background-color: #e4e7ed;
+        margin: -5px auto;
+      }
+    }
+
+    .oa-timeLine-item-content-cont {
+      width: 100%;
+      margin: 15px 0px 15px 15px;
+      padding: 15px;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+}
+
+// .oa-timeLine-item:last-child {
+//   .oa-timeLine-item-content {
+//     .oa-timeLine-item-content-icon {
+//       .icon {
+//         margin-bottom: 15px;
+//       }
+//     }
+//   }
+// }
+</style>

+ 62 - 0
src/pages/business/zhaf/oa-timeLine/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <view class="oa-timeLine">
+    <view class="oa-timeLine-btn" :style="{ color: fontColor }">
+      <span @click="activitiesSortClick()">排序</span>
+    </view>
+    <slot></slot>
+  </view>
+</template>
+
+<script setup>
+import { ref, toRefs } from "vue";
+
+const emit = defineEmits(["activitiesSortChange"]);
+
+const props = defineProps({
+  sort: {
+    type: String,
+    default: "DESC",
+  },
+  fontColor: {
+    type: String,
+    default: "#149eff",
+  },
+});
+
+const { sort, fontColor } = toRefs(props);
+
+const _sort = ref(sort.value);
+
+function activitiesSortClick() {
+  if (_sort.value == "ASC") {
+    _sort.value = "DESC";
+  } else {
+    _sort.value = "ASC";
+  }
+
+  emit("activitiesSortChange", _sort.value);
+}
+</script>
+
+<style lang="scss" scoped>
+.oa-timeLine {
+  padding: 0px 15px;
+  padding-bottom: 15px;
+
+  .u-steps-item__wrapper {
+    background-color: #f1f1f1;
+  }
+
+  .oa-timeLine-btn {
+    margin: 0px -3.5px;
+    font-size: 13px;
+  }
+}
+
+.oa-timeLine-data {
+  padding: 0px 15px;
+  text-align: center;
+  color: #bdbdbd;
+  font-size: 14px;
+}
+</style>

+ 0 - 0
src/components/oa-ttsAudio/index.vue → src/pages/business/zhaf/oa-ttsAudio/index.vue


+ 0 - 0
src/components/oa-ttsAudio/ttsAudio.js → src/pages/business/zhaf/oa-ttsAudio/ttsAudio.js


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

@@ -84,7 +84,7 @@ import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject,
 /*----------------------------------接口引入-----------------------------------*/
 import { addSite } from "@/api/business/zhaf/xunJian/collect.js";
 /*----------------------------------组件引入-----------------------------------*/
-import oaMovable from "@/components/oa-movable/index.vue"; // 引入组件
+import oaMovable from "../../oa-movable/index.vue"; // 引入组件
 /*----------------------------------store引入-----------------------------------*/
 import { xunJianStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

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

@@ -95,7 +95,7 @@ import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject,
 /*----------------------------------接口引入-----------------------------------*/
 import { updatePlan } from "@/api/business/zhaf/xunJian/plan.js";
 /*----------------------------------组件引入-----------------------------------*/
-import oaTtsAudio from "@/components/oa-ttsAudio/index"
+import oaTtsAudio from "../../../oa-ttsAudio/index"
 
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";

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

@@ -78,7 +78,7 @@ import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject,
 /*----------------------------------接口引入-----------------------------------*/
 import { recordList, recordOption, siteDetails, planSonSiteDetails } from "@/api/business/zhaf/xunJian/plan.js";
 /*----------------------------------组件引入-----------------------------------*/
-import oaMovable from "@/components/oa-movable/index.vue"; // 引入组件
+import oaMovable from "../../../oa-movable/index.vue"; // 引入组件
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/

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

@@ -121,9 +121,9 @@ import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject,
 import { recordList, recordOption, planList, patrolInspectionPlan, appPlanStatistics } from "@/api/business/zhaf/xunJian/plan.js";
 /*----------------------------------组件引入-----------------------------------*/
 import drawer from "./components/drawer.vue"; // 引入组件
-import oaMovable from "@/components/oa-movable/index.vue"; // 引入组件
-import oaTimeLine from "@/components/oa-timeLine/index"
-import oaTimeLineItem from "@/components/oa-timeLine-item/index"
+import oaMovable from "../../oa-movable/index.vue"; // 引入组件
+import oaTimeLine from "../../oa-timeLine/index"
+import oaTimeLineItem from "../../oa-timeLine-item/index"
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/