vue2-client 1.14.33 → 1.14.34

package/src/pages/userInfoDetailManage/index.vue

@@ -143,8 +143,8 @@ export default {
       handler () {
         if (this.userInfo) {
           console.log('userinfo', this.userInfo)
-          this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表')
-          this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用'
+          this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.login?.r.includes('开户权限')
+          this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用' && this.login?.r.includes('开关阀权限')
         }
       },
       deep: true
@@ -277,7 +277,7 @@ export default {
   },
   mounted () {},
   computed: {
-    ...mapState('account', { currUser: 'user' }),
+    ...mapState('account', { currUser: 'user',login: 'login' }),
     ...mapState('setting', { isMobile: 'isMobile' })
   }
 }

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }

package/Users/objecrt/af-vue2-client/src/base-client/components/his/XShiftSchedule/XShiftSchedule.vue

@@ -1,36 +0,0 @@
-<script>
-export default {
-  props: {
-    weekDays: {
-      type: Array,
-      default: () => []
-    }
-  },
-  computed: {
-    columns () {
-      const baseColumns = [
-        { title: '序号', dataIndex: 'index', width: 60 },
-        { title: '科室', dataIndex: 'department', width: 120 },
-        { title: '医生', dataIndex: 'doctor', width: 100 },
-        { title: '上/下/晚', dataIndex: 'shiftType', width: 80 },
-      ]
-
-      // 增加防御判断，确保 weekDays 存在
-      const dayColumns = this.weekDays.length > 0
-        ? this.weekDays.map((day, dayIndex) => ({
-            title: `${day.label} ${day.date}`,
-            dataIndex: `shifts-${dayIndex}`, // 改为字符串形式
-            dayIndex: dayIndex,
-            width: 120,
-          }))
-        : []
-
-      const tailColumns = [
-        { title: '排班数', dataIndex: 'count', width: 80 }
-      ]
-
-      return [...baseColumns, ...dayColumns, ...tailColumns]
-    }
-  }
-}
-</script>

package/src/base-client/components/TreeList/TreeList.vue

@@ -1,91 +0,0 @@
-<template>
-  <div class="tree-container">
-    <div class="tree-list">
-      <tree-node 
-        v-for="node in treeData" 
-        :key="node.id"
-        :node="node"
-        @toggle="toggleNode"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import TreeNode from './TreeNode.vue'
-
-export default {
-  name: 'TreeList',
-  components: {
-    TreeNode
-  },
-  data() {
-    return {
-      treeData: [
-        {
-          id: '1',
-          title: '体征',
-          expanded: false,
-          children: [
-            {
-              id: '1-1',
-              title: '一般情况'
-            },
-            {
-              id: '1-2',
-              title: '皮肤粘膜'
-            },
-            {
-              id: '1-3',
-              title: '头颈',
-              expanded: false,
-              children: [
-                {
-                  id: '1-3-1',
-                  title: '头部'
-                },
-                {
-                  id: '1-3-2',
-                  title: '颈部'
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  },
-  methods: {
-    toggleNode(node) {
-      node.expanded = !node.expanded
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tree-container {
-  width: 240px;
-  height: 400px;
-  border: 1px solid #e8e8e8;
-  overflow-y: auto;
-  padding: 8px;
-}
-
-/* 自定义滚动条样式 */
-.tree-container::-webkit-scrollbar {
-  width: 6px;
-}
-
-.tree-container::-webkit-scrollbar-thumb {
-  background-color: #ccc;
-  border-radius: 3px;
-}
-
-.tree-container::-webkit-scrollbar-track {
-  background-color: #f5f5f5;
-}
-
-.tree-list {
-  font-size: 14px;
-}
-</style> 

package/src/base-client/components/TreeList/TreeNode.vue

@@ -1,81 +0,0 @@
-<template>
-  <div class="tree-node">
-    <div class="node-content" @click="handleClick">
-      <span v-if="hasChildren" class="toggle-icon">
-        {{ node.expanded ? '-' : '+' }}
-      </span>
-      <span class="node-title">{{ node.title }}</span>
-    </div>
-    <div v-if="hasChildren && node.expanded" class="node-children">
-      <tree-node
-        v-for="child in node.children"
-        :key="child.id"
-        :node="child"
-        @toggle="$emit('toggle', $event)"
-        :level="level + 1"/>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'TreeNode',
-  props: {
-    node: {
-      type: Object,
-      required: true
-    },
-    level: {
-      type: Number,
-      default: 0
-    }
-  },
-  computed: {
-    hasChildren() {
-      return this.node.children && this.node.children.length > 0
-    }
-  },
-  methods: {
-    handleClick() {
-      if (this.hasChildren) {
-        this.$emit('toggle', this.node)
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tree-node {
-  margin: 2px 0;
-}
-
-.node-content {
-  display: flex;
-  align-items: center;
-  padding: 4px 0;
-  user-select: none;
-}
-
-.toggle-icon {
-  width: 16px;
-  text-align: center;
-  font-size: 14px;
-  color: #666;
-  margin-right: 4px;
-  cursor: pointer;
-}
-
-.node-title {
-  flex: 1;
-  cursor: default;
-}
-
-.node-content:hover {
-  background-color: #f5f5f5;
-}
-
-.node-children {
-  padding-left: 20px;
-}
-</style> 

package/src/base-client/components/common/XCardSet/XTiltle.vue

@@ -1,191 +0,0 @@
-<template>
-  <a-row
-    class="title_box"
-    :style="{backgroundColor: requiredParameters.backgroundColor,height:requiredParameters.height}"
-    type="flex"
-    v-model="requiredParameters">
-    <a-col class="title_col_left" :flex="3">
-      <div class="title_img_box">
-        <img src="../img/header10086.png" class="title_img" alt="">
-      </div>
-      <div class="title_name">{{ requiredParameters.title }}</div>
-    </a-col>
-    <a-col class="title_col_right" id="titleSelect" :flex="3" style="padding-right: 3%" v-model="dateData">
-      <div class="title_date_box">
-        <div class="title_data">{{ dateData.date }}</div>
-        <div class="title_week">{{ dateData.dayOfWeek }}</div>
-      </div>
-      <div class="title_time">{{ dateData.time }}</div>
-      <div style="font-size: x-large;margin-left: 1%">|</div>
-      <div class="title_refresh" @click="refreshTitle"><a-icon type="undo" style="font-size: x-large;"/></div>
-      <div class="title_refresh_box">
-        <div class="title_refresh_time">{{ dateData.refreshTime }}</div>
-        <div class="latest_update_time">最新更新时间</div>
-      </div>
-    </a-col>
-  </a-row>
-</template>
-
-<script>
-
-export default {
-  name: 'TitleComponent',
-  components: {},
-  data () {
-    return {
-      dateData: {
-        date: '',
-        dayOfWeek: '',
-        time: '',
-        refreshTime: ''
-      },
-      timer: null
-    }
-  },
-  props: {
-    requiredParameters: {
-      type: Object,
-      default: () => ({
-        title: '',
-        backgroundColor: '',
-        height: ''
-      }),
-    }
-  },
-  created () {
-    this.updateDateData()
-    this.startTimer()
-  },
-  beforeDestroy () {
-    this.stopTimer()
-  },
-  methods: {
-    // 刷新页面
-    refreshTitle () {
-      this.$forceUpdate()
-      const now = new Date()
-      this.dateData.refreshTime = now.toLocaleTimeString()
-      this.$emit('refreshTitle')
-    },
-    updateDateData () {
-      const now = new Date()
-      const options = { weekday: 'long' }
-      this.dateData.date = this.formatDate(now)
-      this.dateData.time = this.formatTime(now)
-      this.dateData.dayOfWeek = now.toLocaleDateString(undefined, options)
-      this.dateData.refreshTime = now.toLocaleTimeString()
-    },
-    formatDate (date) {
-      const month = date.getMonth() + 1
-      const day = date.getDate()
-      return `${month}月${day}日`
-    },
-    formatTime (date) {
-      const hours = String(date.getHours()).padStart(2, '0')
-      const minutes = String(date.getMinutes()).padStart(2, '0')
-      return `${hours}:${minutes}`
-    },
-    startTimer () {
-      this.timer = setInterval(() => {
-        const now = new Date()
-        this.dateData.time = this.formatTime(now)
-      }, 10000) // 每秒更新一次
-    },
-    stopTimer () {
-      if (this.timer) {
-        clearInterval(this.timer)
-        this.timer = null
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.title_box {
-  width: 100%;
-  min-height:42px;
-}
-.title_col_left {
-  height: 100%;
-  color: white;
-  display: flex;
-  align-content: center;
-  align-items: center;
-}
-.title_col_right {
-  height: 100%;
-  color: white;
-  display: flex;
-  align-content: center;
-  align-items: center;
-  justify-content: flex-end;
-}
-.title_img_box {
-  height: 80%;
-  width: auto;
-  margin-left: 1%;
-  border-radius: 50%;
-  background-color: #35baf6;
-}
-.title_img{
-  width: 100%;
-  height: 100%;
-}
-.title_name {
-  font-size: medium !important;
-  font-weight: bold;
-  margin-left: 1%;
-}
-.title_date_box{
-  width: 20%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-.title_data{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: smaller;
-}
-.title_week{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: smaller;
-}
-.title_time{
-  font-size: x-large;
-}
-.title_refresh{
-  margin-left: 1%;
-  height: 100%;
-  align-content: center;
-  align-items: center;
-  cursor: pointer;
-  display: flex;
-  width: 7%;
-  justify-content: center;
-  min-width: 31px;
-}
-.title_refresh:hover{
-  background-color: rgb(31, 138, 137);
-}
-.title_refresh:active{
-  background-color: rgb(26, 129, 128);
-}
-.title_refresh_box{
-  margin-right: 1%;
-}
-.latest_update_time{
-  font-size: x-small;
-}
-.title_refresh_time{
-  display: flex;
-  font-size: x-small;
-  align-content: center;
-  justify-content: center;
-}
-</style>