vue2-client 1.2.95 → 1.2.98

package/CHANGELOG.md

@@ -1,11 +1,14 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.2.94 -2022-08-05  - 1.2.95 @张振宇**
+**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.95",
+  "version": "1.2.98",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -182,7 +182,7 @@
         </a-col>
         <a-col v-if="item.formType" :span="9">
           <a-card :bodyStyle="bodyStyle" title="扩展属性">
-            <template v-if="(dataMode.addOrEditForm || dataMode.queryForm ) && (item.formType === 'input' || item.formType === 'select' || item.formType === 'selects')">
+            <template v-if="(dataMode.addOrEditForm || dataMode.queryForm ) && (item.formType === 'input' || item.formType === 'select' || item.formType === 'selects' || item.formType === 'cascader')">
               <a-divider style="font-size: 14px;margin-top: 0">提示相关</a-divider>
               <a-form-model-item label="表单水印" prop="placeholder">
                 <a-input v-model="item.placeholder" placeholder="表单水印（placeholder）" />
@@ -330,7 +330,7 @@
         style="margin-top: 5px"
         type="error"/>
       <a-alert
-        v-if="dataMode.addOrEditForm && !dataMode.sqlQueryItem && item.formType !== 'file' && item.formType !== 'image' && item.formType !== 'personSetting' "
+        v-if="dataMode.addOrEditForm && !dataMode.sqlQueryItem && item.formType !== 'file' && item.formType !== 'image' && item.formType !== 'personSetting' && item.formType !== 'cascader' "
         message="错误：如果要生成新增/修改表单项，必须勾选生成SQL查询项"
         show-icon
         style="margin-top: 5px"
@@ -380,7 +380,7 @@ export default {
   computed: {
     // 是否展示数据源相关字段
     selectDataShow () {
-      return this.item.formType === 'select' || (this.item.formType === 'selects' && this.item.groupIndexView === '1') || this.item.formType === 'checkbox' || this.item.formType === 'radio'
+      return this.item.formType === 'select' || this.item.formType === 'cascader' || (this.item.formType === 'selects' && this.item.groupIndexView === '1') || this.item.formType === 'checkbox' || this.item.formType === 'radio'
     },
     // 作用域插槽是否禁用
     slotTypeDisabled () {
@@ -592,7 +592,7 @@ export default {
             this.$message.error('请至少选择一种数据模式')
             return
           }
-          if (!fileBool && (this.dataMode.addOrEditForm && !this.dataMode.sqlQueryItem) && this.item.formType !== 'personSetting') {
+          if (!fileBool && (this.dataMode.addOrEditForm && !this.dataMode.sqlQueryItem) && this.item.formType !== 'personSetting' && this.item.formType !== 'cascader') {
             this.$message.error('如果要生成新增/修改表单项，必须勾选生成SQL查询项')
             return
           }

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

@@ -170,12 +170,13 @@
     :xl="xl"
     :xxl="xxl">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <template v-if="attr.keys">
-        <a-dcascader :disabled="disabled" :option="attr.keys" :value="form[attr.model]"/>
-      </template>
-      <template v-else>
-        <a-dcascader :disabled="disabled" :option="option" :value="form[attr.model]"/>
-      </template>
+      <a-cascader
+        :disabled="disabled"
+        change-on-select
+        :options="option"
+        v-model="form[attr.model]"
+        :placeholder="attr.placeholder ? attr.placeholder : '请选择'+attr.name.replace(/\s*/g, '')"
+        :rows="4"/>
     </a-form-model-item>
   </x-form-col>
   <!-- 文本域 -->
@@ -323,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/config/CreateQueryConfig.js

@@ -38,6 +38,9 @@ module.exports = {
     {
       label: '级联选择框', key: 'selects'
     },
+    {
+      label: 'cascader选择框', key: 'cascader'
+    },
     {
       label: '多选框', key: 'checkbox'
     },
@@ -288,12 +291,12 @@ module.exports = {
     {
       label: '字典键',
       key: 'key',
-      noMatch: ['selects']
+      noMatch: ['selects', 'cascader']
     },
     {
       label: '固定集合',
       key: 'fixArray',
-      noMatch: ['selects']
+      noMatch: ['selects', 'cascader']
     },
     {
       label: '业务逻辑',

package/src/layouts/header/HeaderNotice.vue

@@ -1,96 +1,150 @@
-<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-dropdown>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'HeaderNotice',
+  data () {
+    return {
+      loading: false,
+      show: false,
+      exception: [],
+      backlog: []
+    }
+  },
+  computed: {},
+  created () {
+    this.get_to_be_confirmed()
+  },
+  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()
+      })
+    },
+    get_to_be_confirmed (item) {
+      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) {
+      post('/webmeterapi/affirmInstitution', {
+        data: {
+          tobe: [
+            {
+              id: item.id,
+              f_affirm_type: '系统确认'
+            }
+          ]
+        }
+      }).then(res => {
+        this.get_to_be_confirmed()
+      })
+    },
+    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/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'