af-mobile-client-vue3 1.3.22 → 1.3.23

package/src/views/component/XCellListView/index.vue

@@ -1,30 +1,147 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
-import { defineEmits, ref } from 'vue'
+import { defineOptions, onActivated, onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
-const emit = defineEmits(['addressSelected'])
+defineOptions({ name: 'XCellListView' })
+const configName = ref('ApplyMobileProcessCRUD')
+const serviceName = ref('af-apply')
 const router = useRouter()
-const configName = ref('ApplyContractPhoneCRUD')
-const xCellListRefPatrolPlan = ref()
-// 详情
-function toDetail(row) {
-  emit('addressSelected', {
-    f_address: row.tua_f_address,
-    f_address_id: row.tua_id,
-  })
+// 删除功能
+function phone(result) {
+  // todo 调用真机进行通话
 }
+// 跳转流程处理
+function action(row) {
+  router.push({ name: 'XFormGroupView', query: { workflowId: row.ab_f_workflow_id, stepId: row.ws_f_step_id } })
+}
+// 工作日志
+function worklog(row) {
+  router.push({ name: 'worklog', query: { workflowid: row.ab_f_workflow_id, defname: row.ws_f_name } })
+}
+onMounted(() => {
+  console.log('初始化页面===')
+})
+onActivated(() => {
+  // 每次回到页面都会触发
+  console.log('activated: 每次回到页面都会触发')
+})
 </script>
 
 <template>
   <XCellList
-    ref="xCellListRefPatrolPlan"
-    service-name="af-apply"
     :config-name="configName"
-    :hide-all-actions="true"
-    @to-detail="toDetail"
+    :service-name="serviceName"
+    @phone="phone"
+    @action="action"
+    @worklog="worklog"
   />
 </template>
 
 <style scoped lang="less">
+.cell-search-after {
+  padding: 0 12px 12px 12px;
+  background-color: #fff;
+  .van-row:first-child {
+    align-items: center;
+    margin-bottom: 8px;
+    padding: 0 2px;
+    h4 {
+      font-size: 1.08rem;
+      font-weight: 600;
+      margin: 0;
+      color: #222;
+      letter-spacing: 1px;
+    }
+    .stat-date-range {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      font-size: 0.92rem;
+      color: #b0b3b8;
+      font-weight: 400;
+      span {
+        margin-left: 4px;
+        font-size: 0.92rem;
+        color: #b0b3b8;
+      }
+      .van-icon {
+        font-size: 1rem;
+        color: #b0b3b8;
+        margin-right: 2px;
+      }
+    }
+  }
+  .van-row:nth-child(2) {
+    margin-top: 8px;
+    // 统计卡片间距由gutter控制
+    .van-col {
+      // 让卡片宽度自适应
+      .stat-card {
+        width: 100%;
+      }
+    }
+  }
+  .stat-card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-radius: 12px;
+    padding: 6px 0 4px 0; // 压缩高度
+    min-height: 44px; // 压缩高度
+    position: relative;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
+    background: #f7f8fa;
+    .stat-num {
+      font-size: 1.08rem; // 缩小字体
+      font-weight: 600;
+      margin-bottom: 2px;
+    }
+    .stat-label {
+      font-size: 0.82rem; // 缩小字体
+      margin-bottom: 2px;
+    }
+    .stat-icon {
+      position: absolute;
+      top: 6px;
+      right: 8px;
+      font-size: 1rem;
+      opacity: 0.4;
+    }
+  }
+  .stat-total {
+    background: #f0f5ff;
+    color: #2f54eb;
+    .stat-num,
+    .stat-label {
+      color: #2f54eb;
+    }
+    .stat-icon {
+      color: #2f54eb;
+    }
+  }
+  .stat-done {
+    background: #e6fffb;
+    color: #13c2c2;
+    .stat-num,
+    .stat-label {
+      color: #13c2c2;
+    }
+    .stat-icon {
+      color: #13c2c2;
+    }
+  }
+  .stat-processing {
+    background: #f9f0ff;
+    color: #b37feb;
+    .stat-num,
+    .stat-label {
+      color: #b37feb;
+    }
+    .stat-icon {
+      color: #b37feb;
+    }
+  }
+}
 </style>

package/src/views/component/XFormGroupView/index.vue

@@ -16,22 +16,20 @@ const serviceName = ref('af-apply')
 // const configName = ref('lngChargeAuditMobileFormGroup')
 // const serviceName = ref('af-gaslink')
 
-const formData = ref({})
+const formData = ref({ t_userinfo: { f_user_name: 111 } })
 const formGroup = ref(null)
 const route = useRoute()
 const isInit = ref(false)
-
-const formShow = {
-  showt_userinfo: true,
-  showdevices: true
-}
-
 function submit(_result) {
-  showDialog({ message: '提交成功' }).then(() => {
-    history.back()
-  })
+  showDialog({ message: '提交成功' })
+  history.back()
+}
+const myXForm = ref([])
+function setRef(value: any) {
+  console.log('myXForm', myXForm)
+  formGroup.value.setRef(myXForm.value)
+  console.log(formGroup)
 }
-
 // 表单组——数据
 // function initComponents () {
 //   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
@@ -61,22 +59,30 @@ function submit(_result) {
 // onBeforeMount(() => {
 //   initComponents()
 // })
+function a() {
+  formData.value.t_userinfo.f_user_name = '453333333'
+}
 </script>
 
 <template>
   <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
+      <button @click="a">
+        修改
+      </button>
       <!--      v-if="isInit" -->
       <XFormGroup
         ref="formGroup"
         :config-name="configName"
         :service-name="serviceName"
         :group-form-data="formData"
-        :form-show="formShow"
         mode="新增"
-        :is-scrollspy="true"
         @submit="submit"
-      />
+      >
+        <!--        <template #device="{ setRef, removeRef, item, formData }">
+          <XFormView :setRef="setRef" :formGroupName="'myXForm'"/>
+        </template> -->
+      </XFormGroup>
     </template>
   </NormalDataLayout>
 </template>

package/src/views/component/XFormView/index.vue

@@ -7,19 +7,8 @@ const configName = ref('AddConstructionForm')
 const serviceName = ref('af-linepatrol')
 
 const formGroupAddConstruction = ref(null)
-function emitFunc(func, data) {
-  if (func === 'selectAddress') {
-    const add = 'ccss'
-    // 设置单个字段
-    formGroupAddConstruction.value?.setForm({ address: '你的字符串' })
-  }
-}
-function submit(data) {
-  console.log('>>>> data: ', JSON.stringify(data))
-}
 </script>
 
-<!-- workflowId -->
 <template>
   <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
@@ -28,10 +17,6 @@ function submit(data) {
         mode="新增"
         :config-name="configName"
         :service-name="serviceName"
-        :param-logic-name-param="{ aa: 123 }"
-        :form-data="{ f_project_name: 333 }"
-        @x-form-item-emit-func="emitFunc"
-        @on-submit="submit"
       />
     </template>
   </NormalDataLayout>

package/src/views/component/XOlMapView/XLocationPicker/index.vue

@@ -1,118 +1,118 @@
-<script setup lang="ts">
-import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
-import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { showNotify } from 'vant'
-import { ref } from 'vue'
-
-const selectedLocation = ref<LocationResult>()
-
-// 处理位置选择
-function handleLocationConfirm(location: LocationResult) {
-  // console.log('选择的位置:', location)
-  // selectedLocation.value = location
-  showNotify({ type: 'success', message: '位置已选择' })
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
-    <template #layout_content>
-      <div class="location-picker-demo">
-        <!-- 页面标题 -->
-        <div class="page-header">
-          <div class="title">
-            位置选择
-          </div>
-        </div>
-
-        <!-- 选择结果展示 -->
-        <div v-if="selectedLocation" class="location-result">
-          <div class="label">
-            已选位置:
-          </div>
-          <div class="value">
-            {{ selectedLocation.address }}
-          </div>
-          <div class="coordinates">
-            经度: {{ selectedLocation.longitude.toFixed(6) }},
-            纬度: {{ selectedLocation.latitude.toFixed(6) }}
-          </div>
-        </div>
-
-        <!-- 地图组件 -->
-        <div class="map-container">
-          <LocationPicker
-            v-model="selectedLocation"
-            :default-center="[108.948024, 34.263161]"
-            :default-zoom="12"
-            @confirm="handleLocationConfirm"
-          />
-        </div>
-      </div>
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-.location-picker-demo {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  background-color: #f7f8fa;
-}
-
-.page-header {
-  height: 44px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: white;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-  position: relative;
-  z-index: 1;
-
-  .title {
-    font-size: 16px;
-    color: #333;
-    font-weight: 500;
-  }
-}
-
-.location-result {
-  background: white;
-  padding: 12px 16px;
-  margin: 10px;
-  border-radius: 8px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-
-  .label {
-    font-size: 14px;
-    color: #666;
-    margin-bottom: 4px;
-  }
-
-  .value {
-    font-size: 16px;
-    color: #333;
-    margin-bottom: 8px;
-    word-break: break-all;
-  }
-
-  .coordinates {
-    font-size: 12px;
-    color: #999;
-  }
-}
-
-.map-container {
-  flex: 1;
-  position: relative;
-  margin: 0 10px 10px 10px;
-  border-radius: 8px;
-  overflow: hidden;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-</style>
+<script setup lang="ts">
+import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
+import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showNotify } from 'vant'
+import { ref } from 'vue'
+
+const selectedLocation = ref<LocationResult>()
+
+// 处理位置选择
+function handleLocationConfirm(location: LocationResult) {
+  // console.log('选择的位置:', location)
+  // selectedLocation.value = location
+  showNotify({ type: 'success', message: '位置已选择' })
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
+    <template #layout_content>
+      <div class="location-picker-demo">
+        <!-- 页面标题 -->
+        <div class="page-header">
+          <div class="title">
+            位置选择
+          </div>
+        </div>
+
+        <!-- 选择结果展示 -->
+        <div v-if="selectedLocation" class="location-result">
+          <div class="label">
+            已选位置:
+          </div>
+          <div class="value">
+            {{ selectedLocation.address }}
+          </div>
+          <div class="coordinates">
+            经度: {{ selectedLocation.longitude.toFixed(6) }},
+            纬度: {{ selectedLocation.latitude.toFixed(6) }}
+          </div>
+        </div>
+
+        <!-- 地图组件 -->
+        <div class="map-container">
+          <LocationPicker
+            v-model="selectedLocation"
+            :default-center="[108.948024, 34.263161]"
+            :default-zoom="12"
+            @confirm="handleLocationConfirm"
+          />
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.location-picker-demo {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
+}
+
+.page-header {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  position: relative;
+  z-index: 1;
+
+  .title {
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+}
+
+.location-result {
+  background: white;
+  padding: 12px 16px;
+  margin: 10px;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+  .label {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 4px;
+  }
+
+  .value {
+    font-size: 16px;
+    color: #333;
+    margin-bottom: 8px;
+    word-break: break-all;
+  }
+
+  .coordinates {
+    font-size: 12px;
+    color: #999;
+  }
+}
+
+.map-container {
+  flex: 1;
+  position: relative;
+  margin: 0 10px 10px 10px;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+</style>

package/vite.config.ts

@@ -11,8 +11,8 @@ export default ({ mode }: ConfigEnv): UserConfig => {
 
   const appProxys = {}
 
-  const v4Server = 'http://192.168.50.67:31467'
-  const v3Server = 'http://192.168.50.67:31467'
+  const v4Server = 'http://192.168.50.67:31567'
+  const v3Server = 'http://192.168.50.67:31567'
   const OSSServerDev = 'http://192.168.50.67:30351'
   const geoserver = 'http://39.104.49.8:30372'
   // const OSSServerProd = 'http://192.168.50.67:31351'

package/src/views/component/XFormView/oldindex.vue

@@ -1,70 +0,0 @@
-<script setup lang="ts">
-import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
-import { onBeforeMount, ref, toRaw } from 'vue'
-
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
-const formGroup = ref(null)
-const formConfig = ref(null)
-const submitSimple = ref(null)
-const isLoading = ref(true)
-
-function safeStringify(obj) {
-  const seen = new WeakSet()
-  return JSON.stringify(toRaw(obj), (key, val) => {
-    if (typeof val === 'object' && val !== null) {
-      if (seen.has(val))
-        return
-      seen.add(val)
-    }
-    return val
-  }, 2)
-}
-
-function submit(result) {
-  console.log('>>>> result: ', safeStringify(result))
-}
-
-function loadConfig() {
-  return new Promise((resolve) => {
-    getConfigByName(configName.value, (result) => {
-      submitSimple.value = result.showSubmitBtn
-      formConfig.value = result
-      resolve(result)
-    }, serviceName.value)
-  })
-}
-
-onBeforeMount(async () => {
-  try {
-    await loadConfig()
-  }
-  finally {
-    isLoading.value = false
-  }
-})
-</script>
-
-<template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <van-loading v-if="isLoading" />
-      <XForm
-        v-else
-        ref="formGroup"
-        mode="查询"
-        :service-name="serviceName"
-        :group-form-items="formConfig"
-        :form-data="{}"
-        :form-name="formConfig?.groupName || '11111'"
-        :submit-button="submitSimple"
-        @on-submit="submit"
-      />
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-</style>