vue2-client 1.2.96 → 1.2.99-test

package/CHANGELOG.md

@@ -1,12 +1,14 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.2.94 -2022-08-05  - 1.2.96 @张振宇**
+**1.2.94 -2022-08-05  - 1.2.98 @张振宇**
 - 功能新增：
 - 新增表单组件 人员选择框
 - 新增表单配置可以配置自定义请求
 - 文件表单项新增附件用途配置
 - 文件表单项cascader 修改了一下能用了
+- xformitem修改了两个文件上传框时得bug
+- 新增制度待确认提示
 
 **1.2.93 -2022-08-03 @江超**
 - 功能新增：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.96",
+  "version": "1.2.99-test",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -27,6 +27,7 @@
     "enquire.js": "^2.1.6",
     "file-saver": "^2.0.5",
     "highlight.js": "^10.7.3",
+    "js-base64": "^3.7.2",
     "js-cookie": "^2.2.1",
     "jsencrypt": "^3.2.1",
     "lodash.get": "^4.4.2",

package/src/base-client/components/common/PersonSetting/PersonSetting.vue

@@ -79,15 +79,6 @@ export default {
       type: Array,
       default: () => []
     },
-    // 默认选中key
-    defaultCheckedNames: {
-      type: Array,
-      default: () => []
-    },
-    defaultCheckedIds: {
-      type: Array,
-      default: () => []
-    },
     // // 返回数据类型 String,Array 发现返回类型只能有一个
     // type: {
     //   type: String,
@@ -115,10 +106,8 @@ export default {
       this.visible = true
       this.searchValue = ''
       this.treeData = this.sourceTreeData
-      if (this.defaultCheckedIds.length > 0) {
-        this.checkedKeys = this.getCheckedKeys(this.defaultCheckedIds)
-      } else if (this.defaultCheckedNames.length > 0) {
-        this.checkedKeys = this.getCheckedKeys(this.defaultCheckedNames)
+      if (this.value.length > 0) {
+        this.checkedKeys = this.getCheckedKeys(this.value)
       }
       this.expandedKeys = []
     },

package/src/base-client/components/common/Upload/Upload.vue

@@ -70,7 +70,12 @@ export default {
     ...mapState('account', { currUser: 'user' })
   },
   created () {
-    this.uploadedFileList = this.model.type === 'file' ? [...this.files] : [...this.images]
+    const list = this.model.type === 'file' ? [...this.files] : [...this.images]
+    if (this.model.useType) {
+      this.uploadedFileList = list.filter(item => item.f_use_type === this.model.useType)
+    } else {
+      this.uploadedFileList = list
+    }
   },
   methods: {
     uploadFiles (info) {

package/src/base-client/components/common/XAddForm/XAddForm.vue

@@ -323,7 +323,11 @@ export default {
           }
           const item = this.realJsonData[i]
           if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
-            this.form[item.model] = this.modifyModelData.data[item.model] + ''
+            if (this.modifyModelData.data[item.model] instanceof Array) {
+              this.form[item.model] = this.modifyModelData.data[item.model]
+            } else {
+              this.form[item.model] = this.modifyModelData.data[item.model] + ''
+            }
           } else {
             this.form[item.model] = undefined
           }

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -174,7 +174,7 @@
         :disabled="disabled"
         change-on-select
         :options="option"
-        :value="form[attr.model]"
+        v-model="form[attr.model]"
         :placeholder="attr.placeholder ? attr.placeholder : '请选择'+attr.name.replace(/\s*/g, '')"
         :rows="4"/>
     </a-form-model-item>
@@ -313,7 +313,6 @@ export default {
   created () {
     if (this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
       this.getData({}, res => {
-        console.log(res, '====')
         this.option = res
       })
     }
@@ -325,7 +324,10 @@ export default {
     },
     // 文件框时设置上传组件的值
     setFiles (fileIds) {
-      this.form[this.attr.model] = fileIds
+      if (!this.form[this.attr.model]) {
+        this.form[this.attr.model] = []
+      }
+      this.form[this.attr.model] = [...this.form[this.attr.model], ...fileIds]
     },
     // 懒加载检索方法
     fetchFunction (value) {

package/src/layouts/header/HeaderNotice.vue

@@ -1,96 +1,158 @@
-<template>
-  <a-dropdown :trigger="['click']" v-model="show">
-    <div slot="overlay">
-      <a-spin :spinning="loading">
-        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
-          <a-tab-pane tab="通知" key="1">
-            <a-list>
-              <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
-                <a-list-item-meta :title="'设备号'+ item.e_f_device_id" :description="item.e_f_error_msg" @click="read(item)">
-                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>
-          </a-tab-pane>
-          <a-tab-pane tab="消息" key="2">
-            <a-list class="tab-pane"></a-list>
-          </a-tab-pane>
-          <a-tab-pane tab="待办" key="3">
-            <a-list class="tab-pane"></a-list>
-          </a-tab-pane>
-        </a-tabs>
-      </a-spin>
-    </div>
-    <span @click="fetchNotice" class="header-notice">
-      <a-badge class="notice-badge" :count=" exception.length">
-        <a-icon :class="['header-notice-icon']" type="bell" />
-      </a-badge>
-    </span>
-  </a-dropdown>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-export default {
-  name: 'HeaderNotice',
-  data () {
-    return {
-      loading: false,
-      show: false,
-      exception: []
-    }
-  },
-  computed: {
-  },
-  created () {
-  },
-  methods: {
-    read (item) {
-      post('/webmeterapi/saveSingleTable', { data: { tablename: 't_iot_device_exception', param: { id: item.e_id, f_is_read: 1 } } }).then(res => {
-        this.refresh()
-      })
-    },
-    refresh () {
-      post('/webmeterapi/commonQuery', { queryParamsName: 'deviceExceptionQueryParams', conditionParams: { e_f_is_read: 0 }, pageNo: 1, pageSize: 999999 }).then(res => {
-        this.exception = res.data
-      })
-    },
-    fetchNotice () {
-      if (this.loading) {
-        this.loading = false
-        return
-      }
-      this.loadding = true
-      setTimeout(() => {
-        this.loadding = false
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .header-notice{
-    display: inline-block;
-    transition: all 0.3s;
-    span {
-      vertical-align: initial;
-    }
-    .notice-badge{
-      color: inherit;
-      .header-notice-icon{
-        font-size: 16px;
-        padding: 4px;
-      }
-    }
-  }
-  .dropdown-tabs{
-    background-color: @base-bg-color;
-    box-shadow: 0 2px 8px @shadow-color;
-    border-radius: 4px;
-    .tab-pane{
-      padding: 0 24px 12px;
-      min-height: 250px;
-    }
-  }
-</style>
+<template>
+  <a-dropdown :trigger="['click']" v-model="show">
+    <div slot="overlay">
+      <a-spin :spinning="loading">
+        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
+          <a-tab-pane tab="通知" key="1">
+            <a-list>
+              <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
+                <a-list-item-meta
+                  :title="'设备号'+ item.e_f_device_id"
+                  :description="item.e_f_error_msg"
+                  @click="read(item)">
+                  <a-avatar
+                    style="background-color: white"
+                    slot="avatar"
+                    src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+            </a-list>
+          </a-tab-pane>
+          <a-tab-pane tab="消息" key="2">
+            <a-list class="tab-pane"></a-list>
+          </a-tab-pane>
+          <a-tab-pane tab="待办" key="3">
+            <a-list item-layout="horizontal" :data-source="backlog" :bordered="true">
+              <a-list-item slot="renderItem" slot-scope="item, index">
+                <a slot="actions" v-if="item.type==='制度待确认'" @click="confirm_institution(item)">确认</a>
+                <a-list-item-meta :title="item.title" :description="item.description"/>
+              </a-list-item>
+            </a-list>
+          </a-tab-pane>
+        </a-tabs>
+      </a-spin>
+    </div>
+    <span @click="fetchNotice" class="header-notice">
+      <a-badge class="notice-badge" :count="exception.length + backlog.length">
+        <a-icon :class="['header-notice-icon']" type="bell"/>
+      </a-badge>
+    </span>
+    <a-drawer
+      placement="right"
+      title="待确认制度详情"
+      :width="screenWidth * 0.5"
+      :visible="institutionDetailVisible"
+      @close="institutionDetailVisible = false"
+    >
+      <institution-detail
+        :institutionId="institution"
+        affirmInstitution="affirmInstitution"
+        @get_to_be_confirmed="getToBeConfirmed"/>
+    </a-drawer>
+  </a-dropdown>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+import InstitutionDetail from './InstitutionDetail'
+
+export default {
+  name: 'HeaderNotice',
+  data () {
+    return {
+      loading: false,
+      screenWidth: document.documentElement.clientWidth,
+      show: false,
+      institutionDetailVisible: false,
+      institution: undefined,
+      affirmInstitution: undefined,
+      exception: [],
+      backlog: []
+    }
+  },
+  components: { InstitutionDetail },
+  computed: {},
+  created () {
+    this.getToBeConfirmed()
+  },
+  methods: {
+    read (item) {
+      post('/webmeterapi/saveSingleTable', {
+        data: {
+          tablename: 't_iot_device_exception',
+          param: { id: item.e_id, f_is_read: 1 }
+        }
+      }).then(res => {
+        this.refresh()
+      })
+    },
+    getToBeConfirmed () {
+      try {
+        if (this.$login.f.name) {
+          post('/webmetersql/getToBeConfirmed', { data: { condition: `state = '待确认' and f_affirm_by  = '${this.$login.f.name}'` } }).then(res => {
+            this.backlog = [...res]
+          })
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    confirm_institution (item) {
+      this.institution = item.institution
+      this.affirmInstitution = item.id
+      this.institutionDetailVisible = true
+    },
+    refresh () {
+      post('/webmeterapi/commonQuery', {
+        queryParamsName: 'deviceExceptionQueryParams',
+        conditionParams: { e_f_is_read: 0 },
+        pageNo: 1,
+        pageSize: 999999
+      }).then(res => {
+        this.exception = res.data
+      })
+    },
+    fetchNotice () {
+      if (this.loading) {
+        this.loading = false
+        return
+      }
+      this.loadding = true
+      setTimeout(() => {
+        this.loadding = false
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.header-notice {
+  display: inline-block;
+  transition: all 0.3s;
+
+  span {
+    vertical-align: initial;
+  }
+
+  .notice-badge {
+    color: inherit;
+
+    .header-notice-icon {
+      font-size: 16px;
+      padding: 4px;
+    }
+  }
+}
+
+.dropdown-tabs {
+  background-color: @base-bg-color;
+  box-shadow: 0 2px 8px @shadow-color;
+  border-radius: 4px;
+
+  .tab-pane {
+    padding: 0 24px 12px;
+    min-height: 250px;
+  }
+}
+</style>

package/src/layouts/header/InstitutionDetail.vue

@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
+    <p>简述: {{ institutionData.f_sketch }}</p>
+    <p>生效时间: {{ format(institutionData.f_effective_date) }}</p>
+    <div v-if="showDocument" class="content">
+      <iframe :src="institutionDocUrl" width="100%" height="100%" frameborder="0"></iframe>
+    </div>
+    <!-- 其他附件 -->
+    <div class="other-file">
+      <div class="title">其他附件</div>
+      <div v-for="file in otherFiles" :key="file.id">
+        <a class="file-item">
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="link" />{{ file.name }}
+          </span>
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="eye" />预览
+          </span>
+          <a class="file-action" @click="handlePreDowDoc(file)" target="_blank"><a-icon type="download" />下载</a>
+        </a>
+      </div>
+    </div>
+    <!-- 其他附件预览 -->
+    <a-modal v-model="previewDocVisible" :footer="null" :dialog-style="{ top: '20px' }" width="97%" :z-index="1001">
+      <div class="preview-doc-container">
+        <a-spin size="large" :spinning="previewDocLoading" />
+        <iframe
+          v-show="!previewDocLoading"
+          :src="previewDocUrl"
+          width="100%"
+          height="100%"
+          frameborder="0"
+          @load="previewDocLoading = false" />
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { Base64 } from 'js-base64'
+import { post } from '@vue2-client/services/api/restTools'
+import { formatDate } from '@vue2-client/utils/util'
+
+export default {
+  name: 'InstitutionDetail',
+  props: {
+    institutionId: {
+      type: Number,
+      default: undefined
+    },
+    affirmInstitution: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data () {
+    return {
+      institutionDocUrl: undefined,
+      showDocument: false,
+      otherFiles: [],
+      institutionData: {},
+      previewDocVisible: false,
+      previewDocUrl: undefined,
+      previewDocLoading: false
+    }
+  },
+  watch: {
+    institutionId () {
+      this.getDetailData()
+    }
+  },
+  mounted () {
+    this.getDetailData()
+  },
+  methods: {
+    // 获取详情数据
+    getDetailData () {
+      if (!this.institutionId) {
+        return
+      }
+      const otherFiles = []
+      post('/webmeterapi/getInstitutionDetail', {
+        id: this.institutionId
+      }).then(res => {
+        res.files.forEach(item => {
+          if (item.use_type === '制度文件') {
+            const institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
+            this.institutionDocUrl = institutionDocUrl
+            this.showDocument = true
+          } else {
+            otherFiles.push(item)
+          }
+        })
+        this.institutionData = res.institution
+        this.otherFiles = otherFiles
+      })
+    },
+    format (dateStr) {
+      return formatDate(dateStr, 'yyyy-MM-dd')
+    },
+    // 其他附件预览
+    handlePreviewDoc (url) {
+      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
+      if (this.previewDocUrl != previewDocUrl) {
+        this.previewDocLoading = true
+        this.previewDocUrl = previewDocUrl
+      }
+      this.previewDocVisible = true
+    },
+    // 下载文档
+    handlePreDowDoc (file) {
+      const a = document.createElement('a')
+      a.href = file.url
+      a.download = file.name
+      a.click()
+    },
+    confirm_institution (item) {
+      this.institution = item.institution
+      post('/webmeterapi/affirmInstitution', {
+        data: {
+          tobe: [
+            {
+              id: item.id,
+              f_affirm_type: '系统确认'
+            }
+          ]
+        }
+      }).then(res => {
+        this.$emit('get_to_be_confirmed')
+      })
+    },
+  }
+}
+// 文档预览服务 API
+const previewDocService = 'http://123.60.214.109:8012/onlinePreview?url='
+// 文件服务器地址
+const fileServer = 'http://123.60.214.109:8406'
+</script>
+
+<style lang="less" scoped>
+.content {
+  height: 80vh;
+  img {
+    max-width: 100%;
+  }
+}
+.other-file {
+  margin: 16px 0;
+  .title {
+    margin-bottom: 6px;
+  }
+}
+.file-item {
+  .file-action {
+    padding: 3px 4px;
+    color: #1890ff;
+    &:hover {
+      background: #e6f7ff;
+    }
+  }
+  .anticon {
+    margin-right: 3px;
+  }
+}
+.file-list-title {
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: bold;
+  font-size: 16px;
+  margin-bottom: 8px;
+}
+.preview-doc-container {
+  height: calc(100vh - 92px);
+  padding-top: 20px;
+}
+</style>

package/vue.config.js

@@ -34,7 +34,7 @@ const isProd = process.env.NODE_ENV === 'production'
 //   ]
 // }
 
-const server = 'http://121.36.106.17:8400'
+const server = 'http://123.60.214.109:8406'
 const local = 'http://localhost:8445/webmeter'
 // const local = 'http://123.60.214.109:8405/webmeter'