vue2-client 1.14.6 → 1.14.8

package/src/pages/userInfoDetailManage/index.vue

@@ -1,36 +1,107 @@
 <template>
-  <a-drawer
-    id="agencyManageDetail"
-    title="用户详情信息"
-    placement="right"
-    :body-style="{padding:0}"
-    :destroy-on-close="true"
-    :z-index="200"
-    width="85vw"
-    :closable="false"
-    :visible="userInfoDetailVisible"
-    @close="onClose">
-    <a-page-header v-if="userInfoDetailVisible && userInfo" :title="`用户编号：${ userInfo ? userInfo.f_userinfo_code : '' }`">
-      <x-descriptions
-        :title="null"
-        :content="userInfo"
-        serviceName="af-revenue"
-        :getRealData="true"
-        :column="4"
-        config-name="User_Info_Desc_Config">
-        <template #addonAfter>
-          <div style="text-align: right">
-            <a-statistic title="用户状态" :value="userInfo.f_user_state || 0"/>
-            <a-statistic title="表具状态" :precision="0" :value="userInfo.f_table_state || 0"/>
-          </div>
+  <div>
+    <a-drawer
+      id="agencyManageDetail"
+      title="用户详情信息"
+      placement="right"
+      :body-style="{padding:0}"
+      :destroy-on-close="true"
+      :z-index="200"
+      width="85vw"
+      :closable="false"
+      :visible="userInfoDetailVisible"
+      @close="onClose">
+      <a-page-header v-if="userInfoDetailVisible && userInfo" :title="`用户编号：${ userInfo ? userInfo.f_userinfo_code : '' }`">
+        <x-descriptions
+          :title="null"
+          :content="userInfo"
+          serviceName="af-revenue"
+          :getRealData="true"
+          :column="4"
+          config-name="User_Info_Desc_Config">
+          <template #addonAfter>
+            <div style="text-align: right">
+              <a-statistic title="用户状态" :value="userInfo.f_user_state || 0"/>
+              <a-statistic title="表具状态" :precision="0" :value="userInfo.f_table_state || 0"/>
+            </div>
+          </template>
+        </x-descriptions>
+        <user-info-detail-query-tabs :userInfo="userInfo"/>
+        <template #extra>
+          <a-button type="primary" v-if="userInfo.gb_f_meter_type.includes('物联网表')" @click="openUser">开户</a-button>
+          <a-button type="primary" v-if="userInfo.gb_f_meter_type.includes('物联网表')&&!(userInfo.u_f_user_state === '停用')" @click="valvecontrol">开关阀</a-button>
+          <a-button type="dashed" @click="refresh">刷新</a-button>
         </template>
-      </x-descriptions>
-      <user-info-detail-query-tabs :userInfo="userInfo"/>
-      <template #extra>
-        <a-button type="dashed" @click="refresh">刷新</a-button>
+      </a-page-header>
+    </a-drawer>
+    <!-- 阀控管理弹框 -->
+    <a-modal
+      title="阀控管理"
+      :visible="valve"
+      :closable="false"
+      :width="600"
+      :body-style="{ padding: '24px' }"
+    >
+      <!-- 阀控状态选择 -->
+      <div style="margin-bottom: 16px;">
+        <label style="display: block; font-size: 14px; color: #555; margin-bottom: 8px;">阀控状态</label>
+        <a-select
+          v-model="selectedOption"
+          style="width: 100%;"
+          placeholder="请选择"
+        >
+          <a-select-option v-for="item in networkValveOptions" :value="item" :key="item">
+            {{ item }}
+          </a-select-option>
+        </a-select>
+      </div>
+
+      <!-- 操作原因输入框 -->
+      <div style="margin-bottom: 16px;">
+        <label
+          style="display: block; font-size: 14px; color: #555; margin-bottom: 8px;"
+          :style="operateReason ? '' : 'color: #ff4d4f;'"
+        >
+          操作原因
+        </label>
+        <a-textarea
+          v-model="operateReason"
+          placeholder="请填写操作原因"
+          :rows="2"
+          style="width: 100%;"
+        />
+      </div>
+
+      <!-- 底部按钮 -->
+      <template #footer>
+        <div style="display: flex; justify-content: space-between; align-items: center;">
+          <!-- 左侧关闭按钮 -->
+          <a-button type="danger" @click="closeValveModal" style="border-radius: 4px;">
+            关闭
+          </a-button>
+          <!-- 右侧开阀和关阀按钮 -->
+          <div>
+            <a-button
+              type="primary"
+              :disabled="!operateReason"
+              @click="valveoperate(true, 1)"
+              style="border-radius: 4px; margin-right: 8px;"
+            >
+              开阀
+            </a-button>
+            <a-button
+              type="primary"
+              :disabled="!operateReason"
+              @click="valveoperate(false, 1)"
+              style="border-radius: 4px;"
+            >
+              关阀
+            </a-button>
+          </div>
+        </div>
       </template>
-    </a-page-header>
-  </a-drawer>
+    </a-modal>
+  </div>
 </template>
 
 <script>
@@ -38,6 +109,7 @@ import XDescriptions from '@vue2-client/base-client/components/common/XDescripti
 import { mapState } from 'vuex'
 import { runLogic } from '@vue2-client/services/api/common'
 import userInfoDetailQueryTabs from '@vue2-client/pages/userInfoDetailManage/userInfoDetailQueryTabs'
+import Vue from 'vue'
 
 export default {
   name: 'UserInfoDetailManage',
@@ -48,7 +120,18 @@ export default {
   data () {
     return {
       userInfo: undefined,
-      userInfoDetailVisible: false
+      userInfoDetailVisible: false,
+      valve: false,
+      networkValveOptions: [
+        '手动',
+        '自动',
+        '1小时后自动',
+        '3小时后自动',
+        '6小时后自动',
+        '12小时后自动'
+      ],
+      selectedOption: '',
+      operateReason: '',
     }
   },
   methods: {
@@ -57,6 +140,33 @@ export default {
         this.userInfo = res
       })
     },
+    openUser () {
+      this.$confirm({
+        title: '开户确认',
+        content: '是否需要给用户进行开户?',
+        onOk: ()=> {
+          const data = {
+            f_userfiles_id: this.userInfo.f_userfiles_id
+          }
+          runLogic('StartUp', data, 'af-revenue').then(res => {
+            this.$message.success('开户成功')
+          })
+        }
+      })
+    },
+    // 阀控管理
+    valvecontrol () {
+      if (this.$login.r.includes('开关阀权限')) {
+        this.valve = true
+      } else {
+        this.$message.error('您没有【开关阀权限】,请联系管理员！！')
+      }
+    },
+    closeValveModal () {
+      this.valve = false
+      this.selectedOption = ''
+      this.operateReason = ''
+    },
    async init (user) {
       this.userInfo = user
       await this.refresh()
@@ -65,6 +175,77 @@ export default {
     onClose () {
       this.userInfoDetailVisible = false
       this.$emit('close')
+    },
+    // 开关阀操作
+    async valveoperate (oper, value) {
+      const msg = oper ? '开阀' : '关阀'
+      let delaySeconds = 0 // 初始化 delaySeconds 变量
+      const currentTime = new Date() // 获取当前时间
+      const adjustedTime = new Date(currentTime) // 创建一个新的 Date 对象用于计算延迟后的时间
+
+      const beijingTime = new Date(currentTime.getTime() + 8 * 60 * 60 * 1000)
+      const formattedBeijingTime = beijingTime.toISOString().slice(0, 19).replace('T', ' ')
+
+      const datas = {
+        instructType: '阀门控制',
+        instructTitle: `手动${msg}`,
+        condition: `t_userfiles.f_userfiles_id='${this.userInfo.f_userfiles_id}'`,
+        meterBrandName: this.userInfo.f_alias,
+        f_instruct_state: '待发送',
+        inputtor: Vue.$login.f.name,
+        inputtorid: Vue.$login.f.id,
+        reasonInfo: this.operateReason,
+        meternumberf: this.userInfo.f_meternumber,
+        contentData: { isOpen: oper ? 1 : 0 },
+        auto_adjust_option: this.selectedOption,
+        delaySeconds: delaySeconds,
+        executeDelayedOperation: true,
+        f_timestamp: formattedBeijingTime, // 使用北京时间
+        f_userfiles_id: this.userInfo.f_userfiles_id,
+        f_userinfo_id: this.userInfo.f_userinfo_id
+      }
+      console.log('看看datas', datas)
+      const _this = this
+      // 计算延迟时间
+      switch (_this.selectedOption) {
+        case '1小时后自动':
+          delaySeconds = 3600 // 1小时 = 3600秒
+          break
+        case '3小时后自动':
+          delaySeconds = 10800 // 3小时 = 10800秒
+          break
+        case '6小时后自动':
+          delaySeconds = 21600 // 6小时 = 21600秒
+          break
+        case '12小时后自动':
+          delaySeconds = 43200 // 12小时 = 43200秒
+          break
+        default:
+          delaySeconds = 0
+      }
+
+      adjustedTime.setSeconds(adjustedTime.getSeconds() + delaySeconds)
+      const adjustedBeijingTime = new Date(adjustedTime.getTime() + 8 * 60 * 60 * 1000)
+      const formattedAdjustedBeijingTime = adjustedBeijingTime.toISOString().slice(0, 19).replace('T', ' ')
+
+      // 更新 datas 对象
+      datas.delaySeconds = delaySeconds
+      datas.f_current_timestamp = formattedAdjustedBeijingTime // 使用延迟后的北京时间
+      runLogic('iot_saveInstruct', datas, 'af-revenue').then(res => {
+        _this.valve = false
+        _this.operateReason = ''
+        if (_this.selectedOption !== '手动') {
+          const msg = _this.selectedOption !== '自动' ? `阀控状态将在${_this.selectedOption}后自动调整为【自动】` : `阀控状态自动调整为 【自动】`
+          this.$message.success(msg)
+          runLogic('iot_processDelayedOperations',datas,'af-revenue').then(res => {
+            this.$emit('refresh')
+            console.log('延时操作逻辑已执行')
+          })
+        } else {
+          this.$emit('refresh')
+        }
+        this.$message.success('操作成功')
+      })
     }
   },
   created () {

package/src/plugins/EventLogPlugin.js

@@ -1,33 +1,33 @@
-const EventLogger = {
-
-  install (Vue) {
-    const originalEmit = Vue.prototype.$emit
-    // const originalOn = Vue.prototype.$on
-    // 排除 一些 vue 框架 / 前端脚手架 底层的一些事件日志
-    const exclude = ['menuSelect', 'menuDeselect', 'popupScroll', 'popupFocus', 'mouseenter',
-      'mouseleave', 'popupVisibleChange', 'popupScroll', 'click', 'keypress', 'keydown ', 'input ',
-      'change', 'popupVisibleChange', 'beforeCreate', 'created', 'beforeMount', 'mounted', 'componentDidMounted', 'update:visible',
-    ]
-    // 劫持 $emit
-    Vue.prototype.$emit = function (eventName, ...args) {
-      if (!exclude.includes(eventName) && !eventName.startsWith('hook:')) {
-        console.info(`Event emitted: ${eventName}`, args)
-      }
-      return originalEmit.call(this, eventName, ...args)
-    }
-    //
-    // Vue.prototype.$on = function (eventName, callback) {
-    //   // 包装原始回调函数，以便在触发时打印参数
-    //   const wrappedCallback = (...args) => {
-    //     if (!exclude.includes(eventName)) {
-    //       console.log(`Event handled: "${eventName}" triggered with:`, args)
-    //     }
-    //     callback.apply(this, args) // 执行原始回调
-    //   }
-    //   // 使用包装后的回调注册事件
-    //   return originalOn.call(this, eventName, wrappedCallback)
-    // }
-  }
-}
-
-export default EventLogger
+const EventLogger = {
+
+  install (Vue) {
+    const originalEmit = Vue.prototype.$emit
+    // const originalOn = Vue.prototype.$on
+    // 排除 一些 vue 框架 / 前端脚手架 底层的一些事件日志
+    const exclude = ['menuSelect', 'menuDeselect', 'popupScroll', 'popupFocus', 'mouseenter',
+      'mouseleave', 'popupVisibleChange', 'popupScroll', 'click', 'keypress', 'keydown ', 'input ',
+      'change', 'popupVisibleChange', 'beforeCreate', 'created', 'beforeMount', 'mounted', 'componentDidMounted', 'update:visible',
+    ]
+    // 劫持 $emit
+    Vue.prototype.$emit = function (eventName, ...args) {
+      if (!exclude.includes(eventName) && !eventName.startsWith('hook:')) {
+        console.info(`Event emitted: ${eventName}`, args)
+      }
+      return originalEmit.call(this, eventName, ...args)
+    }
+    //
+    // Vue.prototype.$on = function (eventName, callback) {
+    //   // 包装原始回调函数，以便在触发时打印参数
+    //   const wrappedCallback = (...args) => {
+    //     if (!exclude.includes(eventName)) {
+    //       console.log(`Event handled: "${eventName}" triggered with:`, args)
+    //     }
+    //     callback.apply(this, args) // 执行原始回调
+    //   }
+    //   // 使用包装后的回调注册事件
+    //   return originalOn.call(this, eventName, wrappedCallback)
+    // }
+  }
+}
+
+export default EventLogger

package/src/plugins/FindParentsData.js

@@ -1,17 +1,17 @@
-export default {
-    install (Vue) {
-      // 添加公共方法到 Vue 原型上
-      Vue.prototype.$findParentData = function (dataName) {
-        // 尝试从父组件获取数据
-        let parent = this.$parent
-        while (parent) {
-          const parentData = parent[dataName]
-          if (parentData !== undefined) {
-            return parentData // 找到返回数据
-          }
-          parent = parent.$parent // 继续向上寻找
-        }
-      return null // 如果没有找到，返回空
-    }
-  }
-}
+export default {
+    install (Vue) {
+      // 添加公共方法到 Vue 原型上
+      Vue.prototype.$findParentData = function (dataName) {
+        // 尝试从父组件获取数据
+        let parent = this.$parent
+        while (parent) {
+          const parentData = parent[dataName]
+          if (parentData !== undefined) {
+            return parentData // 找到返回数据
+          }
+          parent = parent.$parent // 继续向上寻找
+        }
+      return null // 如果没有找到，返回空
+    }
+  }
+}

package/src/router/async/config.async.js

@@ -1,35 +1,35 @@
-import routerMap from './router.map'
-import { parseRoutes } from '@vue2-client/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'submitTicket',
-  'ServiceReview',
-  'dynamicStatistics',
-  'newDynamicStatistics',
-  'XReportGrid',
-  'example',
-  'settings',
-  'createQuery',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  mode: 'history',
-  base: `/${process.env.VUE_APP_PUBLIC_PATH}/`.replaceAll('//', '/'),
-  routes: parseRoutes(routesConfig, routerMap),
-  config: routesConfig
-}
-
-export default options
+import routerMap from './router.map'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'submitTicket',
+  'ServiceReview',
+  'dynamicStatistics',
+  'newDynamicStatistics',
+  'XReportGrid',
+  'example',
+  'settings',
+  'createQuery',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+
+const options = {
+  mode: 'history',
+  base: `/${process.env.VUE_APP_PUBLIC_PATH}/`.replaceAll('//', '/'),
+  routes: parseRoutes(routesConfig, routerMap),
+  config: routesConfig
+}
+
+export default options

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/example', '/system/example', '/system/example/default', '/system/example/sub-example', '/submitTicket', '/submitTicket/', '/ServiceReview', '/DynamicStatistics', '/NewDynamicStatistics'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {RouterOptions}
- */
-function initRouter (isAsync) {
-  const options = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/example', '/system/example', '/system/example/default', '/system/example/sub-example', '/submitTicket', '/submitTicket/', '/ServiceReview', '/DynamicStatistics', '/NewDynamicStatistics'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/src/router.js

@@ -1,19 +1,19 @@
-// 动态导入你的组件
-function loadView (view) {
-  console.log('view', view)
-  return () => import(/* webpackChunkName: "view-[request]" */ `@vue2-client/base-client/components/common/${view}`)
-}
-
-const routes = [
-  // 对于每个路由，你都可以使用 'loadView' 方法动态加载对应的组件
-  { path: '/Tree', component: loadView('Tree') },
-  { path: '/XStepView', component: loadView('XStepView') },
-  { path: '/Amis', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo') },
-  { path: '/Amis2', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo2') },
-  { path: '/DynamicStatistics', component: () => import('@vue2-client/pages/DynamicStatistics/index') },
-  { path: '/NewDynamicStatistics', component: () => import('@vue2-client/pages/NewDynamicStatistics/index') },
-  { path: '/submitTicket', component: () => import('@vue2-client/pages/system/ticket') },
-  { path: '/submitTicket/', component: () => import('@vue2-client/pages/system/ticket') }
-  // ... 其他路由
-]
-export default routes
+// 动态导入你的组件
+function loadView (view) {
+  console.log('view', view)
+  return () => import(/* webpackChunkName: "view-[request]" */ `@vue2-client/base-client/components/common/${view}`)
+}
+
+const routes = [
+  // 对于每个路由，你都可以使用 'loadView' 方法动态加载对应的组件
+  { path: '/Tree', component: loadView('Tree') },
+  { path: '/XStepView', component: loadView('XStepView') },
+  { path: '/Amis', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo') },
+  { path: '/Amis2', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo2') },
+  { path: '/DynamicStatistics', component: () => import('@vue2-client/pages/DynamicStatistics/index') },
+  { path: '/NewDynamicStatistics', component: () => import('@vue2-client/pages/NewDynamicStatistics/index') },
+  { path: '/submitTicket', component: () => import('@vue2-client/pages/system/ticket') },
+  { path: '/submitTicket/', component: () => import('@vue2-client/pages/system/ticket') }
+  // ... 其他路由
+]
+export default routes

package/src/services/DataModel.js

@@ -1,30 +1,30 @@
-import { post } from '@vue2-client/services/api'
-import { message } from 'ant-design-vue'
-
-export default class DataModel {
-  // 用url及pageSize构造
-  // url - 加载数据的url
-  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
-  constructor ({ billUrl, serviceName, ...params }) {
-    this.billUrl = billUrl
-    this.params = params
-    this.serviceName = serviceName
-    this.data = undefined
-  }
-
-  // 执行查询过程，加载数据汇总信息
-  // condition - 查询组件产生的查询条件
-  // model - 查询组件收集到的输入数据
-  search () {
-    return post(`/api/${this.serviceName}/report/${this.billUrl}`, { data: this.params }).then(
-      (res) => {
-        this.data = res.value || res
-      }
-    ).catch(
-      () => {
-        this.data = undefined
-        message.error('获取票据信息失败')
-      }
-    )
-  }
-}
+import { post } from '@vue2-client/services/api'
+import { message } from 'ant-design-vue'
+
+export default class DataModel {
+  // 用url及pageSize构造
+  // url - 加载数据的url
+  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
+  constructor ({ billUrl, serviceName, ...params }) {
+    this.billUrl = billUrl
+    this.params = params
+    this.serviceName = serviceName
+    this.data = undefined
+  }
+
+  // 执行查询过程，加载数据汇总信息
+  // condition - 查询组件产生的查询条件
+  // model - 查询组件收集到的输入数据
+  search () {
+    return post(`/api/${this.serviceName}/report/${this.billUrl}`, { data: this.params }).then(
+      (res) => {
+        this.data = res.value || res
+      }
+    ).catch(
+      () => {
+        this.data = undefined
+        message.error('获取票据信息失败')
+      }
+    )
+  }
+}