vue2-client 1.8.117 → 1.8.120

package/package.json

@@ -1,94 +1,94 @@
-{
-  "name": "vue2-client",
-  "version": "1.8.117",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "amis": "^3.4.3",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-jest": "^26.6.3",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^26.6.3",
-    "jest-environment-jsdom": "^26.6.2",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.8.120",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "amis": "^3.4.3",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.get": "^4.4.2",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-jest": "^26.6.3",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^26.6.3",
+    "jest-environment-jsdom": "^26.6.2",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

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

@@ -0,0 +1,128 @@
+<template>
+  <div class="reportMain">
+    <h2 class="reportTitle" v-html="config.title"></h2>
+    <table class="reportTable">
+      <tbody>
+        <template v-for="(row, rowIndex) in config.columns">
+          <template v-if="row[0].type !== 'inputColumns'">
+            <tr :key="rowIndex">
+              <td v-for="(cell, cellIndex) in row" :key="cellIndex" :colspan="cell.colSpan ? cell.colSpan : undefined" :rowspan="cell.rowSpan ? cell.rowSpan : undefined">
+                <template v-if="cell.type === 'column'">
+                  {{ cell.text }}
+                </template>
+                <template v-else-if="cell.type === 'value'">
+                  {{ cell.value }}
+                </template>
+                <template v-else-if="cell.type === 'input'">
+                  <a-input v-model="data[cell.dataIndex]" />
+                </template>
+                <template v-else-if="cell.type === 'inputs'">
+                  <a-input v-model="data[cell.dataIndex]" />
+                </template>
+              </td>
+            </tr>
+          </template>
+          <template v-else>
+            <tr v-for="(item, definitionIndex) in data[row[0].dataIndex]" :key="row[0].dataIndex + definitionIndex">
+              <td v-for="(cell, cellIndex) in row[0].definition" :key="cellIndex" :colspan="cell.colSpan ? cell.colSpan : undefined" :rowspan="cell.rowSpan ? cell.rowSpan : undefined">
+                <template v-if="cell.type === 'column'">
+                  {{ cell.text }}
+                </template>
+                <template v-else-if="cell.type === 'value'">
+                  {{ cell.value }}
+                </template>
+                <template v-else-if="cell.type === 'input'">
+                  <a-input v-model="data[row[0].dataIndex][definitionIndex][cell.dataIndex]" />
+                </template>
+                <template v-else-if="cell.type === 'inputs'">
+                  <a-input v-model="data[row[0].dataIndex][definitionIndex][cell.dataIndex]" />
+                </template>
+              </td>
+            </tr>
+            <tr :key="'dataAction' + rowIndex">
+              <td :colspan="maxColSpan">
+                <a-button-group>
+                  <a-button @click="addData(data[row[0].dataIndex])"><a-icon type="plus"/></a-button>
+                  <a-button @click="removeData(data[row[0].dataIndex])"><a-icon type="minus"/></a-button>
+                </a-button-group>
+              </td>
+            </tr>
+          </template>
+        </template>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'XReport',
+  props: {
+    config: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      data: this.config.data,
+      maxColSpan: 12
+    }
+  },
+  methods: {
+    removeData (dataItem) {
+      if (dataItem.length === 0) {
+        this.$message.warn('已经没有更多了')
+        return
+      }
+      dataItem.pop()
+    },
+    addData (dataItem) {
+      dataItem.push({
+        no: '',
+        sort: '',
+        content: '',
+        finishTime: ''
+      })
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.reportMain {
+  width: 800px;
+  text-align: center;
+  margin: 0 auto;
+  font-size: 16px;
+  color: #000;
+  background-color: #fff;
+  padding: 15px;
+  border-radius: 8px;
+
+  .reportTitle {
+    font-weight: bold;
+  }
+
+  .reportTable {
+    width: 100%;
+    border-collapse: collapse;
+    table-layout:fixed;
+    word-break:break-all;
+  }
+
+  td {
+    border: 1px solid #000;
+    padding: 8px;
+  }
+
+  input {
+    width: 100%;
+    box-sizing: border-box;
+  }
+
+  .innerTable {
+    width: 784px;
+  }
+}
+</style>

package/src/base-client/components/common/XReport/index.js

@@ -0,0 +1,3 @@
+import XReport from './XReport'
+
+export default XReport

package/src/base-client/components/common/XReport/index.md

@@ -0,0 +1,38 @@
+# XReport
+
+动态报表控件，根据JSON配置生成一个完整的报表
+
+
+## 何时使用
+
+当需要一个动态生成的报表时
+
+
+引用方式：
+
+```javascript
+import XReport from '@vue2-client/base-client/components/XReport/XReport'
+
+export default {
+    components: {
+      XReport
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+```
+
+## API
+
+| 参数              | 说明                       | 类型     | 默认值  |
+|-----------------|--------------------------|--------|------|
+
+## 例子1
+----
+```
+```

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

@@ -80,7 +80,7 @@ const GetAppDataService = {
     }
   },
   // 新版获取配置中心字典推荐使用 服务名默认为当前服务
-  getDictByKey (dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME,  callback) {
+  getDictByKey (dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
     getConfigByName(dictKey, undefined, result => {
       callback(result.value)
     })

package/src/pages/DynamicStatistics/DataTabs.vue

@@ -1,67 +1,67 @@
-<template>
-  <a-row class="data-content">
-    <a-row>
-      <DynamicTable v-if="pane.key" :title="pane.title" :table-data="pane.content"></DynamicTable>
-    </a-row>
-    <a-row>
-      <ChartSelector :rawData="pane.content" v-if="pane?.content?.length"/>
-    </a-row>
-    <EvaluationArea :uuid="pane.key" v-if="pane.key && pane.content" @submitEvaluationLib="submitEvaluationLib"/>
-  </a-row>
-</template>
-
-<script>
-import ChartSelector from './ChartSelector.vue'
-import EvaluationArea from './EvaluationArea.vue'
-import Ellipsis from '@vue2-client/components/Ellipsis/Ellipsis.vue'
-import DynamicTable from './DynamicTable.vue'
-
-export default {
-  components: {
-    DynamicTable,
-    Ellipsis,
-    ChartSelector,
-    EvaluationArea
-  },
-  data () {
-    return {
-      dataTypeActiveKey: '0',
-      pane: {}
-    }
-  },
-  mounted () {
-    this.pane = {}
-  },
-  methods: {
-    submitEvaluationLib (value, uuid) {
-     this.$emit('submitEvaluationLib', value, uuid)
-    },
-    show (obj) {
-      const { uuid, question, data } = obj
-      this.pane = { title: question, content: data, key: uuid }
-    },
-  }
-}
-</script>
-<style lang="less" scoped>
-.tab-title {
-  font-size: 20px;
-  font-weight: bold;
-  color: #333;
-}
-
-.chart-card {
-  margin-top: 20px;
-}
-
-.data-content {
-  min-height: 100%;
-  background-color: #fff;
-  padding: 20px;
-  border-radius: 8px;
-}
-
-:deep(.ant-tabs-bar) {
-  margin-bottom: 0px;
-}
-</style>
+<template>
+  <a-row class="data-content">
+    <a-row>
+      <DynamicTable v-if="pane.key" :title="pane.title" :table-data="pane.content"></DynamicTable>
+    </a-row>
+    <a-row>
+      <ChartSelector :rawData="pane.content" v-if="pane?.content?.length"/>
+    </a-row>
+    <EvaluationArea :uuid="pane.key" v-if="pane.key && pane.content" @submitEvaluationLib="submitEvaluationLib"/>
+  </a-row>
+</template>
+
+<script>
+import ChartSelector from './ChartSelector.vue'
+import EvaluationArea from './EvaluationArea.vue'
+import Ellipsis from '@vue2-client/components/Ellipsis/Ellipsis.vue'
+import DynamicTable from './DynamicTable.vue'
+
+export default {
+  components: {
+    DynamicTable,
+    Ellipsis,
+    ChartSelector,
+    EvaluationArea
+  },
+  data () {
+    return {
+      dataTypeActiveKey: '0',
+      pane: {}
+    }
+  },
+  mounted () {
+    this.pane = {}
+  },
+  methods: {
+    submitEvaluationLib (value, uuid) {
+     this.$emit('submitEvaluationLib', value, uuid)
+    },
+    show (obj) {
+      const { uuid, question, data } = obj
+      this.pane = { title: question, content: data, key: uuid }
+    },
+  }
+}
+</script>
+<style lang="less" scoped>
+.tab-title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #333;
+}
+
+.chart-card {
+  margin-top: 20px;
+}
+
+.data-content {
+  min-height: 100%;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 8px;
+}
+
+:deep(.ant-tabs-bar) {
+  margin-bottom: 0px;
+}
+</style>

package/src/pages/DynamicStatistics/DynamicTable.vue

@@ -10,6 +10,9 @@
         :rowKey="record => record.id">
         <template slot="footer">
           <a-space>
+            <span>
+              <strong>{{ `总行数 : ${tableData.length}` }}</strong>
+            </span>
             <span v-for="column in tableColumns" :key="column.key">
               <strong v-if="column.sum !== undefined">{{ `${column.key} : ${column.sum}` }}</strong>
             </span>

package/src/pages/DynamicStatistics/EvaluationArea.vue

@@ -1,69 +1,69 @@
-<template>
-  <div class="evaluation-card">
-    <div v-if="!action">
-      <p>您对这次搜索结果满意吗？</p>
-      <a-button-group>
-        <a-space>
-          <a-button type="primary" icon="like" @click="submitEvaluation(0)">满意</a-button>
-          <a-button type="danger" icon="dislike" @click="submitEvaluation(1)">不满意</a-button>
-          <a-button type="default" icon="frown" @click="submitEvaluation(2)">待改进</a-button>
-        </a-space>
-      </a-button-group>
-    </div>
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  data () {
-    return {
-      action: false
-    }
-  },
-  props: {
-    uuid: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    submitEvaluation (result) {
-      const key = 'question-' + this.uuid
-      let flag = true
-      indexedDB.get(key, (item) => {
-        flag = false
-        // 收藏状态不存储到库里
-        delete item.isFavorite
-        const content = Object.assign(item, {
-          evaluation: result
-        })
-        // 保存到数据库中
-        post('/api/af-system/logic/openapi/updateCommonData', {
-          type: 'ai-question',
-          content: this.uuid,
-          newContent: content
-        }).then(res => {
-          this.action = true
-          this.$message.success('评论成功')
-          indexedDB.delete(key)
-          indexedDB.add(key, content)
-        })
-      })
-      // 如果 indexedDB 没有获取到说明是对话库的数据
-      if (flag) {
-        this.$emit('submitEvaluationLib', result, this.uuid)
-      }
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.evaluation-card {
-  width: 50%;
-  text-align: center;
-  margin: 20px auto 0 auto;
-}
-</style>
+<template>
+  <div class="evaluation-card">
+    <div v-if="!action">
+      <p>您对这次搜索结果满意吗？</p>
+      <a-button-group>
+        <a-space>
+          <a-button type="primary" icon="like" @click="submitEvaluation(0)">满意</a-button>
+          <a-button type="danger" icon="dislike" @click="submitEvaluation(1)">不满意</a-button>
+          <a-button type="default" icon="frown" @click="submitEvaluation(3)">问题不明确</a-button>
+        </a-space>
+      </a-button-group>
+    </div>
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  data () {
+    return {
+      action: false
+    }
+  },
+  props: {
+    uuid: {
+      type: String,
+      required: true
+    }
+  },
+  methods: {
+    submitEvaluation (result) {
+      const key = 'question-' + this.uuid
+      let flag = true
+      indexedDB.get(key, (item) => {
+        flag = false
+        // 收藏状态不存储到库里
+        delete item.isFavorite
+        const content = Object.assign(item, {
+          evaluation: result
+        })
+        // 保存到数据库中
+        post('/api/af-system/logic/openapi/updateCommonData', {
+          type: 'ai-question',
+          content: this.uuid,
+          newContent: content
+        }).then(res => {
+          this.action = true
+          this.$message.success('评论成功')
+          indexedDB.delete(key)
+          indexedDB.add(key, content)
+        })
+      })
+      // 如果 indexedDB 没有获取到说明是对话库的数据
+      if (flag) {
+        this.$emit('submitEvaluationLib', result, this.uuid)
+      }
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.evaluation-card {
+  width: 50%;
+  text-align: center;
+  margin: 20px auto 0 auto;
+}
+</style>

package/src/pages/DynamicStatistics/QuestionHistoryAndFavorites.vue

@@ -117,6 +117,13 @@
               </span>
             </a-list-item-meta>
             <a-space>
+              <a-tooltip title="查看元数据">
+                <a-icon
+                  v-if="renderItem.data"
+                  type="eye"
+                  @click.stop="openMetaDataModal(renderItem)"/>
+              </a-tooltip>
+              <span>&emsp;</span>
               <a-tooltip :title="renderItem.isFavorite ? '取消收藏' : '收藏'" v-if="renderItem.sql">
                 <a-icon
                   type="star"
@@ -213,9 +220,9 @@ export default {
           color: '#FF4F53'
         },
         2: {
-          icon: 'frown',
-          text: '待改进',
-          color: '#52c41a'
+          icon: 'dislike',
+          text: '不满意',
+          color: '#FF4F53'
         }
       }, // 对话库
       // 元数据窗口

package/src/pages/DynamicStatistics/index.vue

@@ -130,6 +130,7 @@ export default {
           uuid: uuid,
           question: value,
           queryType: queryType,
+          evaluation: -1,
           filterTable: res.filter_table,
           prompt: res.prompt,
           relationTable: res.relation_table,

package/src/pages/Example/index.vue

@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <XReport :config="tableConfig" />
+  </div>
+</template>
+
+<script>
+  import XReport from '@vue2-client/base-client/components/common/XReport'
+
+  export default {
+    name: 'Example',
+    components: {
+      XReport
+    },
+    data () {
+      return {
+        tableConfig: {
+          title: '陕西城市燃气产业发展有限公司<br/>操作卡',
+          header: [
+            {},
+            {},
+            {}
+          ],
+          columns: [
+            [
+              { type: 'column', text: '操作任务', colSpan: 2 },
+              { type: 'value', colSpan: 10, value: '立管置换及顶层用户通气点火工艺流程' }
+            ],
+            [
+              { type: 'column', text: '操作单位', colSpan: 2 },
+              { type: 'input', colSpan: 4, dataIndex: 'unitName' },
+              { type: 'column', text: '操作地点', colSpan: 2 },
+              { type: 'input', colSpan: 4, dataIndex: 'addressName' }
+            ],
+            [
+              { type: 'column', text: '开 始', colSpan: 2 },
+              { type: 'inputs', colSpan: 4, dataIndex: 'startDateArr', format: '{}月{}日{}时{}分' },
+              { type: 'column', text: '完 毕', colSpan: 2 },
+              { type: 'inputs', colSpan: 4, dataIndex: 'endDateArr', format: '{}月{}日{}时{}分' }
+            ],
+            [
+              { type: 'column', text: '记号' },
+              { type: 'column', text: '顺序' },
+              { type: 'column', text: '操 作 内 容', colSpan: 8 },
+              { type: 'column', text: '操作完成时间', colSpan: 2 },
+            ],
+            [
+              {
+                type: 'inputColumns',
+                dataIndex: 'actionArr',
+                definition: [
+                  { type: 'input', dataIndex: 'no' },
+                  { type: 'input', dataIndex: 'sort' },
+                  { type: 'input', dataIndex: 'content', colSpan: 8 },
+                  { type: 'input', dataIndex: 'finishTime', colSpan: 2 },
+                ]
+              },
+            ],
+            [
+              { type: 'column', text: '备注', colSpan: 2 },
+              { type: 'input', colSpan: 10, dataIndex: 'remark' }
+            ],
+            [
+              { type: 'column', text: '操作人', colSpan: 2, rowSpan: 2 },
+              { type: 'input', colSpan: 4, rowSpan: 2, dataIndex: 'actionPerson' },
+              { type: 'column', text: '监护人', colSpan: 2, rowSpan: 2 },
+              { type: 'input', colSpan: 4, rowSpan: 2, dataIndex: 'guardian' }
+            ],
+          ],
+          data: {
+            taskName: '',
+            unitName: '',
+            addressName: '',
+            startDateArr: [],
+            endDateArr: [],
+            actionArr: [],
+            remark: '',
+            actionPerson: '',
+            guardian: ''
+          }
+        }
+      }
+    },
+    methods: {
+    }
+  }
+</script>

package/src/router/async/router.map.js

@@ -1,72 +1,74 @@
-const { homePage } = require('../../config')
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
-// 通用服务评价
-routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
-// 系统设置
-routerResource.settings = () => import('@vue2-client/pages/system/settings')
-// AMIS示例页面
-routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
-// 数据检索
-routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@vue2-client/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: homePage,
-    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () => import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () => import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () => import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+const { homePage } = require('../../config')
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
+// 通用服务评价
+routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
+// 系统设置
+routerResource.settings = () => import('@vue2-client/pages/system/settings')
+// AMIS示例页面
+routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
+// 数据检索
+routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
+// 示例页面
+routerResource.example = () => import('@vue2-client/pages/Example')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@vue2-client/pages/login')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: homePage,
+    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () => import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () => import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () => import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap