vue2-client 1.3.0 → 1.3.3

package/src/base-client/components/ticket/TicketSubmitSuccessView/TicketSubmitSuccessView.vue

@@ -1,32 +1,32 @@
 <template>
   <a-drawer
-    title="工单进度查询"
-    placement="right"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
     :visible="visible"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    placement="right"
+    title="工单进度查询"
     @close="onClose"
   >
     <!--  添加描述弹框  -->
     <a-modal
-      title="追加问题描述"
       :visible="addOnVisible"
-      @ok="handleAddOn"
-      @cancel="handleCancelAddOn"
       :zIndex="1001"
+      title="追加问题描述"
+      @cancel="handleCancelAddOn"
+      @ok="handleAddOn"
     >
       <a-form-model-item label="描述">
         <a-input v-model="desc" type="textarea" />
       </a-form-model-item>
       <div class="clearfix">
         <a-upload
-          name="avatar"
-          list-type="picture-card"
           :before-upload="beforeUpload"
-          action="/webmeteruploadapi/upload"
           :file-list="fileList"
-          @preview="handlePreview"
-          @change="handleChange"
           :remove="remove"
+          action="/af-system/upload"
+          list-type="picture-card"
+          name="avatar"
+          @change="handleChange"
+          @preview="handlePreview"
         >
           <div v-if="fileList.length < 5">
             <a-icon type="plus" />
@@ -34,16 +34,16 @@
           </div>
         </a-upload>
         <a-modal
-          :visible="previewVisible"
           :footer="null"
+          :visible="previewVisible"
           @cancel="handleCancel"
         >
-          <img style="width: 100%" :src="previewImage" alt="图片上传"/>
+          <img :src="previewImage" alt="图片上传" style="width: 100%"/>
         </a-modal>
       </div>
     </a-modal>
-    <a-card class="result-success" :bordered="false">
-      <result :is-success="icon" :description="getDescription()" :title="getTitle()" :title-class="titleClass">
+    <a-card :bordered="false" class="result-success">
+      <result :description="getDescription()" :is-success="icon" :title="getTitle()" :title-class="titleClass">
         <template slot="action">
           <a-space v-show="btnGroup">
             <!--<a-tooltip placement="topLeft" :title="tip" arrow-point-at-center>-->
@@ -55,11 +55,11 @@
           <a-button v-show="!btnGroup" type="primary" @click="onClose">返回</a-button>
         </template>
         <a-modal
-          title="关闭工单"
           :visible="closeVisible"
-          @ok="handleCloseOk"
-          @cancel="handleCloseCancel"
           :zIndex="1002"
+          title="关闭工单"
+          @cancel="handleCloseCancel"
+          @ok="handleCloseOk"
         >
           <p>是否确认手动关闭工单？</p>
           <p style="color: red">（该操作不可撤销，请谨慎操作！）</p>
@@ -79,13 +79,13 @@
             </a-step>
             <a-step title="工单处理中" >
               <a-step-item-group slot="description">
-                <a-step-item :title="details.name" v-if="step >= 1" />
-                <a-step-item :title="details.confirmTime" v-if="step >= 1"/>
+                <a-step-item v-if="step >= 1" :title="details.name" />
+                <a-step-item v-if="step >= 1" :title="details.confirmTime"/>
               </a-step-item-group>
             </a-step>
             <a-step title="工单完成" >
               <a-step-item-group slot="description">
-                <a-step-item :title="details.finishedTime" v-if="step >= 2"/>
+                <a-step-item v-if="step >= 2" :title="details.finishedTime"/>
               </a-step-item-group>
             </a-step>
           </a-steps>
@@ -234,7 +234,7 @@ export default {
         file: file
       })
         .then(res => {
-          if (res === 'success') {
+          if (res.data === 'success') {
             this.$message.success('删除成功')
           }
           this.fileList = this.fileList.filter((item) => {
@@ -332,7 +332,7 @@ export default {
         categoryStr: this.categoryStr
       })
         .then(res => {
-          if (res === 1) {
+          if (res.data === 1) {
             this.$message.success(
               '已为您自动加急',
               5
@@ -517,7 +517,7 @@ export default {
 }
 </script>
 
-<style scoped lang="less">
+<style lang="less" scoped>
 .result-success{
   .action:not(:first-child){
     margin-left: 8px;

package/src/base-client/plugins/PagedList.js

@@ -1,176 +1,177 @@
-import Vue from 'vue'
-import { nanoid } from 'nanoid'
-
-export default class PagedList {
-  // 用url及pageSize构造
-  // url - 加载数据的url
-  // pageSize - 每页数据个数
-  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
-  // sums - 需要求和的字段。格式为:{参数名:参数值}
-  // isBlank - 是否使用空行填充表格，值为true或者 false
-  // comp - 调用时的组件名，方便调试
-  // aoteEncrypt - 加密类型, 不传使用全局的
-  // encryKey - 加密key, 不传使用全局的
-  // timeout - 查询超时时间, 默认50秒
-  constructor (url, pageSize, params, sums, isBlank, comp, aoteEncrypt, encryKey, timeout) {
-    // 正在查询标志位
-    this.seaching = false
-    this.url = url
-    this.pageSize = pageSize
-    this.pageIndex = 0
-    this.isBlank = isBlank
-    this.aoteEncrypt = aoteEncrypt || Vue.mmType
-    this.encryKey = encryKey || Vue.mm
-    this.timeout = timeout || 50000
-
-    // 登记组件名
-    if (comp) {
-      this.comp = comp
-    }
-
-    // 登记参数源码，查询前，执行参数源码，获得实际参数值
-    if (params) {
-      this.paramSource = params
-    }
-    // 查询时，提交后台的参数值
-    this.params = {}
-
-    // 求和的字段
-    this.sums = sums
-    // 符合条件的数据总数
-    this.count = 0
-    // 符合条件的数据总页数
-    this.totalPage = 0
-    // 加载过来的数据
-    this.rows = []
-    // 状态，字符串型，包括：初始(默认)，查询，错误，正确
-    this.state = '初始'
-    // 出现错误时的错误内容，没找到符合条件的数据当错误处理
-    this.error = '请输入条件, 进行查询'
-
-    // 每次加载所需要的条件
-    this.condition = null
-    this.model = null
-    this.condValue = null
-
-    // 初始填充数据空行
-    // isNuN标记本行是否为空行
-    if (isBlank == true) {
-      for (let i = 1; i <= pageSize; i++) {
-        this.rows.push({ isNuN: 'true' })
-      }
-    }
-  }
-
-  // 执行查询过程，加载数据汇总信息
-  // condition - 查询组件产生的查询条件
-  // model - 查询组件收集到的输入数据
-  // condValue - 交给后台的查询条件，可以为空
-  search (condition, model, condValue) {
-    // 保存条件，以便加载某页时可以直接调用
-    this.condition = condition
-    this.model = model
-    this.condValue = condValue
-    this.state = '查询'
-    this.procParams()
-    this.seaching = true
-    if (this.sums) {
-      const totals = []
-      for (const key in this.sums) {
-        totals.push(key)
-        var param = { data: this.params, sums: totals }
-      }
-    } else {
-      param = { data: this.params }
-    }
-    // 发生请求时，不进行任何提醒
-    return Vue.resetpost(`${this.url}/n`, param, {
-      timeout: this.timeout,
-      rejectMsg: null,
-      aoteEncrypt: this.aoteEncrypt,
-      encryKey: this.encryKey
-    }).then(response => {
-      this.seaching = false
-      if (response.n === 0) {
-        this.state = '错误'
-        this.error = '没有符合条件的记录'
-        this.rows = []
-        return
-      }
-      this.state = '正确'
-      this.count = response.n
-      for (const key in this.sums) {
-        this.sums[key] = response[key]
-      }
-      this.totalPage = Math.ceil(this.count / this.pageSize)
-      // 加载第一页数据
-      return this.loadPage(1, this.pageSize)
-    }).catch((error) => {
-      this.seaching = false
-      if (error.status !== 603) {
-        this.state = '错误'
-        this.error = `提取数据出错，错误码: ${error.status}, 错误信息：${error.data}，组件：${this.comp}`
-      }
-    })
-  }
-
-  // 重新进行查询
-  refresh () {
-    this.search(this.condition, this.model, this.condValue)
-  }
-
-  // 加载一页数据
-  loadPage (pageNo, pageSize) {
-    this.pageIndex = pageNo
-    this.pageSize = pageSize
-    this.state = '查询'
-    return this.postGen(pageNo, pageSize)
-  }
-
-  postGen (pageNo, pageSize) {
-    this.seaching = true
-    return Vue.resetpost(`${this.url}?pageNo=${pageNo}&pageSize=${pageSize}`, { data: this.params }, {
-      aoteEncrypt: this.aoteEncrypt,
-      encryKey: this.encryKey,
-      resolveMsg: null,
-      rejectMsg: null
-    }).then(response => {
-      this.state = '正确'
-      // a-table需要每条数据都加上一个字符传类型的key 这里通过一个生成uuid的库加入
-      this.rows = response.map(item => {
-        item.nanoid = nanoid()
-        return item
-      })
-      if (this.isBlank == true) {
-        const size = response.length % this.pageSize
-        if (pageNo == this.totalPage) {
-          for (let i = 1; i <= this.pageSize - size; i++) {
-            this.rows.push({ isNuN: 'true' })
-          }
-        }
-      }
-      this.pageIndex = pageNo
-      this.seaching = false
-    }).catch(error => {
-      this.seaching = false
-      this.state = '错误'
-      this.error = JSON.stringify(error)
-      throw error
-    })
-  }
-
-  // 处理查询参数，把condition以及condValue附加到参数列表中，condValue指后台查询条件
-  procParams () {
-    this.params.condition = this.condition
-    if (this.condValue) {
-      this.params.condValue = this.condValue
-    }
-    if (!this.paramSource) {
-      return
-    }
-    // 对附加参数进行计算
-    for (const name in this.paramSource) {
-      this.params[name] = this.paramSource[name]
-    }
-  }
-}
+import Vue from 'vue'
+import { nanoid } from 'nanoid'
+
+export default class PagedList {
+  // 用url及pageSize构造
+  // url - 加载数据的url
+  // pageSize - 每页数据个数
+  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
+  // sums - 需要求和的字段。格式为:{参数名:参数值}
+  // isBlank - 是否使用空行填充表格，值为true或者 false
+  // comp - 调用时的组件名，方便调试
+  // aoteEncrypt - 加密类型, 不传使用全局的
+  // encryKey - 加密key, 不传使用全局的
+  // timeout - 查询超时时间, 默认50秒
+  constructor (url, pageSize, params, sums, isBlank, comp, aoteEncrypt, encryKey, timeout) {
+    // 正在查询标志位
+    this.seaching = false
+    this.url = url
+    this.pageSize = pageSize
+    this.pageIndex = 0
+    this.isBlank = isBlank
+    this.aoteEncrypt = aoteEncrypt || Vue.mmType
+    this.encryKey = encryKey || Vue.mm
+    this.timeout = timeout || 50000
+
+    // 登记组件名
+    if (comp) {
+      this.comp = comp
+    }
+
+    // 登记参数源码，查询前，执行参数源码，获得实际参数值
+    if (params) {
+      this.paramSource = params
+    }
+    // 查询时，提交后台的参数值
+    this.params = {}
+
+    // 求和的字段
+    this.sums = sums
+    // 符合条件的数据总数
+    this.count = 0
+    // 符合条件的数据总页数
+    this.totalPage = 0
+    // 加载过来的数据
+    this.rows = []
+    // 状态，字符串型，包括：初始(默认)，查询，错误，正确
+    this.state = '初始'
+    // 出现错误时的错误内容，没找到符合条件的数据当错误处理
+    this.error = '请输入条件, 进行查询'
+
+    // 每次加载所需要的条件
+    this.condition = null
+    this.model = null
+    this.condValue = null
+
+    // 初始填充数据空行
+    // isNuN标记本行是否为空行
+    if (isBlank == true) {
+      for (let i = 1; i <= pageSize; i++) {
+        this.rows.push({ isNuN: 'true' })
+      }
+    }
+  }
+
+  // 执行查询过程，加载数据汇总信息
+  // condition - 查询组件产生的查询条件
+  // model - 查询组件收集到的输入数据
+  // condValue - 交给后台的查询条件，可以为空
+  search (condition, model, condValue) {
+    let param
+// 保存条件，以便加载某页时可以直接调用
+    this.condition = condition
+    this.model = model
+    this.condValue = condValue
+    this.state = '查询'
+    this.procParams()
+    this.seaching = true
+    if (this.sums) {
+      const totals = []
+      for (const key in this.sums) {
+        totals.push(key)
+        param = { data: this.params, sums: totals }
+      }
+    } else {
+      param = { data: this.params }
+    }
+    // 发生请求时，不进行任何提醒
+    return Vue.resetpost(`${this.url}/n`, param, {
+      timeout: this.timeout,
+      rejectMsg: null,
+      aoteEncrypt: this.aoteEncrypt,
+      encryKey: this.encryKey
+    }).then(response => {
+      this.seaching = false
+      if (response.n === 0) {
+        this.state = '错误'
+        this.error = '没有符合条件的记录'
+        this.rows = []
+        return
+      }
+      this.state = '正确'
+      this.count = response.n
+      for (const key in this.sums) {
+        this.sums[key] = response[key]
+      }
+      this.totalPage = Math.ceil(this.count / this.pageSize)
+      // 加载第一页数据
+      return this.loadPage(1, this.pageSize)
+    }).catch((error) => {
+      this.seaching = false
+      if (error.status !== 603) {
+        this.state = '错误'
+        this.error = `提取数据出错，错误码: ${error.status}, 错误信息：${error.data}，组件：${this.comp}`
+      }
+    })
+  }
+
+  // 重新进行查询
+  refresh () {
+    this.search(this.condition, this.model, this.condValue)
+  }
+
+  // 加载一页数据
+  loadPage (pageNo, pageSize) {
+    this.pageIndex = pageNo
+    this.pageSize = pageSize
+    this.state = '查询'
+    return this.postGen(pageNo, pageSize)
+  }
+
+  postGen (pageNo, pageSize) {
+    this.seaching = true
+    return Vue.resetpost(`${this.url}?pageNo=${pageNo}&pageSize=${pageSize}`, { data: this.params }, {
+      aoteEncrypt: this.aoteEncrypt,
+      encryKey: this.encryKey,
+      resolveMsg: null,
+      rejectMsg: null
+    }).then(response => {
+      this.state = '正确'
+      // a-table需要每条数据都加上一个字符传类型的key 这里通过一个生成uuid的库加入
+      this.rows = response.map(item => {
+        item.nanoid = nanoid()
+        return item
+      })
+      if (this.isBlank == true) {
+        const size = response.length % this.pageSize
+        if (pageNo == this.totalPage) {
+          for (let i = 1; i <= this.pageSize - size; i++) {
+            this.rows.push({ isNuN: 'true' })
+          }
+        }
+      }
+      this.pageIndex = pageNo
+      this.seaching = false
+    }).catch(error => {
+      this.seaching = false
+      this.state = '错误'
+      this.error = JSON.stringify(error)
+      throw error
+    })
+  }
+
+  // 处理查询参数，把condition以及condValue附加到参数列表中，condValue指后台查询条件
+  procParams () {
+    this.params.condition = this.condition
+    if (this.condValue) {
+      this.params.condValue = this.condValue
+    }
+    if (!this.paramSource) {
+      return
+    }
+    // 对附加参数进行计算
+    for (const name in this.paramSource) {
+      this.params[name] = this.paramSource[name]
+    }
+  }
+}