From 7bcd75e6fb4fc0eb4a1228fccb7b1166d8008bce Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 26 Jun 2024 23:04:30 +0800
Subject: [PATCH 01/60] =?UTF-8?q?fix=20:=20=E5=85=AC=E5=8F=B8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/CompanyPicker.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index 7834cac..b739cd8 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -10,6 +10,7 @@
             <el-button @click="getList()">搜索</el-button>
           </template>
         </el-input>
+
         <fvCheckbox style="margin-left: 10px" :options="checkOptions" v-model="checkList" @change="checkBoxChange"/>
         <!-- 人员选择 -->
         <el-empty :image-size="100" description="似乎没有数据" v-show="dataList.length === 0"/>

From 9bdad91b7e80b03012e3a3da68876ed4650037c7 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Thu, 27 Jun 2024 22:53:43 +0800
Subject: [PATCH 02/60] =?UTF-8?q?feat=20:=20=E9=A6=96=E9=A1=B5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index dfa993f..5cb2f39 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -105,7 +105,7 @@ const todoNum = ref(0)
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'processName',
+      prop: 'targetName',
       label: '流程名称',
       align: 'center',
     },
@@ -116,7 +116,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'targetState',
-      label: '类型',
+      label: '流程类型',
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {

From a943687afe3122f20879aff4d2a5d96ec399647e Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Thu, 27 Jun 2024 23:35:05 +0800
Subject: [PATCH 03/60] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=80=82=E9=85=8D=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           |   2 +-
 .../DetailComponent/FileComponent.vue         |  24 +-
 src/router/index.js                           |  10 +
 .../AllocationSummaryDetailMoblie.vue         | 105 +++++++
 .../moblieDetail/ExpenseDetailMoblie.vue      | 257 ++++++++++++++++++
 .../share/moblieDetail/index.vue              | 138 ++++++++++
 .../moblieDetail/CollectionDetailMoblie.vue   | 192 +++++++++++++
 .../moblieDetail/OpinionMoblie.vue            | 168 ++++++++++++
 .../requirement/moblieDetail/index.vue        | 141 ++++++++++
 .../mobledetail/ApprovalDetailMoblie.vue      |  11 +-
 .../mobledetail/SummaryDetailMoblie.vue       |  11 +-
 .../project-management/mobledetail/index.vue  |  94 +++----
 src/views/system/user/add.vue                 |  32 +--
 13 files changed, 1106 insertions(+), 79 deletions(-)
 create mode 100644 src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
 create mode 100644 src/views/expense-management/share/moblieDetail/ExpenseDetailMoblie.vue
 create mode 100644 src/views/expense-management/share/moblieDetail/index.vue
 create mode 100644 src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
 create mode 100644 src/views/project-demand/requirement/moblieDetail/OpinionMoblie.vue
 create mode 100644 src/views/project-demand/requirement/moblieDetail/index.vue

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 5a615de..2f95257 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
+  <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules" label-position="top">
     <el-row>
       <el-col :span="24">
         <el-form-item :label="label" prop="attachment">
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index f4a1374..688380e 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -1,13 +1,15 @@
 <template>
-  <el-form-item :label="title" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'">
-    <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
-    <fvTable style="width: 100%;max-height: 300px;" v-if="processViewer" :tableConfig="tableConfig"
-             :data="_value" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-  </el-form-item>
+  <el-form :label-position="labelAlign">
+    <el-form-item :label="title" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign">
+      <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
+      <fvTable style="width: 100%;max-height: 300px;" v-if="processViewer" :tableConfig="tableConfig"
+              :data="_value" :isSettingCol="false" :pagination="false">
+        <template #empty>
+          <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+        </template>
+      </fvTable>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script setup lang="jsx">
@@ -35,6 +37,10 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  labelAlign: {
+    type: String,
+    default: 'left'
+  }
 })
 const emit = defineEmits(['update:value'])
 const tableConfig = reactive({
diff --git a/src/router/index.js b/src/router/index.js
index a2a6185..05ecc69 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -40,6 +40,16 @@ const router = createRouter({
             name: 'shareDetailMobile',
             component: () => import('@/views/project-management/mobledetail/ShareDetailMobile.vue')
         },
+        {
+            path: '/projectDemand/requirement/moblie',
+            name: 'projectDemandRequirementMoblie',
+            component: () => import('@/views/project-demand/requirement/moblieDetail/index.vue')
+        },
+        {
+            path: '/expenseManagement/share/moblie',
+            name: 'expenseManagementMoblie',
+            component: () => import('@/views/expense-management/share/moblieDetail/index.vue')
+        },
         {
             path: '/',
             name: 'layout',
diff --git a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
new file mode 100644
index 0000000..ccd1b78
--- /dev/null
+++ b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
+  <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
+            :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
+    <el-table-column type="index" label="序号" align="center" width="60"/>
+    <el-table-column prop="projectName" label="项目名称" align="center"/>
+    <el-table-column prop="projectCost" label="费用性质" align="center">
+      <template #default="scope">
+        <div v-if="scope.row.projectCost !== null">
+          <Tag dictType="project_cost" :value="scope.row.projectCost"/>
+        </div>
+        <div v-else>--</div>
+      </template>
+    </el-table-column>
+    <el-table-column prop="researchStage" label="项目阶段" align="center">
+      <template #default="scope">
+        <div
+            v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
+          <Tag dictType="research_stage" :value="scope.row.researchStage"/>
+        </div>
+        <div v-else>--</div>
+      </template>
+    </el-table-column>
+    <el-table-column prop="afterTax" label="分摊金额" align="center">
+      <template #default="scope">
+        <div v-if="scope.row.afterTax !== null">
+<!--          {{ toThousands(scope.row.afterTax) }}-->
+          {{ scope.row.afterTax }}
+        </div>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script setup>
+import {toThousands} from '@/utils/changePrice.js'
+import {exportExcel} from "@/utils/export-excel";
+import {getAllocationSummaryDetails} from "@/api/expense-manage";
+
+const tableData = ref([{
+  id: '12987122',
+  name: 'Tom',
+  amount1: '234',
+  amount2: '3.2',
+  amount3: 10,
+},
+  {
+    id: '12987123',
+    name: 'Tom',
+    amount1: '165',
+    amount2: '4.43',
+    amount3: 12,
+  }])
+const loading = ref(false)
+const table = ref()
+const route = useRoute()
+const getSummaries = (param) => {
+  const {columns, data} = param
+  const sums = []
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = '小计'
+    } else if (index === 4) {
+      const values = data.map((item) => Number(item[column.property]))
+      if (!values.every((value) => Number.isNaN(value))) {
+        sums[index] = `${values.reduce((prev, curr) => {
+          const value = Number(curr)
+          if (!Number.isNaN(value)) {
+            return prev + curr
+          } else {
+            return prev
+          }
+        }, 0)}`
+        // sums[index] = toThousands(sums[index])
+      } else {
+        sums[index] = '-'
+      }
+    }
+  })
+  return sums
+}
+const exportTable = () => {
+  const $e = table.value.$el
+  let $table = $e.querySelector('.el-table__fixed')
+  if (!$table) {
+    $table = $e
+  }
+  exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目费用分摊表",2)
+}
+const init = () => {
+  loading.value = true
+  let params = {
+    allocationId: route.query.id
+  }
+  getAllocationSummaryDetails(params).then(res => {
+    tableData.value = res.data
+    loading.value = false
+  })
+}
+init()
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/expense-management/share/moblieDetail/ExpenseDetailMoblie.vue b/src/views/expense-management/share/moblieDetail/ExpenseDetailMoblie.vue
new file mode 100644
index 0000000..cfbeeb6
--- /dev/null
+++ b/src/views/expense-management/share/moblieDetail/ExpenseDetailMoblie.vue
@@ -0,0 +1,257 @@
+<template>
+  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
+  <div style="width: 375px; overflow-x: scroll;">
+    <el-table ref="reportTable" :data="tableData" style="width: 100%;height: 479px"
+            :span-method="objectSpanMethod" v-loading="loading">
+    <!--        <el-table-column label="四川省国有资产经营投资管理有限责任公司-->
+    <!--    科技创新项目人工成本分摊明细表" align="center">-->
+      <el-table-column v-for="column in columnInfo" :prop="column.prop" :label="column.label" align="center">
+        <template #default="scope">
+          <template v-if="column.children">
+            <el-table-column v-for="childColumn in column.children"
+                            :prop="column.prop + '.'+ childColumn.prop"
+                            :label="childColumn.label"
+                            :width="childColumn.prop === 'subtotal' ? 160 : 130">
+              <template #default="columnScope">
+                <template v-if="(tableData.length -1) !== columnScope.$index">
+                  {{
+                    columnScope.row[column.prop][childColumn.prop] ? columnScope.row[column.prop][childColumn.prop] : '/'
+                  }}
+                </template>
+                <template v-else>
+                  {{ columnScope.row[column.prop][childColumn.prop] }}
+                </template>
+              </template>
+            </el-table-column>
+          </template>
+          <template v-else>
+            <!--分摊金额合计与分摊金额总计计算-->
+            <template
+                v-if="(column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost') && (tableData.length -1) !== scope.$index">
+              {{ getTotalSeparation(scope.row, column.prop) }}
+            </template>
+            <template
+                v-else-if="(tableData.length -1) === scope.$index && (column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost')">
+              {{ getTotalSummary(scope.row, column.prop) }}
+            </template>
+            <template v-else>
+              {{ scope.row[column.prop] }}
+            </template>
+          </template>
+        </template>
+      </el-table-column>
+    <!--        </el-table-column>-->
+    </el-table>
+  </div>
+  
+</template>
+
+
+<script setup lang="jsx">
+import {getResearchUser, getAllocationDetails} from "@/api/expense-manage";
+import {exportExcel} from "@/utils/export-excel";
+import {ElNotification} from "element-plus";
+
+const route = useRoute()
+const tableIns = ref()
+const reportTable = ref({});
+const columnInfo = ref([])
+const monthConcat = new Map()
+const tableData = ref([])
+const loading = ref(false)
+const researchOptions = ref([])
+
+const objectSpanMethod = ({row, column, rowIndex, columnIndex}) => {
+  if (columnIndex === 0) {
+    if (monthConcat.has(rowIndex)) {
+      return {
+        rowspan: monthConcat.get(rowIndex),
+        colspan: 1,
+      }
+    } else {
+      return {
+        rowspan: 0,
+        colspan: 0,
+      }
+    }
+  } else {
+    let length = Object.keys(row).length
+    console.log(length)
+    if (length > 5) {
+      if (concatColumn(columnIndex, length, rowIndex)) {
+        if (rowIndex % 5 === 0) {
+          return {
+            rowspan: 5,
+            colspan: 1,
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0,
+          }
+        }
+      }
+    }
+  }
+}
+
+
+const getTotalSeparation = (row, prop) => {
+  let totalSeparation = 0.00
+  for (let key of Object.keys(row)) {
+    if (key.startsWith('personInfo')) {
+      let value = prop === 'totalSeparation' ? (row[key].separationAmount ? row[key].separationAmount : 0) : row[key].subtotal
+      if ("/" !== value) {
+        try {
+          totalSeparation += parseFloat(value)
+        } catch (e) {
+        }
+      }
+    }
+  }
+  if (totalSeparation !== 0) {
+    return totalSeparation.toFixed(2);
+  } else {
+    return "/"
+  }
+}
+
+
+const getTotalSummary = (row, prop) => {
+  let key;
+  if (prop === 'totalSeparation') {
+    key = 'separationAmount'
+  } else {
+    key = 'subtotal'
+  }
+  let result = 0
+  for (const rowKey of Object.keys(row)) {
+    if (rowKey.startsWith('personInfo')) {
+      let value = row[rowKey][key]
+      if (value && "/" !== value) {
+        try {
+          result += parseFloat(value)
+        } catch (e) {
+        }
+      }
+    }
+  }
+  return result.toFixed(2);
+}
+
+const concatColumn = (columnIndex, length, rowIndex) => {
+  if (rowIndex === tableData.value.length - 1) {
+    return false
+  }
+  let columnLength = 5 + (length - 5) * 5
+  if (columnIndex === 1
+      || columnIndex === columnLength - 1) {
+    return true;
+  }
+  for (let i = 0; i < length - 5; i++) {
+    if (columnIndex === 4 + (i * 5)
+        || columnIndex === 5 + (i * 5)
+        || columnIndex === 7 + (i * 5)) {
+      return true
+    }
+  }
+  return false
+}
+
+const init = () => {
+  loading.value = true
+  getAllocationDetails(route.query.id).then(res => {
+    if(res.code!==1000){
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+    columnInfo.value = res.data.columns
+    let tableDataLet = res.data.tableData;
+    let personInfoKey = []
+    columnInfo.value.forEach(item => {
+      if (item.prop.startsWith('personInfo')) {
+        personInfoKey.push(item.prop)
+      }
+    })
+    tableData.value = []
+    let rowIndex = 0;
+    let summary = {
+      month: "",
+      salaryType: '',
+      projectName: "合计",
+      totalSeparation: 10,
+      totalSeparationCost: 10
+    }
+    for (const key of personInfoKey) {
+      summary[key] = {
+        researchDuration: "",
+        separationAmount: 0,
+        subtotal: 0,
+        wagesPayable: "",
+        workday: "",
+      }
+    }
+    tableDataLet.forEach((tableDatum) => {
+      let rowspan = tableDatum.rows.length * 5
+      monthConcat.set(rowIndex, rowspan)
+      rowIndex += rowspan
+      for (const tableDatumElement of tableDatum.rows) {
+        tableData.value = tableData.value.concat(tableDatumElement)
+        let row = tableDatumElement[0]
+        for (const key of personInfoKey) {
+          try {
+            if (row[key].subtotal && '/' !== row[key].subtotal) {
+              summary[key].subtotal += parseFloat(row[key].subtotal)
+            }
+          } catch (e) {
+          }
+        }
+      }
+    })
+    for (const row of tableData.value) {
+      for (const key of personInfoKey) {
+        try {
+          if (row[key].separationAmount && '/' !== row[key].separationAmount) {
+            summary[key].separationAmount += parseFloat(row[key].separationAmount)
+          }
+        } catch (e) {
+        }
+      }
+    }
+    for (const key of personInfoKey) {
+      summary[key].subtotal = summary[key].subtotal.toFixed(2)
+      summary[key].separationAmount = summary[key].separationAmount.toFixed(2)
+    }
+    monthConcat.set(rowIndex, 1)
+    tableData.value.push(summary)
+    loading.value = false
+  })
+}
+
+const getResearchOptions = async () => {
+  const res = await getResearchUser()
+  researchOptions.value = res.data
+}
+const search = (val) => {
+  tableConfig.params = {
+    allocationId: route.query.id,
+    ...val
+  }
+  tableIns.value.refresh()
+}
+getResearchOptions()
+init()
+
+
+const exportTable = () => {
+  const $e = reportTable.value.$el
+  let $table = $e.querySelector('.el-table__fixed')
+  if (!$table) {
+    $table = $e
+  }
+  exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目人工成本分摊明细表", 2)
+}
+</script>
diff --git a/src/views/expense-management/share/moblieDetail/index.vue b/src/views/expense-management/share/moblieDetail/index.vue
new file mode 100644
index 0000000..48e79b6
--- /dev/null
+++ b/src/views/expense-management/share/moblieDetail/index.vue
@@ -0,0 +1,138 @@
+<template>
+<div style="padding: 0 10px;">
+  <el-form :model="formData" ref="form" class="query-form" label-width="auto">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="分摊名称">
+          <span>{{ formData.shareName }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="分摊月份">
+          <span>{{ formData.apportionmentMonth }}</span>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+  <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+    <el-tab-pane label="分摊明细" name="first">
+      <ExpenseDetailMoblie/>
+    </el-tab-pane>
+    <el-tab-pane label="分摊汇总" name="second" v-loading="loading">
+      <AllocationSummaryDetailMoblie/>
+    </el-tab-pane>
+  </el-tabs>
+  <div v-if="shareData.taskId">
+    <baseTitle title="审核意见"></baseTitle>
+    <el-form-item prop="auditOpinion">
+      <el-input
+          v-model="auditOpinion"
+          :rows="3"
+          type="textarea"
+          placeholder="请输入审核意见"
+      />
+    </el-form-item>
+  </div>
+  <div class="approval-record">
+    <div class="approval-title">
+      <baseTitle title="审批记录"></baseTitle>
+      <div class="diagram">
+        <div class="base-title">流程图</div>
+        <el-switch
+            v-model="changeDiagram"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+        />
+      </div>
+    </div>
+    <div class="process">
+      <operation-render
+          v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"
+          :operation-list="shareData.operationList"
+          :state="shareData.state"/>
+      <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>
+    </div>
+  </div>
+  <opinion v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"
+           v-model:value="auditOpinion"></opinion>
+</div>
+</template>
+
+<script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
+import {ElNotification} from "element-plus";
+import {useProcessStore} from '@/stores/processStore.js';
+import {getAllocationDetail} from "@/api/expense-manage";
+import AllocationSummaryDetailMoblie from './AllocationSummaryDetailMoblie.vue'
+import ExpenseDetailMoblie from './ExpenseDetailMoblie.vue'
+
+const changeDiagram = ref(false)
+const processStore = useProcessStore()
+const route = useRoute()
+const shareData = ref({})
+const formData = ref({})
+const auditOpinion = ref('')
+const shareProcessViewer = ref(true)
+const loading = ref(false)
+const activeName = ref('first')
+// const activeName = ref('second')
+
+const getDetail = async () => {
+  const id = route.query.id
+  shareProcessViewer.value = false
+  const {code, data, msg} = await getAllocationDetail(id)
+  if (code === 1000) {
+    shareData.value = data
+    formData.value = data.formData
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
+    nextTick(() => {
+      shareProcessViewer.value = true
+    })
+  } else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type: 'error'
+    })
+  }
+}
+
+
+const handleClick = (tab) => {
+  if (tab.index == 0) {
+    getDetail()
+  }
+}
+getDetail()
+</script>
+<style scoped lang="scss">
+:deep(.el-table--fit ) {
+  width: 100%;
+  height: 479px !important;
+}
+
+:deep(.el-tabs__nav-scroll) {
+  width: 100%;
+  display: flex;
+
+  .el-tabs__nav {
+    display: flex;
+    flex: 1;
+
+    .el-tabs__item {
+      flex: 1;
+      font-size: 16px;
+    }
+
+    .is-active {
+      color: black;
+      //background-color: #DED0B2;
+    }
+  }
+}
+</style>
diff --git a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
new file mode 100644
index 0000000..74c0730
--- /dev/null
+++ b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
@@ -0,0 +1,192 @@
+<template>
+  <div v-loading="loading">
+    <el-form :model="formData" label-width="auto">
+      <el-row>
+        <el-col :span="24" v-if="type==='singleDetail'">
+          <el-form-item label="征集名称">
+            <span>{{ formData.requirementName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="征集类型">
+            <span>{{ formData.collectType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="截止时间">
+            <span>{{ formData.deadline }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" v-if="type==='singleDetail'">
+          <el-form-item label="所属公司">
+            <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
+                getCompanyName(formData.companyIds)
+              }}</span>
+            <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
+                 @click="handleExpend">{{ showExpendText }}
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" v-if="formData.isSpecialFund">
+          <el-form-item label="专项资金">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <baseTitle title="征集说明"></baseTitle>
+          <el-form-item>
+            <el-card style="width: 100%">
+              <div v-html="formData.collectExplain">
+              </div>
+            </el-card>
+          </el-form-item>
+        </el-col>
+        <baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"></baseTitle>
+        <el-col :span="24">
+          <file-component title="" tag="需求征集"
+                          v-model:value="formData.fileList" :processViewer="processViewer"
+                          :file-list-show="fileListShow"/>
+        </el-col>
+        <el-col :span="24">
+          <div v-if="data.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="_value">
+              <el-input
+                  v-model="_value"
+                  :rows="3"
+                  type="textarea"
+                  placeholder="请输入审核意见"
+              />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="approval-record">
+        <div class="approval-title">
+          <baseTitle title="审批记录"></baseTitle>
+          <div class="diagram">
+            <div class="base-title">流程图</div>
+            <el-switch
+                v-model="changeDiagram"
+                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            />
+          </div>
+        </div>
+        <div class="process">
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+                            :operation-list="data.operationList"
+                            :state="data.state"/>
+          <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="collectionProcess"/>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
+import {downloadFile} from "@/api/project-demand";
+
+const emit = defineEmits(['update:value'])
+const showExpendText = ref('')
+const showMoreCompany = ref(false)
+const props = defineProps({
+  formData: {
+    type: Array,
+    default: []
+  },
+  data: {
+    type: Array,
+    default: []
+  },
+  processViewer: {
+    type: Boolean,
+    default: false
+  },
+  companyOption: {
+    type: Array,
+    default: []
+  },
+  loading: {
+    type: Boolean,
+    default: false
+  },
+  fileListShow: {
+    type: String,
+    default: ''
+  },
+  type: {
+    type: String,
+    default: ''
+  },
+  value: {
+    type: String,
+    default: ''
+  }
+})
+const changeDiagram = ref(false)
+const _value = computed({
+  get() {
+    return props.value;
+  },
+  set(val) {
+    emit("update:value", val);
+  }
+})
+const getCompanyName = (data) => {
+  if (data) {
+    return data.join('，')
+  }
+}
+const handleExpend = () => {
+  showMoreCompany.value = !showMoreCompany.value;
+  showExpendClass(showMoreCompany.value, props.formData.companyIds)
+}
+const showExpendClass = (showMoreCompany, data) => {
+  if (!showMoreCompany) {
+    if (data && data.length > 14) {
+      showExpendText.value = '展开'
+      return 'company-style'
+    }
+  } else {
+    showExpendText.value = '收缩'
+    return ''
+  }
+}
+
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
+
+watch(() => props.loading, (newVal) => {
+  props.loading = newVal
+}, {deep: true})
+
+watch(() => props.processViewer, (newVal) => {
+  props.processViewer = newVal
+}, {deep: true})
+</script>
+
+<style scoped lang="scss">
+:deep(.el-empty__description) {
+  margin-top: 0;
+}
+
+.company-style {
+  //width: 98%;
+  min-height: 30px;
+  max-height: 60px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+</style>
diff --git a/src/views/project-demand/requirement/moblieDetail/OpinionMoblie.vue b/src/views/project-demand/requirement/moblieDetail/OpinionMoblie.vue
new file mode 100644
index 0000000..9b775e6
--- /dev/null
+++ b/src/views/project-demand/requirement/moblieDetail/OpinionMoblie.vue
@@ -0,0 +1,168 @@
+<template>
+  <!--  <baseTitle title="审核意见"></baseTitle>-->
+  <!--  <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>-->
+  <div class="oper-page-btn">
+    <el-button type="danger" @click="handleReject">驳回</el-button>
+    <el-button color="#DED0B2" @click="handleAgree">同意</el-button>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {ElNotification} from 'element-plus';
+import {agreeTask, rejectTask} from "@/api/project-demand/index.js";
+import {useTagsView} from '@/stores/tagsview.js'
+
+const tagsViewStore = useTagsView()
+const route = useRoute()
+const router = useRouter()
+const props = defineProps({
+  taskId: {
+    type: String,
+    default: ''
+  },
+  formData: {
+    type: Object,
+    default: {}
+  },
+  value: {
+    type: String,
+    default: ''
+  }
+})
+
+const form = ref()
+const schema = computed(() => {
+  return [
+    {
+      label: '',
+      prop: 'auditOpinion',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入审核意见',
+        type: 'textarea',
+        rows: 3
+      }
+    }
+  ]
+})
+const _value = computed({
+  get() {
+    return props.value;
+  },
+  set(val) {
+    emit("update:value", val);
+  }
+})
+const back = () => {
+  switch (route.name) {
+    case 'Initiation/detail':
+      router.push({name: 'Initiation'})
+      break;
+    case 'Filing/detail':
+      router.push({name: 'Filing'})
+      break;
+    case 'Implementation/detail':
+      if (route.query.source === 'home') {
+        router.push('/home')
+      } else {
+        if (route.query.step === '10') {
+          router.push({name: 'Summary'})
+        } else if (route.query.step === '20') {
+          router.push({name: 'Initiation'})
+        } else if (route.query.step === '40') {
+          router.push({name: 'Implementation'})
+        } else if (route.query.step === '50') {
+          router.push({name: 'Filing'})
+        } else if (route.query.step === '00') {
+          router.push({name: 'Requirement'})
+        }
+      }
+      break;
+    case 'Summary/detail':
+      if (route.query.source === 'home') {
+        router.push('/home')
+      } else {
+        router.push({name: 'Summary'})
+      }
+      break;
+    case 'Requirement/detail':
+      if (route.query.source === 'home') {
+        router.push('/home')
+      } else {
+        router.push({name: 'Requirement'})
+      }
+      break;
+    case 'Fund/detail':
+      if (route.query.source === 'home') {
+        router.push('/home')
+      } else {
+        router.push({name: 'Fund'})
+      }
+      break;
+    case 'Share/detail':
+      if (route.query.source === 'home') {
+        router.push('/home')
+      } else {
+        router.push({name: 'Expense/share'})
+      }
+      break;
+    case 'Phase/detail':
+      if (route.query.source === 'home') {
+        router.push('/home')
+      } else {
+        router.push({name: 'Implementation'})
+      }
+      break;
+  }
+}
+// 驳回
+const handleReject = async () => {
+  // const values = form.value.getValues()
+  if (!_value.value) {
+    ElNotification({
+      title: '提示',
+      message: '请填写审核意见',
+      type: 'warning'
+    })
+    return
+  }
+  const params = {
+    taskId: props.taskId,
+    // ...values
+    auditOpinion: _value.value
+  }
+  // console.log('params', params)
+  const res = await rejectTask(params)
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  back()
+}
+
+const handleAgree = async () => {
+  // const values = form.value.getValues()
+  const params = {
+    taskId: props.taskId,
+    formData: props.formData,
+    auditOpinion: _value.value
+  }
+  const res = await agreeTask(params)
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  back()
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/project-demand/requirement/moblieDetail/index.vue b/src/views/project-demand/requirement/moblieDetail/index.vue
new file mode 100644
index 0000000..b6c78f9
--- /dev/null
+++ b/src/views/project-demand/requirement/moblieDetail/index.vue
@@ -0,0 +1,141 @@
+<template>
+  <div style="padding: 0 10px;">
+    <baseTitle title="需求征集详情"></baseTitle>
+    <CollectionDetailMoblie :formData="collectData.formData" :data="collectData" type="singleDetail"
+                      :fileListShow="fileListShow"
+                      :processViewer="processViewer" :loading="loading" v-model:value="auditOpinion"/>
+    <OpinionMoblie v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId"  v-model:value="auditOpinion"></OpinionMoblie>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {useProcessStore} from '@/stores/processStore.js'
+import {getInfo} from "@/api/project-demand/index.js";
+import {ElNotification} from "element-plus";
+import {useTagsView} from '@/stores/tagsview.js'
+import {getFundOption} from "@/api/special-fund";
+import {getSubCompOpt} from "@/api/user/user";
+import {matterTree} from "@/utils/matterTree";
+import CollectionDetailMoblie from './CollectionDetailMoblie.vue'
+import OpinionMoblie from './OpinionMoblie.vue'
+
+const tagsViewStore = useTagsView()
+const router = useRouter()
+const route = useRoute()
+const form = ref();
+const loading = ref(false)
+const processStore = useProcessStore()
+const specialFundOption = ref([])
+const processInstanceData = ref({})
+const fileListShow = ref("READ")
+const showTable = ref(false)
+const auditOpinion = ref('')
+const processViewer = ref(false)
+const processTree = ref()
+const collectData = ref([])
+const formData = ref({})
+const companyOption = ref([])
+const companyNameArray = ref([])
+const getFundOptions = async () => {
+  const res = await getFundOption()
+  specialFundOption.value = res.data
+}
+
+const getCompanyOption = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
+const getCompanyOptionItem = (val) => {
+  if (val !== undefined) {
+    val.forEach(item => {
+      matterTree(companyNameArray.value, companyOption.value, item)
+    })
+  }
+  return companyNameArray.value
+}
+const init = async () => {
+  if (!route.query.id) return;
+  await getFundOptions()
+  await getCompanyOption()
+  getInfo(route.query.id).then(res => {
+    if (res.code !== 1000) {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+    loading.value = false
+    let data = res.data
+    data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
+    collectData.value = data
+    formData.value = data.formData;
+    if (data.formData.specialFund) {
+      specialFundOption.value.forEach(item => {
+        if (data.formData.specialFund == item.value) {
+          data.formData.specialFund = item.label
+        }
+      })
+    }
+    processInstanceData.value = data
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
+    nextTick(() => {
+      processViewer.value = true
+      showTable.value = true
+      if (data.formPermMap["fileList"]) {
+        fileListShow.value = data.formPermMap["fileList"].perm
+      }
+    })
+  })
+}
+onMounted(async () => {
+  loading.value = true
+  await init()
+})
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-empty__description) {
+  margin-top: 0;
+}
+
+:deep(.el-table--fit ) {
+  height: 300px !important;
+}
+
+.detail-block {
+  overflow: hidden;
+  padding-right: 10px;
+
+  //.info {
+  //  display: flex;
+  //  flex-wrap: wrap;
+  //
+  //  > div {
+  //    width: 350px;
+  //    margin-bottom: 15px;
+  //    margin-right: 10px;
+  //
+  //    > span:first-child {
+  //      color: black;
+  //      font-size: 16px;
+  //      font-weight: bold;
+  //    }
+  //  }
+  //}
+
+  //.approval-record {
+  //  padding-bottom: 30px;
+  //
+  //  .process {
+  //    position: relative;
+  //  }
+  //}
+}
+
+</style>
diff --git a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
index 322fb4b..3aca84c 100644
--- a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
@@ -2,9 +2,14 @@
   <div v-loading="loading">
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
     <el-form :model="formData" label-width="auto">
-      <file-component :title="getTagName(type)+'附件'" :tag="getTagName(type)"
-                      v-model:value="formData.fileList" :processViewer="processViewer"
-                      :file-list-show="fileListShow"/>
+      <file-component 
+        :title="getTagName(type)+'附件'" 
+        :tag="getTagName(type)"
+        v-model:value="formData.fileList" 
+        :processViewer="processViewer"
+        :file-list-show="fileListShow"
+        labelAlign="top"
+      />
     </el-form>
     <div v-if="data.taskId">
       <baseTitle title="审核意见"></baseTitle>
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index 9706b26..311c809 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -132,9 +132,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <file-component title="需求上报附件" tag="需求上报"
-                          v-model:value="localFormData.fileList" :processViewer="processViewer"
-                          :file-list-show="fileListShow"/>
+          <file-component 
+          title="需求上报附件" 
+          tag="需求上报"
+          v-model:value="localFormData.fileList" 
+          :processViewer="processViewer"
+          :file-list-show="fileListShow"
+          labelAlign="top"
+        />
         </el-col>
         <el-col :span="24">
           <div v-if="data.taskId">
diff --git a/src/views/project-management/mobledetail/index.vue b/src/views/project-management/mobledetail/index.vue
index 74b09c4..9b3744e 100644
--- a/src/views/project-management/mobledetail/index.vue
+++ b/src/views/project-management/mobledetail/index.vue
@@ -1,51 +1,53 @@
 <template>
-  <StepsMoblie :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
-         :reportType="route.query.id==='-1'?'direct':''">
-    <template #content>
-      <collection-detail :formData="detailData.formData"
-                         :data="detailData"
-                         :processViewer="commonProvessViewer"
-                         v-show="showActive == '00'"
-                         :fileListShow="fileListShow"
-                         v-model:value="auditOpinion"
-      />
-      <summary-detail v-show="showActive == '10'"
-                      :formData="detailData.formData"
+  <div style="padding: 0 10px;">
+    <StepsMoblie :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
+          :reportType="route.query.id==='-1'?'direct':''">
+      <template #content>
+        <collection-detail :formData="detailData.formData"
+                          :data="detailData"
+                          :processViewer="commonProvessViewer"
+                          v-show="showActive == '00'"
+                          :fileListShow="fileListShow"
+                          v-model:value="auditOpinion"
+        />
+        <summary-detail v-show="showActive == '10'"
+                        :formData="detailData.formData"
+                        :data="detailData"
+                        :processViewer="commonProvessViewer"
+                        :fileListShow="fileListShow"
+                        v-model:value="auditOpinion"/>
+        <ApprovalDetail type="approval"
+                        v-if="showActive == '20'&&!editShow"
+                        :formData="detailData.formData"
+                        :data="detailData"
+                        :processViewer="commonProvessViewer"
+                        :fileListShow="fileListShow"
+                        v-model:value="auditOpinion"/>
+        <ApprovalDetail type="execute"
+                        v-if="showActive == '40'&&!editShow"
+                        :formData="detailData.formData"
+                        :data="detailData"
+                        :processViewer="commonProvessViewer"
+                        :fileListShow="fileListShow"
+                        v-model:value="auditOpinion"/>
+        <ApprovalDetail type="archivist"
+                        v-show="showActive == '50'&&!editShow"
+                        :formData="detailData.formData"
+                        :data="detailData"
+                        :processViewer="commonProvessViewer"
+                        :fileListShow="fileListShow"
+                        v-model:value="auditOpinion"/>
+        <project-apply-moblie :title="applyTitle"
+                      v-if="editShow"
+                      :mode="mode"
+                      :step="showActive"
                       :data="detailData"
-                      :processViewer="commonProvessViewer"
-                      :fileListShow="fileListShow"
-                      v-model:value="auditOpinion"/>
-      <ApprovalDetail type="approval"
-                      v-if="showActive == '20'&&!editShow"
-                      :formData="detailData.formData"
-                      :data="detailData"
-                      :processViewer="commonProvessViewer"
-                      :fileListShow="fileListShow"
-                      v-model:value="auditOpinion"/>
-      <ApprovalDetail type="execute"
-                      v-if="showActive == '40'&&!editShow"
-                      :formData="detailData.formData"
-                      :data="detailData"
-                      :processViewer="commonProvessViewer"
-                      :fileListShow="fileListShow"
-                      v-model:value="auditOpinion"/>
-      <ApprovalDetail type="archivist"
-                      v-show="showActive == '50'&&!editShow"
-                      :formData="detailData.formData"
-                      :data="detailData"
-                      :processViewer="commonProvessViewer"
-                      :fileListShow="fileListShow"
-                      v-model:value="auditOpinion"/>
-      <project-apply-moblie :title="applyTitle"
-                     v-if="editShow"
-                     :mode="mode"
-                     :step="showActive"
-                     :data="detailData"
-                     :formData="detailData.formData"/>
-    </template>
-  </StepsMoblie>
-  <opinion-moblie v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
-           v-model:value="auditOpinion"/>
+                      :formData="detailData.formData"/>
+      </template>
+    </StepsMoblie>
+    <opinion-moblie v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
+            v-model:value="auditOpinion"/>
+  </div>
 </template>
 
 
diff --git a/src/views/system/user/add.vue b/src/views/system/user/add.vue
index f60fec1..4e71d6c 100644
--- a/src/views/system/user/add.vue
+++ b/src/views/system/user/add.vue
@@ -16,6 +16,7 @@ import { useTagsView } from '@/stores/tagsview.js'
 import { useAuthStore } from '@/stores/userstore.js'
 import { useCacheStore } from "@/stores/cache.js";
 import { getDeptOpt, getSubCompOpt, getRolesOpt, getJobOpt, getUserDetail } from '@/api/user/user.js'
+import { onBeforeMount } from 'vue';
 
 const tagsViewStore = useTagsView()
 const authStore = useAuthStore()
@@ -183,22 +184,17 @@ const getInstance = (e) => {
 }
 
 const init = async () => {
-  const { data } = await getDeptOpt()
-  localData.departmentIdOpt = data
-  const res = await getSubCompOpt()
-  localData.subCompanyIdOpt = res.data
-  const roleRes = await getRolesOpt()
-  localData.roleOpt = roleRes.data
-  const jobRes = await getJobOpt()
-  localData.jobOpt = jobRes.data
-  // const reqList = [
-  //   getDeptOpt(),
-  //   getSubCompOpt(),
-  //   getRolesOpt(),
-  //   getJobOpt()
-  // ]
-  // const resAll = await Promise.all(reqList)
-  // console.log("🚀 ~ init ~ resAll:", resAll)
+  const reqList = [
+    getDeptOpt(),
+    getSubCompOpt(),
+    getRolesOpt(),
+    getJobOpt()
+  ]
+  const resAll = await Promise.all(reqList)
+  localData.departmentIdOpt = resAll[0].data
+  localData.subCompanyIdOpt = resAll[1].data
+  localData.roleOpt = resAll[2].data
+  localData.jobOpt = resAll[3].data
 }
 
 const getInfo = async () => {
@@ -209,7 +205,9 @@ const getInfo = async () => {
     const res = await getDeptOpt({subCompanyId: data.subCompanyId})
     localData.departmentIdOpt = res.data
   }
-  form.value.setValues(data)
+  nextTick(()=>{
+    form.value.setValues(data)
+  })
 
 }
 

From 114c9116b1914adb5e23881023a51e6a5532633d Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Fri, 28 Jun 2024 00:08:24 +0800
Subject: [PATCH 04/60] =?UTF-8?q?feat:=20=E9=98=B6=E6=AE=B5=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |   5 +
 .../ApprovalDetailMoblie.vue                  | 277 ++++++++++++++++++
 .../phaseDetailMoblie/index.vue               |  96 ++++++
 3 files changed, 378 insertions(+)
 create mode 100644 src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
 create mode 100644 src/views/project-management/phaseDetailMoblie/index.vue

diff --git a/src/router/index.js b/src/router/index.js
index 05ecc69..270b259 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -50,6 +50,11 @@ const router = createRouter({
             name: 'expenseManagementMoblie',
             component: () => import('@/views/expense-management/share/moblieDetail/index.vue')
         },
+        {
+            path: '/phase/detail/moblie',
+            name: 'phaseDetailMoblie',
+            component: () => import('@/views/project-management/phaseDetailMoblie/index.vue')
+        },
         {
             path: '/',
             name: 'layout',
diff --git a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
new file mode 100644
index 0000000..3aca84c
--- /dev/null
+++ b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
@@ -0,0 +1,277 @@
+<template>
+  <div v-loading="loading">
+    <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
+    <el-form :model="formData" label-width="auto">
+      <file-component 
+        :title="getTagName(type)+'附件'" 
+        :tag="getTagName(type)"
+        v-model:value="formData.fileList" 
+        :processViewer="processViewer"
+        :file-list-show="fileListShow"
+        labelAlign="top"
+      />
+    </el-form>
+    <div v-if="data.taskId">
+      <baseTitle title="审核意见"></baseTitle>
+      <el-form-item prop="_value">
+        <el-input
+            v-model="_value"
+            :rows="3"
+            type="textarea"
+            placeholder="请输入审核意见"
+        />
+      </el-form-item>
+    </div>
+    <div class="approval-record">
+      <div class="approval-title">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="diagram">
+          <div class="base-title">流程图</div>
+          <el-switch
+              v-model="changeDiagram"
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+          />
+        </div>
+      </div>
+      <div class="process">
+        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+                          :operation-list="data.operationList"
+                          :state="data.state"/>
+        <process-diagram-viewer v-if="processViewer&&changeDiagram" :id-name="idName?idName:type"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import {ElLoading} from 'element-plus';
+import {downloadFile} from "@/api/project-demand";
+
+const changeDiagram = ref(false)
+const props = defineProps({
+  formData: {
+    type: Object,
+    default: {}
+  },
+  data: {
+    type: Object,
+    default: {}
+  },
+  processViewer: {
+    type: Boolean,
+    default: false
+  },
+  companyOption: {
+    type: Array,
+    default: []
+  },
+  fileListShow: {
+    type: String,
+    default: 'READ'
+  },
+  // approval 立项, execute 实施, 归档 archivist
+  type: {
+    type: String,
+    default: 'approval'
+  },
+  loading: {
+    type: Boolean,
+    default: false
+  },
+  value: {
+    type: String,
+    default: ''
+  },
+  idName: {
+    type: String,
+    default: ''
+  }
+})
+const form = ref()
+const schema = computed(() => {
+  let arr
+  if (props.type == 'approval') {
+    arr = [
+      {
+        label: '前置流程',
+        prop: 'preProcess',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.preProcess ? props.formData.preProcess.map(item => {
+                  return <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}}
+                                  href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName}</a> </span>
+                }) : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
+      {
+        label: '项目立项附件',
+        prop: 'singleFile',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.singleFile?.originalFileName ?
+                    <span
+                        style={{color: '#409EFF', cursor: 'pointer'}}
+                        onClick={() => handleDownload(props.formData.singleFile)}
+                    >
+                {props.formData.singleFile?.originalFileName}
+              </span> :
+                    <span>{'--'}</span>
+              }
+            </div>
+
+        )
+      },
+    ]
+  } else if (props.type == 'execute') {
+    arr = [
+      {
+        label: '前置流程',
+        prop: 'preProcess',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.preProcess ? props.formData.preProcess.map(item => {
+                  return <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}}
+                                  href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName}</a> </span>
+                }) : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
+      {
+        label: '项目验收附件',
+        prop: 'singleFile',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.singleFile?.originalFileName ?
+                    <span
+                        style={{color: '#409EFF', cursor: 'pointer'}}
+                        onClick={() => handleDownload(props.formData.singleFile)}
+                    >
+                {props.formData.singleFile?.originalFileName}
+              </span> :
+                    <span>{'--'}</span>
+              }
+            </div>
+
+        )
+      },
+    ]
+  } else if (props.type == 'archivist') {
+    arr = [
+      {
+        label: '项目归档附件',
+        prop: 'singleFile',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.singleFile?.originalFileName ?
+                    <span
+                        style={{color: '#409EFF', cursor: 'pointer'}}
+                        onClick={() => handleDownload(props.formData.singleFile)}
+                    >
+                {props.formData.singleFile?.originalFileName}
+              </span> :
+                    <span>{'--'}</span>
+              }
+            </div>
+
+        )
+      },
+    ]
+  } else if (props.type == 'phase') {
+    arr = [
+      {
+        label: '阶段变更附件',
+        prop: 'singleFile',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.singleFile?.originalFileName ?
+                    <span
+                        style={{color: '#409EFF', cursor: 'pointer'}}
+                        onClick={() => handleDownload(props.formData.singleFile)}
+                    >
+                {props.formData.singleFile?.originalFileName}
+              </span> :
+                    <span>{'--'}</span>
+              }
+            </div>
+
+        )
+      },
+    ]
+  }
+  return arr
+})
+
+const emit = defineEmits(['update:value'])
+const _value = computed({
+  get() {
+    return props.value;
+  },
+  set(val) {
+    emit("update:value", val);
+  }
+})
+
+const getTagName = (type) => {
+  switch (type) {
+    case 'approval':
+      return '项目立项'
+    case 'execute':
+      return '项目实施'
+    case 'archivist':
+      return '项目归档'
+    case 'phase':
+      return '阶段变更'
+  }
+}
+const handleDownload = (row) => {
+  const loading = ElLoading.service({fullscreen: true})
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+    loading.close()
+  })
+}
+watchEffect(() => {
+  Object.keys(props.formData).length && (form.value?.setValues(props.formData))
+})
+
+watch(() => props.loading, (newVal) => {
+  props.loading = newVal
+}, {deep: true})
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/project-management/phaseDetailMoblie/index.vue b/src/views/project-management/phaseDetailMoblie/index.vue
new file mode 100644
index 0000000..f6625d4
--- /dev/null
+++ b/src/views/project-management/phaseDetailMoblie/index.vue
@@ -0,0 +1,96 @@
+<template>
+  <div style="padding: 0 10px; box-sizing: border-box;">
+    <baseTitle title="基础信息"></baseTitle>
+    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
+    <baseTitle title="阶段变更详情"></baseTitle>
+    <div style="color: #606266;font-size: 14px">抄送人：{{copyName}}</div>
+    <ApprovalDetailMoblie :formData="summaryData.formData" :data="summaryData" type="phase"
+                    :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
+    <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {ElNotification} from "element-plus";
+import {useProcessStore} from '@/stores/processStore.js';
+import {getPhaseDetail} from "@/api/project-manage";
+import {computed, ref} from "vue";
+import {getBaseInfoApi} from "@/components/steps/api";
+import ApprovalDetailMoblie from './ApprovalDetailMoblie.vue'
+
+const route = useRoute()
+const summaryData = ref({})
+const summaryProcessViewer = ref(true)
+const processStore = useProcessStore()
+const loading = ref(false)
+const auditOpinion = ref('')
+const copyName = ref('')
+const fileListShow = ref('READ')
+const schema = computed(() => {
+  return [
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 24
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 24
+      }
+    }
+  ]
+})
+const baseForm = ref()
+const getBaseInfo = async () => {
+  try {
+    const {code, data} = await getBaseInfoApi(route.query.projectId)
+    baseForm.value.setValues(data)
+  } catch {
+  }
+}
+
+getBaseInfo()
+const getInfo = async () => {
+  fileListShow.value = 'READ'
+  const projectId = route.query.projectId
+  summaryProcessViewer.value = false
+  loading.value = true
+  const {code, data, msg} = await getPhaseDetail(projectId)
+  if (code === 1000) {
+    summaryData.value = data;
+    copyName.value= data.formData.userInfoList?.map(item=>item.name).join('，')
+    loading.value = false
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
+    nextTick(() => {
+      summaryProcessViewer.value = true
+      if (data.formPermMap["fileList"]) {
+        fileListShow.value = data.formPermMap["fileList"].perm
+      }
+    })
+  } else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type: 'error'
+    })
+    if (msg === '查询结果为空') {
+      summaryData.value = []
+    }
+    loading.value = false
+  }
+}
+getInfo()
+</script>
+
+<style scoped>
+
+</style>

From daac1812bf2b89d869d15c46c7c6d0814f7e6d72 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 16:25:21 +0800
Subject: [PATCH 05/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=B0=E5=BD=95=E3=80=81=E7=94=A8=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=88=87=E6=8D=A2=E7=82=B9=E5=87=BB=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E3=80=81=E6=89=80=E5=B1=9E=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CompanyPicker.vue         | 36 +++++++++---------
 src/layout/navbar/index.vue                   |  4 +-
 src/views/project-demand/requirement/add.vue  |  8 ++--
 .../project-demand/requirement/detail.vue     |  6 ++-
 .../project-management/filing/attachment.vue  |  3 --
 .../implementation/account.vue                |  4 +-
 src/views/workflow/common/OperationRender.vue | 38 ++++++++++++-------
 7 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index b739cd8..61cedf2 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -89,7 +89,6 @@ const props = defineProps({
     type: Boolean
   }
 });
-const isChooseAll = ref(true);
 let selectItem = reactive({
   type: -1,
   value: "0"
@@ -138,22 +137,14 @@ const checkBoxChange = (val) => {
 }
 const matterTree = (list, flag) => {
   list.forEach(item => {
-    if (!flag&&item.value!==-1) {
+    if (!flag) {
       tree.value.setChecked(item, false)
     }
     if (item.children !== undefined) {
-      matterTree(item.children)
+      matterTree(item.children, false)
     }
   })
 }
-// const cancelAll = () => {
-//   isChooseAll.value = true
-//   tree.value.setCheckedNodes([])
-// }
-// const chooseAll = () => {
-//   isChooseAll.value = false
-//   matterTree(dataList.value)
-// }
 const getList = () => {
   getSubCompOpt().then(res => {
     dataList.value = [
@@ -176,15 +167,26 @@ const filterNode = (value, data) => {
 const show = () => {
   //用于弹开部门选择
   visible.value = true;
-  selectList.value = _value.value
-  defaultChecked.value = _value.value.map(item => item.value)
+  if(selectList.value.length==0){
+    selectList.value=[]
+    defaultChecked.value =[]
+  }else {
+    selectList.value = _value.value
+    defaultChecked.value = _value.value.map(item => item.value)
+  }
   getList()
 };
 const handleChange = (data, checked) => {
-  if (data.value == -1&&checked) {
-    // tree.value.setCheckedNodes(['-1'])
-    matterTree(dataList.value, false)
-    // return;
+  if (data.value == -1) {
+    if(checked){
+      checkStrictly.value = false
+      const index = checkList.value.indexOf('2')
+      if (index != -1) {
+        checkList.value.splice(index, 1)
+      }
+      matterTree(dataList.value[0].children, false)
+      tree.value.setChecked(data,true);
+    }
   }
   // 左侧有选择框 + 多选
   if (props.multiple) {
diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue
index 642f14a..0a5618e 100644
--- a/src/layout/navbar/index.vue
+++ b/src/layout/navbar/index.vue
@@ -5,9 +5,9 @@
     <div class="right-bar">
       <!--        <bell-socket/>-->
       <div class="user-box">
-        <div>
+        <div  @click.stop="handleVisitedP">
           <el-avatar>{{ userInfo.nickName }}</el-avatar>
-          <div @click.stop="handleVisitedP">{{ userInfo.nickName }}
+          <div>{{ userInfo.nickName }}
             <el-icon style="margin-left: 5px">
               <ArrowDownBold/>
             </el-icon>
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 2449aeb..93c11e1 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -34,13 +34,15 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="所属公司" prop="companyIds" class="tree-select">
+            <div style="width: 100%">
+              <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
+              </el-button>
+            </div>
             <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ selectedCompanyList }}</div>
             <div v-else :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
                  @click="handleExpend">{{ showExpendText }}
             </div>
-            <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
-            </el-button>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -98,7 +100,7 @@
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
-    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected"/>
+    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected" v-model:value="selectedCompanyList"/>
   </div>
 </template>
 
diff --git a/src/views/project-demand/requirement/detail.vue b/src/views/project-demand/requirement/detail.vue
index 7157acd..bcff8c0 100644
--- a/src/views/project-demand/requirement/detail.vue
+++ b/src/views/project-demand/requirement/detail.vue
@@ -63,7 +63,11 @@ const init = async () => {
     }
     loading.value = false
     let data = res.data
-    data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
+    if(data.formData.companyIds[0]==-1){
+      data.formData.companyIds = ['所有公司']
+    }else {
+      data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
+    }
     collectData.value = data
     formData.value = data.formData;
     if (data.formData.specialFund) {
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index 20dde41..ba98f28 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -81,9 +81,6 @@ const handleClick = (tab) => {
 }
 
 const search = async (param) => {
-  if (activeName.value === '00') {
-    param.requirementId = requirementId.value
-  }
   param.targetId = projectId.value
   param.targetState = activeName.value
   searchFileList(param).then(res => {
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index a279d04..e12e82a 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -209,7 +209,7 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         if (row.researchStage && row.researchStage !== null && row.researchStage !== undefined) {
-          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+          return (<Tag dictType={'fee_stage'} value={row.researchStage}/>)
         } else {
           return '--'
         }
@@ -285,7 +285,7 @@ const handleUploadFee = () => {
 const exportExcelHandler = () => {
   console.log('exportIds.value',exportIds.value)
   let data = {
-    projectId: 113
+    projectId: route.query.id
   }
   exportExcel(data).then(res => {
     console.log(res)
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index e1d4538..b4fc42e 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -13,19 +13,22 @@
           </div>
           <div class="card">
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
-              <div>
+              <div class="avatar-block">
                 <name-circle :user="user"/>
-                <span>{{ user.name }}</span>
+                <div class="name">
+                  <span>{{ user.name }}</span>
+                  <span>{{ user.jobActivityDesc }}</span>
+                </div>
               </div>
               <div>
                 <div class="remark">{{ operation.remark }}</div>
-                <div>
-                  <div>审批人：</div>
-                  <div>{{ user.name }}</div>
-                </div>
+                <!--                <div>-->
+                <!--                  <div>审批人：</div>-->
+                <!--                  <div>{{ user.name }}</div>-->
+                <!--                </div>-->
                 <div v-if="user.auditOpinion">
                   <div style="margin-bottom: 10px;color: #909399">{{ user.operationTime }}</div>
-                  <div  class="username">
+                  <div class="username">
                     <span style="font-weight: bold">审批意见：</span>
                     <el-text v-text="user.auditOpinion" style="word-break: break-all">
                     </el-text>
@@ -274,16 +277,25 @@ init()
       border-bottom: none;
     }
 
-    > div:first-child {
+   .avatar-block {
       display: flex;
 
-
-      > span {
-        width: 100px;
-        color: #2a99ff;
+     .name {
+        width:130px;
+        display: flex;
+        flex-direction: column;
         margin-left: 10px;
-        margin-right: 20px;
+       margin-right: 20px;
+
+        > span:first-child {
+          color: #2a99ff;
+        }
+        >span:last-child{
+          margin-top: 5px;
+          color: #909399;
+        }
       }
+
     }
 
     > div:nth-child(2) {

From b7946d44c8ee9cd7ab69bbec3a1b84c09a8de7f0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 16:38:35 +0800
Subject: [PATCH 06/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 2f540dc..03b4764 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -47,8 +47,8 @@ const searchConfig = ref([
     }
   },
   {
-    label: '用户账号',
-    prop: 'userName',
+    label: '用户名称',
+    prop: 'nickName',
     component: 'el-input',
     props: {
       placeholder: '请输入',
@@ -56,8 +56,8 @@ const searchConfig = ref([
     }
   },
   {
-    label: '用户昵称',
-    prop: 'nickName',
+    label: '用户账号',
+    prop: 'userName',
     component: 'el-input',
     props: {
       placeholder: '请输入',
@@ -91,12 +91,12 @@ const tableConfig = reactive({
   columns: [
     {
       prop: 'userName',
-      label: '用户名称',
+      label: '用户账号',
       align: 'center',
     },
     {
       prop: 'nickName',
-      label: '用户昵称',
+      label: '用户名称',
       align: 'center',
     },
     {

From 291708e71a5edc8bd7f4d8741f7602187bf7df62 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 20:05:23 +0800
Subject: [PATCH 07/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=9C=80=E6=B1=82=E5=BE=81=E9=9B=86"=E4=B8=93?=
 =?UTF-8?q?=E9=A1=B9=E8=B5=84=E9=87=91=E5=90=8D=E7=A7=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/add.vue | 46 +++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 93c11e1..74fbbc6 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -38,10 +38,12 @@
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
               </el-button>
             </div>
-            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ selectedCompanyList }}</div>
+            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div v-else :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
-                 @click="handleExpend">{{ showExpendText }}
+                 @click="handleExpend">
+              {{ showExpendText }}
+
             </div>
           </el-form-item>
         </el-col>
@@ -54,7 +56,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金" prop="specialFundId">
+          <el-form-item label="专项资金名称" prop="specialFundId">
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
               <el-option
                   v-for="item in specialFundOption"
@@ -100,7 +102,8 @@
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
-    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected" v-model:value="selectedCompanyList"/>
+    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected"
+                    v-model:value="selectedCompanyList"/>
   </div>
 </template>
 
@@ -222,24 +225,16 @@ const showExpendClass = (showMoreCompany) => {
   if (!showMoreCompany) {
     if (selectedCompanyList.value.length === 0) {
       showExpendText.value = ''
-      return  ''
-    } else if (selectedCompanyList.value.length>14) {
+      return ''
+    } else if (selectedCompanyList.value.length > 14) {
       showExpendText.value = '展开'
-      return  'company-style'
+      return 'company-style'
     }
   } else {
     showExpendText.value = '收缩'
-    return  ''
+    return ''
   }
 }
-const getCompanyOptionItem = (val) => {
-  if (val !== undefined) {
-    val.forEach(item => {
-      matterTree(companyNameArray.value, companyOption.value, item)
-    })
-  }
-  return companyNameArray.value.join('，');
-}
 const getName = (list) => {
   return list.map(item => item.label).join('，')
 }
@@ -405,6 +400,25 @@ const handleResubmit = () => {
     }
   })
 }
+
+const getCompanyOptionItem = (val) => {
+  let newObj = {}
+  let newArray = []
+  if (val !== undefined) {
+    val.forEach(item => {
+      matterTree(companyNameArray.value, companyOption.value, item)
+      companyNameArray.value.forEach(companyItem => {
+        newObj = {
+          label: companyItem,
+          value: item
+        }
+        newArray.push(newObj)
+      })
+    })
+  }
+
+  return newArray;
+}
 const getDetailInfo = async () => {
   getFormInfo(route.query.id).then(res => {
     if (res.code === 1000) {

From efd06e0da77baaad1e0ca0143f82a2a10510aeef Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 20:15:58 +0800
Subject: [PATCH 08/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 1170283..8d88b2b 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="detail-block" v-loading="loading">
     <baseTitle title="需求上报"></baseTitle>
-    <el-form :model="formData" ref="summaryForm" :rules="rules">
+    <el-form :model="formData" ref="summaryForm" :rules="rules" label-width="140">
       <el-row gutter="50">
         <el-col :span="12">
           <el-form-item label="项目名称" prop="projectName">
             <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="5" v-if="!route.query.id">
+        <el-col :span="6" v-if="!route.query.id">
           <el-form-item label="是否专项资金" prop="isSpecialFund">
             <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
               <el-radio :label="true">是</el-radio>
@@ -16,7 +16,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="route.query.id && formData.isSpecialFund">
+        <el-col :span="5" v-if="route.query.id && formData.isSpecialFund">
           <el-form-item label="专项资金" prop="specialFundId">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
@@ -33,7 +33,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="开始时间" prop="startTime">
             <el-config-provider>
               <el-date-picker
@@ -47,7 +47,7 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="结束时间" prop="endTime"
                         :title="!formData.startTime?'请先选择开始时间!':''">
             <el-config-provider>
@@ -64,7 +64,7 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="项目类型" prop="projectType">
             <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
               <el-option
@@ -76,7 +76,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="研发主体" prop="rdSubject">
             <el-select v-model="formData.rdSubject" placeholder="请选择研发主体" clearable filterable>
               <el-option
@@ -148,7 +148,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
             <el-radio-group v-model="formData.industryUniversityResearch">
               <el-radio v-for="item in cacheStore.getDict('industry_university')"
@@ -158,7 +158,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="开展政府申报" prop="governmentDeclaration">
             <el-radio-group v-model="formData.governmentDeclaration">
               <el-radio v-for="item in cacheStore.getDict('government_declaration')"
@@ -189,7 +189,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="实用性新型专利(项)" prop="newPatent">
+          <el-form-item label="实用性新型专利(项)" prop="newPatent" label-width="145">
             <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利" :controls="false"/>
           </el-form-item>
         </el-col>
@@ -214,7 +214,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="formData.isSpecialFund!==false">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" label-width="280">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
@@ -225,7 +225,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="研发项目关键内容描述" prop="contentDescription">
+          <el-form-item label="研发项目关键内容描述" prop="contentDescription" label-width="140">
             <el-input v-model="formData.contentDescription" placeholder="请输入研发项目关键内容描述" rows="4" type="textarea"
                       clearable></el-input>
           </el-form-item>

From 84fb6838fbad233bef15a343de58b7defdf19525 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 20:16:24 +0800
Subject: [PATCH 09/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CompanyPicker.vue         | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index 61cedf2..2b97236 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -135,24 +135,14 @@ const checkBoxChange = (val) => {
     isExpand.value = '展开'
   }
 }
-const matterTree = (list, flag) => {
-  list.forEach(item => {
-    if (!flag) {
-      tree.value.setChecked(item, false)
-    }
-    if (item.children !== undefined) {
-      matterTree(item.children, false)
-    }
-  })
-}
 const getList = () => {
   getSubCompOpt().then(res => {
     dataList.value = [
       {
-        label: "全选",
+        label: "所有公司",
         value: -1,
-        children: res.data
-      }
+      },
+      ...res.data
     ]
   });
 };
@@ -167,24 +157,34 @@ const filterNode = (value, data) => {
 const show = () => {
   //用于弹开部门选择
   visible.value = true;
-  if(selectList.value.length==0){
-    selectList.value=[]
-    defaultChecked.value =[]
-  }else {
-    selectList.value = _value.value
-    defaultChecked.value = _value.value.map(item => item.value)
-  }
+  console.log('_value.value', _value.value, selectList.value)
+  // if(selectList.value.length==0){
+  //   selectList.value=[]
+  //   defaultChecked.value =[]
+  // }else {
+  selectList.value = _value.value
+  defaultChecked.value = _value.value.map(item => item.value)
+  // }
   getList()
 };
+
+const updateTreeCheck = (item, flag) => {
+  // list.forEach(item => {
+    tree.value.setChecked(item, flag)
+    if (item.children !== undefined) {
+      updateTreeCheck(item.children, flag)
+    }
+  // })
+}
 const handleChange = (data, checked) => {
   if (data.value == -1) {
     if(checked){
-      checkStrictly.value = false
-      const index = checkList.value.indexOf('2')
-      if (index != -1) {
-        checkList.value.splice(index, 1)
+      for (const item of dataList.value) {
+        if (item.value !== -1) {
+          console.log('item',item)
+          updateTreeCheck(item, false)
+        }
       }
-      matterTree(dataList.value[0].children, false)
       tree.value.setChecked(data,true);
     }
   }

From fc034cc65315337243f0175cffb0f0de62112015 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 28 Jun 2024 20:22:23 +0800
Subject: [PATCH 10/60] =?UTF-8?q?feat=20:=20=E9=9C=80=E6=B1=82=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/add.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 74fbbc6..890e780 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -9,8 +9,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="征集类型" prop="collectType">
-            <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
+          <el-form-item label="科技创新与信息化系统建设" prop="collectType">
+            <el-select v-model="formData.collectType" placeholder="科技创新与信息化系统建设" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('collect_type')"
                   :key="item.value"
@@ -21,21 +21,21 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="截止时间" prop="deadline">
+          <el-form-item label="需求上报截止时间" prop="deadline">
             <el-config-provider>
               <el-date-picker
                   v-model="formData.deadline"
                   type="date"
-                  placeholder="截止时间"
+                  placeholder="需求上报截止时间"
                   value-format="YYYY-MM-DD"
               />
             </el-config-provider>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="所属公司" prop="companyIds" class="tree-select">
+          <el-form-item label="征集公司" prop="companyIds" class="tree-select">
             <div style="width: 100%">
-              <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
+              <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
               </el-button>
             </div>
             <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>

From 377509b62a3ec373ae2635f3bd79f12f373ffc7d Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 28 Jun 2024 21:41:24 +0800
Subject: [PATCH 11/60] =?UTF-8?q?feat=20:=20=E5=88=86=E6=91=8A=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E5=B0=8F=E8=AE=A1=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/AllocationSummaryDetail.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index ccd1b78..51af440 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -24,7 +24,7 @@
     <el-table-column prop="afterTax" label="分摊金额" align="center">
       <template #default="scope">
         <div v-if="scope.row.afterTax !== null">
-<!--          {{ toThousands(scope.row.afterTax) }}-->
+          <!--          {{ toThousands(scope.row.afterTax) }}-->
           {{ scope.row.afterTax }}
         </div>
       </template>
@@ -33,7 +33,6 @@
 </template>
 
 <script setup>
-import {toThousands} from '@/utils/changePrice.js'
 import {exportExcel} from "@/utils/export-excel";
 import {getAllocationSummaryDetails} from "@/api/expense-manage";
 
@@ -71,6 +70,7 @@ const getSummaries = (param) => {
             return prev
           }
         }, 0)}`
+        sums[index] = parseFloat(sums[index]).toFixed(2)
         // sums[index] = toThousands(sums[index])
       } else {
         sums[index] = '-'
@@ -85,7 +85,7 @@ const exportTable = () => {
   if (!$table) {
     $table = $e
   }
-  exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目费用分摊表",2)
+  exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目费用分摊表", 2)
 }
 const init = () => {
   loading.value = true

From aa9001edd79941ad84ce248dc5aaaacad400d5b0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 21:50:05 +0800
Subject: [PATCH 12/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=92=E6=A1=A3-=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=B1=95=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2,=20=E4=B8=93=E9=A1=B9=E8=B5=84=E9=87=91=E5=8A=A0"?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0"=E4=BA=8C=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue                       | 2 +-
 src/components/DetailComponent/CollectionDetail.vue       | 2 +-
 src/components/DetailComponent/SummaryDetail.vue          | 2 +-
 src/views/project-demand/requirement/add.vue              | 4 ++--
 src/views/project-management/filing/attachment.vue        | 3 ++-
 src/views/project-management/filing/upload.vue            | 3 ++-
 .../mobledetail/CollectionDetailMoblie.vue                | 2 +-
 .../mobledetail/SummaryDetailMoblie.vue                   | 8 ++++----
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 2f95257..7827482 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -19,7 +19,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="其他文件">
-          <el-card style="width: 100%">
+          <el-card style="width: 100%;box-shadow: none">
             <file-upload @getFile="getOtherFile"/>
             <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
                      :data="allFileList" :isSettingCol="false" :pagination="false">
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 7c6ec41..6c3db8a 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -28,7 +28,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金">
+          <el-form-item label="专项资金名称">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 9f9ba54..ee64028 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
+          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
             <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 74fbbc6..a88b1a4 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -57,7 +57,7 @@
         </el-col>
         <el-col :span="6" v-if="formData.isSpecialFund">
           <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -171,7 +171,7 @@ const rules = reactive({
   companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
   collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
   deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
-  specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
+  specialFundId: [{required: true, message: '请选择专项资金名称', trigger: 'blur'}],
 })
 
 const tableConfig = reactive({
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index ba98f28..a5b4949 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -116,7 +116,8 @@ const upload = () => {
       name: 'Filing/upload',
       query: {
         id: route.query.id,
-        name: activeName.value
+        name: activeName.value,
+        requirementId:requirementId.value
       }
     })
   }
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index ed3ec34..52dd235 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -162,7 +162,8 @@ const handleSubmit = async () => {
       await router.push({
         name: 'Filing/attachment',
         query:{
-          id: route.query.id
+          id: route.query.id,
+          requirementId:route.query.requirementId
         }
       })
     }
diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
index 83b15c6..ea949be 100644
--- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
@@ -28,7 +28,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金">
+          <el-form-item label="专项资金名称">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index 311c809..cbf239c 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
+          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
             <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
           </el-form-item>
         </el-col>
@@ -132,10 +132,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <file-component 
-          title="需求上报附件" 
+          <file-component
+          title="需求上报附件"
           tag="需求上报"
-          v-model:value="localFormData.fileList" 
+          v-model:value="localFormData.fileList"
           :processViewer="processViewer"
           :file-list-show="fileListShow"
           labelAlign="top"

From 58d5efb6556eb52f87f8d75397cc378195c851a7 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 28 Jun 2024 21:54:16 +0800
Subject: [PATCH 13/60] =?UTF-8?q?fix=20:=20=E8=B4=B9=E7=94=A8=E5=88=86?=
 =?UTF-8?q?=E6=91=8A=E9=80=89=E6=8B=A9=E7=94=A8=E6=88=B7=E4=BC=9A=E8=A2=AB?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 6a8a2ba..cbe616e 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -39,9 +39,9 @@
           <el-table-column prop="researchPersonnel" label="研发人员" width="230">
             <template #default="scope">
               <el-form-item prop="researchPersonnel">
-                {{ scope.row.researchPersonnelName ? scope.row.researchPersonnelName : currentReachPerson.name }}
+                {{ scope.row.researchPersonnelName }}
                 <el-button @click="showPersonnelPicker(scope.row,scope.$index)">
-                  {{ scope.row.researchPersonnelName || currentReachPerson.name ? '更改' : '请选择研发人员' }}
+                  {{ scope.row.researchPersonnelName ? '更改' : '请选择研发人员' }}
                 </el-button>
               </el-form-item>
             </template>
@@ -211,13 +211,13 @@ const showPersonnelPicker = (row, index) => {
   userPicker.value.showUserPicker()
 }
 const selected = (select) => {
-  for (const selectElement of select) {
-    currentReachPerson.value = selectElement
+  if (!select || select.length === 0) {
+    return
   }
   formData.value.tableData.forEach((item, index) => {
-    if (index == currentIndex.value) {
-      item.researchPersonnel = currentReachPerson.value.id
-      item.researchPersonnelName = currentReachPerson.value.name
+    if (index === currentIndex.value) {
+      item.researchPersonnel = select[0].id
+      item.researchPersonnelName = select[0].name
     }
   })
 }
@@ -252,7 +252,7 @@ const handleAdd = () => {
     workday: '21.75',
     researchDuration: null,
   }
-  currentReachPerson.value.name=''
+  currentReachPerson.value.name = ''
   formData.value.tableData.push(row)
 }
 const handleCopy = (row) => {
@@ -260,6 +260,7 @@ const handleCopy = (row) => {
     projectId: row.projectId,
     projectName: '',
     researchPersonnel: row.researchPersonnel,
+    researchPersonnelName: row.researchPersonnelName,
     wagesPayable: row.wagesPayable,
     performance: row.performance,
     reserveFund: row.reserveFund,

From 942fc219e26cf369f8dc480c848c3b22ef21145b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 22:37:30 +0800
Subject: [PATCH 14/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E6=8E=92=E7=89=88=E3=80=81=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E5=88=86=E6=91=8A=E4=BC=A0=E5=8F=82=E3=80=81=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue |  36 ++---
 src/views/project-demand/summary/add.vue   | 161 +++++++++++----------
 src/views/project-demand/summary/index.vue |  69 ++++++++-
 3 files changed, 165 insertions(+), 101 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index cbe616e..9d2329c 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -36,12 +36,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="researchPersonnel" label="研发人员" width="230">
+          <el-table-column prop="researchPersonnelId" label="研发人员" width="230">
             <template #default="scope">
-              <el-form-item prop="researchPersonnel">
-                {{ scope.row.researchPersonnelName }}
+              <el-form-item prop="researchPersonnelId">
+                {{ scope.row.researchPersonnel }}
                 <el-button @click="showPersonnelPicker(scope.row,scope.$index)">
-                  {{ scope.row.researchPersonnelName ? '更改' : '请选择研发人员' }}
+                  {{ scope.row.researchPersonnel ? '更改' : '请选择研发人员' }}
                 </el-button>
               </el-form-item>
             </template>
@@ -163,7 +163,7 @@ const rules = reactive({
   shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
   apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
   projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
-  // researchPersonnel: [{required: true, message: '请选择研发人员', trigger:  ['blur', 'change']}],
+  // researchPersonnelId: [{required: true, message: '请选择研发人员', trigger:  ['blur', 'change']}],
   wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
   performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
   reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
@@ -187,7 +187,7 @@ const formData = ref({
     {
       projectId: '',
       projectName: '',
-      researchPersonnel: '',
+      researchPersonnelId: '',
       wagesPayable: null,
       performance: null,
       reserveFund: null,
@@ -216,8 +216,8 @@ const selected = (select) => {
   }
   formData.value.tableData.forEach((item, index) => {
     if (index === currentIndex.value) {
-      item.researchPersonnel = select[0].id
-      item.researchPersonnelName = select[0].name
+      item.researchPersonnelId = select[0].id
+      item.researchPersonnel = select[0].name
     }
   })
 }
@@ -242,8 +242,8 @@ const handleAdd = () => {
   let row = {
     projectId: '',
     projectName: '',
+    researchPersonnelId: '',
     researchPersonnel: '',
-    researchPersonnelName: '',
     wagesPayable: null,
     performance: null,
     reserveFund: null,
@@ -259,8 +259,8 @@ const handleCopy = (row) => {
   let copyObj = {
     projectId: row.projectId,
     projectName: '',
+    researchPersonnelId: row.researchPersonnelId,
     researchPersonnel: row.researchPersonnel,
-    researchPersonnelName: row.researchPersonnelName,
     wagesPayable: row.wagesPayable,
     performance: row.performance,
     reserveFund: row.reserveFund,
@@ -284,15 +284,15 @@ const handleSubmit = (instance) => {
         type: 'error'
       })
     }
-    let researchPersonnel = ''
+    let researchPersonnelId = ''
     formData.value.tableData.forEach(item => {
       item.projectName = getProjectName(item.projectId)
-      researchPersonnel = item.researchPersonnel
+      researchPersonnelId = item.researchPersonnelId
       if (item.performance == 0) {
         item.performance = null
       }
     })
-    if (!researchPersonnel) {
+    if (!researchPersonnelId) {
       ElNotification({
         title: '提示',
         message: '请选择研发人员',
@@ -333,18 +333,18 @@ const handleResubmit = (instance) => {
     }
     let newUsrAllocationsObj = {}
     let newUsrAllocationsObjArray = []
-    let researchPersonnel = ''
+    let researchPersonnelId = ''
     formData.value.tableData.forEach(item => {
       item.allocationId = formData.value.allocationId
       item.projectName = getProjectName(item.projectId)
-      researchPersonnel = item.researchPersonnel
+      researchPersonnelId = item.researchPersonnelId
       if (item.performance == 0) {
         item.performance = null
       }
       newUsrAllocationsObj = {
         projectId: item.projectId,
         projectName: item.projectName,
-        researchPersonnel: item.researchPersonnel,
+        researchPersonnelId: item.researchPersonnelId,
         wagesPayable: item.wagesPayable,
         performance: item.performance,
         reserveFund: item.reserveFund,
@@ -355,7 +355,7 @@ const handleResubmit = (instance) => {
       }
       newUsrAllocationsObjArray.push(newUsrAllocationsObj)
     })
-    if (!researchPersonnel) {
+    if (!researchPersonnelId) {
       ElNotification({
         title: '提示',
         message: '请选择研发人员',
@@ -409,7 +409,7 @@ const getDetailList = async () => {
   const {code, data, msg} = await getAllocationDetailList(params)
   if (code === 1000) {
     data.rows.forEach(item => {
-      item.researchPersonnel = Number(item.researchPersonnel)
+      item.researchPersonnelId = Number(item.researchPersonnelId)
     })
     formData.value.tableData = data.rows
     nextTick(() => {
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 8d88b2b..9d3f60b 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -1,40 +1,16 @@
 <template>
   <div class="detail-block" v-loading="loading">
     <baseTitle title="需求上报"></baseTitle>
-    <el-form :model="formData" ref="summaryForm" :rules="rules" label-width="140">
-      <el-row gutter="50">
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="projectName">
+    <el-form :model="formData" ref="summaryForm" :rules="rules">
+      <el-row gutter="15">
+        <!--        label-width="140"-->
+        <el-col :span="8">
+          <el-form-item label="项目名称" prop="projectName" label-width="105">
             <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="!route.query.id">
-          <el-form-item label="是否专项资金" prop="isSpecialFund">
-            <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="5" v-if="route.query.id && formData.isSpecialFund">
-          <el-form-item label="专项资金" prop="specialFundId">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" v-if="!route.query.id && formData.isSpecialFund">
-          <el-form-item label="专项资金" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
-              <el-option
-                  v-for="item in specialFundOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="开始时间" prop="startTime">
+        <el-col :span="8">
+          <el-form-item label="开始时间" prop="startTime" label-width="145">
             <el-config-provider>
               <el-date-picker
                   v-model="formData.startTime"
@@ -47,9 +23,9 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="结束时间" prop="endTime"
-                        :title="!formData.startTime?'请先选择开始时间!':''">
+                        :title="!formData.startTime?'请先选择开始时间!':''" label-width="134">
             <el-config-provider>
               <el-date-picker
                   v-model="formData.endTime"
@@ -64,8 +40,8 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="项目类型" prop="projectType">
+        <el-col :span="8">
+          <el-form-item label="项目类型" prop="projectType" label-width="105">
             <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('project_type')"
@@ -76,8 +52,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="研发主体" prop="rdSubject">
+        <el-col :span="8">
+          <el-form-item label="研发主体" prop="rdSubject" label-width="145">
             <el-select v-model="formData.rdSubject" placeholder="请选择研发主体" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('rd_subject')"
@@ -88,8 +64,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="出资类型" prop="investmentType">
+        <el-col :span="8">
+          <el-form-item label="出资类型" prop="investmentType" label-width="134">
             <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('invest_type')"
@@ -100,8 +76,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目影响" prop="projectImpact">
+        <el-col :span="8">
+          <el-form-item label="项目影响" prop="projectImpact" label-width="105">
             <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('project_impact')"
@@ -112,8 +88,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属业务板块" prop="businessSegment">
+        <el-col :span="8">
+          <el-form-item label="所属业务板块" prop="businessSegment" label-width="145">
             <el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('business_segment')"
@@ -124,19 +100,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
-              <el-option
-                  v-for="item in cacheStore.getDict('result_form')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
             <el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
               <el-option
@@ -149,7 +113,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="产学研联合" prop="industryUniversityResearch">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="105">
             <el-radio-group v-model="formData.industryUniversityResearch">
               <el-radio v-for="item in cacheStore.getDict('industry_university')"
                         :key="item.value"
@@ -168,7 +132,32 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="!route.query.id && formData.isSpecialFund?4:12" v-if="!route.query.id">
+          <el-form-item label="是否专项资金" prop="isSpecialFund" >
+            <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="route.query.id && formData.isSpecialFund">
+          <el-form-item label="专项资金名称" prop="specialFundId">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="!route.query.id && formData.isSpecialFund" >
+          <el-form-item label="专项资金名称" prop="specialFundId" label-width="135">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
+              <el-option
+                  v-for="item in specialFundOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label="知识产权状况" prop="intellectualProperty">
             <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
               <el-option
@@ -180,52 +169,64 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="16">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('result_form')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <baseTitle title="预期知识产权"></baseTitle>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="发明专利(项)" prop="inventionPatent">
+        <el-col :span="8">
+          <el-form-item label="发明专利(项)" prop="inventionPatent" label-width="107">
             <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="实用性新型专利(项)" prop="newPatent" label-width="145">
             <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="软件著作权(项)" prop="softwareCopyright">
+        <el-col :span="8">
+          <el-form-item label="软件著作权(项)" prop="softwareCopyright" label-width="135">
             <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="著作权(项)" prop="copyright">
+        <el-col :span="8">
+          <el-form-item label="著作权(项)" prop="copyright" label-width="107">
             <el-input-number v-model="formData.copyright" placeholder="请输入著作权" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="其他(项)" prop="other">
+        <el-col :span="8">
+          <el-form-item label="其他(项)" prop="other" label-width="145">
             <el-input-number v-model="formData.other" placeholder="请输入其他" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="经济概算(元)" prop="economicEstimate">
+        <el-col :span="8">
+          <el-form-item label="经济概算(元)" prop="economicEstimate" label-width="135">
             <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济概算" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="formData.isSpecialFund!==false">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" label-width="280">
+        <el-col :span="16" v-if="formData.isSpecialFund">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="现有业务描述" prop="serviceDescription">
+          <el-form-item label="现有业务描述" prop="serviceDescription" label-width="107">
             <el-input v-model="formData.serviceDescription" placeholder="请输入现有业务描述" rows="4" type="textarea"
                       clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="研发项目关键内容描述" prop="contentDescription" label-width="140">
+          <el-form-item label="研发项目关键内容描述" prop="contentDescription" label-width="107">
             <el-input v-model="formData.contentDescription" placeholder="请输入研发项目关键内容描述" rows="4" type="textarea"
                       clearable></el-input>
           </el-form-item>
@@ -337,11 +338,11 @@ const getIsFund = async () => {
   })
 }
 const getFundName = (id) => {
-  let label=''
+  let label = ''
   specialFundOption.value.forEach(item => {
-   if(item.value==id){
-     label=item.label
-   }
+    if (item.value == id) {
+      label = item.label
+    }
   })
   return label
 }
@@ -448,8 +449,8 @@ const handleResubmit = debounce(() => {
   } else {
     attachment.value.clearValidate()
   }
-  if (formData.value.isSpecialFund&&formData.value.specialFund === null) {
-    formData.value.specialFund=getFundName(formData.value.specialFundId)
+  if (formData.value.isSpecialFund && formData.value.specialFund === null) {
+    formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
   let params = {
     ...formData.value,
@@ -482,7 +483,7 @@ const getDetailInfo = async () => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      res.data.formData.specialFundId= res.data.formData.specialFundId===0?null:res.data.formData.specialFundId
+      res.data.formData.specialFundId = res.data.formData.specialFundId === 0 ? null : res.data.formData.specialFundId
       formData.value = res.data.formData
       loading.value = false
     }
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 6cc316b..e6f7792 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -8,6 +8,35 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 
 const tableIns = ref()
 const router = useRouter()
+const shortcuts = [
+  {
+    text: '上周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '上月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      return [start, end]
+    },
+  },
+  {
+    text: '三月前',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+      return [start, end]
+    },
+  },
+]
 const searchConfig = reactive([
   {
     label: '征集名称',
@@ -32,6 +61,18 @@ const searchConfig = reactive([
     },
     colProps: {}
   },
+  {
+    label: '项目影响',
+    prop: 'projectImpact',
+    component: shallowRef(fvSelect),
+    props: {
+      cacheKey: 'project_impact',
+      placeholder: '请选择项目影响',
+      clearable: true,
+      filterable: true,
+    },
+    colProps: {}
+  },
   {
     label: '研发主体',
     prop: 'rdSubject',
@@ -40,9 +81,31 @@ const searchConfig = reactive([
       placeholder: '请选择研发主体',
       cacheKey: 'rd_subject',
       clearable: true,
-      filterable: true
-    },
-    colProps: {}
+      filterable: true,
+    }
+  },
+  {
+    label: '起止时间',
+    prop: 'dateValue',
+    component: 'el-date-picker',
+    props: {
+      clearable: true,
+      type: 'daterange',
+      startPlaceholder: '开始日期',
+      endPlaceholder: '结束日期',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      shortcuts: shortcuts
+    }
+  },
+  {
+    label: '状态',
+    prop: 'state',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择状态',
+      clearable: true,
+      cacheKey: 'project_initiation'
+    }
   },
   // {
   //   label: '项目影响',

From bd2d12551a718ce75342a14eb3397458d37594ea Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Fri, 28 Jun 2024 23:53:43 +0800
Subject: [PATCH 15/60] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E6=9D=A1=E6=A0=B7=E5=BC=8F=EF=BC=8C=20=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BAtag=E7=BB=84=E4=BB=B6=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tag.vue                        |  3 ++-
 src/components/steps/index.vue                | 13 ++++++++++++-
 .../implementation/account.vue                |  1 +
 .../implementation/updateTable.vue            |  2 +-
 .../mobledetail/StepsMoblie.vue               | 19 +++++++++++++++----
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/components/Tag.vue b/src/components/Tag.vue
index e50abbd..3447898 100644
--- a/src/components/Tag.vue
+++ b/src/components/Tag.vue
@@ -31,6 +31,7 @@ const props = defineProps({
 const tagConfig = ref({})
 
 const filterDict = (data, value) => {
+  console.log("🚀 ~ filterDict ~ data:", data)
   if (!data || value == null) return
   if (data instanceof Array) {
     if (value == true || value == false) {
@@ -45,7 +46,7 @@ const filterDict = (data, value) => {
       tagConfig.value = data.find(item => item.value == value)
     }
   }
-  return tagConfig.value.label
+  return tagConfig.value?.label || '未知'
 }
 </script>
 
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index c95f922..dded12f 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -11,7 +11,12 @@
           :class="stepClass(index)"
           @click="handleStep(item.key, index)"
 
-      />
+      >
+        <template #icon>
+          <el-icon style="font-size: 20px;" :class="index == localActive ? 'is-active' : 'is-end'" v-if="localStepSuccess.includes(index)"><SuccessFilled /></el-icon>
+          <el-icon style="font-size: 20px; color: gray;" v-else><WarningFilled /></el-icon>
+        </template>
+      </el-step>
     </el-steps>
   </div>
 
@@ -311,4 +316,10 @@ watchEffect(() => {
 .step-error {
   cursor: not-allowed;
 }
+.is-active {
+  color: #BEA266;
+}
+.is-end {
+  color: #67c23a;
+}
 </style>
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index e12e82a..71fa18e 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -308,6 +308,7 @@ const search = (val) => {
 }
 const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
+  console.log("🚀 ~ init ~ data:", data)
   if (data) {
     tableData.value = data
     baseForm.value.setValues(data)
diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index d74bf80..d8a138d 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -141,7 +141,7 @@ const handleSubmit = async () => {
 }
 const getBaseInfo = async () => {
   const {code, data} = await getBaseInfoApi(route.query.id)
-  tableForm.value.projectName = data.projectName
+  tableForm.value.projectName = data?.projectName || ''
 }
 getBaseInfo()
 const init = async () => {
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index a42e83b..dded12f 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -11,7 +11,12 @@
           :class="stepClass(index)"
           @click="handleStep(item.key, index)"
 
-      />
+      >
+        <template #icon>
+          <el-icon style="font-size: 20px;" :class="index == localActive ? 'is-active' : 'is-end'" v-if="localStepSuccess.includes(index)"><SuccessFilled /></el-icon>
+          <el-icon style="font-size: 20px; color: gray;" v-else><WarningFilled /></el-icon>
+        </template>
+      </el-step>
     </el-steps>
   </div>
 
@@ -96,21 +101,21 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 24
+        span: 12
       }
     },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
       colProps: {
-        span: 24
+        span: 12
       }
     },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
-        span: 24
+        span: 12
       }
     }
 
@@ -311,4 +316,10 @@ watchEffect(() => {
 .step-error {
   cursor: not-allowed;
 }
+.is-active {
+  color: #BEA266;
+}
+.is-end {
+  color: #67c23a;
+}
 </style>

From 72171fb573e9ecfccc32ea14d5a79c8e18a94ce4 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 00:07:43 +0800
Subject: [PATCH 16/60] =?UTF-8?q?fix=20:=20=E9=9C=80=E6=B1=82=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E6=96=B0=E5=A2=9E/=E8=AF=A6=E6=83=85=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96,=E9=9C=80=E6=B1=82=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E8=AF=A6=E6=83=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      | 17 ++---
 .../DetailComponent/SummaryDetail.vue         | 57 +++++++++-------
 src/components/steps/index.vue                |  3 +-
 src/views/project-demand/requirement/add.vue  | 65 +++++++++----------
 src/views/project-demand/summary/add.vue      |  5 +-
 .../implementation/uploadFee.vue              |  4 +-
 src/views/workflow/common/OperationRender.vue |  2 +-
 7 files changed, 80 insertions(+), 73 deletions(-)

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 6c3db8a..c02bd4e 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading">
-    <el-form :model="formData" label-width="auto">
+    <el-form :model="formData">
       <el-row>
         <el-col :span="6" v-if="type==='singleDetail'">
           <el-form-item label="征集名称">
@@ -13,12 +13,17 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="截止时间">
+          <el-form-item label="需求上报截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="formData.isSpecialFund">
+          <el-form-item label="专项资金名称">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="type==='singleDetail'">
-          <el-form-item label="所属公司">
+          <el-form-item label="征集公司">
             <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
                 getCompanyName(formData.companyIds)
               }}</span>
@@ -27,11 +32,7 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金名称">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="24">
           <baseTitle title="征集说明"></baseTitle>
           <el-form-item>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index ee64028..bf34c34 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -2,82 +2,85 @@
   <div class="detail-block" v-loading="loading">
     <el-form :model="localFormData" ref="summaryForm" :rules="rules">
       <el-row gutter="50">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目名称" prop="projectName">
             <span>{{ localFormData.projectName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
-            <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="开始时间" prop="startTime">
             <span>{{ localFormData.startTime }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="结束时间" prop="endTime">
             <span>{{ localFormData.endTime }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目类型" prop="projectType">
             <span>{{ filterDict(cacheStore.getDict('project_type'), localFormData.projectType) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="研发主体" prop="rdSubject">
             <span>{{ filterDict(cacheStore.getDict('rd_subject'), localFormData.rdSubject) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="出资类型" prop="investmentType">
             <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目影响" prop="projectImpact">
             <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="所属业务板块" prop="businessSegment">
             <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
             <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
             <span>{{
                 filterDict(cacheStore.getDict('industry_university'), localFormData.industryUniversityResearch)
               }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="开展政府申报" prop="governmentDeclaration">
             <span>{{
                 filterDict(cacheStore.getDict('government_declaration'), localFormData.governmentDeclaration)
               }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
+          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
+            <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label="知识产权状况" prop="intellectualProperty">
             <span>{{
                 filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
               }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="16">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <baseTitle title="预期知识产权"></baseTitle>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="发明专利(项)" prop="inventionPatent">
             <span>{{ localFormData.inventionPatent }}</span>
@@ -125,14 +128,20 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="需求上报申请书">
+          <baseTitle title="需求上报申请书"></baseTitle>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item>
             <el-button type="primary" link @click="handleDownload(localFormData.singleFile)" style="font-size: 16px">
               {{ localFormData.singleFile?.originalFileName }}
             </el-button>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <file-component title="需求上报附件" tag="需求上报"
+          <baseTitle title="附件列表"></baseTitle>
+        </el-col>
+        <el-col :span="24">
+          <file-component  tag="需求上报"
                           v-model:value="localFormData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>
         </el-col>
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index c95f922..67ab94d 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -1,7 +1,6 @@
 <template>
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-  <baseTitle title="各流程信息"></baseTitle>
   <div class="steps-box">
     <el-steps :active="localActive" finish-status="success">
       <el-step
@@ -14,9 +13,9 @@
       />
     </el-steps>
   </div>
-
   <!-- 步骤内容 -->
   <div>
+    <baseTitle title="各流程信息"></baseTitle>
     <slot name="content" :localActive="localActive"></slot>
     <!-- <template v-for="(item, index) in stepList" :key="item.key">
       <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 37b7c18..3ae6605 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -1,16 +1,16 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
-      <el-row>
-        <el-col :span="6">
-          <el-form-item label="名称" prop="requirementName">
+    <el-form :model="formData"  ref="demandForm" :rules="rules">
+      <el-row gutter="30">
+        <el-col :span="8">
+          <el-form-item label="征集名称" prop="requirementName" label-width="96">
             <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="科技创新与信息化系统建设" prop="collectType">
-            <el-select v-model="formData.collectType" placeholder="科技创新与信息化系统建设" clearable filterable>
+        <el-col :span="8">
+          <el-form-item label="征集类型" prop="collectType" label-width="105">
+            <el-select v-model="formData.collectType" placeholder="请选择征集类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('collect_type')"
                   :key="item.value"
@@ -20,7 +20,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="需求上报截止时间" prop="deadline">
             <el-config-provider>
               <el-date-picker
@@ -32,8 +32,28 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="征集公司" prop="companyIds" class="tree-select">
+        <el-col :span="8">
+          <el-form-item label="是否专项资金" prop="isSpecialFund">
+            <el-select v-model="formData.isSpecialFund" placeholder="是否专项资金" clearable filterable>
+              <el-option value="true" label="是"></el-option>
+              <el-option value="false" label="否"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="专项资金名称" prop="specialFundId">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="formData.isSpecialFund==='false'">
+              <el-option
+                  v-for="item in specialFundOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" style="margin-bottom: -18px">
+          <el-form-item label="征集公司" prop="companyIds" class="tree-select" label-width="96">
             <div style="width: 100%">
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
               </el-button>
@@ -43,30 +63,9 @@
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
                  @click="handleExpend">
               {{ showExpendText }}
-
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="是否专项资金" prop="isSpecialFund">
-            <el-radio-group v-model="formData.isSpecialFund" size="mini">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
-              <el-option
-                  v-for="item in specialFundOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
@@ -146,11 +145,11 @@ const dateValue = ref()
 const formData = ref({
   requirementName: '',
   companyIds: [],
-  collectType: '',
+  collectType: '科技创新与信息化系统建设',
   deadline: '',
   collectExplain: '',
   fileList: [],
-  isSpecialFund: false
+  isSpecialFund: 'false'
 })
 const showTinymce = ref(true)
 const routerName = ref(router.currentRoute.value.name)
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 9d3f60b..dc42ec0 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -3,7 +3,6 @@
     <baseTitle title="需求上报"></baseTitle>
     <el-form :model="formData" ref="summaryForm" :rules="rules">
       <el-row gutter="15">
-        <!--        label-width="140"-->
         <el-col :span="8">
           <el-form-item label="项目名称" prop="projectName" label-width="105">
             <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
@@ -170,8 +169,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
+          <el-form-item label="预期成果形式" prop="resultForm" label-width="145">
+            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
               <el-option
                   v-for="item in cacheStore.getDict('result_form')"
                   :key="item.value"
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 68027a0..f3c2d48 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -114,8 +114,8 @@ const schema = computed(() => {
 const baseForm = ref()
 const rules = reactive({
   time: [{required: true, message: '请选择时间', trigger: 'blur'}],
-  projectCost: [{required: true, message: '请输入项目费用', trigger: 'blur'}],
-  researchStage: [{required: true, message: '请输入研发阶段', trigger: 'blur'}],
+  projectCost: [{required: true, message: '请选择项目费用', trigger: 'blur'}],
+  researchStage: [{required: true, message: '请选择研发阶段', trigger: 'blur'}],
   digest: [{required: true, message: '请输入摘要', trigger: 'blur'}],
   afterTax: [{required: true, message: '请输入税后余额', trigger: 'blur'}]
 })
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index b4fc42e..4d2f616 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -312,7 +312,7 @@ init()
       }
 
       > div:nth-child(2) {
-        display: flex;
+        //display: flex;
         margin-top: -5px;
       }
     }

From 13c0e3a7f060cb88c0689dbbe4e9893595c11e93 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 00:09:42 +0800
Subject: [PATCH 17/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index dc42ec0..33f2ddf 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -170,7 +170,7 @@
         </el-col>
         <el-col :span="16">
           <el-form-item label="预期成果形式" prop="resultForm" label-width="145">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
+            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('result_form')"
                   :key="item.value"

From 0a6c37019a545ad8ff8a5e62a8dc0a3c893048c6 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 02:12:04 +0800
Subject: [PATCH 18/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  |   3 +-
 src/components/AttachmentUpload.vue           | 123 ++++++++++++++++--
 .../DetailComponent/ApprovalDetail.vue        |   2 +-
 .../DetailComponent/CollectionDetail.vue      |   2 +-
 .../DetailComponent/ProjectApply.vue          |   3 +-
 .../DetailComponent/SpecialFundDetail.vue     |   2 +-
 .../DetailComponent/SummaryDetail.vue         |   2 +-
 src/views/expense-management/share/add.vue    |   2 +-
 src/views/expense-management/share/detail.vue |   2 +-
 .../share/moblieDetail/index.vue              |   2 +-
 src/views/project-demand/requirement/add.vue  |   5 +-
 .../moblieDetail/CollectionDetailMoblie.vue   |   2 +-
 src/views/project-demand/summary/add.vue      |  41 ++++--
 .../implementation/phase.vue                  |   2 +-
 .../mobledetail/ApprovalDetailMoblie.vue      |   8 +-
 .../mobledetail/CollectionDetailMoblie.vue    |   2 +-
 .../mobledetail/ProjectApplyMoblie.vue        |   4 +-
 .../mobledetail/ShareDetailMobile.vue         |   2 +-
 .../mobledetail/SpecialFundDetailMobile.vue   |   2 +-
 .../mobledetail/SummaryDetailMoblie.vue       |   2 +-
 .../ApprovalDetailMoblie.vue                  |   8 +-
 src/views/special-fund/add.vue                |   2 +-
 22 files changed, 169 insertions(+), 54 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index da3e9b3..caed37a 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -556,7 +556,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
   .approval-title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    //justify-content: space-between;
 
     .diagram {
       display: flex;
@@ -564,6 +564,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
       float: right;
 
       .base-title {
+        margin-left: 10px;
         margin-right: 10px;
       }
 
diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 7827482..f50707c 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -1,8 +1,8 @@
 <template>
-  <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules" label-position="top">
+  <el-form :model="formData" ref="applyForm"  :rules="rules" :label-position="labelPosition">
     <el-row>
       <el-col :span="24">
-        <el-form-item :label="label" prop="attachment">
+        <el-form-item :label="label" prop="attachment" label-width="125">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
               {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
@@ -12,22 +12,29 @@
           </template>
           <template
               v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null||formData.singleFile==null">
-            <file-upload @getFile="getAttachment" :showFileList="showFileList" :multiple="false" :maxSize="1"
-                         :disabled="isSingleFile" @delete="deleteAttachment"/>
+            <file-upload @getFile="getAttachment"  :multiple="false" :maxSize="1"  :showFileList="showFileList" @delete="deleteAttachment"
+                         :disabled="isSingleFile" />
+<!--           -->
+<!--            <fvTable style="width: 100%;max-height: 80px;" v-if="showSingleTable" :tableConfig="singleTableConfig"-->
+<!--                     :data="singleFileList" :isSettingCol="false" :pagination="false">-->
+<!--              <template #empty>-->
+<!--                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>-->
+<!--              </template>-->
+<!--            </fvTable>-->
           </template>
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="其他文件">
-          <el-card style="width: 100%;box-shadow: none">
-            <file-upload @getFile="getOtherFile"/>
+        <el-form-item label="其他文件" label-width="125">
+          <file-upload @getFile="getOtherFile"/>
+<!--          <el-card style="width: 100%;box-shadow: none">-->
             <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
                      :data="allFileList" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
               </template>
             </fvTable>
-          </el-card>
+<!--          </el-card>-->
         </el-form-item>
       </el-col>
     </el-row>
@@ -50,12 +57,20 @@ const props = defineProps({
   },
   showTable: {
     type: Boolean,
-    default: true
+    default: false
+  },
+  showSingleTable: {
+    type: Boolean,
+    default: false
   },
   preview: {
     type: Boolean,
     default: false
   },
+  singleList: {
+    type: Array,
+    default: []
+  },
   otherFileList: {
     type: Array,
     default: []
@@ -63,6 +78,10 @@ const props = defineProps({
   formData: {
     type: Object,
     default: {}
+  },
+  labelPosition: {
+    type: String,
+    default:''
   }
 })
 const emit = defineEmits(["getAttachment", "getOtherFile"])
@@ -128,6 +147,68 @@ const tableConfig = reactive({
     }
   ]
 })
+const singleTableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        btn.push({label: '下载', func: () => handleDownload(row), type: 'primary'})
+        // if (row.newFile) {
+        //   btn.push({label: '删除', func: () => handleDelete(row), type: 'primary'})
+        // }
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+              {
+                row.newFile || props.preview || !props.preview ?
+                    <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
+                        // perm={['']}
+                                    onDelete={() => handleSingleDelete(row)}/>
+                    : ''
+              }
+            </div>
+        )
+      }
+    }
+  ]
+})
 const rules = reactive({
   attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
 })
@@ -135,9 +216,16 @@ const applyForm = ref()
 const singleFile = ref(props.formData.singleFile)
 const isSingleFile = ref(false)
 const allFileList = ref([])
+const singleFileList = ref([])
+if(props.formData.fileList !== null && props.formData.fileList.length > 0){
+  allFileList.value = props.formData.fileList
+}
 watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
+watch(() => props.showSingleTable, (newVal) => {
+  props.showSingleTable = newVal
+}, {deep: true})
 watch(() => props.formData.fileList, (newVal) => {
   // console.log('newVal-fileList', newVal)
   if (props.preview) {
@@ -160,6 +248,10 @@ watch(() => props.otherFileList, (newVal) => {
     allFileList.value = newVal
   }
 }, {deep: true})
+watch(() => props.singleList, (newVal) => {
+  // console.log('singleFile', newVal)
+  singleFileList.value = newVal
+}, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
   // console.log('singleFile', newVal)
   singleFile.value = newVal
@@ -167,7 +259,7 @@ watch(() => props.formData.singleFile, (newVal) => {
 watch(() => isSingleFile.value, (newVal) => {
   isSingleFile.value = newVal
 }, {deep: true})
-const handleDelete = (row) => {
+const handleDelete = (row,type) => {
   deleteFile(row.fileId).then(res => {
     ElNotification({
       title: '提示',
@@ -175,11 +267,20 @@ const handleDelete = (row) => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
+      if(type==='single'){
+        singleFileList.value.splice(singleFileList.value.findIndex((item) => item.id === row.fileId), 1);
+        isSingleFile.value = false
+      }else {
+        allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
+      }
     }
   });
 }
+const handleSingleDelete = (row) => {
+ handleDelete(row,'single')
+}
 const getAttachment = (val) => {
+  console.log('getAttachment',val)
   isSingleFile.value = true
   emit('getAttachment', val)
 }
diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 322fb4b..0c507bd 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -24,7 +24,7 @@
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+              style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
           />
         </div>
       </div>
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index c02bd4e..b902362 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -69,7 +69,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 516d763..fa88507 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -29,7 +29,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
@@ -414,7 +414,6 @@ const init = async () => {
 watchEffect(() => {
   return Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
-
 onMounted(async () => {
   await init()
 })
diff --git a/src/components/DetailComponent/SpecialFundDetail.vue b/src/components/DetailComponent/SpecialFundDetail.vue
index f9c0298..542b5ad 100644
--- a/src/components/DetailComponent/SpecialFundDetail.vue
+++ b/src/components/DetailComponent/SpecialFundDetail.vue
@@ -70,7 +70,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index bf34c34..5b8fee4 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -166,7 +166,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 9d2329c..6331374 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -118,7 +118,7 @@
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+              style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
           />
         </div>
       </div>
diff --git a/src/views/expense-management/share/detail.vue b/src/views/expense-management/share/detail.vue
index 38d6ca5..730668a 100644
--- a/src/views/expense-management/share/detail.vue
+++ b/src/views/expense-management/share/detail.vue
@@ -39,7 +39,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
         />
       </div>
     </div>
diff --git a/src/views/expense-management/share/moblieDetail/index.vue b/src/views/expense-management/share/moblieDetail/index.vue
index 48e79b6..9ec4e0b 100644
--- a/src/views/expense-management/share/moblieDetail/index.vue
+++ b/src/views/expense-management/share/moblieDetail/index.vue
@@ -40,7 +40,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
         />
       </div>
     </div>
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 3ae6605..6e84b22 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -90,7 +90,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd;margin-left: 10px"
         />
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
@@ -160,7 +160,7 @@ const form = ref(null)
 const expendClass = ref()
 const fileList = ref([])
 const loading = ref(false)
-const showTable = ref(true)
+const showTable = ref(false)
 const processStore = useProcessStore()
 const processInstanceData = ref()
 const formPermMap = ref(new Map());
@@ -451,6 +451,7 @@ const handleDelete = (row) => {
     })
     if (res.code === 1000) {
       formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
+      showTable.value = formData.value.fileList.length !== 0;
     }
   });
 }
diff --git a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
index 74c0730..163e199 100644
--- a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
+++ b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
@@ -68,7 +68,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 33f2ddf..a5df96b 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -4,7 +4,7 @@
     <el-form :model="formData" ref="summaryForm" :rules="rules">
       <el-row gutter="15">
         <el-col :span="8">
-          <el-form-item label="项目名称" prop="projectName" label-width="105">
+          <el-form-item label="项目名称" prop="projectName" label-width="125">
             <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
           </el-form-item>
         </el-col>
@@ -40,7 +40,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="项目类型" prop="projectType" label-width="105">
+          <el-form-item label="项目类型" prop="projectType" label-width="125">
             <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('project_type')"
@@ -76,7 +76,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="项目影响" prop="projectImpact" label-width="105">
+          <el-form-item label="项目影响" prop="projectImpact" label-width="125">
             <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('project_impact')"
@@ -112,7 +112,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="105">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="125">
             <el-radio-group v-model="formData.industryUniversityResearch">
               <el-radio v-for="item in cacheStore.getDict('industry_university')"
                         :key="item.value"
@@ -156,8 +156,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="知识产权状况" prop="intellectualProperty">
+        <el-col :span="8" style="margin-bottom: -18px">
+          <el-form-item label="知识产权状况" prop="intellectualProperty" label-width="125">
             <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('intellectual_property')"
@@ -168,7 +168,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="16">
+        <el-col :span="16" style="margin-bottom: -18px">
           <el-form-item label="预期成果形式" prop="resultForm" label-width="145">
             <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
               <el-option
@@ -184,7 +184,7 @@
           <baseTitle title="预期知识产权"></baseTitle>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="发明专利(项)" prop="inventionPatent" label-width="107">
+          <el-form-item label="发明专利(项)" prop="inventionPatent" label-width="125">
             <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利" :controls="false"/>
           </el-form-item>
         </el-col>
@@ -199,7 +199,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="著作权(项)" prop="copyright" label-width="107">
+          <el-form-item label="著作权(项)" prop="copyright" label-width="125">
             <el-input-number v-model="formData.copyright" placeholder="请输入著作权" :controls="false"/>
           </el-form-item>
         </el-col>
@@ -219,13 +219,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="现有业务描述" prop="serviceDescription" label-width="107">
+          <el-form-item label="现有业务描述" prop="serviceDescription" label-width="125">
             <el-input v-model="formData.serviceDescription" placeholder="请输入现有业务描述" rows="4" type="textarea"
                       clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="研发项目关键内容描述" prop="contentDescription" label-width="107">
+          <el-form-item label="研发项目关键内容描述" prop="contentDescription" label-width="125">
             <el-input v-model="formData.contentDescription" placeholder="请输入研发项目关键内容描述" rows="4" type="textarea"
                       clearable></el-input>
           </el-form-item>
@@ -233,7 +233,7 @@
       </el-row>
     </el-form>
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
+                      @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Summary/edit'"/>
     <div class="approval-record">
@@ -241,7 +241,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;margin-left: 10px"
         />
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
@@ -281,8 +281,10 @@ const companyOption = ref([])
 const summaryForm = ref()
 const deploymentId = ref()
 const specialFundOption = ref([])
-const showTable = ref(true)
+const showTable = ref(false)
+const showSingleTable = ref(false)
 const otherFileList = ref([])
+const singleList = ref([])
 const formData = ref({
   isSpecialFund: false,
   industryUniversityResearch: '0',
@@ -363,7 +365,12 @@ const compositeParam = (item, type) => {
 
 const getAttachment = (val) => {
   // console.log('上传文件getAttachment', val)
+  showSingleTable.value=false
   formData.value.singleFile = compositeParam(val)
+  singleList.value.push( compositeParam(val))
+  nextTick(() => {
+    showSingleTable.value = true
+  })
 }
 const getOtherFile = (val) => {
   // console.log('上传文件getOtherFile', val)
@@ -374,6 +381,12 @@ const getOtherFile = (val) => {
     showTable.value = true
   })
 }
+watch(() => otherFileList.value, (newVal) => {
+  showTable.value = newVal.length !== 0;
+}, {deep: true})
+watch(() => singleList.value, (newVal) => {
+  showSingleTable.value = newVal.length !== 0;
+}, {deep: true})
 const getFileParam = (item) => {
   if (item === undefined) return;
   return {
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index c048100..98f4df3 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -17,7 +17,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;margin-left: 10px"
         />
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
diff --git a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
index 3aca84c..61a64ab 100644
--- a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
@@ -2,10 +2,10 @@
   <div v-loading="loading">
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
     <el-form :model="formData" label-width="auto">
-      <file-component 
-        :title="getTagName(type)+'附件'" 
+      <file-component
+        :title="getTagName(type)+'附件'"
         :tag="getTagName(type)"
-        v-model:value="formData.fileList" 
+        v-model:value="formData.fileList"
         :processViewer="processViewer"
         :file-list-show="fileListShow"
         labelAlign="top"
@@ -29,7 +29,7 @@
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
           />
         </div>
       </div>
diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
index ea949be..89f1b88 100644
--- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
@@ -68,7 +68,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
index a1e661d..b49ce38 100644
--- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
+++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
@@ -17,7 +17,7 @@
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
                       :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
+                      @getAttachment="getAttachment" :labelPosition="'top'"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>
     <div>
@@ -29,7 +29,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
diff --git a/src/views/project-management/mobledetail/ShareDetailMobile.vue b/src/views/project-management/mobledetail/ShareDetailMobile.vue
index d58d183..e6f79bb 100644
--- a/src/views/project-management/mobledetail/ShareDetailMobile.vue
+++ b/src/views/project-management/mobledetail/ShareDetailMobile.vue
@@ -40,7 +40,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
         />
       </div>
     </div>
diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
index 4257601..3de5857 100644
--- a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
+++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
@@ -73,7 +73,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index cbf239c..45cc9f8 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -162,7 +162,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
diff --git a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
index 3aca84c..61a64ab 100644
--- a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
@@ -2,10 +2,10 @@
   <div v-loading="loading">
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
     <el-form :model="formData" label-width="auto">
-      <file-component 
-        :title="getTagName(type)+'附件'" 
+      <file-component
+        :title="getTagName(type)+'附件'"
         :tag="getTagName(type)"
-        v-model:value="formData.fileList" 
+        v-model:value="formData.fileList"
         :processViewer="processViewer"
         :file-list-show="fileListShow"
         labelAlign="top"
@@ -29,7 +29,7 @@
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
           />
         </div>
       </div>
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index 9b990ea..a9306a3 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -31,7 +31,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd;margin-left: 10px"
         />
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>

From e44b41bf14c848a9fe738600d07cc0a9ac5bc68a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 03:30:26 +0800
Subject: [PATCH 19/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?,=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5=E6=8E=92=E7=89=88?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                   |  1 +
 src/components/AttachmentUpload.vue            |  4 ++--
 src/components/Tag.vue                         |  1 -
 src/views/expense-management/share/add.vue     |  2 +-
 src/views/project-demand/requirement/add.vue   |  2 +-
 src/views/project-demand/summary/add.vue       | 18 +++++++++---------
 src/views/project-demand/summary/index.vue     |  2 +-
 .../implementation/phase.vue                   |  2 +-
 src/views/special-fund/add.vue                 |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index caed37a..b664b8f 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -551,6 +551,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 }
 
 .approval-record {
+  padding-top: 10px;
   padding-bottom: 30px;
   position: relative;
   .approval-title {
diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index f50707c..8b8b53f 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -217,7 +217,7 @@ const singleFile = ref(props.formData.singleFile)
 const isSingleFile = ref(false)
 const allFileList = ref([])
 const singleFileList = ref([])
-if(props.formData.fileList !== null && props.formData.fileList.length > 0){
+if(props.formData.fileList !== null && props.formData.fileList?.length > 0){
   allFileList.value = props.formData.fileList
 }
 watch(() => props.showTable, (newVal) => {
@@ -237,7 +237,7 @@ watch(() => props.formData.fileList, (newVal) => {
 watch(() => props.otherFileList, (newVal) => {
   // console.log('newotherFileList', newVal, props.formData)
   if (props.preview) {
-    if (props.formData.fileList === null || props.formData.fileList.length === 0) {
+    if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
       allFileList.value = newVal
     } else {
       newVal?.forEach(item => {
diff --git a/src/components/Tag.vue b/src/components/Tag.vue
index 3447898..8bc4691 100644
--- a/src/components/Tag.vue
+++ b/src/components/Tag.vue
@@ -31,7 +31,6 @@ const props = defineProps({
 const tagConfig = ref({})
 
 const filterDict = (data, value) => {
-  console.log("🚀 ~ filterDict ~ data:", data)
   if (!data || value == null) return
   if (data instanceof Array) {
     if (value == true || value == false) {
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 6331374..055b107 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -114,7 +114,7 @@
       <div class="approval-title">
         <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
         <div v-else></div>
-        <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <div style="display: flex;align-items: center;justify-content: flex-start;">
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 6e84b22..e93be62 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -86,7 +86,7 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index a5df96b..f401b4f 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -111,7 +111,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">
           <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="125">
             <el-radio-group v-model="formData.industryUniversityResearch">
               <el-radio v-for="item in cacheStore.getDict('industry_university')"
@@ -121,8 +121,8 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="开展政府申报" prop="governmentDeclaration">
+        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?route.query.id?8:6:6">
+          <el-form-item label="开展政府申报" prop="governmentDeclaration" :label-width="route.query.id && formData.isSpecialFund?145:!formData.isSpecialFund?145:145">
             <el-radio-group v-model="formData.governmentDeclaration">
               <el-radio v-for="item in cacheStore.getDict('government_declaration')"
                         :key="item.value"
@@ -131,7 +131,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="!route.query.id && formData.isSpecialFund?4:12" v-if="!route.query.id">
+        <el-col :span="!route.query.id && formData.isSpecialFund?4:!route.query.id?12:12" v-if="!route.query.id">
           <el-form-item label="是否专项资金" prop="isSpecialFund" >
             <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
               <el-radio :label="true">是</el-radio>
@@ -140,7 +140,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" v-if="route.query.id && formData.isSpecialFund">
-          <el-form-item label="专项资金名称" prop="specialFundId">
+          <el-form-item label="专项资金名称" prop="specialFundId" :label-width="route.query.id && formData.isSpecialFund?135:''">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
@@ -157,7 +157,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" style="margin-bottom: -18px">
-          <el-form-item label="知识产权状况" prop="intellectualProperty" label-width="125">
+          <el-form-item label="知识产权状况" prop="intellectualProperty" :label-width="!formData.isSpecialFund?!route.query.id?125:135:125">
             <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('intellectual_property')"
@@ -236,8 +236,8 @@
                       @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Summary/edit'"/>
-    <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+    <div class="approval-record" style="margin-left: 70px">
+      <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
@@ -468,7 +468,7 @@ const handleResubmit = debounce(() => {
     ...formData.value,
     deploymentId: deploymentId.value,
     fileList: otherFiles,
-    requirementId: route.query.id ? route.query.id : '-1'
+    requirementId: route.query.requirementId ? route.query.requirementId : '-1'
   }
   // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
   resubmitReported(params).then(res => {
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index e6f7792..3c70964 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -304,7 +304,7 @@ const handleEdit = (row) => {
   router.push({
     name: 'Summary/edit',
     query: {
-      id: row.requirementId,
+      requirementId: row.requirementId,
       projectId: row.projectId
     }
   })
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 98f4df3..166b7a3 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -13,7 +13,7 @@
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Phase/edit'"/>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index a9306a3..bac3267 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -27,7 +27,7 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"

From ed08c6a7960d6afa29f2bac8b7bf366f1cb1ef50 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 11:21:50 +0800
Subject: [PATCH 20/60] =?UTF-8?q?fix=20:=20=E9=9C=80=E6=B1=82=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5-=E9=A2=84=E6=9C=9F=E6=88=90=E6=9E=9C=E5=BD=A2?=
 =?UTF-8?q?=E5=BC=8F=E5=A4=9A=E9=80=89=E5=8F=8A=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         | 27 ++++++++++++++-----
 src/views/project-demand/summary/add.vue      |  7 +++--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 5b8fee4..6b7fa74 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -240,12 +240,27 @@ const _value = computed({
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
-  if (data instanceof Array) {
-    data.find(item => {
-      if (item.value == value) {
-        label = item.label
-      }
-    })
+  let result=[]
+  if(value.indexOf(",") >= 0){
+    if (value.split(",") instanceof Array) {
+      value.split(",").forEach(item1 => {
+        console.log('item',item1)
+        data.find(item => {
+          if (item.value == item1) {
+            result.push(item.label)
+          }
+        })
+      })
+    }
+    label=result.map(item=>item).join('，')
+  }else {
+    if (data instanceof Array) {
+      data.find(item => {
+        if (item.value == value) {
+          label = item.label
+        }
+      })
+    }
   }
   return label
 }
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index f401b4f..1546f67 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -170,7 +170,7 @@
         </el-col>
         <el-col :span="16" style="margin-bottom: -18px">
           <el-form-item label="预期成果形式" prop="resultForm" label-width="145">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
+            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
               <el-option
                   v-for="item in cacheStore.getDict('result_form')"
                   :key="item.value"
@@ -286,9 +286,10 @@ const showSingleTable = ref(false)
 const otherFileList = ref([])
 const singleList = ref([])
 const formData = ref({
-  isSpecialFund: false,
+  isSpecialFund: true,
   industryUniversityResearch: '0',
   governmentDeclaration: '0',
+  resultForm:[]
 })
 
 const rules = reactive({
@@ -411,6 +412,7 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
+    formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
@@ -464,6 +466,7 @@ const handleResubmit = debounce(() => {
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
+  formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,

From 12db4164d0785d465754a2ff6dc269dc80269f96 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 12:05:10 +0800
Subject: [PATCH 21/60] =?UTF-8?q?fix=20:=20=E5=8D=95=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E5=A4=9A=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue | 55 ++++++++++++++++-------------
 src/components/FileUpload.vue       | 10 ++++--
 vite.config.js                      | 32 ++++++++---------
 3 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 8b8b53f..9742001 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form :model="formData" ref="applyForm"  :rules="rules" :label-position="labelPosition">
+  <el-form :model="formData" ref="applyForm" :rules="rules" :label-position="labelPosition">
     <el-row>
       <el-col :span="24">
         <el-form-item :label="label" prop="attachment" label-width="125">
@@ -12,29 +12,29 @@
           </template>
           <template
               v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null||formData.singleFile==null">
-            <file-upload @getFile="getAttachment"  :multiple="false" :maxSize="1"  :showFileList="showFileList" @delete="deleteAttachment"
-                         :disabled="isSingleFile" />
-<!--           -->
-<!--            <fvTable style="width: 100%;max-height: 80px;" v-if="showSingleTable" :tableConfig="singleTableConfig"-->
-<!--                     :data="singleFileList" :isSettingCol="false" :pagination="false">-->
-<!--              <template #empty>-->
-<!--                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>-->
-<!--              </template>-->
-<!--            </fvTable>-->
+            <file-upload @getFile="getAttachment" :multiple="false"
+                         :disabled="isSingleFile" ref="fileUploadRef"/>
+            <!--           :showFileList="showFileList" @delete="deleteAttachment"-->
+            <fvTable style="width: 100%;max-height: 80px;" v-if="showSingleTable" :tableConfig="singleTableConfig"
+                     :data="singleFileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
           </template>
         </el-form-item>
       </el-col>
       <el-col :span="24">
         <el-form-item label="其他文件" label-width="125">
           <file-upload @getFile="getOtherFile"/>
-<!--          <el-card style="width: 100%;box-shadow: none">-->
-            <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
-                     :data="allFileList" :isSettingCol="false" :pagination="false">
-              <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-              </template>
-            </fvTable>
-<!--          </el-card>-->
+          <!--          <el-card style="width: 100%;box-shadow: none">-->
+          <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
+                   :data="allFileList" :isSettingCol="false" :pagination="false">
+            <template #empty>
+              <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+            </template>
+          </fvTable>
+          <!--          </el-card>-->
         </el-form-item>
       </el-col>
     </el-row>
@@ -81,7 +81,7 @@ const props = defineProps({
   },
   labelPosition: {
     type: String,
-    default:''
+    default: ''
   }
 })
 const emit = defineEmits(["getAttachment", "getOtherFile"])
@@ -209,6 +209,7 @@ const singleTableConfig = reactive({
     }
   ]
 })
+const fileUploadRef=ref()
 const rules = reactive({
   attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
 })
@@ -216,8 +217,9 @@ const applyForm = ref()
 const singleFile = ref(props.formData.singleFile)
 const isSingleFile = ref(false)
 const allFileList = ref([])
+const deleteFileVal = ref({})
 const singleFileList = ref([])
-if(props.formData.fileList !== null && props.formData.fileList?.length > 0){
+if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
   allFileList.value = props.formData.fileList
 }
 watch(() => props.showTable, (newVal) => {
@@ -259,7 +261,7 @@ watch(() => props.formData.singleFile, (newVal) => {
 watch(() => isSingleFile.value, (newVal) => {
   isSingleFile.value = newVal
 }, {deep: true})
-const handleDelete = (row,type) => {
+const handleDelete = (row, type) => {
   deleteFile(row.fileId).then(res => {
     ElNotification({
       title: '提示',
@@ -267,21 +269,24 @@ const handleDelete = (row,type) => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      if(type==='single'){
+      if (type === 'single') {
         singleFileList.value.splice(singleFileList.value.findIndex((item) => item.id === row.fileId), 1);
         isSingleFile.value = false
-      }else {
+      } else {
         allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
       }
     }
   });
 }
 const handleSingleDelete = (row) => {
- handleDelete(row,'single')
+  console.log('row',row)
+  // fileUploadRef.value.handleRemove(deleteFileVal.value.id)
+  handleDelete(row, 'single')
 }
 const getAttachment = (val) => {
-  console.log('getAttachment',val)
+  console.log('getAttachment', val)
   isSingleFile.value = true
+  // deleteFileVal.value=val
   emit('getAttachment', val)
 }
 const getOtherFile = (val) => {
diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 2a6a16d..52df26b 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -44,10 +44,12 @@ const props = defineProps({
   showFileList: {
     type: Boolean,
     default: false
-  }, disabled: {
+  },
+  disabled: {
     type: Boolean,
     default: false
-  }, multiple: {
+  },
+  multiple: {
     type: Boolean,
     default: true
   }
@@ -98,7 +100,9 @@ const uploadError = () => {
     type: 'error'
   })
 }
-
+defineExpose({
+  handleRemove
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/vite.config.js b/vite.config.js
index 3f5511a..8b9be8c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -68,31 +68,31 @@ export default defineConfig({
     strictPort: false,
     open: true,
     proxy: {
-      // '/api/workflow': {
-      //   // target: 'http://frp.feashow.cn:31800/',
-      //   target: 'http://clay.frp.feashow.cn/',
-      //   // target: 'http://192.168.31.175:8000',
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, '')
-      // },
+      '/api/workflow': {
+        target: 'http://frp.feashow.cn:31800/',
+        // target: 'http://clay.frp.feashow.cn/',
+        // target: 'http://192.168.31.175:8000',
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, '')
+      },
       // '/api/admin': {
       //   // target: 'http://frp.feashow.cn:31800/',
       //   target: 'http://clay.frp.feashow.cn/',
       //   // target: 'http://192.168.31.175:8000',
       //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, '')
+      //   rewrite: (path) => path.replace(/^\/summary/, '')
       // },
       '/api': {
-        // target: 'http://mosr.feashow.cn/',
-        target: 'http://10.7.127.57:8000',
+        target: 'http://mosr.feashow.cn',
+        // target: 'http://clay.frp.feashow.cn',
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, '')
+        // rewrite: (path) => path.replace(/^\/api/, '')
       },
-      '/api/notice-ws': {
-        target: 'ws://mosr.feashow.cn/api/notice-ws',
-        ws: true,
-        changeOrigin: true,
-      }
+      // '/api/notice-ws': {
+      //   target: 'ws://mosr.feashow.cn/summary/notice-ws',
+      //   ws: true,
+      //   changeOrigin: true,
+      // }
     }
   }
 })

From 0bfa18eac8bc53182a00cbcedf027a20662d1b5a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 13:02:12 +0800
Subject: [PATCH 22/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9=E6=A1=86=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CompanyPicker.vue         | 24 +++++++++----------
 src/views/project-demand/requirement/add.vue  |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index 2b97236..e54ed84 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -168,26 +168,26 @@ const show = () => {
   getList()
 };
 
-const updateTreeCheck = (item, flag) => {
-  // list.forEach(item => {
-    tree.value.setChecked(item, flag)
-    if (item.children !== undefined) {
-      updateTreeCheck(item.children, flag)
+const updateTreeCheck = (list, flag) => {
+  list.forEach(item => {
+    if (item.value !== -1) {
+      tree.value.setChecked(item, flag)
+      if (item.children !== undefined) {
+        updateTreeCheck(item.children, flag)
+      }
     }
-  // })
+  })
 }
 const handleChange = (data, checked) => {
   if (data.value == -1) {
     if(checked){
-      for (const item of dataList.value) {
-        if (item.value !== -1) {
-          console.log('item',item)
-          updateTreeCheck(item, false)
-        }
-      }
+      updateTreeCheck(dataList.value, false)
       tree.value.setChecked(data,true);
     }
   }
+  if(tree.value.getCheckedKeys().length>1&&tree.value.getCheckedKeys().indexOf(-1)!==-1){
+    tree.value.setChecked(-1,false);
+  }
   // 左侧有选择框 + 多选
   if (props.multiple) {
     //不添加重复的数据到右边
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index e93be62..1449933 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -52,7 +52,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-bottom: -18px">
+        <el-col :span="24" style="margin-bottom: -25px">
           <el-form-item label="征集公司" prop="companyIds" class="tree-select" label-width="96">
             <div style="width: 100%">
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}

From 0ad12c361dd24b3ca2d1b061a247d80f9f6c7c1b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 13:40:05 +0800
Subject: [PATCH 23/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/add.vue | 22 +++++++++-----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 1449933..6eade9d 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -35,14 +35,14 @@
         <el-col :span="8">
           <el-form-item label="是否专项资金" prop="isSpecialFund">
             <el-select v-model="formData.isSpecialFund" placeholder="是否专项资金" clearable filterable>
-              <el-option value="true" label="是"></el-option>
-              <el-option value="false" label="否"></el-option>
+              <el-option :value="true" label="是"></el-option>
+              <el-option :value="false" label="否"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="formData.isSpecialFund==='false'">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="!formData.isSpecialFund">
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -149,15 +149,13 @@ const formData = ref({
   deadline: '',
   collectExplain: '',
   fileList: [],
-  isSpecialFund: 'false'
+  isSpecialFund: false
 })
-const showTinymce = ref(true)
 const routerName = ref(router.currentRoute.value.name)
 const processDiagramViewer = ref(false)
 const companyOption = ref([])
 const specialFundOption = ref([])
 const form = ref(null)
-const expendClass = ref()
 const fileList = ref([])
 const loading = ref(false)
 const showTable = ref(false)
@@ -423,12 +421,12 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds)
       formData.value = res.data
-      showTinymce.value = false
-      showTable.value = false
-      nextTick(() => {
-        showTinymce.value = true
-        showTable.value = true
-      })
+      if(res.data.fileList.length!==0){
+        showTable.value = false
+        nextTick(() => {
+          showTable.value = true
+        })
+      }
     } else {
       ElNotification({
         title: '提示',

From 3efcc1d039425f274b926b80395b49a8c26ecb9f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 13:42:40 +0800
Subject: [PATCH 24/60] =?UTF-8?q?fix=20:=20=E8=BF=98=E5=8E=9Fvite.config.j?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index 8b9be8c..3f5511a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -68,31 +68,31 @@ export default defineConfig({
     strictPort: false,
     open: true,
     proxy: {
-      '/api/workflow': {
-        target: 'http://frp.feashow.cn:31800/',
-        // target: 'http://clay.frp.feashow.cn/',
-        // target: 'http://192.168.31.175:8000',
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, '')
-      },
+      // '/api/workflow': {
+      //   // target: 'http://frp.feashow.cn:31800/',
+      //   target: 'http://clay.frp.feashow.cn/',
+      //   // target: 'http://192.168.31.175:8000',
+      //   changeOrigin: true,
+      //   rewrite: (path) => path.replace(/^\/api/, '')
+      // },
       // '/api/admin': {
       //   // target: 'http://frp.feashow.cn:31800/',
       //   target: 'http://clay.frp.feashow.cn/',
       //   // target: 'http://192.168.31.175:8000',
       //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/summary/, '')
+      //   rewrite: (path) => path.replace(/^\/api/, '')
       // },
       '/api': {
-        target: 'http://mosr.feashow.cn',
-        // target: 'http://clay.frp.feashow.cn',
+        // target: 'http://mosr.feashow.cn/',
+        target: 'http://10.7.127.57:8000',
         changeOrigin: true,
-        // rewrite: (path) => path.replace(/^\/api/, '')
+        rewrite: (path) => path.replace(/^\/api/, '')
       },
-      // '/api/notice-ws': {
-      //   target: 'ws://mosr.feashow.cn/summary/notice-ws',
-      //   ws: true,
-      //   changeOrigin: true,
-      // }
+      '/api/notice-ws': {
+        target: 'ws://mosr.feashow.cn/api/notice-ws',
+        ws: true,
+        changeOrigin: true,
+      }
     }
   }
 })

From 38e9c1d1e5d2b819c8edcc17a9fdb28585b2a181 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 15:39:42 +0800
Subject: [PATCH 25/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?,=E6=96=B0=E5=A2=9E=E5=BE=81=E9=9B=86=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  |  2 +-
 src/views/project-demand/requirement/add.vue  |  8 ++++++-
 src/views/project-demand/summary/index.vue    |  6 ++---
 .../implementation/account.vue                |  8 +++----
 .../implementation/updateTable.vue            | 22 +++++++++++--------
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index b664b8f..93b3576 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -551,7 +551,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 }
 
 .approval-record {
-  padding-top: 10px;
+  //padding-top: 10px;
   padding-bottom: 30px;
   position: relative;
   .approval-title {
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 6eade9d..828a747 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -367,7 +367,13 @@ const submitParam = (item) => {
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) {
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
     const {msg, code} = await addRequirement(submitParam(formData.value))
     ElNotification({
       title: '提示',
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 3c70964..b3ef500 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -283,9 +283,9 @@ const headBtnClick = (key) => {
 
 const search = (val) => {
   let obj = {...val}
-  if (obj.time) {
-    obj.startTime = obj.time[0]
-    obj.endTime = obj.time[1]
+  if (obj.dateValue) {
+    obj.startTime = obj.dateValue[0]
+    obj.endTime = obj.dateValue[1]
     delete obj.dateValue
   }
   tableConfig.params = obj
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 71fa18e..7d4ae3b 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -173,10 +173,10 @@ const searchConfig = reactive([
 ])
 const tableConfig = reactive({
   columns: [
-    {
-      type: 'selection',
-      prop: 'selection'
-    },
+    // {
+    //   type: 'selection',
+    //   prop: 'selection'
+    // },
     {
       prop: 'name',
       type: 'index',
diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index d8a138d..e072c59 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -9,9 +9,9 @@
       </el-col>
       <el-col :span="24">
         <el-form-item prop="projectChargePerson" label="项目负责人">
-          {{tableForm.projectChargePerson?tableForm.projectChargePerson: currentPerson.name }}
+          {{tableForm.projectChargePersonName}}
           <el-button @click="showPersonnelPicker">
-            {{ tableForm.projectChargePerson||currentPerson.name ? '更改' : '请选择研发人员' }}
+            {{ tableForm.projectChargePersonName ? '更改' : '请选择研发人员' }}
           </el-button>
         </el-form-item>
       </el-col>
@@ -55,7 +55,7 @@
       </el-col>
       <el-col :span="6">
         <el-form-item prop="projectCompletionRate" label="项目总体完成率（%）">
-          <el-input-number v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" :controls="false" style="width: 200px">
+          <el-input-number v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" min="0" max="100" :controls="false" style="width: 200px">
           </el-input-number>
         </el-form-item>
       </el-col>
@@ -88,23 +88,30 @@ const tagsViewStore = useTagsView()
 const baseForm = ref()
 const route = useRoute()
 const router = useRouter()
-const currentPerson = ref({})
 const tableForm = ref({
   projectName: '',
   completeWork: '',
   endTime: '',
   projectBudgetDescription: '',
   projectChargePerson: '',
+  projectChargePersonName:'',
   projectCompletionRate: '',
   projectDevelopmentWay: '',
   projectId: '',
-  startTime: '',
+  startTime: ''
 })
 const userPicker = ref()
+
+const showPersonnelPicker = () => {
+  userPicker.value.showUserPicker()
+}
 const selected = (select) => {
+  if (!select || select.length === 0) {
+    return
+  }
   for (const selectElement of select) {
-    currentPerson.value = selectElement
     tableForm.value.projectChargePerson = selectElement.id
+    tableForm.value.projectChargePersonName = selectElement.name
   }
 }
 const disabledDate = (time) => {
@@ -113,9 +120,6 @@ const disabledDate = (time) => {
 const handleBack = () => {
   history.back()
 }
-const showPersonnelPicker = () => {
-  userPicker.value.showUserPicker()
-}
 const handleSubmit = async () => {
   let params = {
     ...tableForm.value,

From 54e50de6b149f031efb35b117574b7b35e1844ff Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 15:51:03 +0800
Subject: [PATCH 26/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/implementation/phase.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 166b7a3..c330d85 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="apply-block">
+  <div class="apply-block" v-loading="loading">
     <baseTitle title="基础信息"></baseTitle>
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
     <el-form :model="formData" label-width="auto">
@@ -47,7 +47,7 @@ const route = useRoute()
 const attachment = ref()
 const userPicker = ref()
 const name = ref(router.currentRoute.value.name)
-const loading = ref(false)
+const loading = ref(true)
 const formData = ref({})
 const file = ref({})
 const deploymentId = ref()
@@ -269,6 +269,7 @@ const getDetailInfo = async () => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
+      userList.value=res.data.userInfoList
       formData.value = res.data
       loading.value = false
     }

From e075eeb0d53081b931398319d6a8456386bc1588 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 16:39:30 +0800
Subject: [PATCH 27/60] =?UTF-8?q?fix=20:=20=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86=E4=B8=BA=E6=9C=88=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue    |  2 +-
 .../implementation/account.vue                |  4 +-
 .../implementation/share.vue                  | 67 ++++++++-----------
 .../implementation/uploadFee.vue              |  8 +--
 4 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 055b107..6fe222d 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -14,7 +14,7 @@
                 v-model="formData.apportionmentMonth"
                 type="month"
                 format="YYYY-MM"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM"
                 placeholder="选择月"
             >
             </el-date-picker>
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 7d4ae3b..4e55864 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -119,8 +119,10 @@ const searchConfig = reactive([
     prop: 'time',
     component: 'el-date-picker',
     props: {
-      placeholder: '请选择时间',
+      type:'month',
+      placeholder: '请选择月份',
       clearable: true,
+      format: 'YYYY-MM',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
     colProps: {}
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index d37b65e..d7a1a4c 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -37,35 +37,23 @@ const schema = computed(() => {
 const baseForm = ref()
 const searchConfig = reactive([
   {
-    label: '关键词',
-    prop: 'requirementName',
+    label: '项目人员',
+    prop: 'researchPersonnel',
     component: 'el-input',
     props: {
-      placeholder: '请输入关键词查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
-  {
-    label: '项目人员',
-    prop: 'projectCost',
-    component: shallowRef(fvSelect),
-    props: {
-      placeholder: '请选择项目人员查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true,
-      cacheKey: ''
+      placeholder: '请输入项目人员查询'
     }
   },
   {
     label: '时间',
-    prop: 'datetime',
+    prop: 'time',
     component: 'el-date-picker',
     props: {
-      placeholder: '请选择时间',
+      type:'month',
+      placeholder: '请选择月份',
       clearable: true,
+      format: 'YYYY-MM',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
     }
   }
 ])
@@ -87,10 +75,7 @@ const tableConfig = reactive({
     {
       prop: 'researchPersonnel',
       label: '研发人员',
-      align: 'center',
-      currentRender:({row})=>{
-        return <span>{getResearchName(row.researchPersonnel)}</span>
-      }
+      align: 'center'
     },
     {
       prop: 'wagesPayable',
@@ -138,21 +123,25 @@ const tableConfig = reactive({
     projectId: route.query.id
   }
 })
-const researchOptions = ref([])
-const getResearchOptions = async () => {
-  const res = await getResearchUser()
-  researchOptions.value = res.data
-}
-const getResearchName=(id)=>{
-  if(!id)return;
-  let label=''
-  researchOptions.value.forEach(item=>{
-    if(item.value==id){
-      label=item.label
-    }
-  })
-  return label
+const search = (val) => {
+  tableConfig.params = {...val, projectId: route.query.id}
+  tableIns.value.refresh()
 }
+// const researchOptions = ref([])
+// const getResearchOptions = async () => {
+//   const res = await getResearchUser()
+//   researchOptions.value = res.data
+// }
+// const getResearchName=(id)=>{
+//   if(!id)return;
+//   let label=''
+//   researchOptions.value.forEach(item=>{
+//     if(item.value==id){
+//       label=item.label
+//     }
+//   })
+//   return label
+// }
 const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
@@ -161,7 +150,7 @@ const getBaseInfo = async () => {
   }
 }
 
-getResearchOptions()
+// getResearchOptions()
 getBaseInfo()
 </script>
 
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index f3c2d48..656e936 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -8,9 +8,9 @@
           <el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
             <el-date-picker
                 v-model="scope.row.time"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+                type="month"
+                format="YYYY-MM"
+                value-format="YYYY-MM"
                 placeholder="选择时间"
             >
             </el-date-picker>
@@ -56,7 +56,7 @@
       <el-table-column prop="afterTax" label="税后余额(元)" width="220">
         <template #default="scope">
           <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
-            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
+            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额"  :controls="false">
             </el-input-number>
           </el-form-item>
         </template>

From d25c285ad695609ff973efc4ddeb1bab86260a6c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 17:13:42 +0800
Subject: [PATCH 28/60] =?UTF-8?q?fix=20:=20=E5=AE=8C=E5=96=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/filing/index.vue    |  2 +-
 .../project-management/implementation/check.vue  | 16 ++++++++++++++--
 .../project-management/implementation/upload.vue |  8 +++++++-
 .../implementation/uploadFee.vue                 |  8 +++++++-
 .../project-management/initiation/apply.vue      |  8 +++++++-
 src/views/special-fund/add.vue                   |  8 +++++++-
 6 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index b8c158d..dcae27b 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -94,7 +94,7 @@ const searchConfig = reactive([
     component: 'el-date-picker',
     props: {
       clearable: true,
-      type: 'datetimerange',
+      type: 'daterange',
       startPlaceholder: '开始日期',
       endPlaceholder: '结束日期',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index 5200207..1d10b04 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -88,7 +88,13 @@ const getFileParam = (item) => {
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) {
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
     let files = []
     otherFileList.value.forEach(item => {
       files.push(getFileParam(item))
@@ -132,7 +138,13 @@ const handleSubmit = (instance) => {
 const handleResubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) {
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
     let otherFiles = []
     if (name.value === 'Implementation/edit') {
       attachment.value.allFileList?.forEach(item => {
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index fb9d3f0..10f3212 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -168,7 +168,13 @@ const getFile = (val) => {
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) {
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
     let params = {
       fileList: fileList.value,
       projectId: route.query.id,
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 656e936..fe278f8 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -158,7 +158,13 @@ const handleDelete = (index) => {
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) {
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
     instance.clearValidate()
     tableForm.tableData.forEach(item=>{
       item.projectName=projectName.value
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index 5ffb219..600263c 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -137,7 +137,13 @@ const getFileParam = (item) => {
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) {
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
     let files = []
     otherFileList.value.forEach(item => {
       files.push(getFileParam(item))
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index bac3267..ed41db1 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -187,7 +187,13 @@ const submitParam = (item) => {
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) {
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
     const {msg, code} = await addFund(submitParam(formData.value))
     ElNotification({
       title: '提示',

From bd6fef9f7e9a8a01c09054b23e70db15e2ad66d9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 18:56:05 +0800
Subject: [PATCH 29/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E6=88=90=E6=9E=9C=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue   | 8 ++++----
 src/views/project-demand/summary/index.vue | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 1546f67..ec4118d 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -412,14 +412,14 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
-    formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
+    // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
       fileList: otherFiles,
       requirementId: route.query.id ? route.query.id : '-1'
     }
-    // console.log('params', params)
+    console.log('params', params)
     if (!attachment.value.isSingleFile) {
       attachment.value.validate()
       ElNotification({
@@ -466,12 +466,12 @@ const handleResubmit = debounce(() => {
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
-  formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
+  // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,
     fileList: otherFiles,
-    requirementId: route.query.requirementId ? route.query.requirementId : '-1'
+    requirementId: route.query.id ? route.query.id : '-1'
   }
   // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
   resubmitReported(params).then(res => {
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index b3ef500..8df7cab 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -304,7 +304,7 @@ const handleEdit = (row) => {
   router.push({
     name: 'Summary/edit',
     query: {
-      requirementId: row.requirementId,
+      // requirementId: row.requirementId,
       projectId: row.projectId
     }
   })

From a446dfcaa61fb77cb1ece5aacc21841e71d0fe4f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 21:43:57 +0800
Subject: [PATCH 30/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85=E5=89=8D=E7=BD=AE=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/AllocationSummaryDetail.vue        |  2 +-
 src/components/DetailComponent/ProjectApply.vue        | 10 +++++++++-
 .../moblieDetail/AllocationSummaryDetailMoblie.vue     |  2 +-
 .../project-management/implementation/account.vue      |  1 -
 .../mobledetail/AllocationSummaryDetailMobile.vue      |  2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index 51af440..0223cf8 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center">
+    <el-table-column prop="researchStage" label="研发阶段" align="center">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index fa88507..967edf6 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -57,7 +57,7 @@
         </el-form-item>
       </el-form>
       <el-table :data="preProcessList" stripe v-loading="loading"
-                @select="handleSelect" row-key="requestId">
+                @select="handleSelect" row-key="requestId" ref="preProcessTable">
         <el-table-column type="selection" width="55" :reserve-selection="true"/>
         <el-table-column prop="requestId" label="请求id"></el-table-column>
         <el-table-column prop="requestName" label="请求名称"></el-table-column>
@@ -106,6 +106,7 @@ import Paging from "@/components/pagination/index.vue";
 const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
+const preProcessTable = ref()
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
@@ -210,6 +211,13 @@ const getPreProcessList = () => {
         searchArray.push(item)
       }
     })
+    res.data.forEach((item) => {
+      localFormData.value.preProcess.forEach((item1) => {
+        if (item.requestId == item1.requestId) {
+          preProcessTable.value.toggleRowSelection(item)
+        }
+      })
+    })
     total.value = searchArray.length
     currentList.value = searchArray
     preProcessList.value = currentList.value.slice(0, 10)
diff --git a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
index ccd1b78..0a27000 100644
--- a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
+++ b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center">
+    <el-table-column prop="researchStage" label="研发阶段" align="center">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 4e55864..d52f14d 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -310,7 +310,6 @@ const search = (val) => {
 }
 const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
-  console.log("🚀 ~ init ~ data:", data)
   if (data) {
     tableData.value = data
     baseForm.value.setValues(data)
diff --git a/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue b/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
index 6cdb330..691578d 100644
--- a/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
+++ b/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center" min-width="100">
+    <el-table-column prop="researchStage" label="研发阶段" align="center" min-width="100">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">

From 3b884c0b785b392ab6b9547aa3ba9c7248e510b8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 22:27:22 +0800
Subject: [PATCH 31/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E6=88=90=E6=9E=9C=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?,=E9=9C=80=E6=B1=82=E6=96=B0=E5=A2=9E=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AllocationSummaryDetail.vue               |  2 +-
 .../DetailComponent/SummaryDetail.vue         | 34 +++++++++----------
 src/views/project-demand/requirement/add.vue  |  6 ++--
 src/views/project-demand/summary/add.vue      |  5 +--
 src/views/special-fund/add.vue                |  3 +-
 5 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index 0223cf8..d5459d7 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
+<!--  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
   <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
             :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
     <el-table-column type="index" label="序号" align="center" width="60"/>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 6b7fa74..ec79794 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -63,7 +63,9 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
-            <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
+            <span>{{
+                localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId)
+              }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -108,7 +110,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="经济概算(元)" prop="economicEstimate">
-            <span>{{toThousands( localFormData.economicEstimate )}}</span>
+            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -141,7 +143,7 @@
           <baseTitle title="附件列表"></baseTitle>
         </el-col>
         <el-col :span="24">
-          <file-component  tag="需求上报"
+          <file-component tag="需求上报"
                           v-model:value="localFormData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>
         </el-col>
@@ -171,7 +173,8 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+                            :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
         </div>
@@ -240,20 +243,17 @@ const _value = computed({
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
-  let result=[]
-  if(value.indexOf(",") >= 0){
-    if (value.split(",") instanceof Array) {
-      value.split(",").forEach(item1 => {
-        console.log('item',item1)
-        data.find(item => {
-          if (item.value == item1) {
-            result.push(item.label)
-          }
-        })
+  let result = []
+  if (JSON.parse(value) instanceof Array) {
+    JSON.parse(value).forEach(item1 => {
+      data.find(item => {
+        if (item.value == item1) {
+          result.push(item.label)
+        }
       })
-    }
-    label=result.map(item=>item).join('，')
-  }else {
+    })
+    label = result.map(item => item).join('，')
+  } else {
     if (data instanceof Array) {
       data.find(item => {
         if (item.value == value) {
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 828a747..cdb13c4 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -41,8 +41,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="!formData.isSpecialFund">
+          <el-form-item label="专项资金名称" prop="specialFundId" v-if="formData.isSpecialFund">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable >
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -158,7 +158,7 @@ const specialFundOption = ref([])
 const form = ref(null)
 const fileList = ref([])
 const loading = ref(false)
-const showTable = ref(false)
+const showTable = ref(true)
 const processStore = useProcessStore()
 const processInstanceData = ref()
 const formPermMap = ref(new Map());
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index ec4118d..2d4b8dc 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -412,7 +412,7 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
-    // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
+    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
@@ -466,7 +466,7 @@ const handleResubmit = debounce(() => {
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
-  // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
+  formData.value.resultForm=JSON.stringify(formData.value.resultForm)
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,
@@ -499,6 +499,7 @@ const getDetailInfo = async () => {
     })
     if (res.code === 1000) {
       res.data.formData.specialFundId = res.data.formData.specialFundId === 0 ? null : res.data.formData.specialFundId
+      res.data.formData.resultForm = JSON.parse(res.data.formData.resultForm)
       formData.value = res.data.formData
       loading.value = false
     }
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index ed41db1..d287762 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -136,6 +136,7 @@ const handleDelete = (row) => {
     })
     if (res.code === 1000) {
       formData.value.files.splice(formData.value.files.findIndex((item) => item.id === row.fileId), 1);
+      showTable.value = formData.value.files.length !== 0;
     }
   });
 }
@@ -246,7 +247,7 @@ const init = async () => {
     } else {
       ElNotification({
         title: '提示',
-        message: msg,
+        message: res.msg,
         type: 'error'
       })
     }

From 40d3d423c7d399a878fe64a1c00e76ae317077d2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 22:30:21 +0800
Subject: [PATCH 32/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E6=96=87=E4=BB=B6=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 2d4b8dc..bbfbac6 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -281,7 +281,7 @@ const companyOption = ref([])
 const summaryForm = ref()
 const deploymentId = ref()
 const specialFundOption = ref([])
-const showTable = ref(false)
+const showTable = ref(true)
 const showSingleTable = ref(false)
 const otherFileList = ref([])
 const singleList = ref([])

From 1e4397b5ea52d970608bebba4f147225361675c0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 22:46:37 +0800
Subject: [PATCH 33/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85=E5=8D=95=E4=B8=AA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue             |  4 ++--
 src/components/DetailComponent/ProjectApply.vue | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 9742001..bc336d8 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -2,7 +2,7 @@
   <el-form :model="formData" ref="applyForm" :rules="rules" :label-position="labelPosition">
     <el-row>
       <el-col :span="24">
-        <el-form-item :label="label" prop="attachment" label-width="125">
+        <el-form-item :label="label" prop="attachment" label-width="110">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
               {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
@@ -25,7 +25,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="其他文件" label-width="125">
+        <el-form-item label="其他文件" label-width="110">
           <file-upload @getFile="getOtherFile"/>
           <!--          <el-card style="width: 100%;box-shadow: none">-->
           <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 967edf6..41be74b 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -3,7 +3,7 @@
     <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="前置流程" :required="preProcessRequired" prop="requestName">
+          <el-form-item label="前置流程" :required="preProcessRequired" prop="requestName" label-width="110">
             <div v-for="item in localFormData.preProcess" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
                  style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ item.requestName }}</a>
@@ -17,7 +17,7 @@
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
                       :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
+                      @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>
     <div>
@@ -26,7 +26,7 @@
           <baseTitle title="审批记录" v-if="mode === 'resubmit'"></baseTitle>
           <div v-else></div>
           <div class="diagram">
-            <div class="base-title">流程图</div>
+            <div class="base-title" style="margin-left: 50px">流程图</div>
             <el-switch
                 v-model="changeDiagram"
                 style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
@@ -107,6 +107,8 @@ const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
 const preProcessTable = ref()
+const showSingleTable = ref(false)
+const singleList = ref([])
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
@@ -276,8 +278,16 @@ const compositeParam = (item) => {
 }
 const getAttachment = (val) => {
   // console.log('上传文件getAttachment', val)
+  showSingleTable.value=false
   localFormData.value.singleFile = compositeParam(val)
+  singleList.value.push( compositeParam(val))
+  nextTick(() => {
+    showSingleTable.value = true
+  })
 }
+watch(() => singleList.value, (newVal) => {
+  showSingleTable.value = newVal.length !== 0;
+}, {deep: true})
 const getOtherFile = (val) => {
   // console.log('上传文件getOtherFile', val)
   showTable.value = false

From 2e9adb3248a79f30c6f635cee7be460841f894e7 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 23:17:47 +0800
Subject: [PATCH 34/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           |  4 ++--
 .../DetailComponent/FileComponent.vue         |  4 ++--
 .../DetailComponent/ProjectApply.vue          |  4 ++--
 .../components/ToolToShowUserPicker.vue       |  4 ++--
 .../implementation/phase.vue                  | 20 ++++++++++++++-----
 .../implementation/phaseDetail.vue            |  4 ++--
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index bc336d8..9742001 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -2,7 +2,7 @@
   <el-form :model="formData" ref="applyForm" :rules="rules" :label-position="labelPosition">
     <el-row>
       <el-col :span="24">
-        <el-form-item :label="label" prop="attachment" label-width="110">
+        <el-form-item :label="label" prop="attachment" label-width="125">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
               {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
@@ -25,7 +25,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="其他文件" label-width="110">
+        <el-form-item label="其他文件" label-width="125">
           <file-upload @getFile="getOtherFile"/>
           <!--          <el-card style="width: 100%;box-shadow: none">-->
           <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index 688380e..359eaa3 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form :label-position="labelAlign">
-    <el-form-item :label="title" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign">
+    <el-form-item label="其他文件" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign" label-width="95">
       <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
       <fvTable style="width: 100%;max-height: 300px;" v-if="processViewer" :tableConfig="tableConfig"
               :data="_value" :isSettingCol="false" :pagination="false">
@@ -39,7 +39,7 @@ const props = defineProps({
   },
   labelAlign: {
     type: String,
-    default: 'left'
+    default: 'right'
   }
 })
 const emit = defineEmits(['update:value'])
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 41be74b..8e87bac 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -3,7 +3,7 @@
     <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="前置流程" :required="preProcessRequired" prop="requestName" label-width="110">
+          <el-form-item label="前置流程" :required="preProcessRequired" prop="requestName" label-width="125">
             <div v-for="item in localFormData.preProcess" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
                  style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ item.requestName }}</a>
@@ -33,7 +33,7 @@
             />
           </div>
         </div>
-        <div class="process">
+        <div class="process" style="margin-left: 50px">
           <operation-render v-if="mode === 'resubmit'&&!changeDiagram" :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
diff --git a/src/views/project-management/implementation/components/ToolToShowUserPicker.vue b/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
index 3dde1c2..ba962ed 100644
--- a/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
+++ b/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>{{modelValue}}</div>
-  <el-button color="#DED0B2" style="margin-left: 10px" @click="click">
+  <el-button color="#DED0B2"  @click="click">
     {{ modelValue?'更改':'请选择抄送人员' }}
   </el-button>
+  <div style="margin-left: 10px">{{modelValue}}</div>
 </template>
 
 <script setup>
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index c330d85..1fb70cc 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="apply-block" v-loading="loading">
     <baseTitle title="基础信息"></baseTitle>
-    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
+    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" style="margin-left: 56px"></fvForm>
     <el-form :model="formData" label-width="auto">
-      <el-form-item label="抄送人员">
+      <el-form-item label="抄送人员" label-width="125">
         <Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/>
       </el-form-item>
     </el-form>
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
     <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
+                      @getAttachment="getAttachment"  :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Phase/edit'"/>
-    <div class="approval-record">
+    <div class="approval-record"  style="margin-left: 68px">
       <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
@@ -46,8 +46,10 @@ const router = useRouter()
 const route = useRoute()
 const attachment = ref()
 const userPicker = ref()
+const showSingleTable = ref(false)
+const singleList = ref([])
 const name = ref(router.currentRoute.value.name)
-const loading = ref(true)
+const loading = ref(false)
 const formData = ref({})
 const file = ref({})
 const deploymentId = ref()
@@ -102,8 +104,16 @@ const compositeParam = (item) => {
 }
 const getAttachment = (val) => {
   // console.log('上传文件getAttachment', val)
+  showSingleTable.value=false
   formData.value.singleFile = compositeParam(val)
+  singleList.value.push( compositeParam(val))
+  nextTick(() => {
+    showSingleTable.value = true
+  })
 }
+watch(() => singleList.value, (newVal) => {
+  showSingleTable.value = newVal.length !== 0;
+}, {deep: true})
 const getOtherFile = (val) => {
   // console.log('上传文件getOtherFile', val)
   showTable.value = false
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index dd1b291..d785850 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -1,8 +1,8 @@
 <template>
   <baseTitle title="基础信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" style="margin-left:27px"></fvForm>
   <baseTitle title="阶段变更详情"></baseTitle>
-  <div style="color: #606266;font-size: 14px">抄送人：{{copyName}}</div>
+  <div style="color: #606266;font-size: 14px;width: 84px;text-align: right">抄送人{{copyName}}</div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
                   :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
   <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>

From 80aef38e7abcf453b1522f1d7f42f01581ba91d9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 00:00:16 +0800
Subject: [PATCH 35/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ApprovalDetail.vue        |  6 ++--
 .../DetailComponent/CompanyPicker.vue         |  2 +-
 .../DetailComponent/ExpenseDetail.vue         |  2 +-
 .../DetailComponent/FileComponent.vue         |  5 ++--
 src/stores/userstore.js                       |  2 +-
 src/views/expense-management/share/add.vue    |  1 +
 .../moblieDetail/CollectionDetailMoblie.vue   |  6 ++--
 .../implementation/phaseDetail.vue            |  4 +--
 .../mobledetail/SpecialFundDetailMobile.vue   |  2 +-
 .../mobledetail/StepsMoblie.vue               |  6 ++--
 .../mobledetail/SummaryDetailMoblie.vue       | 28 +++++++++++--------
 .../ApprovalDetailMoblie.vue                  |  4 +--
 .../phaseDetailMoblie/index.vue               |  4 +--
 .../workflow/process/common/UserPicker.vue    | 10 +++----
 14 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 0c507bd..6163c3e 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading">
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
-    <el-form :model="formData" label-width="auto">
+    <el-form :model="formData" label-width="auto"  style="margin-top: -15px">
       <file-component :title="getTagName(type)+'附件'" :tag="getTagName(type)"
                       v-model:value="formData.fileList" :processViewer="processViewer"
                       :file-list-show="fileListShow"/>
@@ -18,8 +18,8 @@
       </el-form-item>
     </div>
     <div class="approval-record">
-      <div class="approval-title">
-        <baseTitle title="审批记录"></baseTitle>
+      <div class="approval-title"  style="margin-top: -15px">
+        <baseTitle title="审批记录" ></baseTitle>
         <div class="diagram">
           <div class="base-title">流程图</div>
           <el-switch
diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index e54ed84..03f8bed 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -157,7 +157,7 @@ const filterNode = (value, data) => {
 const show = () => {
   //用于弹开部门选择
   visible.value = true;
-  console.log('_value.value', _value.value, selectList.value)
+  // console.log('_value.value', _value.value, selectList.value)
   // if(selectList.value.length==0){
   //   selectList.value=[]
   //   defaultChecked.value =[]
diff --git a/src/components/DetailComponent/ExpenseDetail.vue b/src/components/DetailComponent/ExpenseDetail.vue
index 02f0e87..63b8486 100644
--- a/src/components/DetailComponent/ExpenseDetail.vue
+++ b/src/components/DetailComponent/ExpenseDetail.vue
@@ -75,7 +75,7 @@ const objectSpanMethod = ({row, column, rowIndex, columnIndex}) => {
     }
   } else {
     let length = Object.keys(row).length
-    console.log(length)
+    // console.log(length)
     if (length > 5) {
       if (concatColumn(columnIndex, length, rowIndex)) {
         if (rowIndex % 5 === 0) {
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index 359eaa3..f1ec76f 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form :label-position="labelAlign">
-    <el-form-item label="其他文件" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign" label-width="95">
+    <el-form-item :label="title?'其他文件':''" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign" :label-width="title?95:''">
       <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
       <fvTable style="width: 100%;max-height: 300px;" v-if="processViewer" :tableConfig="tableConfig"
               :data="_value" :isSettingCol="false" :pagination="false">
@@ -50,7 +50,7 @@ const tableConfig = reactive({
       type: 'index',
       label: '序号',
       align: 'center',
-      width: '80',
+      width: 90,
     },
     {
       prop: 'originalFileName',
@@ -66,6 +66,7 @@ const tableConfig = reactive({
       prop: 'size',
       label: '文件大小',
       align: 'center',
+      width: 150,
       currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
     {
diff --git a/src/stores/userstore.js b/src/stores/userstore.js
index 3c74cf6..097a254 100644
--- a/src/stores/userstore.js
+++ b/src/stores/userstore.js
@@ -9,7 +9,7 @@ export const useAuthStore = defineStore('auth', () => {
   const permisstions = ref([])
   const roles = ref([])
   const casToken = (token) => {
-    console.log('getToken()!==token',getToken()!==token)
+    // console.log('getToken()!==token',getToken()!==token)
     let flag=''
     if(getToken()!==token){//切换token
        setToken(token)
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 6fe222d..5cb9d99 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -220,6 +220,7 @@ const selected = (select) => {
       item.researchPersonnel = select[0].name
     }
   })
+  userList.value=select
 }
 const getResearchOptions = async () => {
   const res = await getResearchUser()
diff --git a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
index 163e199..eecd401 100644
--- a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
+++ b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
@@ -13,12 +13,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="截止时间">
+          <el-form-item label="需求上报截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="type==='singleDetail'">
-          <el-form-item label="所属公司">
+          <el-form-item label="征集公司">
             <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
                 getCompanyName(formData.companyIds)
               }}</span>
@@ -28,7 +28,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金">
+          <el-form-item label="专项资金名称">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index d785850..95cd6b4 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -1,8 +1,8 @@
 <template>
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" style="margin-left:27px"></fvForm>
-  <baseTitle title="阶段变更详情"></baseTitle>
-  <div style="color: #606266;font-size: 14px;width: 84px;text-align: right">抄送人{{copyName}}</div>
+  <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
+  <div style="color: #606266;font-size: 14px;width: 84px;height:25px;text-align: right">抄送人{{copyName}}</div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
                   :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
   <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>
diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
index 3de5857..c9a4cb0 100644
--- a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
+++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
@@ -2,7 +2,7 @@
 <!--  <special-fund-detail :formData="fundData.formData" :data="fundData" :showTable="showTable" :processViewer="fundProcessViewer"-->
 <!--                       :loading="loading"/>-->
 
-  <div v-loading="loading">
+  <div v-loading="loading" style="padding: 0 10px;">
     <baseTitle title="专项资金详情"></baseTitle>
     <el-form :model="formData" ref="form" label-width="auto">
       <el-row>
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index dded12f..5fb6999 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -101,21 +101,21 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 12
+        span: 24
       }
     },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
       colProps: {
-        span: 12
+        span: 24
       }
     },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
-        span: 12
+        span: 24
       }
     }
 
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index 45cc9f8..50afca5 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -9,7 +9,9 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
-            <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
+            <span>{{
+                localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId)
+              }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -105,7 +107,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="经济概算(元)" prop="economicEstimate">
-            <span>{{toThousands( localFormData.economicEstimate )}}</span>
+            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -125,21 +127,22 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="需求上报申请书">
-            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)" style="font-size: 16px">
+          <el-form-item label="需求上报申请书" label-position="top" style="display:block;">
+            <!--            style="font-size: 16px"-->
+            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">
               {{ localFormData.singleFile?.originalFileName }}
             </el-button>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <file-component
-          title="需求上报附件"
-          tag="需求上报"
-          v-model:value="localFormData.fileList"
-          :processViewer="processViewer"
-          :file-list-show="fileListShow"
-          labelAlign="top"
-        />
+              title="需求上报附件"
+              tag="需求上报"
+              v-model:value="localFormData.fileList"
+              :processViewer="processViewer"
+              :file-list-show="fileListShow"
+              labelAlign="top"
+          />
         </el-col>
         <el-col :span="24">
           <div v-if="data.taskId">
@@ -167,7 +170,8 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+                            :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
         </div>
diff --git a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
index 61a64ab..d1f8948 100644
--- a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading">
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
-    <el-form :model="formData" label-width="auto">
+    <el-form :model="formData" label-width="auto" style="margin-top: -15px">
       <file-component
         :title="getTagName(type)+'附件'"
         :tag="getTagName(type)"
@@ -23,7 +23,7 @@
       </el-form-item>
     </div>
     <div class="approval-record">
-      <div class="approval-title">
+      <div class="approval-title" style="margin-top: -15px">
         <baseTitle title="审批记录"></baseTitle>
         <div class="diagram">
           <div class="base-title">流程图</div>
diff --git a/src/views/project-management/phaseDetailMoblie/index.vue b/src/views/project-management/phaseDetailMoblie/index.vue
index f6625d4..2b16aaa 100644
--- a/src/views/project-management/phaseDetailMoblie/index.vue
+++ b/src/views/project-management/phaseDetailMoblie/index.vue
@@ -2,8 +2,8 @@
   <div style="padding: 0 10px; box-sizing: border-box;">
     <baseTitle title="基础信息"></baseTitle>
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-    <baseTitle title="阶段变更详情"></baseTitle>
-    <div style="color: #606266;font-size: 14px">抄送人：{{copyName}}</div>
+    <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
+    <div style="color: #606266;font-size: 14px;height:25px;">抄送人{{copyName}}</div>
     <ApprovalDetailMoblie :formData="summaryData.formData" :data="summaryData" type="phase"
                     :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
     <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index 3497021..459236c 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -192,13 +192,13 @@ const showUserPicker = () => {
     value: "0"
   };
   dataList.value = [];
-  console.log('_value.value',_value.value)
-  if(props.setNullToSelectList){
-    selectList.value = []
-  }else {
+  // console.log('_value.value',_value.value)
+  // if(props.setNullToSelectList){
+  //   selectList.value = []
+  // }else {
 
     selectList.value =_value.value
-  }
+  // }
   chooseId.value = 0;
   radio.value = 0;
   visible.value = true;

From 87613e81136693c1cf95a3afb4b0ac1357f24871 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 00:10:42 +0800
Subject: [PATCH 36/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/moblieDetail/AllocationSummaryDetailMoblie.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
index 0a27000..98b1851 100644
--- a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
+++ b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
+<!--  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
   <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
             :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
     <el-table-column type="index" label="序号" align="center" width="60"/>

From 6434605c7a08192fc19d62e6cac46d380c814476 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 01:22:29 +0800
Subject: [PATCH 37/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../requirement/moblieDetail/CollectionDetailMoblie.vue   | 2 +-
 .../mobledetail/ApprovalDetailMoblie.vue                  | 2 +-
 .../mobledetail/CollectionDetailMoblie.vue                | 2 +-
 .../project-management/mobledetail/ProjectApplyMoblie.vue | 2 +-
 .../project-management/mobledetail/ShareDetailMobile.vue  | 2 +-
 .../mobledetail/SpecialFundDetailMobile.vue               | 2 +-
 .../mobledetail/SummaryDetailMoblie.vue                   | 2 +-
 .../phaseDetailMoblie/ApprovalDetailMoblie.vue            | 2 +-
 src/views/workflow/common/OperationRender.vue             | 8 ++++++--
 9 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
index eecd401..9e723a8 100644
--- a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
+++ b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
@@ -74,7 +74,7 @@
         </div>
         <div class="process">
           <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
-                            :operation-list="data.operationList"
+                            :operation-list="data.operationList" :isColumn="true"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="collectionProcess"/>
         </div>
diff --git a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
index 61a64ab..f36614b 100644
--- a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
@@ -34,7 +34,7 @@
         </div>
       </div>
       <div class="process">
-        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :isColumn="true"
                           :operation-list="data.operationList"
                           :state="data.state"/>
         <process-diagram-viewer v-if="processViewer&&changeDiagram" :id-name="idName?idName:type"/>
diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
index 89f1b88..41a3e89 100644
--- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
@@ -73,7 +73,7 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :isColumn="true"
                             :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="collectionProcess"/>
diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
index b49ce38..5ce838e 100644
--- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
+++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
@@ -34,7 +34,7 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="mode === 'resubmit'&&!changeDiagram" :operation-list="data.operationList"
+          <operation-render v-if="mode === 'resubmit'&&!changeDiagram" :operation-list="data.operationList" :isColumn="true"
                             :state="data.state"/>
           <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
         </div>
diff --git a/src/views/project-management/mobledetail/ShareDetailMobile.vue b/src/views/project-management/mobledetail/ShareDetailMobile.vue
index e6f79bb..6c9b5ce 100644
--- a/src/views/project-management/mobledetail/ShareDetailMobile.vue
+++ b/src/views/project-management/mobledetail/ShareDetailMobile.vue
@@ -46,7 +46,7 @@
     </div>
     <div class="process">
       <operation-render
-          v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"
+          v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"  :isColumn="true"
           :operation-list="shareData.operationList"
           :state="shareData.state"/>
       <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>
diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
index c9a4cb0..3788e30 100644
--- a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
+++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
@@ -78,7 +78,7 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="fundProcessViewer && fundData.operationList && fundData.operationList.length > 0&&!changeDiagram"
+          <operation-render v-if="fundProcessViewer && fundData.operationList && fundData.operationList.length > 0&&!changeDiagram" :isColumn="true"
                             :operation-list="fundData.operationList"
                             :state="fundData.state"/>
           <process-diagram-viewer v-if="fundProcessViewer&&changeDiagram" id-name="fundProcess"/>
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index 50afca5..ff0c336 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -170,7 +170,7 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :isColumn="true"
                             :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
diff --git a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
index d1f8948..6914460 100644
--- a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
@@ -35,7 +35,7 @@
       </div>
       <div class="process">
         <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
-                          :operation-list="data.operationList"
+                          :operation-list="data.operationList" :isColumn="true"
                           :state="data.state"/>
         <process-diagram-viewer v-if="processViewer&&changeDiagram" :id-name="idName?idName:type"/>
       </div>
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index 4d2f616..9d512f7 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -12,8 +12,8 @@
             当前节点: {{ operation.operationName }}
           </div>
           <div class="card">
-            <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
-              <div class="avatar-block">
+            <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name" :style="{'flex-direction': isColumn?'column':'row'}">
+              <div class="avatar-block" :style="{'margin-bottom': isColumn?'10px':'0'}">
                 <name-circle :user="user"/>
                 <div class="name">
                   <span>{{ user.name }}</span>
@@ -64,6 +64,10 @@ const props = defineProps({
     default: () => {
       return '1'
     }
+  },
+  isColumn: {
+    type: Boolean,
+    default:false
   }
 })
 

From c89f4db52960972272c5a1ea6ff92cfc14269032 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 16:43:21 +0800
Subject: [PATCH 38/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4=E8=AF=A6=E6=83=85/=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/ProjectApply.vue             | 4 ++--
 src/views/project-management/implementation/phaseDetail.vue | 2 +-
 src/views/project-management/phaseDetailMoblie/index.vue    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 8e87bac..7463001 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -26,14 +26,14 @@
           <baseTitle title="审批记录" v-if="mode === 'resubmit'"></baseTitle>
           <div v-else></div>
           <div class="diagram">
-            <div class="base-title" style="margin-left: 50px">流程图</div>
+            <div class="base-title" >流程图</div>
             <el-switch
                 v-model="changeDiagram"
                 style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
-        <div class="process" style="margin-left: 50px">
+        <div class="process">
           <operation-render v-if="mode === 'resubmit'&&!changeDiagram" :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index 95cd6b4..952d761 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -2,7 +2,7 @@
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" style="margin-left:27px"></fvForm>
   <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
-  <div style="color: #606266;font-size: 14px;width: 84px;height:25px;text-align: right">抄送人{{copyName}}</div>
+  <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;width: 84px;text-align: right;margin-right: 14px">抄送人</span>{{copyName}}</div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
                   :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
   <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>
diff --git a/src/views/project-management/phaseDetailMoblie/index.vue b/src/views/project-management/phaseDetailMoblie/index.vue
index 2b16aaa..d34fd44 100644
--- a/src/views/project-management/phaseDetailMoblie/index.vue
+++ b/src/views/project-management/phaseDetailMoblie/index.vue
@@ -3,7 +3,7 @@
     <baseTitle title="基础信息"></baseTitle>
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
     <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
-    <div style="color: #606266;font-size: 14px;height:25px;">抄送人{{copyName}}</div>
+    <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;width: 84px;text-align: right;margin-right: 14px">抄送人</span>{{copyName}}</div>
     <ApprovalDetailMoblie :formData="summaryData.formData" :data="summaryData" type="phase"
                     :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
     <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>

From e43213d9a7ae0bb0a7f8f26597edcf04aa93a460 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 17:21:00 +0800
Subject: [PATCH 39/60] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E6=91=8A=E6=B1=87=E6=80=BB=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/AllocationSummaryDetail.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index d5459d7..e4d866c 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -14,9 +14,9 @@
     </el-table-column>
     <el-table-column prop="researchStage" label="研发阶段" align="center">
       <template #default="scope">
-        <div
-            v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
-          <Tag dictType="research_stage" :value="scope.row.researchStage"/>
+        <div v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
+          <el-tag effect="plain">{{scope.row.researchStage==1?'开发阶段':'研究阶段'}}</el-tag>
+<!--          <Tag dictType="research_stage" :value="scope.row.researchStage"/>-->
         </div>
         <div v-else>--</div>
       </template>

From fd3231db4d2cb3d191a276e0a5f736b73786209a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 19:17:56 +0800
Subject: [PATCH 40/60] =?UTF-8?q?fix=20:=20=E6=B7=BB=E5=8A=A0=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/steps/index.vue                | 21 ++++++---
 .../project-management/filing/attachment.vue  | 16 ++++++-
 .../project-management/filing/upload.vue      | 16 ++++++-
 .../implementation/account.vue                | 45 ++++++++++---------
 .../implementation/attachment.vue             | 14 ++++++
 .../implementation/phase.vue                  | 16 ++++++-
 .../implementation/phaseDetail.vue            | 16 ++++++-
 .../implementation/share.vue                  | 18 ++++++--
 .../implementation/upload.vue                 | 16 ++++++-
 .../implementation/uploadFee.vue              | 34 +++++++++-----
 .../mobledetail/StepsMoblie.vue               | 28 +++++++-----
 11 files changed, 182 insertions(+), 58 deletions(-)

diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 18d09df..24b2a05 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -103,6 +103,20 @@ const schema = computed(() => {
         span: 12
       }
     },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
@@ -110,13 +124,6 @@ const schema = computed(() => {
         span: 12
       }
     },
-    {
-      label: '项目名称',
-      prop: 'projectName',
-      colProps: {
-        span: 12
-      }
-    }
 
   ]
 })
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index a5b4949..8099ef4 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -39,7 +39,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index 52dd235..80198f4 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -45,7 +45,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index d52f14d..251d593 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -38,35 +38,35 @@ const formDataArray = ref([
     label: '征集名称',
     prop: 'requirementName',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
     label: '项目名称',
     prop: 'projectName',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
     label: '项目负责人',
     prop: 'projectChargePerson',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
     label: '项目开始时间',
     prop: 'startTime',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
     label: '项目预计持续时间',
     prop: 'endTime',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
@@ -84,7 +84,7 @@ const formDataArray = ref([
     }
   },
   {
-    label: '项目总体完成率（%）',
+    label: '项目总体完成率',
     prop: 'projectCompletionRate',
     colProps: {
       span: 6
@@ -257,10 +257,25 @@ const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
     baseForm.value.setValues(data)
+    await init()
   } catch {
   }
 }
-
+const init = async () => {
+  const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
+  console.log('data',data)
+  if (data) {
+    tableData.value = data
+    baseForm.value.setValues(data)
+  }
+  // if (code !== 1000) {
+  //   ElNotification({
+  //     title: '提示',
+  //     message: msg,
+  //     type: 'error'
+  //   })
+  // }
+}
 getBaseInfo()
 const headBtnClick = (key) => {
   switch (key) {
@@ -308,21 +323,7 @@ const search = (val) => {
   tableConfig.params = {...val, projectId: route.query.id}
   tableIns.value.refresh()
 }
-const init = async () => {
-  const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
-  if (data) {
-    tableData.value = data
-    baseForm.value.setValues(data)
-  }
-  // if (code !== 1000) {
-  //   ElNotification({
-  //     title: '提示',
-  //     message: msg,
-  //     type: 'error'
-  //   })
-  // }
-}
-init()
+
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 2c35432..45bb082 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -56,6 +56,20 @@ const schema = computed(() => {
         span: 12
       }
     },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 1fb70cc..e38b0e7 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -74,7 +74,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index 952d761..bee485d 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -38,7 +38,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index d7a1a4c..f8498e9 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -10,10 +10,8 @@
 </template>
 
 <script setup lang="jsx">
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
-import {getResearchUser} from "@/api/expense-manage";
 
 const route = useRoute()
 const schema = computed(() => {
@@ -31,7 +29,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 10f3212..6a2a087 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -59,7 +59,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index fe278f8..11d92f2 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -2,7 +2,7 @@
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <el-form :model="tableForm" ref="form" class="query-form">
-    <el-table :data="tableForm.tableData" style="width: 100%">
+    <el-table :data="tableForm.tableData">
       <el-table-column prop="time" label="时间" width="180">
         <template #default="scope">
           <el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
@@ -33,7 +33,7 @@
       </el-table-column>
       <el-table-column prop="researchStage" label="研发阶段" width="220">
         <template #default="scope">
-          <el-form-item prop="researchStage"  :rules="scope.row.researchStage?'1':rules.researchStage">
+          <el-form-item prop="researchStage" :rules="scope.row.researchStage?'1':rules.researchStage">
             <el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('fee_stage')"
@@ -56,7 +56,7 @@
       <el-table-column prop="afterTax" label="税后余额(元)" width="220">
         <template #default="scope">
           <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
-            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额"  :controls="false">
+            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
             </el-input-number>
           </el-form-item>
         </template>
@@ -92,7 +92,7 @@ const router = useRouter()
 const tagsViewStore = useTagsView()
 const formData = ref({})
 const form = ref()
-const projectName=ref()
+const projectName = ref()
 const schema = computed(() => {
   return [
     {
@@ -108,7 +108,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
@@ -166,10 +180,10 @@ const handleSubmit = (instance) => {
       })
     }
     instance.clearValidate()
-    tableForm.tableData.forEach(item=>{
-      item.projectName=projectName.value
+    tableForm.tableData.forEach(item => {
+      item.projectName = projectName.value
     })
-    const res =await addLedger(tableForm.tableData)
+    const res = await addLedger(tableForm.tableData)
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -179,8 +193,8 @@ const handleSubmit = (instance) => {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
         name: 'Implementation/account',
-        query:{
-          id:route.query.id
+        query: {
+          id: route.query.id
         }
       })
     }
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index 5fb6999..4613810 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -101,24 +101,30 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
-      colProps: {
-        span: 24
+        span: 12
       }
     },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
-        span: 24
+        span: 12
       }
-    }
-
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 

From 7daa4b676d1ea01e195ce28f3a8853eef3c71428 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 20:03:31 +0800
Subject: [PATCH 41/60] =?UTF-8?q?fix=20:=20=E8=B0=83=E6=95=B4=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project-management/implementation/account.vue      | 10 +++++-----
 .../project-management/implementation/updateTable.vue  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 251d593..ce2a964 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -50,7 +50,7 @@ const formDataArray = ref([
   },
   {
     label: '项目负责人',
-    prop: 'projectChargePerson',
+    prop: 'projectChargePersonName',
     colProps: {
       span: 8
     }
@@ -101,11 +101,11 @@ const formDataArray = ref([
 ])
 const tableData = ref({})
 const schema = computed(() => {
-  if (JSON.stringify(tableData.value) !== '{}') {
+  // if (JSON.stringify(tableData.value) !== '{}') {
     return formDataArray.value
-  } else {
-    return formArray.value
-  }
+  // } else {
+  //   return formArray.value
+  // }
 })
 const baseForm = ref()
 const tableIns = ref()
diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index e072c59..4985075 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -11,7 +11,7 @@
         <el-form-item prop="projectChargePerson" label="项目负责人">
           {{tableForm.projectChargePersonName}}
           <el-button @click="showPersonnelPicker">
-            {{ tableForm.projectChargePersonName ? '更改' : '请选择研发人员' }}
+            {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}
           </el-button>
         </el-form-item>
       </el-col>

From c226715097ea5c01c3c72fa622ac80bdb36516bb Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 20:09:53 +0800
Subject: [PATCH 42/60] =?UTF-8?q?fix=20:=20=E8=B0=83=E6=95=B4=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/implementation/account.vue     | 5 ++---
 src/views/project-management/implementation/phaseDetail.vue | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index ce2a964..5fce660 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -257,14 +257,12 @@ const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
     baseForm.value.setValues(data)
-    await init()
   } catch {
   }
 }
 const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
-  console.log('data',data)
-  if (data) {
+  if (code===1000) {
     tableData.value = data
     baseForm.value.setValues(data)
   }
@@ -277,6 +275,7 @@ const init = async () => {
   // }
 }
 getBaseInfo()
+init()
 const headBtnClick = (key) => {
   switch (key) {
     case 'add':
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index bee485d..93bf09c 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -2,7 +2,7 @@
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" style="margin-left:27px"></fvForm>
   <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
-  <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;width: 84px;text-align: right;margin-right: 14px">抄送人</span>{{copyName}}</div>
+  <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;width: 84px;text-align: right;margin-right: 14px">抄送人</span>{{copyName?copyName:'--'}}</div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
                   :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
   <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>

From a7b898fe48e98dececa1fa6509cd51ac203a5589 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 20:43:08 +0800
Subject: [PATCH 43/60] =?UTF-8?q?fix=20:=20=E8=B0=83=E6=95=B4=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E5=88=86=E6=91=8A,=E8=A1=A8=E6=A0=BC=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BA=BA=E5=91=98=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue      |  6 ++++++
 .../implementation/account.vue                  |  2 +-
 .../implementation/updateTable.vue              | 17 +++++++++++++----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 5cb9d99..7576afc 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -411,6 +411,12 @@ const getDetailList = async () => {
   if (code === 1000) {
     data.rows.forEach(item => {
       item.researchPersonnelId = Number(item.researchPersonnelId)
+      let userObj = {
+        id: item.researchPersonnelId,
+        name: item.researchPersonnel,
+        companyName: item.companyName,
+      }
+      userList.value.push(userObj)
     })
     formData.value.tableData = data.rows
     nextTick(() => {
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 5fce660..5c24d7e 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -257,6 +257,7 @@ const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
     baseForm.value.setValues(data)
+    await init()
   } catch {
   }
 }
@@ -275,7 +276,6 @@ const init = async () => {
   // }
 }
 getBaseInfo()
-init()
 const headBtnClick = (key) => {
   switch (key) {
     case 'add':
diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index 4985075..f0155eb 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -9,7 +9,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item prop="projectChargePerson" label="项目负责人">
-          {{tableForm.projectChargePersonName}}
+          {{ tableForm.projectChargePersonName }}
           <el-button @click="showPersonnelPicker">
             {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}
           </el-button>
@@ -55,7 +55,8 @@
       </el-col>
       <el-col :span="6">
         <el-form-item prop="projectCompletionRate" label="项目总体完成率（%）">
-          <el-input-number v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" min="0" max="100" :controls="false" style="width: 200px">
+          <el-input-number v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" min="0" max="100"
+                           :controls="false" style="width: 200px">
           </el-input-number>
         </el-form-item>
       </el-col>
@@ -67,7 +68,7 @@
       </el-col>
     </el-row>
   </el-form>
-  <user-picker :multiple="false" ref="userPicker" title="请选择项目负责人" @ok="selected"/>
+  <user-picker :multiple="false" ref="userPicker" title="请选择项目负责人" @ok="selected" v-model:value="userList"/>
   <div class="oper-page-btn">
     <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
     <el-button @click="handleBack">返回</el-button>
@@ -94,13 +95,14 @@ const tableForm = ref({
   endTime: '',
   projectBudgetDescription: '',
   projectChargePerson: '',
-  projectChargePersonName:'',
+  projectChargePersonName: '',
   projectCompletionRate: '',
   projectDevelopmentWay: '',
   projectId: '',
   startTime: ''
 })
 const userPicker = ref()
+const userList = ref([])
 
 const showPersonnelPicker = () => {
   userPicker.value.showUserPicker()
@@ -113,6 +115,7 @@ const selected = (select) => {
     tableForm.value.projectChargePerson = selectElement.id
     tableForm.value.projectChargePersonName = selectElement.name
   }
+  userList.value = select
 }
 const disabledDate = (time) => {
   return time.getTime() < new Date(tableForm.value.startTime).getTime();
@@ -151,6 +154,12 @@ getBaseInfo()
 const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
   tableForm.value = data
+  let userObj = {
+    id: data.projectChargePerson,
+    name: data.projectChargePersonName,
+    companyName: data.companyName,
+  }
+  userList.value.push(userObj)
   if (code !== 1000) {
     ElNotification({
       title: '提示',

From d87027423ef270fb5f607d4430fe12f459996922 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 21:08:56 +0800
Subject: [PATCH 44/60] =?UTF-8?q?fix=20:=20"=E7=A7=91=E7=A0=94=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0"=20=E6=A0=87=E9=A2=98=E6=94=BE?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                    | 2 +-
 src/layout/siderbar/index.vue | 2 +-
 src/views/login/index.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 7056f8c..264b8e9 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<!--    <title>科研管理平台</title>-->
+    <title>科研管理平台</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/src/layout/siderbar/index.vue b/src/layout/siderbar/index.vue
index ef29c10..90c2474 100644
--- a/src/layout/siderbar/index.vue
+++ b/src/layout/siderbar/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="logo" ref="logo">
-<!--    <span v-if="!siderbarStore.isCollapse">科研管理平台</span>-->
+    <span v-if="!siderbarStore.isCollapse">科研管理平台</span>
     <span v-if="!siderbarStore.isCollapse"></span>
   </div>
   <el-scrollbar :height="`calc(100vh - ${logoHeight}px)`" style="background-color: #ffffff">
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 13913d7..e442e96 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -6,7 +6,7 @@
         :rules="rules"
         label-width="70px"
     >
-<!--      <h2>科研管理平台</h2>-->
+      <h2>科研管理平台</h2>
       <el-form-item prop="username" label="账号">
         <el-input v-model="loginForm.username" :prefix-icon="User"></el-input>
       </el-form-item>

From 47a5cd33381e7575a6c58488fb2f34359df501b6 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 21:28:46 +0800
Subject: [PATCH 45/60] =?UTF-8?q?fix=20:=20=E6=96=B0=E5=A2=9E=E5=88=86?=
 =?UTF-8?q?=E6=91=8A/=E4=B8=8A=E4=BC=A0=E8=B4=B9=E7=94=A8=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue    | 20 +++++++++----------
 .../implementation/uploadFee.vue              | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 7576afc..28dbf61 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -21,7 +21,7 @@
           </el-form-item>
         </el-col>
         <el-table v-if="showTable" :data="formData.tableData" style="width: 100%">
-          <el-table-column prop="projectId" label="项目名称" width="230">
+          <el-table-column prop="projectId" label="项目名称" min-width="230">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.projectId?'1':rules.projectId">
                 <el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable>
@@ -36,7 +36,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="researchPersonnelId" label="研发人员" width="230">
+          <el-table-column prop="researchPersonnelId" label="研发人员" min-width="180">
             <template #default="scope">
               <el-form-item prop="researchPersonnelId">
                 {{ scope.row.researchPersonnel }}
@@ -46,56 +46,56 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="wagesPayable" label="应发工资" width="175">
+          <el-table-column prop="wagesPayable" label="应发工资" min-width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.wagesPayable?'1':rules.wagesPayable">
                 <el-input-number v-model="scope.row.wagesPayable" placeholder="请输入应发工资" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="performance" label="绩效" width="175">
+          <el-table-column prop="performance" label="绩效" min-width="175">
             <template #default="scope">
               <el-form-item prop="time">
                 <el-input-number v-model="scope.row.performance" placeholder="请输入绩效" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="reserveFund" label="公积金" width="175">
+          <el-table-column prop="reserveFund" label="公积金" min-width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.reserveFund?'1':rules.reserveFund">
                 <el-input-number v-model="scope.row.reserveFund" placeholder="请输入公积金" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="socialSecurity" label="社保" width="175">
+          <el-table-column prop="socialSecurity" label="社保" min-width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.socialSecurity?'1':rules.socialSecurity">
                 <el-input-number v-model="scope.row.socialSecurity" placeholder="请输入社保" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="annuity" label="年金" width="175">
+          <el-table-column prop="annuity" label="年金" min-width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.annuity?'1':rules.annuity">
                 <el-input-number v-model="scope.row.annuity" placeholder="请输入年金" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="workday" label="工作日(天)" width="175">
+          <el-table-column prop="workday" label="工作日(天)" min-width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.workday?'1':rules.workday">
                 <el-input-number v-model="scope.row.workday" placeholder="请输入工作日" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="researchDuration" label="研发时长(天)" width="175">
+          <el-table-column prop="researchDuration" label="研发时长(天)" min-width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.researchDuration?'1':rules.researchDuration">
                 <el-input-number v-model="scope.row.researchDuration" placeholder="请输入研发时长" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="oper" label="操作">
+          <el-table-column prop="oper" label="操作" min-width="130">
             <template #default="scope">
               <el-button type="primary" @click="handleCopy(scope.row)" link style="font-size: 18px">复制</el-button>
               <el-button type="primary" @click="handleDelete(scope.$index)" link style="font-size: 18px">删除</el-button>
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 11d92f2..4ab7af2 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -3,7 +3,7 @@
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <el-form :model="tableForm" ref="form" class="query-form">
     <el-table :data="tableForm.tableData">
-      <el-table-column prop="time" label="时间" width="180">
+      <el-table-column prop="time" label="时间" min-width="180">
         <template #default="scope">
           <el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
             <el-date-picker
@@ -17,7 +17,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="projectCost" label="项目费用" width="220">
+      <el-table-column prop="projectCost" label="项目费用" min-width="220">
         <template #default="scope">
           <el-form-item prop="projectCost" :rules="scope.row.projectCost?'1':rules.projectCost">
             <el-select v-model="scope.row.projectCost" placeholder="请选择费用性质" clearable filterable>
@@ -31,7 +31,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="researchStage" label="研发阶段" width="220">
+      <el-table-column prop="researchStage" label="研发阶段" min-width="220">
         <template #default="scope">
           <el-form-item prop="researchStage" :rules="scope.row.researchStage?'1':rules.researchStage">
             <el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
@@ -45,7 +45,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="digest" label="摘要" width="220">
+      <el-table-column prop="digest" label="摘要" min-width="220">
         <template #default="scope">
           <el-form-item prop="digest" :rules="scope.row.digest?'1':rules.digest">
             <el-input v-model="scope.row.digest" placeholder="请输入摘要" clearable>
@@ -53,7 +53,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="afterTax" label="税后余额(元)" width="220">
+      <el-table-column prop="afterTax" label="税后余额(元)" min-width="220">
         <template #default="scope">
           <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
             <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">

From 09e2bfc605d3031335dae7ae79d05d51d55b53bf Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 22:49:37 +0800
Subject: [PATCH 46/60] =?UTF-8?q?fix=20:=20=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=AE=A1=E7=90=86=E6=BC=94=E7=A4=BA,=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           |  9 ++++----
 .../AllocationSummaryDetail.vue               |  5 +++--
 .../DetailComponent/FileComponent.vue         |  2 +-
 src/utils/request.js                          | 14 ++++++------
 .../AllocationSummaryDetailMoblie.vue         |  4 ++--
 src/views/project-demand/summary/add.vue      |  8 ++++---
 .../AllocationSummaryDetailMobile.vue         |  2 +-
 .../mobledetail/SpecialFundDetailMobile.vue   |  3 ++-
 .../mobledetail/StepsMoblie.vue               | 22 +++++++++----------
 .../mobledetail/SummaryDetailMoblie.vue       | 22 ++++++++++++++-----
 src/views/system/department/index.vue         |  5 +++++
 11 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 9742001..68101c4 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -222,9 +222,6 @@ const singleFileList = ref([])
 if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
   allFileList.value = props.formData.fileList
 }
-watch(() => props.showTable, (newVal) => {
-  props.showTable = newVal
-}, {deep: true})
 watch(() => props.showSingleTable, (newVal) => {
   props.showSingleTable = newVal
 }, {deep: true})
@@ -237,7 +234,7 @@ watch(() => props.formData.fileList, (newVal) => {
   }
 }, {deep: true})
 watch(() => props.otherFileList, (newVal) => {
-  // console.log('newotherFileList', newVal, props.formData)
+  // console.log('newotherFileList', newVal)
   if (props.preview) {
     if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
       allFileList.value = newVal
@@ -250,6 +247,10 @@ watch(() => props.otherFileList, (newVal) => {
     allFileList.value = newVal
   }
 }, {deep: true})
+
+watch(() => props.showTable, (newVal) => {
+  props.showTable = newVal
+}, {deep: true})
 watch(() => props.singleList, (newVal) => {
   // console.log('singleFile', newVal)
   singleFileList.value = newVal
diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index e4d866c..99b20ff 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -1,5 +1,5 @@
 <template>
-<!--  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
+  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
   <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
             :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
     <el-table-column type="index" label="序号" align="center" width="60"/>
@@ -16,7 +16,6 @@
       <template #default="scope">
         <div v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
           <el-tag effect="plain">{{scope.row.researchStage==1?'开发阶段':'研究阶段'}}</el-tag>
-<!--          <Tag dictType="research_stage" :value="scope.row.researchStage"/>-->
         </div>
         <div v-else>--</div>
       </template>
@@ -30,6 +29,8 @@
       </template>
     </el-table-column>
   </el-table>
+
+  <!--          <Tag dictType="research_stage" :value="scope.row.researchStage"/>-->
 </template>
 
 <script setup>
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index f1ec76f..cb8d671 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -50,7 +50,7 @@ const tableConfig = reactive({
       type: 'index',
       label: '序号',
       align: 'center',
-      width: 90,
+      width: 85,
     },
     {
       prop: 'originalFileName',
diff --git a/src/utils/request.js b/src/utils/request.js
index d95c00b..78ff3b6 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -35,12 +35,12 @@ serveice.interceptors.response.use(response => {
     const status = response.status;
     switch (status) {
         case 401:
-            ElMessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
-                confirmButtonText: '重新登录',
-                cancelButtonText: '取消',
-                type: 'warning',
-                closeOnClickModal: false
-            }).then(() => {
+            // ElMessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
+            //     confirmButtonText: '重新登录',
+            //     cancelButtonText: '取消',
+            //     type: 'warning',
+            //     closeOnClickModal: false
+            // }).then(() => {
                 removeToken()
                 let path = window.location.pathname;
                 let query = window.location.search
@@ -49,7 +49,7 @@ serveice.interceptors.response.use(response => {
                     query: query
                 }))
                 window.location.href = `${window.location.origin}/api/auth/cas/login`
-            })
+            // })
             return Promise.reject('会话已过期,请重新登录')
         case 402:
             break;
diff --git a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
index 98b1851..ad7d08e 100644
--- a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
+++ b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
@@ -1,5 +1,5 @@
 <template>
-<!--  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
+  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
   <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
             :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
     <el-table-column type="index" label="序号" align="center" width="60"/>
@@ -16,7 +16,7 @@
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
-          <Tag dictType="research_stage" :value="scope.row.researchStage"/>
+          <el-tag effect="plain">{{scope.row.researchStage==1?'开发阶段':'研究阶段'}}</el-tag>
         </div>
         <div v-else>--</div>
       </template>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index bbfbac6..6d19535 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -382,9 +382,11 @@ const getOtherFile = (val) => {
     showTable.value = true
   })
 }
-watch(() => otherFileList.value, (newVal) => {
-  showTable.value = newVal.length !== 0;
-}, {deep: true})
+// watch(() => otherFileList.value, (newVal) => {
+//   console.log('newVal',newVal)
+//   showTable.value = newVal.length !== 0;
+//   console.log('showTable.value',showTable.value)
+// }, {deep: true})
 watch(() => singleList.value, (newVal) => {
   showSingleTable.value = newVal.length !== 0;
 }, {deep: true})
diff --git a/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue b/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
index 691578d..bdfd210 100644
--- a/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
+++ b/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
@@ -16,7 +16,7 @@
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
-          <Tag dictType="research_stage" :value="scope.row.researchStage"/>
+          <el-tag effect="plain">{{scope.row.researchStage==1?'开发阶段':'研究阶段'}}</el-tag>
         </div>
         <div v-else>--</div>
       </template>
diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
index 3788e30..8c02c64 100644
--- a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
+++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
@@ -153,7 +153,7 @@ const fileTable = reactive({
       type: 'index',
       label: '序号',
       align: 'center',
-      width: '80',
+      width: 85,
     },
     {
       prop: 'originalFileName',
@@ -169,6 +169,7 @@ const fileTable = reactive({
       prop: 'size',
       label: '文件大小',
       align: 'center',
+      width: 150,
       currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
     {
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index 4613810..61f119d 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -1,7 +1,6 @@
 <template>
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-  <baseTitle title="各流程信息"></baseTitle>
   <div class="steps-box">
     <el-steps :active="localActive" finish-status="success">
       <el-step
@@ -22,6 +21,7 @@
 
   <!-- 步骤内容 -->
   <div>
+    <baseTitle title="各流程信息"></baseTitle>
     <slot name="content" :localActive="localActive"></slot>
     <!-- <template v-for="(item, index) in stepList" :key="item.key">
       <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />
@@ -101,28 +101,28 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '项目名称',
-      prop: 'projectName',
-      colProps: {
-        span: 12
+        span: 24
       }
     },
     {
       label: '征集描述',
       prop: 'collectExplain',
       colProps: {
-        span: 12
+        span: 24
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 24
       }
     },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
       colProps: {
-        span: 12
+        span: 24
       }
     },
   ]
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index ff0c336..dda0c4e 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -240,12 +240,24 @@ const _value = computed({
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
-  if (data instanceof Array) {
-    data.find(item => {
-      if (item.value == value) {
-        label = item.label
-      }
+  let result = []
+  if (JSON.parse(value) instanceof Array) {
+    JSON.parse(value).forEach(item1 => {
+      data.find(item => {
+        if (item.value == item1) {
+          result.push(item.label)
+        }
+      })
     })
+    label = result.map(item => item).join('，')
+  } else {
+    if (data instanceof Array) {
+      data.find(item => {
+        if (item.value == value) {
+          label = item.label
+        }
+      })
+    }
   }
   return label
 }
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
index b063ea9..4cd5e0c 100644
--- a/src/views/system/department/index.vue
+++ b/src/views/system/department/index.vue
@@ -32,6 +32,11 @@
     <el-table-column prop="departmentMark" label="部门标志"/>
     <el-table-column prop="departmentCode" label="部门编码"/>
     <el-table-column prop="departmentName" label="部门名称"/>
+    <el-table-column prop="matrix" label="矩阵审批">
+      <template #default="scope">
+       <el-tag :type="scope.row.matrix?'success':'danger'"> {{scope.row.matrix?'完备':'缺失'}}</el-tag>
+      </template>
+    </el-table-column>
     <el-table-column prop="createTime" label="创建时间"/>
     <el-table-column prop="oper" label="操作">
       <template #default="{ row }">

From 2fd2d1d25bcbd8e60df5dbd445f93dae876133d3 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 1 Jul 2024 18:56:16 +0800
Subject: [PATCH 47/60] =?UTF-8?q?fix=20:=20=E8=B0=83=E6=95=B4=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8icon,=E5=88=A0=E9=99=A4=E6=B2=A1=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                            |  Bin 4286 -> 65100 bytes
 src/api/custom-query/adapter.js               |   61 -
 src/api/custom-query/datamodel.js             |   66 -
 src/api/custom-query/echarts.js               |   36 -
 src/api/custom-query/query-page.js            |   22 -
 src/api/custom-query/sql-search.js            |   37 -
 src/api/custom-query/sql.js                   |   42 -
 src/api/custom-query/table.js                 |   70 -
 src/api/custom-query/topo-search.js           |   47 -
 src/api/custom-query/topo.js                  |   42 -
 src/router/index.js                           |   54 -
 .../data-adapter/DataAdapterDesign.vue        |   71 -
 src/views/custom-query/data-adapter/index.vue |  285 ---
 src/views/custom-query/datamodel/index.vue    |  392 ----
 .../echarts-editor/EchartsDesign.vue          |  233 ---
 .../echarts-editor/components/AxisBox.vue     |  538 -----
 .../components/ChartsOptions.vue              |  307 ---
 .../components/EchartsEditor.vue              |  307 ---
 .../components/barChart/AdvancedSettings.vue  |   86 -
 .../components/barChart/BasicSetting.vue      |  140 --
 .../components/lineChart/AdvancedSettings.vue |   86 -
 .../components/lineChart/BasicSetting.vue     |  160 --
 .../components/pieChart/BasicSetting.vue      |   17 -
 .../components/pieChart/PieBox.vue            |  116 --
 .../components/radarChart/RadarBox.vue        |  110 -
 .../custom-query/echarts-editor/index.vue     |  233 ---
 src/views/custom-query/query-page/index.vue   |  107 -
 src/views/custom-query/sql/SqlDesign.vue      |  486 -----
 src/views/custom-query/sql/index.vue          |  351 ----
 .../table-management/editTable.vue            |  316 ---
 .../table-management/importTable.vue          |  201 --
 .../custom-query/table-management/index.vue   |  249 ---
 .../components/changeImage/ChangeImage.vue    |   37 -
 .../changeImage/SettingImageDialog.vue        |   62 -
 src/views/custom-query/topo/index.vue         |  352 ----
 .../topo/top/behavior/click-er-edge.js        |   81 -
 .../topo/top/behavior/click-er-node.js        |  157 --
 .../topo/top/behavior/drag-add-edge.js        |  232 ---
 .../topo/top/behavior/drag-event-edit.js      |   57 -
 .../topo/top/behavior/hover-event-edit.js     |   66 -
 .../custom-query/topo/top/behavior/index.js   |   30 -
 .../topo/top/behavior/keyup-event-edit.js     |   67 -
 .../topo/top/components/FooterBar.vue         |   91 -
 .../topo/top/components/HeaderBar.vue         |   91 -
 .../custom-query/topo/top/config/edge.js      |   13 -
 .../custom-query/topo/top/config/index.js     |   11 -
 src/views/custom-query/topo/top/edge/base.js  |   30 -
 src/views/custom-query/topo/top/edge/index.js |   18 -
 .../custom-query/topo/top/edge/top-cubic.js   |   14 -
 .../custom-query/topo/top/elements/button.vue |   92 -
 .../topo/top/elements/checkbox.vue            |   75 -
 .../topo/top/elements/dropdown.vue            |   75 -
 .../custom-query/topo/top/elements/index.js   |   17 -
 .../topo/top/elements/loading.vue             |   91 -
 .../custom-query/topo/top/graph/index.js      |  162 --
 src/views/custom-query/topo/top/index.vue     |   12 -
 .../custom-query/topo/top/node/dice-er-box.js |  302 ---
 src/views/custom-query/topo/top/node/index.js |   20 -
 .../custom-query/topo/top/theme/dark-style.js |  177 --
 .../topo/top/theme/default-style.js           |  179 --
 .../custom-query/topo/top/theme/index.js      |   15 -
 .../topo/top/theme/office-style.js            |  177 --
 .../custom-query/topo/top/toolbar-edit.vue    |  217 --
 .../custom-query/topo/top/toolbar-preview.vue |  183 --
 src/views/custom-query/topo/top/topology.vue  | 1808 -----------------
 .../custom-query/topo/topologyDesign.vue      |  312 ---
 .../topo/utils/anchor/draw_mark.js            |   56 -
 .../custom-query/topo/utils/anchor/index.js   |   13 -
 .../topo/utils/anchor/set-state.js            |   25 -
 .../custom-query/topo/utils/anchor/update.js  |   31 -
 .../custom-query/topo/utils/collapse/index.js |   11 -
 .../topo/utils/collapse/set-state.js          |   32 -
 src/views/custom-query/topo/utils/date.js     |  106 -
 .../custom-query/topo/utils/edge/index.js     |   11 -
 .../custom-query/topo/utils/edge/set-state.js |   20 -
 src/views/custom-query/topo/utils/index.js    |  117 --
 .../custom-query/topo/utils/node/index.js     |   11 -
 .../custom-query/topo/utils/node/set-state.js |   26 -
 src/views/rapid/gen/basicInfoForm.vue         |   67 -
 src/views/rapid/gen/editTable.vue             |  234 ---
 src/views/rapid/gen/importTable.vue           |  185 --
 src/views/rapid/gen/index.vue                 |  362 ----
 src/views/rapid/gen/tableInfo.vue             |  210 --
 src/views/rapid/regular/index.vue             |  302 ---
 src/views/rapid/source/index.vue              |  380 ----
 src/views/steps/step/Step1.vue                |   17 -
 src/views/steps/step/Step2.vue                |   17 -
 src/views/steps/step/Step3.vue                |   17 -
 src/views/steps/step/Step4.vue                |   17 -
 src/views/steps/step/Step5.vue                |   17 -
 src/views/steps/step/index.vue                |   39 -
 91 files changed, 12914 deletions(-)
 delete mode 100644 src/api/custom-query/adapter.js
 delete mode 100644 src/api/custom-query/datamodel.js
 delete mode 100644 src/api/custom-query/echarts.js
 delete mode 100644 src/api/custom-query/query-page.js
 delete mode 100644 src/api/custom-query/sql-search.js
 delete mode 100644 src/api/custom-query/sql.js
 delete mode 100644 src/api/custom-query/table.js
 delete mode 100644 src/api/custom-query/topo-search.js
 delete mode 100644 src/api/custom-query/topo.js
 delete mode 100644 src/views/custom-query/data-adapter/DataAdapterDesign.vue
 delete mode 100644 src/views/custom-query/data-adapter/index.vue
 delete mode 100644 src/views/custom-query/datamodel/index.vue
 delete mode 100644 src/views/custom-query/echarts-editor/EchartsDesign.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/AxisBox.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/ChartsOptions.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/EchartsEditor.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/barChart/AdvancedSettings.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/barChart/BasicSetting.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/lineChart/AdvancedSettings.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/lineChart/BasicSetting.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/pieChart/BasicSetting.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/pieChart/PieBox.vue
 delete mode 100644 src/views/custom-query/echarts-editor/components/radarChart/RadarBox.vue
 delete mode 100644 src/views/custom-query/echarts-editor/index.vue
 delete mode 100644 src/views/custom-query/query-page/index.vue
 delete mode 100644 src/views/custom-query/sql/SqlDesign.vue
 delete mode 100644 src/views/custom-query/sql/index.vue
 delete mode 100644 src/views/custom-query/table-management/editTable.vue
 delete mode 100644 src/views/custom-query/table-management/importTable.vue
 delete mode 100644 src/views/custom-query/table-management/index.vue
 delete mode 100644 src/views/custom-query/topo/components/changeImage/ChangeImage.vue
 delete mode 100644 src/views/custom-query/topo/components/changeImage/SettingImageDialog.vue
 delete mode 100644 src/views/custom-query/topo/index.vue
 delete mode 100644 src/views/custom-query/topo/top/behavior/click-er-edge.js
 delete mode 100644 src/views/custom-query/topo/top/behavior/click-er-node.js
 delete mode 100644 src/views/custom-query/topo/top/behavior/drag-add-edge.js
 delete mode 100644 src/views/custom-query/topo/top/behavior/drag-event-edit.js
 delete mode 100644 src/views/custom-query/topo/top/behavior/hover-event-edit.js
 delete mode 100644 src/views/custom-query/topo/top/behavior/index.js
 delete mode 100644 src/views/custom-query/topo/top/behavior/keyup-event-edit.js
 delete mode 100644 src/views/custom-query/topo/top/components/FooterBar.vue
 delete mode 100644 src/views/custom-query/topo/top/components/HeaderBar.vue
 delete mode 100644 src/views/custom-query/topo/top/config/edge.js
 delete mode 100644 src/views/custom-query/topo/top/config/index.js
 delete mode 100644 src/views/custom-query/topo/top/edge/base.js
 delete mode 100644 src/views/custom-query/topo/top/edge/index.js
 delete mode 100644 src/views/custom-query/topo/top/edge/top-cubic.js
 delete mode 100644 src/views/custom-query/topo/top/elements/button.vue
 delete mode 100644 src/views/custom-query/topo/top/elements/checkbox.vue
 delete mode 100644 src/views/custom-query/topo/top/elements/dropdown.vue
 delete mode 100644 src/views/custom-query/topo/top/elements/index.js
 delete mode 100644 src/views/custom-query/topo/top/elements/loading.vue
 delete mode 100644 src/views/custom-query/topo/top/graph/index.js
 delete mode 100644 src/views/custom-query/topo/top/index.vue
 delete mode 100644 src/views/custom-query/topo/top/node/dice-er-box.js
 delete mode 100644 src/views/custom-query/topo/top/node/index.js
 delete mode 100644 src/views/custom-query/topo/top/theme/dark-style.js
 delete mode 100644 src/views/custom-query/topo/top/theme/default-style.js
 delete mode 100644 src/views/custom-query/topo/top/theme/index.js
 delete mode 100644 src/views/custom-query/topo/top/theme/office-style.js
 delete mode 100644 src/views/custom-query/topo/top/toolbar-edit.vue
 delete mode 100644 src/views/custom-query/topo/top/toolbar-preview.vue
 delete mode 100644 src/views/custom-query/topo/top/topology.vue
 delete mode 100644 src/views/custom-query/topo/topologyDesign.vue
 delete mode 100644 src/views/custom-query/topo/utils/anchor/draw_mark.js
 delete mode 100644 src/views/custom-query/topo/utils/anchor/index.js
 delete mode 100644 src/views/custom-query/topo/utils/anchor/set-state.js
 delete mode 100644 src/views/custom-query/topo/utils/anchor/update.js
 delete mode 100644 src/views/custom-query/topo/utils/collapse/index.js
 delete mode 100644 src/views/custom-query/topo/utils/collapse/set-state.js
 delete mode 100644 src/views/custom-query/topo/utils/date.js
 delete mode 100644 src/views/custom-query/topo/utils/edge/index.js
 delete mode 100644 src/views/custom-query/topo/utils/edge/set-state.js
 delete mode 100644 src/views/custom-query/topo/utils/index.js
 delete mode 100644 src/views/custom-query/topo/utils/node/index.js
 delete mode 100644 src/views/custom-query/topo/utils/node/set-state.js
 delete mode 100644 src/views/rapid/gen/basicInfoForm.vue
 delete mode 100644 src/views/rapid/gen/editTable.vue
 delete mode 100644 src/views/rapid/gen/importTable.vue
 delete mode 100644 src/views/rapid/gen/index.vue
 delete mode 100644 src/views/rapid/gen/tableInfo.vue
 delete mode 100644 src/views/rapid/regular/index.vue
 delete mode 100644 src/views/rapid/source/index.vue
 delete mode 100644 src/views/steps/step/Step1.vue
 delete mode 100644 src/views/steps/step/Step2.vue
 delete mode 100644 src/views/steps/step/Step3.vue
 delete mode 100644 src/views/steps/step/Step4.vue
 delete mode 100644 src/views/steps/step/Step5.vue
 delete mode 100644 src/views/steps/step/index.vue

diff --git a/public/favicon.ico b/public/favicon.ico
index df36fcfb72584e00488330b560ebcf34a41c64c2..9d7795544343653d81f7f0c2487aeefa1f5154d5 100644
GIT binary patch
literal 65100
zcmV*MKx4m&P)<h;3K|Lk000e1NJLTq00Arj00Arr1^@s6d3}y`00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D{ozSOK~#8N?7atj
zR7cVVdjHpb?q@PM=j>g3*SogYyWU`o$k~`+f^q^8g+Sz-bIv(Okwg^Ac|_g!t?HgR
zBW5H40wXasDxEWPx~sdZtE#K}bohTH0SQPz0y+pJ3|0aXkbn*Y34@h@1SFutK*C_X
zLh$I(qbS5b#YfTvj1LUk^ax=dg>dD)A-^j&@mZrZ>9xtlY8fmKq-SyLyWKY_-Ij6`
z0FB2o7)^dpK<9;o!Fp9db=fI*7`>8*^m#mB7&R<SA-P#}O13UfmkslOmz6U|%97jx
zvLNGsvVBb+$e7`23ozX6o9AWA(oEUCewrNKu~^O=-Xulm4oJz}t8J!Z<+AK+lr~07
zK*xlH!FmON%1;a_(t~M)@u`DHWFC_mhZYpw$EVRcxqqdk{L({Gf9Wo1zjTxIU%E<q
z->$NB`T)=bUD9d;Fx<%lYZ14*r1a|wTHPhJUl&R1+e;Qs9f$x=;HfncE$z0ZpMZ`D
z34_&%!4wz<s<BqeON!<4shzTK;~ZI?|EtVN{;$+mmxh(RB}Mno8)4|qAKj$J#Ul+@
zDhya*=Ko+c(3Nv>S_9HMu(<#<y2_NK?l4?EBsmGj@8=$}X8vys;6k<xq|*drb???i
z^~@UUtMQ|CDIY@@CjlK75(cXi1C_MCzFcPh{-dNP^@aySFUBwhc>BuP@OTl_-o<(x
z@L0pp8@qaDFXH!*G{jeg!Aj}ZO$sLeLk&lp0kpO+%Ye7m4F-?cLp`nZzTITo${b6y
z4WM~%YLdm%l8~QXk~8u%S)BEY>{>ldE}hsV)m0DGGgQOv;v}HsLc(BmAW-FOqaqVb
znQLWk%0JQ7q9@cXY-nh-j_+RSl$i!AK3yisa5PxAE+2zoi8ffN@RDYZ{RRfB0fAkl
z)&R8D!qZF9_%v9)YuHT=Zk=z5wgH&$P<@?bkN8C68a*?j$;jvB(|a`EO0KPWOTbGD
z34_&v;AspN4b8>{6U`_<iGzk_)1t`;1HS_#TcXM&?d{zoxqI^*j6u(6gVnE#<c<1V
zLXCAT6AA+8Ey?Z+T4rF>*z|i%4e9BF>)K3*o?%JxRm4M{934X#KXf&#%Wpe_)%F(x
z33z!SVX$68@P?`BQ3Ldv_aUjNyf5dDZjodA*1(gY1@Q{lLRSvYIMv|T?&WF}nj5Tn
zDL-mAPSb0_LNFQ2&m(zw55@uA%OD+kM!Ca3l!m%WCfWk<p_Pr(Am&W`yE9faT3r=M
ztLW^0O|vaPTBr7}H6zuxry5U|lOER0@qdk!kNj$}j8;CIp22%|l`RgR;h!RT+7g`v
zJYPr{td|hfn}MOJF25%y_pg`5c>^SU$h%PJ9x`>*XHs8Rg)n}uQcDJl%GM;sMJExL
z${aCRG!)rG-<P`Da;4Lf5^6H4uaBgnv{=#yyb&;1=z1k}ldQq-N^Nzi3mgxO5b4kx
zn+mVYydm?_los-M_r`@5auW@twQ125Ee{9oX{gMb>?&*LjzNI7ja(VeLvm>6B00RR
zP|EIKM^rQzpwDOcr-+>EZwdHgAYrgxLZE_Fl-!n-q3=P7ZCuB9car<{lB;L-Xc$$d
z7F1i!0}NYTb%|sQqQQ$cSgF7Cl6$w#8l4t&P#<ZSM^al=BAJ8U3K%RKFG}zKhE!GD
z*Kn-?=`_ITrVn`2m92*wn6zKIpnQF#s`R#oX$>sjjWT!24_Y2Ge540Y4fjWPE@=}T
z0=v!)wbe3p%$G(B<ta@6j~v~#R4U7gVZ0)q8veOh33$<vFj&tODA;CF{QtIq4seGW
zB!9~Hrp(SLsKJ3UZd@=~=TlK}jBae8Z=qcrVE*raix?Ro$By_$?)1U6s)Q}+pgvM%
zg`ughk}P<8%?%cfUwO$*rPU&U80l1$-bEaEeQJ>1_!GRW<fONysevA3E4)%VA~jVH
zC3EnbS|0L;hKlpTQjnk9MW-}Od>|3KV@I#(+&)Q3V%L=U=_={UZ{%yp2lC)fk>*MB
z)gsLVJWog%tmg<i-r<DYjDmgFc|t8nJ;Sj}xPS9ZN$pGJaf+kZL$XJHtn-bOZcAN4
zJlD5?=<2L17-w{xp`j<jF6Q=SDbm0^aa=48=o2ji5S|9dtD-$4DtT`yDZZ#-;(_u*
z$A=o_&h_(}z8PWWhctRf?ubtirnYrDcuu2z<Khv-HKVRwL0mZwmJRQ;t_Iy*%Y6)B
zc~B2vAE@EJN!HJw07KVJrl`^4cp5xM81*^7|6M|%dQCHat`hJfAYrhcBT(m5$Z0h6
zN`dF6^`$UWrjpy2CAoj^C_}@0zNNczW-k=qXvPIR^KZyFE@NIygboeF!u0<^@tL32
zRng~b#&3U8<3NLDQxT}(y>zUsCGdP;dRNcvQ$rJ-pYAeu;@@FJICkVB#Q@6(j5@9d
zH_y{}o{oB1Ff<F$ouhZz5`XxJbl7|})K*H?u#dDXDIB<01Bmh^{h#bvH%IBTL@NO=
z1`-DAd4dyiDrkLunS>h5bD)RNqQT+^;hGxJl}r9nl{u`CG!T8e%f`a->V>taL~0;R
zv9Dh^q=wGZF~iqQvW9-3GvV8+j5JuYCw-@efeOt*a*jQ*8&!1vK#O#=>_Fz{^ntY~
zOT^Hqmj#+ja+2_z`F4?F0H0ZyCRsIeDB?xv*xSZ#vVD1$K5w1Rwmj*=@h!$%l!@gr
zZ?>B@7$tYOw$VjOz#j?;gVnA;1u-My6{@D<t{m7nN2ZPbN=_eIkH@C8Eh@I_^04c)
zf8$(JNGh~;o2ZoCW$MUJr5;{^DrFqtGs8zxQ+Zd?2D||p)&(<90!AyT2RylJ8m28k
zdh^r%9nKSJn0M4eE}YojG95f)eD#dBM0-X)PiyCnb-Z(NVgS=nL(^C%d1Kt0#<0O+
zUb@M-BU?a+Z}eQG7!c+Uy38wP4hL_{@S4YHd778<Z!`?{wy-T=d2{&--&-BvF9FX8
z34_&+0FgAoY-*Ishc{%$${fiY_OVl<9x`XjkNP^_3vfK}bf|D8w=YVH>lV_R(Qb-U
z@XKfSwNA&=3f0Q2@!tfz2-2d#=_2QkY-^ED6d><QbCWb5N(1qA<~wNV06sqPfJwky
zsUmM*o~d!Xq2XXTJ)5oYj9N1^%mb{5ls~uugG=5-=vbM0O4);(t<b>(JfvZ%t|*a=
z;EM#J(&;WowijxCTPRi(s6mEjynXFVxqs`NzC7W)F7lUM)HV}JKuky&tabz{D+TuY
zrQ?z|_<bnzYY={$U!+D0igfAJZYV%2V=GF>3>I5=zP9JC2sW3BUVwF5HWW^zhPYTU
zKoyO&cxjTAvquHu(@5Y7Be-K#4xYDFksg802sI2WmwIVxu)4|7T`f-|&@!p_*d%KU
z#%LbGhQ@hn2jF?ph_sX)(jlHdw%OA5MurHQIitUXO|wCAWH%1*8PjQ!ll#_y4h(sa
z4!YfGgI<@42b?J%--~SyO!DH<O;+Fi-;~vJ#>m|pr*&9>yJfUctOT?H5(cXsK@}2M
zUt20Uqdqf*R>Q!SzlWqk2^M7j53MehsU;=wT?iO9w9flC<*P!`NKg@|l)Rrd{6lGM
ztU-9HK@c6duX+K!eVgYYF6TN?v6(k?e~_m|Q-5IqjnX<il68d>v^>_WG{Z-Ox_|Rr
zJZ-6qYKBG^E9dlsVF+~PocDP8z&aPsMT!A@P9w5?1-vvhG!Z&1&oXrHX!Nw;Edc9)
zjl$ww<OTT;({TA&oHGE=Tkj6)bLJVJP(zK(o%FrFU9`b_lxsjASv_|QyyYtzE&)#u
z34_&+U~+59v=2tcgqFs|4dOzXlKXd;8yAkFwe^Zk0p@*Bkey;Hiafk~1>M44py8(h
zn8(JsMmmX<T@Iar-HZ-zfqKEeD`yTs5o!304h>g2@|8RK3stm;;<W^iWb4v2%ZJV^
zXBX3q)~+>E@icyH8Z#>sm*sqCJn=>X_k3%3<qW&IZFq|s3Q1wczny0mp~JaT`?kzi
z8XC^UX%76IUQc<+ElKPDI?5Bsi{_`NoZ7$I(P_a5vs8FaBixAVS#*olbJg;g5jLK8
zlf9b?n0Xg70Z#)7gVl~eQKW#=^{=kDEm_0fhu~77tjnaz1tniPW2g$aDX+$I7#o@z
z(Jf5*!Du*o`Zf$*%=Lwnj8-gz)eOoXLOBOeIT;_uQ;iJ_U;jQj9;A8EzxXuxbkFLk
z8joxDXt2Ct-nul^l_w5Rv5D|7b4Gp&8bJdA;|IKZ{T#xyZm=3^D<pI12aX>RIxO4u
zi-(kk^0x&-99ufHeWB6_8Z4zb=xwR1e4sSgb&QuGO#xx(sWrmr&m8}4ga)qcGIJtp
zF3MY51$r&yCjqTP!eF&0P`06v`gW)(B->YIt1@|y#+17!x(Gd0F<YIM;D8>~K6JN?
z20bgb-c)jUM<YK&7qnbkc@Sf0i_{GGYg4FB@_zl38W-~bUIR@kRad!uVrSTh#-m}t
zxlhOoX}Gm}G+4~r#`zOkEDxWNKU}|<IryC@L&JLxpjSLBR^@Lg3#4=V+Hp15%{`;^
zLGMUyMPv`GmJ9^vd(Gq4JIK2?F#ft?_DHQmEl&#ui(qvgl9PLvE3IIDd{_R!)&-WQ
zmI{`DRv}@qVgN--1xpo-t*2d0cr8p!&?pRNiqEAg8EC1kTL?jRV?I>QwFTqC3Zdvo
z!~!bAgWFfpb?L3buS!5~jmipRc=_!9NFL)*;;&rXyF72O8W~kmHCVPhX79RLi0{|S
zwUir?W4o4E`sm_@X#rQy8qs20J|b_*)YFT8yGI(CLtt#GX>7<B7bylXjU&4k>$sV{
zT{Htu-sDgIP9DJ{wQ@8!5Uy+vAKbnq>DnD+x6PNs=v+9y)eMXpPc{aQ#A9GxLhe+N
zH|{H?p<`;y7p|n0JDQD3h32QNz~l@gcL_)ste9ZJZf-ui4Yk!}ZqAbv__hFoQP{Z`
z6@`~Z#w(V#yy%*h-MikZp&`(aG=&<`E#zRXbuS}|4&%3go(+{VehaQCAe}wyrU&xj
z6bra~`Ve$wX|T-L#v!9{=HPn7L3y0PqQdjKEVsYKjRQ&+^zYqhwx<@5ial-AClYGp
zSQ-pg3mKp%xOT2BHL`{P`B3a3n-+49FK@7#mBW?Iut|2Wo2@iBmPezl`^$qy?#PeS
zYqdOhj0fO4@^fS-jX3$*1?922=9T3-vTLz3eotVqTpso6J_$$|te8L{;W$)NC?r?T
z?2?(|{wCX2W<|OPZ3GHjN%3V#8OQ<ih;l08`<5lCY7|wFTM%XyT)r*bTmXge%HZjA
zm8{{PN~pd<^BiBW@dR`(p4hHRq@GbAKY71?g)~~9BSyG*Vu#W&gGHq@4`pH6Ppy;#
zd4O^ko!zH#g5_X-xMt6$d>{`lPAp*8cJ_q7hk2nMtmdPeoIbEhd8K7gbddm>zSxA$
zP-DH!{{36mopqB%`}R^g>k7wP+%`geO}R|{?K9Bog}m4c7VBDelNrDLS!&^Z*_ax6
z(>h(vC-aDMM0xiKNEobGKqFF7dPmme|0bzP6z11-yOCR0k3Ny$P(XQb!|K^%oB&4@
zltP^`^lhnlX!CqpqU(*w!#mfIpFSGb(@~{`*LCI0?r^x+K%o!mgvvB{H_Z)JYQNr6
zReo2)&{K;Cq|PNc`X<c1CG=x-b0_{y^AHcToG@6Y53MnNL>a8EvLwqd%K?oR*j!z4
zSJIPShi3%i0HdkK6ZBI1^+7l992sWiP+Be$fVcdOM&NeQal`{3TwHorw#=xzTs?nS
z!?g)O>(EwC7cp<jjHnr_v|oD3iG8bJczj-3H(0DcBDe9mS9}TgjEgwL1SAYr1Wcf~
zL*<#n>m_&8r%)n#4v}$^xs(4PjSW@$I$Q-y;0?Igv4Aao)1!L1ef6}Y_DAbYfmWfm
zZWOyAyVmCE*iw8$Lq#_Q<oqoT5_=lf9b?{l$ofKb3&Vrvv4AvSK)IY{1k2XUV1drn
zbDUD(UK+Sq&4Evfi%x0&$rI*-%1#3`W6YlrApSuV%o}M_!J8W_-ml3YgXgB)_~&9V
zO(M$X?k>YPo3Vt^R}YEt;b{*05Im~YFp*CLlm_aA^|yUlx~6Gkiq6>JI(78t(gg2|
z{Ei3UkSj|FhUKAds%Qq2W#ZLn&K&m_w|>;iOFXW+9HZPCF4Q3F3dT#u;P>Ug=6suS
z0vVwPjQ|?vRfUAX0;n1|VF^K4=4bVXLU4?wiyA8`mkD-H*}E~{85o8Kwj_iUE>1US
zYLLab15}8qXcTJgI^aHY*hf0h+>#I~9i+v%Tl=@nQN<z+n*d6~*IlwleG(pLiv?On
zen4Ysc7K%Xaf5Y$6F(8ZC4)sO575okH*{(=ZC@=K!0h24;c<ft_c)L?m2UfrY*&Uz
z`t+2xEl)=nXRrb}V3D+34tKB1Lz?~t2GVxMW@&Ce7dJLo`H_eE8kvSJFyltbZw7SR
z@-!W{Y>^IV@Hxk>_CX$OdmE!=MvM9CDra;OY<xOF@H9DId5$yX;qh8`wTH}0`;Q)D
zW}cdr;Z=o%!2+=Qy&$kl^5E7vv~KUJ&{1Hh+@>5|By-Taa{tx^g!Qdve1QzN#1QPO
z=g^JfKr;m!hRRPVU>XPEakM0amN)Z!9^AR46CKl3VV$CY2J?62G`oed=~x*pKRZ|E
zTG~!oy~3`ZGb$V=9`Fe#Tc-3gkCBGT&%;U`@D>VPZvkTf>C!9V0%zqzFb}xrIfdc$
zgL$yb>+ke5Y%L?pY~B^~&hNX|%+&btz|wD$>!=Ie+J<=ur;jqAyM4Rp1Zz!`j0>a#
z@0$DU=MMiE@tMBS(t&r>P5z|srJ=4y>#Qx{c~klDuH=jaP3A|t+ic{zOXlFW<;ac&
z+Mv=yd{rS~umBWKRR$GApldnp%^tgi6z)iiz992w*KKG;x%muXNRNZO^HTo{8vh3x
z)}5M?)J2!;<c;~tz4mtbXs#}r4v;M@48q*xpP(H72Vu5+sp5mq`uXD{G?;dP4)3U}
z#B)b@7%Jj=Wu=m#T(idi74%zPioz!xUrB)nU<S*)J@O_wsW-frN(&eREME<JyuBI=
z<~y8zcRftP#;_RJ;t+ym3N=(p&hSs*T{`2Ba;U+A(YSJ|mBrvJf2c_|6vAL~fSvJ>
zE|GbeIq`3(SJ#DeabkhxB_w;+&Olt_zZxo~V{c4(V2E{ZTgZ?83zQ8qvUJ8^w{Fz(
z#-qyo3k5DY3h5fjws~!x5fTO~22gmo=eTZB93CT~QaGW+_2|x}+C^(gAQkjE5Z4RG
zwt<ETw9#`4gWpc>S)ofiRCv*id>o7hFZ;L5Rs&`Ef-tMm=q^)-aVOF$Gi(|*nvT*&
z8uxFbOUIW9&RBSZkv`~ksV;Z3yW;}4Nv@Ez0dKl43-dt3*+r)GdtGWO?zwP}gQgGT
zJ$Lf=h}Ya;b(PC!_92jYk_hZ#F-00{^FSWlyaG=sGGUZF)G@RHeWbFi<-Oopc1~K&
z8S#-C0-t|B@V;l=Oie>s&3|!#bgD}4NXGE@5#Q*jhY32&OMdbX`X*D$+Y%l9$F9CL
zlE?O})G~RmH61+l4MHxwu1ch7b*Rx_Nk|y17(k)mI92i0V~<U6G~>`ivW9<PC#$Fc
z8MXv`+}Kd9uhP{kARSK=0y%5kUv=vlsB4R~_^9;GRY~UBLO1c#3<mSoQ!bz0<-8OG
z#5DpwpG`10l{((!)3-bjd&-SVhgEqPJ|3_fJaLDLWXf)yUh*%!!#s%v{5{mb+4i3!
zuZ$N+9|q+1bsmV}4VH@pP=kfvXiQG+U#G?)m~XBh<dT@CkXsKK2l(v5@$E2HGzzwB
z1r45h&*%=8=vz78Xv8lA!|Yg<g?MH-)mW)qu<_`ws|Ktw(+CzZ2H0bkt4SW-xh$DO
zY^f2Asq&U(BuyCT3&*x1ER8AZCO*kd4+(=611Mt@4l3?89U!J+K(JLo=pk{g4P5lR
zAyAUQB*hlM3npK4>n;faWz|>U5YqEUHz8bW1`BkM=G@eOX&y}BDA;BMH_RWaV;o8&
ziVpK=zw=FKVa9(0=~Lm@s`r$`J8j`G!^Z;}*1XZ5DNoE>Wcp^v@87h2-D8!3zv&vl
z!EY%~qYYLc9UF^nu#6t_#lv5t;;FHGP1eq3cepj)HOXpptIQDC3l%k1_+F6mFF2%}
z1LnJNk9WH)509kc;Y~Y;gJY32D4q_k^V9!_Zl#S~`S9@p&+!R0RLH`NzS<QuUJ@gQ
zYu)^bT4%}^eId{i&CU&-*kGYj!$Lzr2Ku)@RLB<UTpuAG1*E>FOlFMxMq6=fMI$X=
z3OtIlhc~G=rs=dml+QUSvZ1cpCK*yFow9p_SO6nrV`Ht+3CV#i`H0Jjj%GZ)kmrp2
z1l=AR4}09hGCt4{Z(f?LX=>WY2k$d}?jdXE|AuHSd03#+)Bun08yDZD?aFfN@^MXD
z(Z%q<->S>*f`3$W=9lptCcQ3=I>FNN7>rCxN)JlQ?iRaU;dsnHjL*>>OTm}s21{e&
zW53r_-E%Kf%n*1Z%e)-gPD9Ofyupgl(Qo?9c(-*~s-~-+6=`VqoCc<s6rJT>`+kWN
z(lrtWVX}6k&mlW}J8J{?%on%nF<ImHys=-{qG_dvc=&5Z^_7CoYp}F(okxL|v%2!W
z6A%-WSS@HwK>VU}2cS^!iu(330d>kk_djR!r&3i$+I1AcxT2)lVfw(s+vc0HP{~#3
zP2l<F?J5Lb1v3t4c~CBPAyWCakc#K>V@lKm-9n@BSZ?^6<H5-TtF$bZt{E<lo6Mf{
zy&8u202(k@`Fa+h#S5noyy|vAwe+KbzukieMnyNHABo44c<k&y<54siJ<fSb9sG7w
zJZnID$ep57YOtacb@>RFc_qT4E8W-1ZN?7e9`L$Ul-zW29tW0$blA<~a;o$}!QDx{
z(e5e>v;L>Ni3^~isIq4?@7_2g=>y-fhR4Z+FBgX+uASQtBWYn1(1{Heh0K=M)amQ;
zoL|3|k~>#i<x{ZRCICtYt>A{j2`ZF2_7W5-{I+i1c%;LLeNYS+?=fI{K(5!Tttf>j
z^pR6|Q+i(MIV{Tg1$k^?E)zdY2kGUf+D-%E{7~SLAHFT5QPVC&5b)g;7>aU}>-o^4
z_j}E*Gy=@afVZWww#-F{1&9xREXepDJWPZSDjD$n(JhugrsHCG;P0Fz@5>vEmp|cK
z&2y}{{7z%UBfYGf6p5$z@R}Oy+~VS>M2+VfAI5M|ZhxdpugbcC+PzQuKUtX5U-=mi
zeEO`rO^diTH2A^-22=Ua3;8?vIM1Vi&s_OHuc5X|=D=fAzLOvRs(I@s+m@#)uUp%p
zHV8)Burop@G*~9=tS~NMT~{!{lnO#R>-WFw@$Xil7TTbN%4Jw|1NioA>aQHPu~yj+
z8dK;~lX}RN(|b(eNGk?8{%+~ATM?4I>!vFmQ#u<5F$L--x3BWJEYfjt0tBHtjt;wp
z^wgYyql}99o<011?Rwf+R0K%HXf>*Wrw;x=)ArpE^R#;CO!k(5=`Wu)(880qs<_6J
zll!>o9rLK!j{^RF=Foce<bv^tOEUYyAOsCopv?Fldenf1$2`;MMx(nFrvF<NTW8rn
zmZlk-@`uInWSmDzzLVeVb|D`p_pQ^qiwjDlQA%!Kbu?(`UH+9;H(3IHaE??<21`rD
zvMIfK*{%ck91~?7I9i}dS(rWXd#QIuSh0D*qQF0Mv>~qz_5LlT{cbn>=fieP=u`%a
zvO*=LL8yXZT9Ea#=sXrDR2=JAl-XaWEKsmi3|OfUh`1H0G%d`zBb!yBIcRP)DQHx5
z7{jq&>#h#gEulbCSRyoeho2lRj^#X%^r3GmJsXEIg{Q$;HERUo2bGukGf=8ZBP6Bw
zu1azeyQ%16C6NZpigNbtDVNUjIQ!@_X&(H42z7ocT6bOI(nY;H9YDwR*uE7mbZlVS
z+^d`e*Ivm~(SV0{EK(j=*V{#Kz~2vTS*S+B_~*NZ-DJ(2UlHDq{V<o2$ox)Ywra*O
z$1irLeY#!YiDYURH9Apgl9uuC@J^n~=sihGlipUwptq!^f-4PLUQ$GZxCWl9O<}M+
zunfd>cvm;C9<gxDLma?k4MXF1od>`Uuyvtoyd5o-g@JFOi+jS+a~NH)C}5hNZV2^y
z?ZQEsJ^3H<;MOH+)cE$?Upq2%E)R>90RgS8E|(d<e+T8GAW*o?i%9#Ki+;Pv+IbU%
zM@0E~RIOH`3)9q8Co5n~)NKbn>sC;JO$oLvOEYDqaN(-?i33!St;=|F3<cjQuv5a+
z0k6ybn-{|Q3y!yuw&n%TnwsjRAoWKmktq+AP|Jxju0a`TG~xkiY*@r@uJObMj=?8f
zH!PZ>&n@l8fr7tj0pHe<uYr66_idbQo>Gi)7aEiuD>%#E6x7FM-nWBye$3H-Jn%QJ
z5zHI?g}#ZiI*p`x!F5Bev2c+bXv2Xnc0uaD5fACQc!phN<;-E)z*(d9ICwsAX-r!G
zH<3R1`<mrlmsxd{<<o~FjYiaxtNVC>N90XSb*W4r_a(|rT0SpUcbr;69@^BBwgK}8
zQw3x7NbX!aE!o4~)3Rm_`$Vpv+Z!3KK)9B&*Abvo8Y~LWu9cjQU>=7FgJG&Ji|Hl%
z)>9}<P+Jr-fC(*yjhpgahah~abZrK_DV(O$|8==_<%k(ADxZrV3mB$U2XNog+3wNZ
zoUXF55JuJKkBNuDzU%K0(1TmK<&5RQ3<%5DMRJCJtWyZ$0cjlDwM@g?oFwwc<|fTg
z{b!7HBS6E$gGw1E%FqILuFP@ew={xGAWe?<**Fr@V?55^>LCX<<uiZ_=+FV_ls*8j
zlDK_~t4p6IJj~Mj+}_#cHxQ3NgZ1zZj7>jw<zSdyJjw*~d;Zuqm)~X)9q@O`)2i8{
zB?AqEt>2`9=hPI?=nroQMuNsd^Uyp40U#~D0NS`P+1?Td%3(6vUFN0zQyS~rzNCks
z`=!CamEOH3Q-9?-jpWP!r}9bpI(u-VKKCAMM}|(=C1gtr!Dwud)%m|#_f3V20t$un
zEg9VUGly0othMTh=?K`Z2i|Hct;kAmk`sGYDjg~;H`Jp7njm+RIl6|7<42Z{cwmYU
zl6CXPslWymUt8`$+-IHJ1yjgeBn6)r<Qq!z@a|Pfi5i=sA?0LBzAfD4!Wsq(#_z>f
zPbx2L?27Seu)0h3(D$S+uwkLajR1MJckN6K+uUGnUX+aIW&ku^AS!vXWU3$dW_nDQ
z<48T_<o=Z|jEfT$?~$B4y4A|2-ZIm&@=hP~r8G7K_VEhD;}`O2FB&KHAX!e2Ea&hK
zrLKnCOIyPb1W1t5qoUurc1F_mY)ESiw9GJAH1zBmt9Jz&xM7Npf&ssi4)Z~I;9g=G
zXfQ4R%!f64M9%FhDZZi&qn0He@DcN?XfKzl9u~{Y34cMptZdAm@>%Ppj~v;#SYIBs
zNVfw(CmeM5U~{PEr~hOg3@gzomLk4q418A)EMULi1k{9%LJ$ws5TQG{D65~+jH1i$
z5X3zjX1Eru<$+w%dT{H4q`-4f1$K0dZdW^0ROz@lF@TdD=cWAv@u^H^2+a8Ol=bt*
z>Dw<gZY&qd=z)S;Q~6M`2EF6FmPk41f!@1$-WeWZbOxw+hr@e7MY=W2_xgh0G(6*~
zVg-Qt&}BJ3pSTj~ZCpCD+l6`@sPsEmWWp2c8Segi!?j}OP)#qkB0`x_SF<PnP4nsF
zdCzdIdz%`|^YG=SN3?u8$Ic@BQC^Y9@Tj>^K6cs$K5rZ|<kF#>(cC4%@eK_G8&sWl
zh3m1M3pGDx_*wv_=kiCat16SZdK!1c_-X!JIoXh$*o(#)UE`MW+7X}=8!XmolT?)7
z)&X%9a4&EwbhagK_K1(d(;ZZJxsI=eN<}cxZIt_WE=$(nw;>D>L!)lJ^N#M_ynwLr
z>6oy=_#uxgXAFm6IYR?Fs?ea5HS}GnD!bD%9c1VLyM+`?C-`c-aGy2&BXkQ(5#Jl(
z2py(R0nY#ZJN3v^z+E{g_;x;^d5KX%&UnBRdzP!AQ}5Ly=&W)l0>v~~P4$vH${j7w
zysDvOp1CaNj0^QR(4Z_x=fZKOVFpWig?Rh7aEFIxdGvta?i8JtWHboo)mdEDJJY;+
zZjbY39yiM5E6Y%P^|;N!Bag!6?4b+SH_jd3y4Qkd@U0}&0K+$Xl;*)aTIRzHH)$`P
zHVDSi-t6gEUP~s+<(V?uP*)*Krw(?!qyaR;Y_w5cc&`UGarlGA>hW@RH0abGmML75
zdJ9zEu)wL%*;_Hb^_ltm-(VQf{el2cyjrSMKJ#?BxteZM5~gX&$7^8*muS?vSdRlJ
zsP*F@?9I!^B$Y?5J316T3LWX}-M}qV;^&9?D7|-0lHv9<ZBtBZY57+4^6A}3!_p#8
z!T_55ef`|uT%HjxP>yX&`R2`*gG8rqip)(8!*5`HJm8Y-U!d&l{!lqw6bGEi&Q0m8
zZ1#pwjVzR^qU5#<^*C^P3Xe?lo|zgh?TYhAuOm^#iU#hzm7(dGQMNHUZtar`PluZ^
z>dOJvMKc;KGnYUuo$B^63zn1j1K&hLchzL3c|il<<>k}?o-S>MkNNRDAnlytpGsND
zb<Kz7hV)ox@xamK&JsM#BxsCHc4)jfOwn7mEK8L}w;`eC#gXW!(5XEvt5{Po?jxQy
zkh7#&u@rhI_$oYIWkKdIP$(OFYDoZD<0gcUAn>)4pUk&(90xL?rofm|_0au`Y~Y+-
zj%cM&(NQ{VDI2wm$?*q$W9JPBzGsj899`Q7&H%VBYXJBg-vZ4`;}ivsTUd*&2v1@S
zm)fvATBb+_tPCMJv~8gpZRJHkAs1%;2Wc|z(fnY(`Tf$#-O4vryg*#;h#E0iOxHyO
zRF>Y>H*Lxv@``1|HFMD0x`|;lnDR3HJJ(NuuQX7Ow`z3YArE{@XTJy2U>x#@N>7EJ
zu5;(C0kA7~LFgu%m!-M<X(~oTzgoJ?|Md%p;9Z$fX1)5lVcMG(q#%s1S4K8aYD$a$
zEFWbLZs?mkqvPZRdEk{hPn<clAu=rCK0%tK%I{WZMl%$um#r(Zt=?EJ&^2RhWn@~b
z=Z*#s>a{EuS1EUB=-dVi5UwZ)#3^)RQv2DlPON0FWLDALW!=2rq)`_$w=nkPz|-Z1
zZ)pSH06nL?UKl|yW7r4k{a9EUnt0;!NUomUWAR*k-4RsZN^wE*A{aFaoe5r$jtOv+
z9NcQ>76!|u#$d#!=oXfTRl$ShDWqd~^j2)vdm!HM4{U2*#6&<B%Ti|C>lcn9y~hpK
ztlz%{uWb-o^BRdN_lqy0TpX{ng~C4mw2_}7ttuDF0n5r<!}uNLv0{O8+1uGJl0W$e
z@TK{x0IL`B<=TbAs8?si8CT<RW`9rZ>II6$LK!Nj1O^0+NJd{Xj>w~VgM66*qc!*)
zDZ5`}>5xA`P%`#AuRH~4aSkWhGJTIGe;mN)pgp&~rhIC`F@V(Q`Ez0{YFl}-e+%ln
zKkJ+Mi>^D$&63<f@Jt_{JlxTt!x$_RLc=EoA1?&q-nBYM1vpC4oFH+X+1_<CRajd~
z%Ri?f*-o0?yP=2W>EeEA-ay+n1~d`D#eN(pwE0v1p~fR({BT9fnK$+uotbXkvuML-
zMyyF5-o54~A_mhZonCVJ6kpv(mj~bUI~UfbBsDv#9rs+wTY48=9;T;h8ju3x-MN0&
zDPb@@p1$)Xf}7FT^a4fZghuX4VcvilEYg@gfrnQ_Pu%qRqldb-Ao>sweMtcCaie=9
z84bn{8qJM`lUzD3E)<&vXF7~3>*O(hI3vTn7oCGgj<_^f>WwQM8i#JOWhu9Ej>t%$
zh+1C8SA&hbAKq4|FBM2j^Px11*0eESNp<;sEkiIb&4EvRTJ)w*?O&y*b<;C8!w0Vo
z<s*I4o}2n3JXXJ8x;cM3HoWu(D_B`%e(-!i`?L*Ah#^Q2)K&SvqLQ5u(S@c!0=d1%
zl>Tth53F?_4W*BfjYce>urW_FC;Syk<P4z-rronEb4uyiV7}#>5Fm=*`25`AO)wN3
zFlBtppXITu(y%hnfVg-7GYn{V;Tg_P{mG?iWg>EbdF{NhT6Qgu1La*4(`}F$<Njo6
zktd!n!1G78>KI#dp=TaS?i6WvCTK`#pmRrjY@V6MLwfvk<vw#{lZH=GgG~OIAy}08
zb5t6dHy4M7o;yQC(lCC|u%Fz&+8L}sxinq_y3rMym!Lr<KWH#^uk&wlgZzl38w%A(
zVcLIC7dAD(8v-@}8AIQd%95K%*XJ>qI)L9<AK>l%TjwNmpdF;^yWM82kq<NyS5I=#
zKepl1Z%WIf)x+geJ9V)(yZ_0gMP9i2;&s-9zeq)Cv34<)H#&A12lz<S4SvE8^zLPY
z4q&kG0pqD8C(*Lxjr*(IyTLbbY{mGjjf~Z>h=U5OuPK#z8UJ%a6nSf7trfa*gWf@x
z=YUqYDpHGSnBW&(*emHAIQPPhs|o09dYruN7HMIPTr^ESYpky}!$-wJ+_0iSY4Ruj
zLmGL=C<QPO)$@S-IJ9LR(ljrC<<jLg$P4Ei)$7(Rk%+w0ynx=yIYU+0!)a>%yUVUs
zQ$g1h%7c$rQBo{+5_KT2h{HFVbv0#1+r{(uN46J2$;^XPo@*X^$f`Lb@jPf08Qyr$
zqsMqUb2tr6r<)`v^^p6wx#1o?vq1hdttPo}(#}paL*wItH~o9TkZ{kg=z7(1vBQPm
zE}htk{Bf=n>(A=b>a@G;SjCqSF0Ya3VIWC9Z>X<=r^BtRO{N&vXqnO6w0H`54<ke(
z%yTnh;om`va!3Pv<H|9~8uE^#;phR?D1(nYy{80TvBl$s{~W<sz-KOP{b)QQc#qG^
z2rs|E0t2ax+yx+wEenJ_YsC9<<I=HkE2$OJ8nEuP^37;fmEM)<<Gxm-rL7bz-U&99
zoreqXzz1!mTB5IXA$XxCbWylmh1=SC0XNzdur+hXB3-Baj|qec3G;Sr_i~Ht@}fw?
z13H{^s0J$lDqNt+*Yl<KizGFvmz7D==OA%cD0erxgw{OBC*FD9?cc<ccp~X}rQ%6H
z*1c<<<|C=DxDUf_1L(oLW(<4-&jR~5x$wkYt8!sLO~I^-MMdk5E>>zdtby@^eC3f|
zQEy_2h?g_+Q{6e0;jA<U8V_=@GJlwsAu501#oXk7qOQ0|nem+AA%Fzqa$oiQ<nJx6
zi|371=J0nRH(Wd)h}R5Q4%XxDwOrgz56Gnrw61IqnLYj+sf7o~^2Gy6h)!={o<Q^d
ztxJ+Q>LV?K$!mlzjaKf^52X0o$;afQMIg_Cc459f-|hM`!plE~1;$-Je^Al~zoC_F
zEeaF^Ee%`I=B|BQ&{{Di(3TYO?%p~N@8c7t7Zhw2P^2~U_phb8%yxH(2l@<1dfXsx
z>aSmd76*1YKx>1`95>-?<I5+v=~Mz0ihz=Vfc*xnuc?yU(O*Ohq~`B6nV<GQq|@wF
z8Wn2B#}x*VYvyb=HkFkI%M1fwC?JrF#1x5k*4@?9`!&De^qgW%9sQZUX^SpD(|V*c
z#50H5nzdkF(_k<wN^Ng-AJ5-!nEyM%(10^f%pbx7_ivn|$`S;Ir%~aNUYeg^8c1_V
z&LA}ms#t-j{Lb;4^g(Ysz6I(PX&>Ce$(c@O0%`g@o<F+L8k|6yyeBOhAzy#-fX|Ar
z9EbP$hI)_D1{1UfydgI(9|j$(w|HRrvBtIH{&mS4`zO~B*^;0zP2%9Ur06Vn3-Ni2
zPd5li!9JQ+y<9xCLwDO~WFy5PjF%8zN`plvY8!*f;s$4&L&eHUPU50dR2ERX6A+41
zV6X|UF&_UM1)~xL`pCklFrad;okv%006hgKn2OeAVJo{Z>%Y>V-6=+UoT`3z^e8Ns
zj>8jlufok(@Jd?UW%_S_f>A5gaGKWuC}sTC6oSXYH$Vt)o|?tg`=p+7?ZP4Cn_(kL
zr}=W<4{j?&92x~G3&%GsJ~znY+d?1C&=$pV^E#Vu;PR|x$8|t&w@xpZSBuMSfZ5g5
z@&%NKZ{WCGD4dRlC$B@YZ0ewJd3^cUZ9TDXWwSI`ENfJj=pI&x6G(&KbsS2|KpwbA
z0M;qzJn<z6y;5&%v_9dXmp{0nMq24>R7SS%jdeBXdVi<k{ZcFABRo3DU~Ody;zW0m
z2}*%9k>9$SQkgmN?}+o7$`NHqyOz$->|Q(78LMc6#eA?Kb;MNm8xe*ZPv%ehyXJ}U
zO)jlW>TN*>&L7^OyfR)y=dC%oRP@U5<RKfuBik2%KYeue{)H2p-82geZTND)OKh+x
z<c+c&f|-)U*ZUFS2@5WeZ%YnsTA*(LRY^3yQSo=NKm|-It4U7mU1k$ERj6nbBV9zM
zxvpR=S{+Wlvx$`PK<S~op$laxs8M+}Be-?(6wrv>y88Uopu3ed;zR8&nb4!0$Qx%b
zFUjNX0>}phnu63EO7C6???kFXt$d@9_d>UDrz({h6GJL5U%lu3`X_`l1Lu{2<6#;n
zDzC;jw#d^)e~vI#K93xu;u}Pxj~r@P<`>={--5buG$a}qX<a&vu5MHs<VBON$>jJS
z!vxb{zAm3}`Fbo~NES^UsBy@<h=J@Xi!=KnA9cu+FF*6<<2{no2YJASO}p@XV0?PY
z`!{eG3dGUVz9VV!&gj@%=*>$~!2?@r#kg8V9d>w43X*?<QADG`y3_QHh62Bkj{l$>
z^tKmd^#vWseW3iN2P|JNIlO(Lt5e1a5{v^H&I~3`X=<pi(Jncse<+{nl@I+;Ze2dA
zd<r*?_`D48k{T?wG*$tRLUpox{Y*(`WkCQq9uuxSeD^EpcdSg8P(!^cyfRrC9G}Uo
z0@SpI<r}))Yw|$*|6mkc#kn*nbQBPtL8q+_FfM>3jgcOPIpRGCL4Xdg%x}Nma^vDL
z6`1DWg^svm^;FG=dRCeT%U5du-g2ktq<IOPmG9zu;P^~I+J6w%x?aJtxpf7<so}6R
z0z5{UmgV{79p;^xviH!91{o#-7MDh7_JqHfLWa>ifa@2J;yK@nk{=dcCvlGXDiRiD
zvT>~LQhe=Hvox5sCV6n1+bP@mhmkaZ1KtWB>7}UQ?Y^SqmZT1*w`k?}28*7~Nv@~U
z@Z=j}X&mGc<qy?W$@KAmv3Mvu8wZ=4)>W4i)mE1x9AlY(;(>Q+072sl=hDHuCJin=
zXWEokdXecv-jaJa&xZM-JPFWo*-=`=P<^c|pE(TjO?o^XDO&C+^Sf40M*|s|^G0k9
zn14+ho_tMJi7cHq81&2oWqlam_@d|wd3etjVr#~NdHn<7<uq7UbGWi1$lOLbvSXq1
z93nzUfmESV!RR6D=S_g%RXU+CM(ahH9nElG!74VmHa6DD>e=J0!c<78v@{eHTnHQ#
z=QO7$1cXB|Kv%y(a2e(Vx~j~VDw`tnY~S-I{!KR#4AKc^j{;ly;EtpXc?03y!f51!
z-V0}Guj6DxgfYR7PM>Sr4sM-~R^7Tp7S{xk-9mprg~sK_(b=<Z8U)t73mPhm+g(=9
z7!s9+rh@M*<NTC=m>~`$%7=ItPjP^sd~(W+8*X)z#W61*7PQqcCiRNZ?PNUe!M+w@
z$TMFCB9BD-8s&uHg^YOm9*^!^Bq@Da4!-=bxSUIsG3Y(1uHc*6!1NLy7oO3Hy(<xi
zFD$IS$p^;c_XFD&SUUPvkA_}JIQ}tyNUAFC$&6pWLV6~b<{49t%<E*G*s6y>eo4!L
z|BdCQao@Oz2VGb_m<&1jLEeZP3MWHmYpnqSAL0R@7`ilpG(u(fZphrp+?Stn&aqA}
zpFQ#2<Sl>7zodc7mk=KRl-?f=FZrOmF^ZMU?jif?83Q?(N(Q4c$!x7mt3=)}Lzk(p
z=Anc_6fh?QT3zu65v?NG1*y<AfUGQAZex|mbT|l|GUzS2cJ2VWhukcU!bbs)R3z`c
zP;iWgZ`rKX@<@Rry<W0=bsh|{Up8Sv>_N*5!?$@c-#R*lRbyauQU<)P^Pv3X#RxF%
zkd)oO7VZ`X4FtQD7f)GNiXR_`$TyJO)k0fZ4R0R8jNd-jZf+2eJ<a3dtX~igiWx|Q
z3UH2ND#`~7$MpDCvH5yQc6m8&!f7T^<>v?G-?(U!dM8?bZA6$xS6MgrHz*y;PTFP!
zv>`#m=I5druUQ_e%M~+ec+IP{q8ktRTSIN7OdtDaN8fnn<4ybZbDR68QCuEzH6B{o
zxH@7@{y4`s#OF&Ercb%Sby0Rdef#K*Wh@{amVxu)cCDG=Xc?c>00MO!7r(EVF-jU6
ztYJnD^b-&4DL%|E!$WR)vQh4+FO*)m%!;N@l-cYd@5-eU_L9hC)DirH;Uza%R=;GJ
zB82$rnO%}O^aEwKwxASzR;~&encqbgr2is3fjIm|hgU~0Cg353iNeC^4te9hhAR%b
zVI?u)W0x^!<j3-$nA07oC=>!mLqQ4I@5pP(-7Atc_+8|S$I6qA(Np0Y_$Imt=S=8G
zE09Akyj)z%fns`9QHqZ5w(k@aAks)HD6LQk-NJt%oq#b>-gJ{S1w6lx<AW}OgYpO0
zA*j8Lr!KFmbTBg9Zkl-_@IP<)edTn{--=Fyae0chH&`a@kK}&wW#k>*S|3i!(L*wa
zy$@bBpLGs|=b$tHmG`7e-m$yZ1zyw=SGUXv>(}a{^llOA2;NmVKTN|srE^C&X`Vc2
z8i-4Nk)AdN0VE$d+;Di;QmxBC^_Y>+G#USq9`!~KU-{)cD;hh#9nK#1k(Atvyo87a
z{GCW%9ow}SJa=B6L!)a(a3LC0o?h+wihrbFgkpl`R)et|=Z<WVEObxFSB?uumzlik
zF4IT<Np4>|q55X|qI|v_@X{MBa@s1C%tPNEn#MyCaz^vbAs9{N@=V9Q?Jv|tW=;CL
zls&i#PlxeLpyNS=K3kwBDAzg38o}ufCh&fGfGsZWAv4E+Bh_X1T`M1<Yl1<^&}=Ks
zL)!{9PrhsETV2wfpZ0H^EUE$#pkwjPNUzEN&BD7fnxc1?%)xK#fu0N(0naPGEnI-K
zBD}G9U7<kl!(*_Cok5_t$J3xA2Fn@%HVi!G%!lWH-cwQ6&m9|;H$|jzXltQ9w{WJ|
zwyrN?+?XHZ<zLh|1<S!S>Z%_~>cH2L2P!K0X0$o`oI89nJn7>P5pa)s+qaRM3P$sa
z-)R)XXEi!NO#NODZ+z-#cpI!^7f<6NZ_~$pBX!*WpVmDR)fp^yzaOcg&mR6M^2SEV
zcuYAlgV0M(?OzRV-|AP>576<z-zj(J4{wyTq_@;?*twNHFDBRdlfKtEZpvGYXL0RY
zY~VAR8+!cvHsynUPko6MmcytrcbECe|B|wYw_Sr^b>|Xt6#rOw`3;t`Tt&nxN3jWB
z&PB;{6F+Sn%UV)iRk&fy^2UCp8{}DQL?kt%Xm<umn;%D?0$Ox#ucSd?I0&y}8Sd?&
z4t|4nA*VYu+m+KkB<Q}w{cdQel?BQFQROjX;9Ft}cTYW|PzUohf0jW{kNLiH?UbaT
zd#6IH@lBc7;_h07ZY7MSDy&Ae7N3H~Mc16FU}0T63MTS?@#Ic~i|!&b{lz)IAe@B_
z8mxm`3LIS^Kbp5kvSrZ}D@R!9O=0)0pQ+E8DJxf#oYiGHJ{<Fcbl`>XxG?M5(qJj~
z^m6UeVbG$|v%z3^yQahVa6HWO%kqPA!{E+FBNaS?%kyg8{4uE0pwX}^`Fm(fA!tYT
zk@CEvmvn5uO}DVTMZkUwp(|J)cv-=;cx64)Fn5*ZGe@9q8{h!CyaIg@3H~=4D-Jbe
zaPAoLVlvGJ&Npt|ByY@DXn?Pysx1ybxZz)rr2Eb4$4|is)mO-d`4f>RGo;#cV41ZZ
zT$yoQIdh~Ar)XWfbRzX0&4WJ*I)K5724x;ABJ@Zq;bG)Y`4N@ija5V;RJc(wStH+<
z8<&qcqYy2$@jw*-VNdT{4fmV|iWN<y(wMi!N?y&`>mj}-ca<7buph}iJuH)MIO9hQ
zmX2=?{y-k0>&S4?O74UOO0jh65EC#hqZwo>aOTiY0*hRuv8kz6=BNKRoL5s`@C0eE
zp65?@jsVl#zA6{t88)JT#5J==>ML-@0d>tI^R{zkwuTS$+$k>ipz=InSkgYcV<DbV
zQ6lw2TseC*o_kN#)d}wRZQ+ilW~6Ck>1olUo}c-zsJv@=@xA!^Ijt-890F<Zd(pXF
zVFffa{&H)YoKc)M5#f)OxvR_^_g86bjJy~L0%_66u={39cp^N|d(fFW`g5t$<yg^i
zgJ2D5NVj0-eqYKHPY3rlj@C`GM|@_(2aU)J{iPOY@|n?XglslRW%(T`%pQPzksnr0
zpN8=kjWG<__LaFhy+w7zeO^ZBcm|6ftq|)nan91h%p`T`n|C?1rGxNg41Hg&oZ_r_
zj@>vz&_aFqO6S|jU2CU-4k|avW{+z+yh3@XfIHVugCJ3e>KTz441>=rm3{Y`X^6);
zJ&31WORpqdVUPxa22b%}3{zfyd|tUP6VEG5?`u0}GOizA<0gWfh-gB}^fab^KeTO;
zDFO1SahP7e*U;VlSQ=`|T`mn6@9YtDNf3tRHKj3wH49x}+p*I4V%JBqf5R+14;Toi
zteX~2jO2wZLH>5SX&T}B(R_86ElX0vG<`nEv*k0n3oFC04w-K=_S;|#eOLnTX*{TK
z^iIrsh@`_q85*PB$a-F(3%OyA@*@p=wR&YE$MW}(GY9$N0O9xvq(>kPzVzV0wB;?5
zp4Dj&9k33TD;Ci3agr_1y9{;#l@7~`vhZmAo0pEMQMUZVAGjy*5yP@e_we>*U7Kop
z!17V<m_O7L(oh*5*hh}-UZ%R?dBjdHh#0|_4E`{Kr7Y(^MRJ*<;eKxcsEjH^yn?BG
z8(3dguI_A<Vggn1s8IBZ(7iju@dPzmtQ<!$2ADykp@G|vF5Rm9vD)u9L*rT|(nW>y
zwfsq)sqMNo0m7_&6*8n*k8aGYi9a}{GH*>4gjck1C(!-Sc|Hj5OQ;{xfR|O6)>q?%
zclmTUZS)s#<LPA?KMWBMw94*Zm*fH7vtxMcmh%46shvKT_8)QX-@b@v?qr&P@?;Ep
zL#oS5G>ji_qj5dF-NxsFVM%*UKD{QF55<tIFPx}ljf7)9xTC6@kcn_UAAF;hH|9(8
zKvmH!EW40gQ;N_UmSEv)^e_s(eKl{#%1GS0G+hmv&$oIW;0>oZ@MIy+Q{|15mHf&7
zLcK>ebL18O_@{Nk-6(X+X3!7U1<K^Ts|_ftAD8pxBJj@W*|oClj?5nSHy6*9kw{vg
zlQHm3xyUzl$iLBY^2KWa!YMeq95cIqcE9B4ZWXRapt=#sFVo?HyI0TbamLE=M~xK;
zIhrpSyf}kJ1}H=9L!(et@laR&E5p=~P!wBZmZzY%%4E_C)m6ym!YOK`bV>p%$O(`d
z30749-Zme`Eq>L?QNtIVpweev9rCTrf{b6FaQ0f6t)B{(8ZCG}1K*JA=Z>f`q);(G
zxCzJi_t!5TKpwc2vCEeVj|plvl&7-nF0G}-W8sLr$8Q%-^3)j4t+IF?`JKmgnL=7w
z!s#ME^U{7&ewc?sW#F}kte^WU=rX($RK(?mZ#g4A09}*|bc1-~5+{Qqd^k>%t~*m>
z7z~R%Ez9FNzervH4MFn0c)x7gV9-Tb1L2sT6MI(}U5Dfy=Lp$O5EjO+==KljqtBGT
z${)rN<16c2>C))f_z%l*>oN}{4d#Wi)+9UE%m~Pb)q%giaCEzcb8++&j$bbaHqtY*
zuvV9bOn=6>zesH*_qbwsW|RL6f^=%DN@QLtC-_?Vj27#(n@r*4Xc*s9Xb5R+8D5L)
z(f)-&n>YqRSkB8jj(Xu+XqJcGmD1KSTHR9~n9uvg=NU=K`F!zX#2oQhpwAiL#T&O5
zXt1nc#uVyOgDjafT&9kAUrry|gjRv`R2<V7wv9k)6b|j~p<A^JU5{kliIE5ab_!w@
z#)|79J65q9XUB@0U~vFCPMVH(1&qn;ao?JNl9nn55S33)D{ItyQgZ8(dLE{%zyM8_
ziCxT1i&LEeaWs7XAWW<0{ED=U4?!Tk5Ins(lfFYd7~iOP-6U_^H}EoSk#aC94IKyd
zO%cqaGw*{3Tv)d-qL>u+kQAm<i4ZQpJM!)Dj>Q^=0&a$-NxdD?ZJwV6nLis3_+hz`
z#=PWzy7U8x@0U(;S&pYkUULERR)lS4G(ndO%WW}sq@m&chDFI*58fD4G0EQ<<G$AL
z-gu~?1^vqMdykJ9Av`@m?&jcm>A})LqlmQb6rGYZ?oz=xlm*8tb}ciKdZYV(5NWXS
zwK(|as2Cm6;MOx-yscd|Up}O-^9%dh60!Z8=R#g0Weim7W1xl#VR+n`cD;3(8OQwS
z$-BmylWEB#)=$QNZKVKs@ic%OAy3f;{YAkGGg!V@R>(#<wr8m_lx}<mn7De*D5<Qt
ztBhxuwu7TfWTin^j&5756DNZTVg}2`p7`czUEw5YtPjqLS7MI=f3`d|%DvkcBzO2n
z0lK6~fnc|#mri%!DL0Xd41oUDq%CXSZ(mt{!omtvntkNL@$CrL><yl4K~EoCZC*q$
zE_lZ-+}Yp)SO>f>yMIF`nyS&#c!s3oCkB!@!_u&9S(2eNgUZZ%o}Xym70YGDh24qA
zjZimTGpOqwol)W2s%gJ|5k-@EVcqj=L{&&2{;RTc(7t(C%F1#ya6T-#!fQiaxnz&}
z#PXqaK~IZ@tGn!6o2O+nUbuQhcWLX&EDakq_M|-F?yT<64i}H0agi?`8<#(sbHgHr
z#&_S?J>0P(OY_f|F4gcIfxHOS*U6fKUv11PXq5RKW#rtbZObxXtm-AC1MJ4b2$jcy
z`K_y|kk$DkwK1e&;`9&g4fwi5p1DkDZNXUeq$y)CtB%5xfz~Ny0ld`SQGi#^8(y5j
zQl?XQo8<nT3z9MPJqXDEsc@+>fw5dnd+8+Haqa(8AU%?R5^*;Xuy6Leg*7IgJ+M~C
z04Rti%oHxZ$~B?pZyeZd@N<&9U^Gj^Q4T-5etw_s1EqP^ywhuQ-V2c41;?wX{PY44
zNs0LQ#EU0(+1p3Whvm=Hn>OYPHELl&4P1HZ%=F*Bc4;y_#-%{^l({KCMmz(DG_oOh
zb%p8wR%I{`1o3D9ps;KCmJ@U>tnChPYTp{oi-mKD`#F=pQxDM$ycw*Umyc@KJ4)%0
zAMOyU`)E0X)!0}q8H0HMhzqA-X|Q@r`Tgsf2Tzj<Uzq-rKKEf+hcs9Rx8%F9mS6Ii
zQ#4Ych{gx=Cb;KTdOsfbe_rY0UpP+r!<&*l7_x^jVIJz0Zy^7po_EB1KvY-v?Cx({
z!MCEUE9b>Au72+(b0_^Eb==hhimVYWrqSUC-V6=*w&iI?L(^n_BQ#h)Yv+yuzqrSH
zz=L6#@$sPaGzoiNQF;qq|Nn*!o{dw|%Va}pc}?lxOLniBspEq>jz<D5d01A2@Qr-}
zybsl(aor-9&+o_g$nPZE0@Y`R7i+M9jSV#r$p2|2X$zwjMnxi%*?)gsHZ1sE5BcQV
zFN<dajemx%0OPO)xO#fGWDb2tTb<?u$==A!hk@a;5lh3h7ECJ+FdX;PwpZvBv<OWv
z%xmWUrtW!!rdJv&C4NKexr+Og_cg&{JT1Srj9q2p!c=5|3%M!eCJczAEh$gp(Gz6C
z>2XR2jZt^G43Ee7h46^$(>uJK-9qL!;u$b*=7<mBHI!?48J6AIyVuWvSIq~~k+(r_
zqZRjENVd%gd-I&qZ60>&s85l18Z6686+Gt*9lHyL>+Vjy0q<22jQ1Su4)0~<!kPm1
zkn5KYA*^rAnBS0gqm_SQx(wT0=1%!hy%Y_ryx_G-HZMuh=k$oeij6qj`Jm_=_mpyB
zjfLSdTswaNU9HHXYSLg`b6k@R<L&Dww2m1g2u2Ha2V=i~(_EzKc4;NTz}W5}q}5Fp
zPaUMo!<eSgiVc=GE)QdUotC_@f3`Yvd9$5Oj3#OGxcbuv*P{1fZ+hDV45mS;3&sN?
zoq_U_8?s{dXz;tIOy$1xI*HokRM8?n7kFU?OC5d`>hhU`&bweA+uT<Z92-M0f$O4^
zLa%X~Vs<T5aUXvR7Y~BWExvpbU4{>hE(BUD(JKL4Al%QH`~xcCCc;y}ozaQ|e8z>h
z+}9|)P}C`l-h(~`c^A4P<}$O~5hWviDg~DSWsPLM$OD%zeZ3AI^ygSeWRo`<2R$(b
z_nZOF-2><$*$jH7NyFbor+2Vrrs1K1(+kq%Ky~WCKFDJvue|3>>`N!Nxx5*2l407Q
zcLL#n$P>Mx+eN352X9<NO7C9-AA?I_7`B^a4tXbHEP&j(RS%zFKEvU<OYX=|Y|24c
zA>2e+D1sVfhwQ$l4|oe@_ns$_CmxqbIvS)fO``Inn;h7}#l{v+4F+VW{9X}^BsU#o
zdB}5be7efQ>|YSRL3w9!SlPyZ?rJc7++Qu8reX0|-=wi`(=0WLjKoh67@zfca^G^@
zse^emV`5&udA?m_Udm4>pB;M3@--u)VEG~<OsGk&oY@^1i({UAxm?~rmpilGxNuN)
z!QM8;ARH4I&hyWZb$Wd78p$5<0n#*YmT9fi-E;%<5o2Y(o!|v~SWsAa4wp`Bmt3xF
zR|O}dX}}`FMn-e2DYbu3*}5!C>Y=16e2$521*S=1c~E@C7PkfjTa^cCo3f)ThUX88
zFCZOf7~_E}M+jYqwex<1fJ7^yj-T{JnUZ?T2?(hgEeaUoSzJR_E)To#Ev^Z_H$Giu
z)`Y*KyUGpsB5^Dp=MT-+mfc>*yKaRFY%g@vj-U)o3(Ce1(?*%*v&%sGzWkcc9w@_@
zX7o8g&V8$*!;&@+PYoKZn({lyKMkQPKaqJs*+V)lz|y}4&xrYrHdx(s%#RC}tubS6
zd8F53SDrxn;A_E@?@=zKtBn`wHiCca!T(4&3kyS#)Jw`A+)_UHJTM(jH&7+h@*tj$
zXEMKi>@BE%TwYu}&QxDNe}d-6d$Vj*)QE!j^E3OxE39&jgi#0r<8x23v;nARmWk;i
zk8CiBEZdCVztbrW;k<&sq!kM^4C<4+QgE+(Z}?P(a5X(5c9EGAzmtb|i@*mivS<F<
z*5Dg39P>kLkdoV%Wns?GC<ADNZ)#{=+B}Tpg3ddmT*NlE?FBE)U|IRSu<>w#JF;r_
zC@=tpX2oe`ns6$*%H(fzP@%<FPlOo)3ieT2@wpRzjyT*WY1U-!+-QQz3iTe6j%Og9
z?9rbf9qv^{Ply;Jjc_@*%D)=j+n*&lsf%P#_}!vaDufQI4tf(^iGA7{hK10@=l4b!
zy=7AeSe}>%#A6G|!O{#U1@}AhQzd*ps2J7d_t4dSSCvPNql-gBw_?UHm!6e@acJz1
z=-WaH7|Uw>R)x#>57@&rTv-uz^U{=XSXD4IARH&Vei1FTs{<{6U6~pu8Y63XNSpQ9
zE8s0Wl5>2UNWPFK%%>tx$41&pk7*mtbp`0+!H_b4;joCeY0)GN>*a?n`qHTbHN6N;
zAiUItS^sgyEy9O~w~HiAR~uN_Js;TMECU^O*+4n+p<zV)i^q4VLRxs1!Scp>=7A6;
zcWjjc)4@NBi+jdrW64RM8AEv5HPf}aGGv3%Q*wU&$czf(AU<gr9cNs^^1^w6pxIE1
zMmz&~vN>m-p6X7&|5M(vj0<y<+}t^%8>Za?Xx=SBi-R(72#0(AXAH41NY=IWh?u6y
z2g@~e%r`on!+73uI?n<x&R_+BybFQ(XnoEe*`ROUSa7~IvKizNVI_0aAfPqby>^Dw
z*K^h~h1?6equB~jAgaqB$RZdRt5ga)1c<_?71339Xh<LOfm}Je(<wb$f28AR1i=dd
z4e#vne^bG?O0;}y-tk+`@b~53E$+(D?9HFX523qu4T2xp8=b<(cq-sfusb|hz!j1g
zjR$4iwjy15MUReNf*Guyl05KrxmSG7(PtTKY^tK<hR)5=E)A|+=$tp^Pv9x{Q>RiR
zJl`AP%B4c<=Z%$h`M=8Q*~4YojG?k&VKTf*F5U17Krgcnp6OqaHarH+v#kW+!g0SB
zJca(~jzwCYAaBU`RkKDQy+C&vU5**tMDH<!#iP<zBMkDV%7g}}v=|KnXPPryBrM~d
z*u7N4gn0lZT3s+!^A`+9*-D4v-$rA|ut6YCDj(jK+|gXv9LNjfYCZRmW4l*^HuLWy
z5nQ@7F86Pp1us58S~MiSaYS6)bDyn@5%0^LqBEL5<}(VIcmDx>)=O<=sVtj5R9N55
z^FzL;{oF?<IB!@uNkVm;&hZ3eRshd0D?^jqDmnqr_D7{3%{$5+d4POC2DyBQ<CfR2
zoNx_n+tYkf_(KeqRREd7!Zqrfo27X}!q!_CeLCh)$UVd85zU+OlfM0FWF@<KDs2IV
zW16+K6|y{UsL|7kw^q-_gD6yJ`3AosXAZ3c^W&#sl}nl-xqtf#3=@xEa$Q@OckMdB
z2+tb#SE(wy8;(QJ@@p$h?`NTgGo_{waPXZp{!a>0{v(Yr(!P6xe~9}?7s6%?WSTS*
z?ApGjWnugSTjn|b0s~!~+c(b31LU>3qC}7V3N_KFunv3}XSg0ihA}~mx*|`d_pZp5
zQ@iEZt|hW{dAcl_Hb4&T<eV)>7d+(tPFk)2Z^-k_i|rs((&M%2VX+$N#|#9#xckMI
zG(F2-lXe}wVGoAq&YqQ}<TdFU^2C|60o>FtKoiLLE2j_9I$$1xKtr@*<_P7l#fzlD
zdS040Ko>vz{Cm(kMHj66!A*Um>$^|Hlz!aj-4@ZO!`NOuw-5D7qw;wA_(6>o>FYrE
z{hN}X@;65-QVz=xd4Ps%Ku@dt5SMuw&By4*1*T<VeGRpxvVCQio|$0YR5Xv3ACOV&
z8ux}*JWeXhi(TEAd^|7s<2)=?K+jZE3R>%9dsj%-P!2>p*O`@}2F%<}WfUuWz?*Vt
zO98wsw)n16lt~fvcOLkQriXOt=58pQ1cBxFk<n$PYdW~5_U$bx{d>rft%VRu^8iRp
z({l7Yc$(MGACingPT5EUd1p(gEAK&nLHhrszQ%TUz&}NLG^}908CwX?&&tg1Bxx{D
zG^*WY|K<W!APR)W(=^e2S};KkT{^s~*%SXR>*r6DqkC3K8HC#u$>-hTF#cl(N%LU!
zV7(CD+jm3WBMd+OUVq0Gd7xr=r8Q-3(4`>^Yu(33@QyahjIm$p_RiL2X4$&SflZNV
z3cOx9wFf+-fw1nS@v)oaj{HdX9``cC=@p#ds$)uymhrv2tbhSxx~k};jj+q-jFgO@
z8P4<7#eqWJxd{))<pKZnN<6u51$b)>n9r|IgD(rp;e9bb5q>hd<&RylIlq6eUX;p{
z$}p$Yn1M|h&|A(Q-K_kJbjNYkk7mRD21J-!SC8u!I5xg%a_VK4wE0`+;P>U?v8~n>
zW_esgrNjcDDQF^rG#rwzSI+LziO4$Us5-|qnQxZgc)&D?dE@?~Z>DK<)qwyiKQw{o
z1AmOcB81DNoKs|hOYU5j1)0BCrND~&$}tx-$h00(nDGm`FPFhER*qE=QE3_FW)OMS
z)L1V&R_26-$P2OWVrjP|sVBUHJe|A3%Jd2o1Wl7l4<$W$U<LBUF&)x~2)WU==?*rd
z-`sA?q2=iwyha*g9lz3UvBf8541Gr)78k)d*m3tNT)@)%*X2Bfw4(GT$XQFx=NiV-
zR{BvFgYcKYuYvFWSEJ;fyI-Q8xbM*y{U81yUp!5@^j;B+*Lt12$hW``cn~Uisz&pX
z>|V#S{2afu4yc@6Wl3%lp8KvNx~#gRD!M-^6MS3h`P@^^9p31Sh{;3o^;0lRudDH)
zA+&I&fNSTBRs-wlLXgzRJw!gUhkb0`i<3X*i*Zwa>7$FpeH=!!tI0rZZJ88i{h|$(
z#zX#D2Af)g@92Ua*~vpw%&>TFk&w?buas#XOMl_m7D*rcp5|9&-^rDJS2^JdfX~pa
zJ?`R0Y9JQ)Fp;!i+))SB<#%P>d^CU@$ft27k6hU!vdEza{Dv@Fm!(Q=^+Thf>5&my
zj22RVcKG8ARuHtju0>?4)mSTsw#|2w4aqdNa_nB20Grk4l!PvlG2}ftwtEQ_!d|PI
zu#%)_WNgr>5}^ik$L2{gT7FH3M#|CFF$bi}!vr=im@Ewq=t7Y;;za>}6PtQLf!(u?
zYt&3Rw8E)WPVi}bxpb)c#(&H$1$6iN*=nq)fF__UD-iiwHFqrHP{^F1F+G+6_f}>W
z+8L~u1jrfW&hm@AaS+<PF8l^wsZ#P84HoVfPa7oZ{r+E9ep43mY|pxxh+|$8X>mT2
z^4Ian^D2GV2Rg4TsEo^|^N<C0!^}G&UESLZT~F?*#(E>)jE9ZdI4#KfS;GeF&hmps
zhg<WY@v=sed1v>YWeTaszhe3@g!i7G$r5Lsn;iF$-D{^IF3W4>@c>dr&*h!nI+l|w
zHquq*o9BmR?ygITDjr<da`-73nyENodG__dbn4~Ykqt6+<Y&mUbyt~|Itng5qB#yd
zWbWke<kl7LM#||k$SXfg^98|6Ww2CmDd4JzjdJ(a1(}=rPni;)Y-g<%t-lJOwpvtZ
z8&lx!kCBs#J;nwTP_|?tIkkVSq_R7wTa9q6!4G89X!X!Hb}MI%gfdiUB}IYKVZO}>
zg&Mf@VjQ}aZcNGxnJSifZR~C^P7o+S^>r2K+Hpq*ma~UUfw0a`{f`{ozCg-LxQ9E+
zLq5@1slY`L|5_>W9{`$P=Ew^+zq;Rmybpg+-$!;Xmg&ELr}fP-BYI4%>r1Ei;W^8R
za8TqqlfG9TSp#E=%Qu;;!FN-5n~Qe)%29-ibo)(y*iG*$>k594&{U)>G|9oOJlE0c
zD_nP~tleeWm_Ml}qGfQPrDI$eIu3SgSZ(Z>H`gV^J!NXc!pSNhW_XE4gTQ<KPWj>q
zKARSR7RpcKYQ2C+er#D!cUd}PsMJ)^%kkxKGy`;_0b$fw;R?AgzkfrP&EN^yZkG$v
z<ro>R%3oi8lp$l_>#}b{fz;J<Je9I;eAaXw^%nu{YOsu1EC4?&5U%bw3T=FF&ow+T
zB1jx>qSul!;0-X+D&GWv(-N#TAhTJaIm15GxlJMN#-J^r&jV1?hyZ_Mj+hq1UOlx-
zGU2Up3lpWy3S)NzS5t}}+VXP1TJxty12h$tkbbA(X{fJ|h1yCp9>+nLSGH1i<=eVz
z=k|g|AdkEUP0pj5I_6v1u_6aurt|pC#;zi*r^T_nQ^<|8Rz8m}352u6+%f;mJ9y_l
z`cTW{pP^i6@r$n>m5mFh=+?&BBR`h9nlgkWf12d(wKI~E)EkY7)rpr0-t(9(<t2<C
z4~AHp(@*Qbx{ho-$bU3I1KyU>yH`zdnI_W)ZQW>bFi$FC9M*rpi$j`M^>k&{hm%j0
z0p__;cCDG}<dEC*(7QGn;yvHyu9`Vo8tdIcY$rRB`m}pK<Nj`ovXhXu$%@GkJs$TG
z2gWNUsfTP?o}p75d|r%|$|dD&7)YNVTzy(RA?oO^MUpl2-AMUdI?T87${DVdBrZ4W
ztKKN*V`*NIf2A5o_eDWF8!Rh?ezY*nzCQ)1K)`F_BH1~5qAptkt3Y+T*)mWdc@JUa
zENLEOTIr6Mw|vk8iS}rMz%U#%ym|Sc4)EGQIoD-b%c!1`8nV~)=p&sKue441Jn)XR
z_^hg|SY}Q5tL8}+i-O>2Q8;K^?-yTihR6ho@zmAk)QvWJik%b4i;&cmKajgO{TQVg
z?(M6%5g>W!>cuHr-l)%QSqqd2A$8Y;6y2gGA|LdwGVy)$qKV39^4Ig7Z({SO*mf`0
zo%40YG`i{mslhjT7LN^MNRI4Sq(+o)0CoIF4Hp#Nd0GoI`N9Pa9lF8MRq68JuAH37
z$)4dM0hjNv%#-GT-g0EuVt8~+oB3!?Ga5*jvaftW-Z{l)QO19jzS0Y)VfsWg{&tfr
zbg_@^TnYnchVf;9b~adaY5B_ih7?~rEnLFlJp*OjQvj=zaalR_wdJyXMLPQRT+?NH
zUuz5Gm~H~b?pzm{1_8csd<W{vX8CFh69<ewC+0QDgIi~1`WViNcP$*plwfGI#c_k2
zGsgW{O72{80uw2h&nuDTepq~2vPN-^8M~S^T#<ZIsArA)i&T}m13{G*l_8=?ith7j
z0n2V(7r!J+$CuEZnhBm+y+=GCHVB(wP`t-Vxm%QB`{)N7G%91}ptq&`!8NTP1je5k
zo}KWJw0=;>=Dl@A*OUgQo6PzB@9^@tw$;KLqMkyJ<jj$Ek~*M|&f#PC)x2nS<(M`a
zxXJ&Js){=n7x`nF9xQF-8Nc7Scvy1ulxuo8JfVpVTtr^zt!1N;yL_5+1a17w%Sub)
zL4Ht9c@F0O4bvrU&|8{6@-4_4Ej!XtFAm0c`Sc-Zn6J5XtjsS1w7<bZE3}piQj=bn
z6*Gs)ooi>EAen%Wxh%TJ*1(u$Zab~K?xuL*0F1^rj`3u=GhDoPLaeP^Qcqb|I8kai
z16LWZ1d%R35zy~^j(l<;o^xJiP5NHP3Mk|hVDq%Bl4%sDjrt<|W+qHU^J>WaQb@0z
zKZyQ6r#mozX0%jL2D~Zj=8xCc<5AsL=hQ1*{cfLU2Q9qaM%@!E1;a>+vCtrLrx5+H
z9RTTjekj^KJ)G+okI0hT{!r*Xs>I4q$iYqBsE=b;At^e&5B0?^4dsFIL7s#EFh*OJ
zr#XJxm?LG1%W`a)3u$>dvbyJlWlk$F8K!}-u_iV!SI_Oyg~dLO4X&HPVczn7`v%7G
z2E2Ec!Hpe-8Rg0a<9h1gTHOJJvTH_<>64b1x9&21>^J%*IkNJ>5dRF7qWh=c?KhT>
z$Ij<No^_2TX}a=RK5-@DH$Iz+hMt4)TzY0+s87%6{n60A1`Cy1Ty$Dz53}&<UiR-J
zE9Z=XYk$GK9WcRKPGf?{xPV6*h94J}@%c)1)56I*w&0l^sR(>W+WgKIgR9w#I7tu2
z$mYF7R{-yV^l50S%I@nnC;G~quD$oTJbhr+;140R9E)N+($&oJPwx$z<kW$6FyNfH
z2!qwXm#ohJO?bAUkE0m=Sbp%M&y{_D3edQoe%OQa*J%DnV@uD7j(?B+?hr;7H_X6O
z0%<h+1n9FKZ(KU0V~Xie>=`f&e5=N1d|O<YO7DvG#Rh^hL3u!Z4SHWHN^QqdmVw5t
zuBKFG`6KEnLr!@qyZpX;-BgupM9?_6sO)kfILFv5o;RG99yj94hPQP87RP;}^KR%G
z-^O~K%3<9}(r|K2BL(!vt1#_<Qt>b{@t6pfI5c{}XWH<hzPV6-^U_p!fNU@=kKUM4
zepyDQq1|8T>H5O);g<?gsGpYu+Qne`f>8jLPaUF6h%nz=_e`{iYoVw-P*YnsRiFsA
z705dF`E^DvTBpk=cgeIdpNA_~jTVK@37iShYidNdEKQf%n!piJanfeqNWZqaOqNa`
zgqD+)O4{}Y(G<W0oGt9R!|RnM6~Uy)0qJvm0$$;+^>bulPCr`{sYW}Jhvx;6GSV>m
zt`)!Y$~;8pgN8=)tKofI3vZ2#p~VkkFsz|vz%K0#s_dvAzL~plYKNRVzD<>s>0Ugw
z6?Nm^DiduB7%Jt?Rk<2h6&hjbt!!L8$=>L)UY*>S$I)F1(tbi$iswceZH<d->7A>R
z^D8$Eqzrhkg>uGtUD1%eEyY)ks6LQC9>^Ac=bJzdZ>%X819|G<=G`HFAbry0Z)?%m
z^W<ss3S%=APn0gv%GDs3Pi<F2Zidv#uSQtq*YwkSgEPl{s|~Nd{ZqX}zMog+JtMTM
z!Mb?`t~K0FeGQ8ij+LiYTos-b1H%Oud+ogOQgVlLU~CH#aLG|>9jtOflv-SE+=+v;
ztLKbED`AyxMvE0f7u#)WhV=RS><NF-d{O}734x};X$nZAp}tzy&L4~N^i;uOIn?WN
zhL|VWaC5YydO|RdbPv*tC_djLvGwN~GyCoN4`OOM<dc>aN?u<hbyW}1wYVskPVSN8
zdsgb<n%kCV$cB02WbLd`dYbdH+<~$L#&y}${<1P}kgT3PQZ^P&k{!!4W#5LGa%9g^
zxo~p39%x(n@Rl^zS7=>Qu}!Isug^>5Jx?QOeC7@jbEa@BW;Q5huuSnefc%kE(tF?s
zVVT!UFm{}MZ-ysgEQs8bi@SFi?MOXVmfn;ZkRdftYG^12yqavJ4|p5A-G#8$<-}hY
zc;A3}sC;-wS3YQ?=VVhSWIEY3`R%21wkR{o&lb4JMus7{+ipd9v8*i^CmFxkQY7nM
zS~_M}+3Vmv^kLxZx&)_|Z(*H2S)Q%DFC#p=!9uxMI4Z=l8QgurSAtapnPUv13u?%*
zq4WW->vkV}y&SGwFiq)^tkQJ}1cBicd24ZWLLwCA!r@JlGXgE28WVGOc?}<eN`at2
z4tP^`teK_*kw%Ne9BsQOnl}OZXvw#&$Z~tdQwS*FM%&hgLE!p#mtCCTs79FLWBKDg
zRuN$!vaAq@=H+SulvemZKcw$IE|2^L=0fk`(&_G`cdwlj9u&b@$=tz!XXT~ze*<}@
z@n&Pfa-d9Vh^>wc$v>9WzME14!8_%tGu-BJ_SVJQb0>W-t7i^J7bj0odf_a5E{={U
z0g?AUkG^193cYPJczP(WZ(dke+%9>2!Fbe#Kj?$<#&UL%y=$kN$3w%7u-x%t>X<Lk
z;P^2kUda#EX%9KFeSylfrlTHNNY61WNP$5Nhl`9?Q5LwD`sw{^G>wQSYPt0H_imii
z6Q#{avVr|S<t^!%2h>fMc%9zA0(895W0zD*uE6qYjq5WjI}O{JgKH&sge}&#GSQIQ
zz43#2wfdc#@-H+v9E0`7*wfQyRzEKzJfp!vp|p@z;D`6Fp(UQIbEZ`2QK1||vdRVX
zJo3A`(lA~F-<3@ZQl<PJ1RTsW_d8M<Pr^7FgNl-yvMg^n(lh!h2%26XeIVBh=A+W?
zTtDLklku$_Dj)&ich0^)uz8-YF|;>+M%xR8eutoMUYv@Sp5BJhY!3+Yf{0H<8K_7=
z7({M_ck|M5owK$mr@v$k{}6&|udP*BsZ<o=01uuAGA*8=m^`2t4CE)Wdd5&Ff1$3~
z<B@58F}d-_&FgXHX%Eo#aA$VQjIm!?xq;au-iH^?6OBzdIe5P+e{_^gP?2ppRX16j
zI{?Pk_Ve=c$SD(x;CY&HqM>ndDO->S%J-qobJe&7!OF%iY?IF8${7AJ!dfF|4TI53
z)p<`{C1?02a_!QA$LIvX^Ni);Thub>&XT;LI%mpuJBgIb>zXy*T_j`hJGwTN4I1mB
zqrtNqtbnDbCqZQ@xqAg&jPbgSiB3PzN@>nSGM7w*L8D<C_?B#40>ky-mR1(&cwuQP
zSS12O+!=9&WDn((0;Xq1Gn~HW0mhQ)BVC?Q!Uf2x{457B2;MkwEb7$$<+`IlD!eud
zuW!jrP#_S4-j}O9IfXRZ$zXw)((-)P=@c-seEWI&&>C3{<>Qtv*7c^~!?V>_|JJga
z;xd1M@;@gGr=`<C&|OAei1a3={rZ`#UoajX*mmuj8oxQe%4DcLz-Wd*zf3mrD1CJK
z_HUZ!yesp@&m3H@1}4g2xqN31e-AQvQ@t?OIpu+S<*&{k<CaaCVexU)W5NB7<yq+N
z!MjEpK`=RPkmEa-sb|mq%lv>oJ%94WCMtK6nZJLhho71uiq8-7iuvP2)Wh%uGxb1M
z>JsRx*N3vWaxpDin$$}c<_wUBcQ1jq&1q{dp1(+FhcPS`8b$?$_e`L{;eaN$1X<0!
z%lp4>3{@t2<>8fMOeO@rWyk>Yw=7T9u>z$<^vM9-#X+-gPViabOuzKrRauZdKovPs
ziA<MDOrfD6HBW3o#?Ml6`=Yjl(ZYgzpAUBD@SJA^@<d+JFoX4)D&_3SKggXMr<@l7
z1#uMG1Wd**0kCi6fblh?TYqrz?Xp=zB@=m|QP37%%R={`!p}Ek&QOK<Z368D`T3yn
z))a@H78S*KZFOKu&X*Y6+IP*I(R%1eLp^t~Aiwx=#g4vdJ7_&MX#I2X@YQqs(Us$7
zf@TCb2a9`w`8;aA$rqQ$(+Ad=$BlYcgN1I{wx!%KkA~Nk&GFi3beA;+W8IP)cHx}y
z)vUv?;P-7jrH5NdD=(ZZ>OInhVP~B!$nG!I6?awsRL%nBHZHjDTE0fPd-JT!*Rv5w
zi$)amw5#gt*~&)w%o_HgoZPb<d2xG`X&%kn>}b#~gYKTCo~>G6o++q+`?t=^DhMZ6
zd7HOI1+z-CHx<^xr~qjt!f?TL-M%VY_cqeOaji%)+anXA_r)6npMzjH_U#X`6#_k_
z9ZuH-COrOtd}YA^9NoE8$6mtY7Y;1}|DChq4@=I7&rImh_1dx|S?V~`IvggLvsOSe
zZgI@$v#hSXC^x$~_ikR0t;^DE7Xk9m@yn22s+Gse;t}QaJoOkhF3$s*p691CQ25>I
z)uG;dg|}TTa)y5<+m~iS3D2XxtWk(4)srfgF+Nfc5#-c|CAou;E@z|D!|@(6`PoHx
zz$LHM13?~W^!9J$Vs<}G$CUx7@(Vd#k~avRj&&dLkAFZIM|fIw)n&Th7LAD2579R+
zKzeNbddvES6VMRZ)<cR~3U?2rOi&)_RW;OB=wLj1BqqDekM&l#i68lG`h_wk^^(=I
zewE6SNaIhPG1|tejt1>yuwsB#oO6jOfDnW`H_pq7StB8|)*=wK%izXZJenKJ)}kA_
zb??ir)wxn#S)#N+2y~q?^Q%iP79eE}M<uv->!Qp{`8Q~~3T0)x^!#s@W=~l<t-p0m
zU5go&h^A|0;@Y!06MvAihc`mFt!wi%K=NvOm9|$@7%CXfOQ(0r!t9@I+Yc2?=GF4u
zp;39xdv9nV4@o_xFynu6?#LDi>AE}fc2&`y0gSJY^sQ!Ue{L;JnR5mNhKk+ioY7zD
z0jsQ6l`&jT>_zuK$=0xXkA+C1!|vhSw0}xnr8_3h0dM)e{NWAA8_zJL@v!)mIqMGc
zH(Zl?%Yluv^`%Y&(+mijr{iUv`MPm&zs#P<!*oqI!udfNk|DQdP^mv%C2!PMa{kyB
zGr;sV9UUdyf#EqCEXQo!#lSJ0*QN%!d+nsGn9e~$b`{wwM2v@`Gghoz9{$J*&Oujk
z_nJHyu6sHTVa6+d1@KoD0nLXQ0JemCH_Xy;D-{?DEGr(!75uh#km=KneqVQSXbO2Z
z+R{-Y$k)j3x6mW^Rxl9e$pLZQ6bN<+>d{5wWYbv_zeQd+9%bDKw#=s70bX@fbbRN%
z)wR_Hy&k^epZ4qLy2Vg!r5!+`jowr8*VhfZg;&r3O!ZrGtAZn4$l>KvJb{{FSO<-A
z>G*CKw?4=Zo~wLXUWqgavw#0qkGC>IU}^Y#-YGgQ(?@@y<?)`CH_)t0+lu>L7?jP3
z@5hs9C<Eow-%Mw!D<8<_#Zz?pj2fh{5%jzS!hmvIl@ql$Eto7dt{d#ju5wHI#10J4
z&0vv5WRfyS`D6?;YfqQCQEpv1D$Ax0f>E;my|qSUJX;MDCfz~=Er<y;_elR(_N||#
zgSJM~R|FHaRJBTYABAkKO`vWUopf82_->19vBH8y#i1~Cla(_^OI0~fq>j+Re<Wb(
z`aGBcWx{O)#^s067$2VyjN`e(8)VLezoEP)lq|QtZl}_O^T)h(bVONDuU013t<?eR
zo*s{vgPf6{>s&E*ue_HK;kz==F|>7Hcs2+R?p}gt{5Pb_d2~Hx<AUGuyS=ewJ>I-@
zK*v(kf3{s?)hlA2nMYh{OnGob^Sn^DE*;w@ndlX0y|E0q+L)r3wJwr7`g4_i9}j;f
zU*V7cy-_Zn*df!$eCgtYS2|v4a$vL_B5yN)|EunNOWiVFdHo~u55MuI1H<$4u$lw;
zWPH<`aHWLmARtF&an3+=39K^0m8<topiwENtTbTV^{v=}O$9JqXi3<zX$3{RIggea
zkZJQbe#4bBn76OYkaQlu<kIwm^K4ZuE&kqJvPXTSJ3n%_P^J|PM$=MiJ4A#W!WC+e
zt7rGg?8!f(Z0s(3r8Y&;vMWY@@A%lfOvY=^ce_#sOb)m$F?U7a+&SGiPBFNnMH_(i
zk9Ztks;Rgqi*pCbjB$U_a|d<qREP&hoC}W=YWkWlA{z|8Ecj6FT|bTRq(u*g@!-9q
z`+j&Ur@go}iLN|))yBr&F3z3&Pbs_4ecQOpLL}cNLngzN2_CYsa`qU+b%qMGqIjZ>
ztov=y>#}prbRFNaf&X|sc>-R&r10VlRx>c;;S3EcAC**e@sKRa`UMr?JuVxJ4+^?^
zTKr7~sEeM~acJvYsjn^5LCLTu<UaAhrUq~ulEX56+@GCLnQ-a7OOHaqx0o5YUspIu
z2l1Z;G;a=B_L6%=vTDW%N$2@~S|$o2gw&;<K&u0<s59Xi>EW+YyKuBo2{pX;@NMqe
z!+Te7Pb1c(2YbvILs_sv`EVXo7U7Kzep{}c+pltFGE4d8^nz;HxM(usu@2!i2I5Xh
zLY=x^0_RHA!Z_NL3FMim*|P7<8~5=#xp$T1j<9Yk(=`t}q6a3cX0Uij$=&PRU?8&f
zO`G}A0pSlbSm129l6<Sc=>YU%uAbi`^E0@wI~O)bjEACDqP1TBRXMv5Q%8R(hj+}^
zeTU4w=F*qu-cSUrg|t0|c%ty;Maepr;RPWoJqSq3pf}~rzO^dY&jMaJ8|tfMKe{@Z
z1K(9)v@W1;O(VjYK%yzF?uMY_dEEYFs66DEfT)i)tEbusDz$k=>TR(;&{$T(<C-<`
zJJ4qL4QU4Cj$Urcz}Mx%(e=)|b8+F3(NkMAwLjuSx_!aCtDGkFmd#7kbgrMJ?+gpB
znk|(HbXD(MmL=K!5f28F@gNgKd$S&p33_@%K9Gak7TDn&njbBk($Ru;Qg~v6#R}H*
z&Q#&OTT6UGMk#}NH6+8W#k4CYe_lDWOXl))6yHq(s(Y?247zUajakI&>LGc*{z;DR
zTB65TnfGSGp{O4w#}9wEbPYpt`SdQC_Ul)=B{GFCndv}5G6%jR7msg)u)4Q~Z3Kw4
z(q^K(>L4icbGzt-<fr^Y2TxfJQxN9g$`cg$1Ok;WrnqL@`Q7&OKeWA2^t?pKBkP+V
zSIK0$y9t1+4_>X_O-4>0-YipeP@A%4a^_F);gXwU+%%8%@6$nDavW>cq`zsN7@lEu
zovFL$Z|VJe%aQF1(a@oB45vxGG1=g6T;s{DnK=PeJ$y~y^5Es%<QuXMW4&bRK%{+D
z^AautKU%bA<?Uqf<OT~&;$AsC1;rNflJU+%BFEYTNDCKwGkm>$@zhSqPvi0F_LfD*
zn^1YWl)?+O-t%`FukPyFAK$Y=>eO(78d_0ULD2SjwWJ6pI21xIq`spQ0aN?EE}4D1
zNao--<jU#Y>it<++g?V`6GJZVsFpn&W=blzd#0xl$a@0Yj@|<@qtZ(X)Bmg9i8Tn6
z9n>*BY}QpP)#dAks~BiBQu?!TG((Z5s|C2l%q$(0x2_!LXEn+7ONS+A^e5p))8|dQ
zZ}?6*%^Lc?TsgG^V#hgD>`6rH3dgZ-7oE{{ecm{Q%jwF;O$60I_w9*p;>U9O;BwVJ
z>IP}NYVbq`i|irePwrbMv#0zZ2R7&HB3Ii1k#4DTO`jE1&a4%)RtfhF_3&~w%beuz
z!Y!<}er$PMC7U2ytH^sAwb|qTET{IZ)Gip^c@rA8!hwA9R(~=f;G0ZtVm58uH*)#Z
zURO3|ig~dpZ2`?U>ET*>?}jYO{6)7i(fq;f4-01kp9t0aP_HK9X=e|8Pmb?f4&%T<
zYvcK2_52vvGp%#h73BCZx>=mn?v2*wg=zZsR%Jsyng%&@Xtf@M%Bcj+8%^&Cau2pU
z*UxJGn_QV}={PIotG>2WcC5;kw1J%G#qMPE%NFzUh?Mc3vNnH|?($&eB2B|r4O%r=
zWC>WK6|YP}OS35RX9x*j+oECzye<o}{wF8)u9BLH2M7~kXgCf(Mu>l5j0?fIir#pk
zb!({6v-mh+Gx!EY1=yi=5oxsOqI3MCr_3JzS2=TVjk@0^M25@>ufgA}rG`hu$%_y!
z|2q*6ERV6khjTQI7a_THa))G(_(1c@R?{#boC$m~bo{gKmq(8GK(XhIle%ikq2s^S
zh1RluqJed3zcD=PnmgJa*pM&Wt#;+?kx~zN(?NMYhi9{I{TxZxneS%Myz%t;pzO^}
z{jVN#ACVoe6OiGidMP@0KxU2m7ICc$sj}davdiDJoLy!5n6Kp0sa-Ipeg{ya^{PS}
z4OT>HOVD@biMf9Kg-j-Mi9AP;$9tbYzFq2S%3Vd1!9g@S{KSXoXBOHEmeJteM?6k`
z*6*CN#C*U&X?M{JkF~y<Hzy2i#b*Ehy_`9^S>u~~?#ia0Nd7b}{SS!BPITUa;Nvon
z9Pi-f{d?BW)FnwemxuZA!cBop;L~9&{<%74ozI!{gC6K$>++(FMqCKj9Sv8VoZP=o
z>T3OFk0EsDD`j25cxOl;`&y4q{$08pAYV0Sl<xl?@vPVYLLPKr|GsQkkSyFjoW{!Q
zjnV);m1A8n4!MPnaWeqERrL8{?)5+JUsY(mOQ`&@7KTjQzcF7cM_U0_m=_qL+aiPg
zcy5!iX~B58ap9mUZln(%F@8@4F0OU&?3FTSh0hrOwN|<bEsd2o5QZikUE!|VTcBA}
z{;r-HyP6R<n+A;C2$$9q0%<5MbRFudOJ(`25#R-R@_&|>Kz<VVoKTHO7s(v?kz78r
z8+GD`6-@5p1D|<0U>$PY$*xsp52R2}Bj?^#wq15GJsrpD*IRb1PS?fGHf6>cDj>(d
z&L7<_d80o=Sjr~7f72n-uzS*>6VP2|Px`yuxOhyBoK4lSd?ldG28&EXC4}lEf8zJb
zTs2xW5WeEbczoBsxEd}y@pcM+oBrFMW!K7Vop8r}rSvW1Q&s?@X<Qf=WGGyjJf`Wy
zzEv`P++Vb%(!2!nW`fN8abUiOWc<ulva8HV{y{Dt-=Q9tw#fQvq1)F2D4#-2Qc-$K
z3Q~Vk!KRU9e*6@SAiomW{%F%fsQi$@0lnq;ZjNg;a50tEY+NwG!j09v${37J>Ajn1
z3~inscb7F8ipae-goECalY3X|7+BCaQWi=d+>({EhM}Rf9trd3x7=2l^mK5~jr+Kt
zSwn4PTV`g%V*=XJB~)gSaa6?Hk~8X0YKVNrnM)hF>hV}q(m<Edyd8u|>M3)k{2+%m
z&y(^J?tA6mm_)oTbEAWXBf6&ScYfS`ARdLKzP>_^?^z}@e*Low3A<uuz&J=xWS;0{
zQK+rkNH1t^>c8aPEglT<gwnyZkxzYligMh$bwOs1{Tei_6}9s7%E43e#{@Ki&k2>+
zW)QR&kkmtVubGa9(l1x>b;eHsOrXLyCQ~7u1<yuWX{rqQt{i2mt7H%V*i9z2?YcSk
z$)S+O#(FuiXSw7I<JhIizYSd&+L9m3D|MwX{XdYM^BOno4Qf^(T`s=~X!95r`NoQ9
z(1p2|&g{~?jJT5mE06>5>}she0p>>(w7DP=S$W+h9mb2Z+K=s9DU}smCC}E06~#*T
z0%K@7XbZ5iS;3q_P$q|WEt0%3U+G@*OqY4H$$dl`U3U+ce$M27+F_S8lA31QK+|I^
z@aE37bCNxRXUj1?GwM-1NZ^Y{)Gwz#Y+5o!yKAQUtT9e3j$h9vdyvP_Bi&RlXVk~~
z_D_wK%1kerJ^nAchnj|ip`qMRetAmrLcS5!!!ROwp^;-lrVXf*yR2dF%8{K5bT?MU
zPe9AirY<3oyz~ad3`(Q6KBo_Ckj2yb>A*4-l*Ws5jI{OeLPKQ5v6A$6dplxYNDs*z
z{JyN5ISgI1?YdmTdrQ{Zu<O^hibSql{#<;};gX%h+viK}sLvp9G_2g^k$JI+ft;b7
zGvZ?@xx*zI5Imi~;|R72mPdM5w=W-qv9je9q&o%pn9)w)3r89W)&u2n{runIX|cOy
za?+Aq(WIHDLs@FlW8%0I0;e%h#usM&SE|Z+x;R2YZs=V#HdN{x#>_$QBVEdwGfX}&
zkUMRxY50EWCCl;#O6lF}N}rAO6A0cb3vD!5GzD6Pt|Dnj?CPfgRF>Y7L)#ZgLCSyC
zcv;IrVZqf^lo^W1@BD6FnRTDozt4n=y>Y=rJuFq1GHA<XS#g<hXb}A74XOzw^Jue+
zX;kWK%H_b8LKrS?`@wuri0SF|mdj`MXgRdYfD$62qZkA5h>s1K77waCE}28$Q<}b<
zG{#oe1pbj|-E!88?H9Fv-gxo*wG-oklXSa6E<&Lu*|%x7(pghDP8w?~bqGLpps7)c
zc~~hIuWNetV#m<wfXcjeQ*%duA!iP6fbryFdeR^=FOmF&zlDE_e)g)u6BsP}@Q3gn
z{)JJ$v+^4Bc%<EHr|Rj<HrQ+}jkP!)QJHSM%Z!&*C@YrtG$uUlcE_rzx`N)1clmB3
zesJG?e(>SFe)svYf8pN|hX=6k-#822&?oQ&yUEVgx!OWT;`-Qe0FS))Mnib#`Z+zR
z$Mz#)SzI|3A6K9RzF>65!i)!Hu)Aztl%i`^DG%mRTir*4$%2UxpQAx*tdX<Fx9W={
zeG3S=;q;wt%X4kNcJ<zomKrB7_kle0>nR%w#=$f56F^Od@z1US(6j^3RJYtcl73~O
zb%XUJ;27&?lv5~fT{$kBmn5TA`P7Xep)&af2i-<}lf&O=w4#K}x|TL(z_GDjGH1$n
z@Q~(9+5I92i{HD*SGr9{z)x`jInxg-o%!QF-^cc>)M*hsl(Vg1!o%0iO;S>PMRG@e
zjy%4Gt^&*Ag)@OKC8BQlrY||^HJxS7hKe#|Z=2)GfJ%<mJB<`%O^sEfTs*r+X8!h-
zdD9#U0e$TPdQ?Mcy$8N&EIPB#;**w1qe~$MXnNEmG^R+8a>_#|EFUez>*Ua`1`E72
zX3~JD*J1{RLczUyE}hyftLKiA^dWD{l%$9k671&_ZD5jv<UF3pdtdg3hAr8`>|f->
zzLio_`2dE4YrK3*6~7|Ah%k%_p1Vf&RB9V&nIJ$_rFUiegl|kxVR*x1Rtbak@?uzy
zIL6vbj_g?I<dpU5DmW(aA?n>Bw=`Z~IKj<$2VKse(kTzF@l}~+dT7K3^pWjLvvmVP
zeTzsLbq2B}v!jhLJ-DiJIkaPuOdtQP9NsqHoPic&c5Y~2gQe&`P72H@SVieQx>1}|
zdFH@cS(4jd(g*SkLvOt3HnYO1{JiH_fQ<{Okm>Ixcr;`g1K*Zavqs6qV>_f?XC()^
zc0f8#xVU^UeG`;$o+yCfK=C0Q-o@oW{=D>`)L7}ug>b%+w^)jjz?TEnpwR1Ko#A``
z-g@Y(HC}G9bXbA|;AF@UfAEqvF3kW9Hmt07%BXo#CaXrjVDi7@&ehZK;5jG{nvga9
z@ZKS5QVvZFDYN`NBxMh7=piiG!#OqzdeDXGW50!$#ieB&pno-?eY=ED09tvWMyWu>
z9NxB2=BECnr+oO`7$QcD!UmyG!$4u+cS9AvB#wi1lbn&C%EpD0<i^E=XaVa~NUW=9
zo*vr8u(04_*hVnnvQtZVFvP0--_!%N{85-9c}idhL05N~LqC)|H_tgaQ3(lu;sL|e
zRX>!O<NxYp)q7MXqZtF=(rul2_$p;D9t0afrq6}j#YLxOO~J2{K9~);^*-3s;9!3;
zWc|X?E$CK0f$(-R_=5}<D~NCKYz)CFt6t}?>{>fbW{vwA#*5uSwpgqz-z|(b5ca#B
zX{gH@&^6=h;%UGASqIba-@G8)AyfrJ4VV`W!#0BxEbfPOVDnt$fn#v?hEuzNK}ASl
z2SL^yPt55qGba2+YAWnN3H5N)SjCqQ4FfN$=)!(UM<eSelybw#MOl5Nr1%1iilY@n
z&LT3%FzjMh%cax1WI=XcG{Ak3C*%!i+a<AAVH2G*2l3F~McOTVRpF2Gu)>uFq_>5u
zy#eH+;TpMd`M7LZlq^$6evHa;9v6j7F<R*8j_dRYcw+jd&cCti*9UI-KjgsH`BM7e
zI%v~)Auac5D`;rMD>}PJr)*H5Xe`ZO1(hIy9SVIz2zgmPbA-MH3>z6@9PpkI--xf9
zKOQuCNY?NV<oNC-(%4Y%yn7<T#gH?VK_C}bAK$ZF^7V8i=EoT)$Z=%(4iDn^Om?oB
zCgqS}4%#QWgw4Phsy9wqacf_#Lc^bDu=JKdgpO9Q{T>z=R5;&`Tt2x=R?ZotJ2Kjq
zA~u%AuAra2&dODf3xdcBXE;{6&cJ8*0dLCI6*(XqUywXlHY^YNLHP2LV#yoviKc0S
zZt1I_HCKd}6eD>iuN=RafA_m$vuB3E-<v-JlD0>!8>V4h^_QAIF7Lc@`pu!Og|5+b
zG8hN^b9T)t%kIhQ1rw#h9ad`bBc57VU)(cJh2YjRd)Cg7Tr|dESw;hEo|@}oB44v7
zd@IMedu~l>gr>t+6<RP@9@%Z<SP)wkYgs(L2*;G^G*Sqf>ZKNL`|17bWN~hPNg31!
zhRAPe8!=iDVf2d0%10Qu+P5wrc9q_W!O}3i(Ldd7g4@!v``KZ;fU1;0p7RJ^==?ZN
z#Rwz#r-(2J%NgAs?TxK<PYfg9qYM{+XJbJ++EuqYh?$?43@JP5gWr<d*G@`^<DG4=
z2`VS(`soIi>?Nqc0QH_LG)!M8bM(gU-8e5B3MWd2j!%&{-dOprA9&Zln=HusMHl2Z
za#lXQwUDEmfcOTBeQS2jHZ94KL)#b1t*a;C!j{9`HJ4P!gn$Tbk)9Kn@$kr2#s<<W
zN^Z%aZ3QxS%D*IefZOtemF|U*0tf-1mqnpiJ8wKHpLsW0E#_OpxU?Z?2e-{vdN$uC
zTF^TTf(OL8lfD-oy20boYN{ScRmDAc33sI8VX>Ze&7Dyn-nk|Zim%B1TbJbSjf+s?
zvr=4iQf@*9Zd^Vl*Df8>@tZ5>_Q{nqyXDHs?Q-eFHa!aM+>uRk=Fny+=6LXn#;SuD
zEaa2pS==wJp_a?TT9@mfT<QxRe(;?#W;=@l8*1h1x&5+u+5ky~oKl83|B%L=3!v?6
z#x9aE@J(4gcZ}S=a#{!9ZEV*Jp1&p_uE8<}m6cpWMRHJ)t!7Wj9Q=;VPyLr{S&}NJ
z4{y?q@Od(_b?1EL8PXouHFA%OeYKw)+9xh(AVx4W`Zid}v9C~59Te-L>_Q)Z=6KGm
zr}1LzWi39hS;#kE6PvpZ^mOBZF9XBhy>V93^`vOu8g>i?d<-2g3a0#sa(R#0@sl2b
zzxT*b)Nc$Q8*Q-K)rrFsdsmo&?;r*%T(`g-t2lJPazx4>5BMa)AIJ<oymH>*sROGd
zf65P_OK;Pr=a?7D^w=}#CON}ClI<(9ZHyHTfOZ=LY2%;Og(at;X}Y_}{i^|S3>Lko
zM{@qyCNS6()nj<9f=o~9B~wRzCd=}M$o>uaQgrr!)KuQrH*<~3d{>DMeI=-nYsCgC
z=4k-YSY@6DSL5?g)=i5iO7_SP;bv1%y2$obStOl<LuKFF#luXlJIHRDjLEibyUCtx
zbF!Ok+xB#;n~lk~&G&qN?_W^o+<o@m&wAGLS$kSmb4^*v#S4B_28JH`7!?d4u5cKz
zKy<=r<`qa4>52~_i`iyJfu-&Ze<G~n7$}~;jYap<usM{rUBN^#<Cbid7w5pToX~#V
zNgRlVb~}NLVi1zJRWzHN7r~^mJ;~?nhEVxgmiRS!1bY5`6{QH6S6g$o;2?}Iii<|(
zlgC{<oGgc-bJLKmvk^^Jo?esyUsKY03X2E#oWHKeasuOaQP+cqc(I-r3b>Z1*yQ?*
zrac|Cbx3ZQ7fzhE2CJ&tke=SB#)C8!^^1zWrkIvEOnm~P)h3ORB5><h18KN&UV$Xk
zjtK0E#YZ=sxK0E}_36`+?4Imn@htmQB@><=L=8XZMQ9DE1{2335~h%AMK9Xw>3C&u
zX}zsb1CwS6P&ecq-Y(QEcJwYwV6BE$3+C9${8L;btRBh)WCBg#3Kc==3L%3f2H&(n
zR)Q4)B`Z34KLM~+PcWnO5s4=0T1xQJdmMoklQVKEB%b>~YC4S5(3~Pfdw1%SR*HCx
z36dh`ZyWhQ!;vY1J;S8UW?e?e`V@m<jg|lf;IhB&N(Yh<zSDBs7s7*X7ORor1qNM$
zF0SmrNZqIhq$6gi3F%ld%b#_#ioTucve#ASJRz<k+TZKl;b#%siicvujU;x}b_oG_
zWfib-cVa_Yh@#XC)av>Ja6ZjQu9e}>V_UUX90Pv#m)h@H@$7drn!IL-_-kzf0Hu+n
zQPt!qAib6aG%=}Op=LGf`a&hvvtpb??|rsv`i72CgL6?Tj~w9VRgun(1~bH|CwGyC
z><0fgsMiu&)#p$)U3@Hr!}V{dk}8<D8dvx5CzJ^?A?Chb<sVk5P-1Iu3-)2`yDn?3
zWZFX4lSyUmYfGT<>Y<uN^#nQw&w;Y916s<yO5}I7$<Svnlj32@By%RbQK8-@N$sop
zbLa{=mEs-&R?*u!6Uj87nW;EES#5Tli+5K3&pHXh*Q(aw140m>DRDaJB(`->k{`x?
zYC<n~`Th^nY-kA<uQ8tUS-10hr9g~e|1R~rrl5tW`C6Noj8cMz9<DL&I`9<8C0qWX
z1k(nr!fXwRmt!MLvk|q^128XV#`}Vonr_N=!?XJQa~Piix|pGHOUv3$a`uBk-Tp2E
zlkqh1oa#N0QGm)2mcJ?D73Sge+y~3qo3^Qk5oS@-13gG<gqwnMQ3=mWLWtVsFkTI~
zDi`9p{07zI?5&eJ26x+jGX@cdv7H59993?zv!by0oCI7#MG(d_Zz*dsI_I3MGKjl+
zRnWE{f9P40VAM~ZFe_&eTX2AJ&vQ0}ytDA{EmNSVY5O;BJTBs(B(s&l>ZgRdR{x3p
z`=Od5aZoJtE>|1#&`vLgHnL5cu_x59(;P%POIdhdJv>DaVXP<@UvTTIeBHO|P#M?U
zw&T38%oFuoCZGcv!5%HQA{dfTL#nQNA6;5ckvoaiEiZ=jRdmG<q#juI^eCux;C`d{
zaJI%zTK`%g!mRfBW-TrE70m9Vqr$a+Z)XAvf8+Wi0hq2|<Xfe$p2b$irTh5ah)5fq
zblO*Hlg5ura}7h+J@&DU^e2#tOwhRL%o`5G1uHNx3y>R4)rsmIHLaYq39^rJhaaH&
z%spT(K%W!PMXXc0+GPlD^C<6;y;B}CD3QO<m!vmOz$I=Q50MUnbF7e=ediylk^Zu2
zgx{^(t5&N)cR1g_EP@_{gL}j5^ENMeX-teZ&)dYPy<?rpoCiO$iV<q!R6v!Z^KT48
zeiL_#`!MHYF<6$=0C2ec={K5x>bsEO?SF<M)&KCY5zy-AF%57Y;{A(-CL|x>gZ$lp
zYJ~tf)ocumhxl+KBh<(I-aUB#<!QRf9^kfJ77)AfhKXHpytH4Y-!IcZq2jhYwK=r9
zT*g}K#%)FyZ)b=X9Xj<ERx?#I4R0n8#<TA^E;ShB0n+<IrvIdv;Q5D7?a~j41{nRA
zA=<SY;cEG9FIhU=o&tAvl(8o6{i|r1EGpKFiynX2jYjlfxS3h7ax}tfno$12-Kw@c
zb^6mEYY=>}u@X%KXc_h5&1JvLk>?Q^4QsOSEA3CokC9uH0>nbiccTy?AFg_@`%y3k
zf42JTd)u_?@U-gAV@0Qw=I0`J->|jLRS}{lX+QmKFzirzT8eJx+4S0n=(M^&7X14<
za^Ue)jnq)xyCt4_fMbCHw$YsR+k{|Tg3k34m_ylzlM4@-ew^xaZDhs&eblMIXZ~3m
zv~O>WY>XlMBU)Dmw?E-o-4c0zKHQk&%#oF1H~RoaL1NjQfg76~Wq#({4z!-y5-;~=
z5m~De;U`x7ovu<r>Ji(K!`E`-xtrYhU_yV^#hh|515?b@57HSh)*(jGt1_B3Bqe@p
z<O`BL*M~v7^h%{)z?R;QOIu0J6idXUIQ4##I#Qbl)xQ}$H<vhESzf#|bSGNp0(_{B
zE7@d)zC@KOp2!v$)|GMv&*t4T%toS)9l4>#AW!vstLEki86H9)$h76x!Z<<V?01Cd
zCbt|SvYJfTuW-jyiYC?N*4kNfmcj@Y)B91*a}MVFFq#>U5e1;2xPZtI_TrO!U%BYh
z?-qo5f~nF(4^_0OToQnaNMhnKS#$ekRA7^^6N+J>>log7$ite1KNEF%$$*!D@>-K|
zxmjEq#;&;R=D!QO@&W?=_*uDC)pTn)RM21~*7LP4v4U6mkXpDdkXhU~7$EkS7#wUW
z<~TgtYl*)!ph6N()<S>}{F8^1F=UsC`^yle#2<X;9Ws|aVK`sA;v&1=Dx2LE_cW&z
zQc<pHN9G>4o$fqsFhJ;4>Q58-K3uRJ=y1}atEvrHZo(c$ck_j{T}m<j{6MGFnmXe<
zV0bJJ%sn!^OscjmTaXPOKWl!i|18f+iAEe0l1p)y^AKNvc2Eg7@&Ulx@uE6u1&Rjg
zD1f8S^>VMUv3fpu`@<6AuW&5vB=ADH(9B6Vr<8Vk1F6>(BXjl7PHnN34+wH;Y`hXZ
z+n)vvN)H<SPLV%D&c;<Wu;)<89e75QS8B-0N<AnS#))FR)Au2DIKswi5cw}cBYPNM
zdba|K$NXmrXqZ%qollU&<l!%2Vg6|XhjA8Kf1N+Qt|0XT*4C(N-!_b?g9%(oU4h0v
zb<y29T|K$?5AJ!H1>S!))N&2>SC=xj_7i7W@Wq&JpB}zIhoJG#SnUU6!$kxaxx$1{
zeH|8<kcfF%y#&8mj23^C7sMgzin#6l`VPW=J8<1wsIGDi%em}H0bZR{Oj)tQGK~pt
z#bUs}ssBDqG%Bn+^0sst0J?If$9;^ecr|4_1zR}21G)+ZUz|*x0!}ohvr~@N3uY{|
zciQB)vu$y(`(u6x2-Kt<)4$G-#42I($m{ObJoGBYThrkr7RIEJm0R>e+u>~&jV>{P
zZ{#`%OCv1-^aAo`sDC0_n)L_udT_A>n*4BH{9}KiOYxhF;CCUko_a%jF<92OA(W9A
zU+)+WoA6gN)#v$g^VqhuFRkvofAH68HRjPHlQg&Asc~S};sN8-x5wYvGNHh&q+Bu@
zP>=VcZIS>=T={Ml0LN!fPGFppVp+nZKS>kCq3?7J;(}u6&Y)=eqAM9q_xH=}IIxx8
z0`&a|yIUtz8}?MTJ!uQ;5;QynpDlkr6AoSI5!T<ef`<pv6hQ%I;NKJY>usLf4Yo6X
zf9E|a`y@69p67TTq1nvoK@aM-ORhasJ0AtkTbZ$Im|92HIyWZ8AL{jAMWtq8a2&`E
z6TZc1InsaBU^Z*8)=wsZXU7^kgvBd3Sb=WU_Yy3lIoA~By2o0fxP*E&(3&y_gAVw~
zU(fJp(urOX-@lpL(-L?tvKi2*>FRyc6xL7!f~UXCj|Tw{kT?W~dSwXqpZVf3bQ=+>
z8qzTehUF_JEScKs45$7nLW1uXqUG+kUk0Sd=rz&FCVjNvmz<xx&-HDpbodVPI(|rd
z6KiE%+SLrJmbSsT_qJ+Ba}q(oqjl!&ZMlk1kDu?BKMA*rhR}}dZXI3f8T_<cjdlb7
zsV-pH&91WsD*(oZx|1aaVeQ`$6s|+3c?n7`?`e$e#?Ox$(xU9x>dx8ecwB02;(QS~
zy!GX4&7c2(OJ9%Ue368KqZmH+xgt=`tR{`r*yQ-iDJ(Ok`@vy<H-U%5a-yJC47f*6
z78>((St;7a8%I4z#QVAvfWvM`;iRfh!rLxYJxR~hgMV@VS^;^;Us1eLnt&oyQ@EIe
zP%%>_N%jc$AVGUc=&&}LQJU`5u&Iz{s`)SWj^2a6a(K6`*VfEg*JfWg9mRdh+7svn
zgDcb7^<1hTbHn*&G1ke)DbaxSqWqwqf0h89!$?EdWGC*C1^UwhE9=Jw?}%l%$oijq
zzY@1u5uiVATwXb|$zWHw2o2o=;O!|?D4Da0ms-CU18lkGrDntAiXl8|AgP`VX!Ymw
zEmk_#6}Q0@oRw5fA~F!nqzDLb!BK^=d%s}SQTw*wFSF^}3dmbh6ZMdbB_BJP{(_4L
zpRkfBMx5M@(o`IqVw`4PiNuV;NFAjwd_JS@r4Dw?XbX6}D_catPg%Hl5s+J98K?uG
zT^^EqldiWc2Yr$6LqIm2@yImGQa6=;3bzh#y*dzwBC6HSCL}CeXbf^+*iEu%Wpe%r
zJj9(KD~lxWj^L$9;@q0dAndkyK6=rc`lCFo2{^1yzO!c6+(!y^imfvUEr*-qbm51|
zz)dfM3p2^FXF=Ib*FVt(Ts!{c(Pd*Tn+3mU#Bl?`CB>~zI?30AY-LjnMqh4nhC~3<
z-^h<(#aVxex3>poD?ym`#yUFdMTwy8N6&Hw0)EHMC^X;eOWLY;Z&iT41|2XX<b0W`
zMmd5+%jK(Z_{hS2wfV(n0Ju>TvEZDMhq_#B%+2%AT1mK8r`ujhlNMg##ktRYzOk$e
z^(Ky}_l*PYlez6JvJffTo(RX{ByO(HoML&9U$P>;%~ty%Lpj{*avL76(~6p`MlG}w
zuQ8(!r&bJ?q>|e^?3I*Fa3ajuVC!~EemsoJ7IBQyjSDx$oU81QozOgOo^eUJ!AH}@
zDBHgV!>z~iccY}emVfB~pdm+5d(MHlte@36fj<!hirQ}nT)}1lZQ8IScxONHDHGIJ
z1*Dlbx_`-qkW^v3f}J}I-FUFBSW7vqbDaIxPpFnPloooEi*z>&;xU#$=(tW9<ox(5
zDGxc+sa%claBOK4z-h$=YrY!aov%yHU)+;v%A=p5f`*%ZD=uJWeL0`|Q)+*4e`-YR
z_H+#ZpXlDpm}+|yhZ~h*aE<kjx}8ctUjJdxIE4jokK5H$Y@U)Vk@C&|9*m_l5}@@X
zg}Nqnp2MhfmrTQl*KfHr_LeP_E3c(5Oc@zugr53zSws2vDI~fNe~cx@bSUhE9j|`r
z+ks?bu7^cMd2HSD!foOKGDXwKrLMHe#4^uPi$MVG2p*+lg0DdKi{miiRaSu`J6r?H
z5t%3nD!lf$Z^8XO%yvWXXW7omTCA*OTp<H51F)*(s~hievnne|EPwN%=RVG^@fI_<
z{Qok&BbL$g8178p*JjbsbDjPCi^=k7dp-Jj|IYKnW#(m6q>(Mlx3E=9jptg;3OV>a
z!$+Zb*fFGIU-y^a?_<7w{MbPjoFZfgh*P;-t8yXY`Hs>WXy3DzyQSc#IRA86&Pz~@
zJ~WR49du&=(ONWV^&D)c^1wC_nH=@8#~iv9AuU1En`{u)^XJ<3tz&4V_VHl{3^@G1
zR~mQ&aW(@D?F_%tXeG8Ia1bB{Fpb*YhB*0I`gKepc@_I3FJ$t;*XjH3TfWS0hJ9N;
z?7^wn2SFq%LF!Z|&(~vwsWQz=%$XQ{>xYf3YQ0H5#AL2j2O^!0;%t!3)8INQ)usxX
z2U*Ph@59k^D?!=JVV{eG!?(Wv`0&h*S>lQzjm^#czZJ;paP#CjR3w_vI68r5nkX?6
zdr$akCt#MS5Gbb~*3@5J$!;Cf(a~|yhmzb(Mm;O?Lh9Ig^?<Yq>q`{H7mbFzXlHrT
zqJwb%vT^U$BaT@t35d4-m`qI!E~fw6E%357w2y7Me%Ye#)kB*s?5v=CIv#>s*Hm92
ztrDZqPFd|P<xQ}{x*K^k(%xCjN~*I{_P5qgrNNsLwy-R7MCYb>frcCLZg5yRCqE3o
zYeyc1*YfxJAgXY`kRP1yaNxR+I|$2X*ixhrIGT2W)e!5Igs)A^P18jgD5?@zXcQ$V
z!lxy4TEsoO&e3G9Y?L?EW@0F^#N&X^QnnJan~MWCgOY<=NNnkY;$DsL)Y{LV81iIE
z!)~mQ`UxI8ud7PRvV5eVV<!YB>pFC&Z>rMa=RGxNi$(H@Mk)!Qq7H@Q2%7-8;y1)V
zal)4nDQGA8<hMXZH!Od@89~Q?x2)>cCco#`ysIcI9N~U&0N4`eiBR-Xk1VCgRAUsR
zuq*aqtkHY+x1ZHYg`U~_2#s)2MRyqeM#~2;oc<K|nYYOYcwiF8-n0E+gd@M5-L?K4
zI2S))nK+R8O7`(;&|O_;9PGW~Txr1XsZ20XF0gt?>xyf&Yw<mXHlKa#Fz`u&)NH+d
zhl{l1CvXosTjL3ZG+JN@`nzFVh+@-H)1%J+_NGzEJ;)T9jxi9~Jki8OPmvn6shMfT
z6I41!aImrRb;ClNdG5~Lzccv+-+?$0xHhQmVM}%|FHdySRN#&uxemA8Ow!YPj*aH7
z&cuU;suS8({D<?#8<1Q4jr%;mIb`bJg~^kd?U==LA33`5WREmV=^xPEbTInHr>n~!
z)&xmvdUeI`AMZsc>=X?7mze&7;j!;P`spY<an6#wQ>n*li?!=d_&oPpc0Phtqf3rA
zgk&#<t}h{&jd5!c3M-??s*s-^JCi^^vG?2QQ8>KA^Rh*&<7vi9r;pr!ayQ_}PxNf2
zAAa2$X{*@nJ*81{*f0Cm%(!JC1yF9J54|@6@sz}Z?v?Z$q#;C@G-`=!$&hJo4<t8?
z+LtU9)s-2#SWD{PAau?(VIUDR$-}AlsC=X_w@3)rk_O1cmcsZ~qcxFlZCUbh{%~hZ
z{I5c1*Hn`g?*|0kN~j~K=IHDz2o*BR*GlV=D6{AJF%jNHlFp`Wn4^%jt~}<03K~%l
z6%p)9XgdkCNV7FNUqE^CjUCYRHkqsVTxYRqywqx$cJfb+nBuNFBy@nWf?_H%`s0rt
zgW7LYf9J23|0vT&5~d^h=JjE35xw`_+dv~Pe}`|zEc^9A`%V3$eo(JNBsjZ&Lp+-?
z610DAWVj(+QG-Ss)kFFcu@b6myB&HNurNd+z#5Q-opm%2yq(X{!vILyiK8UvrLM{R
zkKCGxw-L-dUrp}IbT}JKvNA+mpSFJ6Jej_%RYovOHWyYE>9~FH`5HwTN!Gq5BFm1X
z`!f?gtGpM9X{zco+`o)3{ceUYu676Cz|nL#6je+W(iIp69N>Q)90YJ9D~B3VtErd4
z*cBiCeuNOC$|;9=f_o1hN_nXV1@2c}D5IjPxp>$EF~-c5V~09EW8*pJ+l27AGTW4t
z$Ktl!13%&L>2Yzv!3#8}uUC4;Vmq#$qW_5=uWA#mT%5C`PeP&ltFhpbe4WuPOW``E
z0Yev|9;X!xO0xDbws7fxTj4wrvL4amh0s$YS_8?R__<;K4QF;~549HTDjVndNe<iy
zGsTcX%_yJ$dcLlL5l8B<TA=u^YmKM6XZD@9C}fB0Eyh+ahtLeZ8nyeD<#wMUYu#i3
z+7p$4F%t^O8+|{dy~XMFCR;j4FGg`wj!*E&*Pnp4XQy0iPLF1PY$koPQFQ30=Zdks
zj!$G$FW7Ar#58_6K~Za9>P7<23}0FSn56R%y_hg^u%Yo{53kTME3{#t2}%L+f*Nlu
z`~cSO-tM-;?kpdtr+EU9ZY*+VmqE&{wlf6oLp*Q<rI0Ok4|P!SLq^xTl1uyf<M69M
z_%}sa)IafJE~7#^Z5tOFyqxj0<FY=y3XrWwpZFkwtbhm_%M~{}W3K<bAQbAr+DJ@U
zr98f6n0c}Ss6hP{6zk(~TI>wM_;~a`o<h4JQzS<&LjrH6)!G&U=CLTJjWqq-Dx&t?
ztjamXg54L13HxZaS>+gOm<oY&DnD9D`9yW{KS%hOfrEOVjQn}*gz|A1H3akL*f@RW
z1W_^D{T_<ptR~t@72yUwnKw26j#Dl%Gn=D)je3xcg6X72KGy#SRw`hyY{8bm-DJpF
zO5tX^i_QOsnU~jyUkTH1UqS1-2tS19YX0j+j|4c5_%T(+0DITlMpN_x8>>p6ddYmq
zY>aYn6qX`)z*yX;SKbHI+DGN$j|*hq;}vBA@{^!Q>YTv^PgB^`r5IJm_W*DyXWhRd
zU3OetFe><dGYzNZVlMP{^Tm!$U36yeyRc5oneDNZI}OqP#xL!ipwJ}Xr$bPfNW=Zk
zzq`)FS(@^lqB9roQTF{*UWwt+Q!`_%Rkh!wKVaQt5Ms?)V-bzNUN19Fu=-tn;%vd)
z23Xlrs!If=m3u6qT9eyt!d-vsoI@+LRjQ<GuKka{q@{?G@YQ;@;s%GsejQU#7(P9U
z`qW9_wXiCd2`>t}-9b;p#}z$Q@99F<I_Ui4Z!c?UjB#JiuY|Xk-|Lcw;CExqHG|bu
z!{cdmH{Y3^izXpXdxJ_Ho-R=c(VEY<Kviv3^3=ff5Z7b|4WOEYheE}4>t@*QuEiVc
zdKq&XJVtR2?q_hBAVhVl?9P;9b^a^<G)?UbS$F<+2plVOzno1eXif~>1D($fFtI^Q
zC~%@U79qo)vOJUlqblI38AFXVireH-;M5$ixi<kQr^fR^cE)<k-6q4pNHLdhfwdNo
zrb|^8IXoNI&~ILvotLRfk9Z0DDM_kUPf>t>w-{+e2#1K3YKFI5z9yl+9{r8^Mtg|w
zcW+shTS<h(S2!BOnzv6tkpvz<NnT)NR%p_jbeizMa4S-8XBXbfgniaUP3KnM+(>qB
z>lZd_((tFx#R<;41}w;b&HmHgO!Thq>w;{LMn4}F*=na!J+qG|8?|GOEcGAn0{&-*
zV~9N!RTqNYevyiLvV^cMMkE@Avk;ZjQoyM^0V9vkxFk#2<!^4o=*R83U}XJ96dTwN
zRi)IbAet$%|CZ#3j9x8m2DJr>BKyxi{QokhQQ~lDJmXA+sR^AQL_O)9@HrYo*T=%_
z!$I5EQC;)LU#Y|fVUE9W<$RvB(ZRFIEZ#;9%w^2u#9hpM#dQDD+I%k9^CP-w+O@k0
zg%7>jCSudyVs;@>Iyu^~)g~_UTQ~Lp_LDz^g55#~f<a}4wYguSUSO%(U1k4^XBXYS
z%iXWljLwIz^L6Yx(Mcl1!;(q-&u5aC;S-<zlD`x6s&yZ~KZ&@2HN8kiF%@>32;@Lm
z;%4FyGHZN}^g2iBahQA_*}GgnG9*J$gVCcEaVp0Ukq;bkeEEcM9G-;(e-hkJ7R9Qh
zu1lU|;_5U7R8wXJ2PY)Fi+S}6R*Ah=1}Hy!=PZ|E2=FNpcuLvL7DJD;fbK${L8n^|
zJ<j<UM{3sNc^t_XBJwBB&%k;2xuH1_MI3e^m87UQ{K&r3?<#N??DlS-6y$r?F8r<=
zBlZ({r>(*Ux^N0T{?Mpvn$hpS;xO=I6|Nnu)ZCYEEyCp!<~I}gA^!S*)(5AiMZ+)|
zU|y!bfc;H-3G;!mHc)EyVveBhABOISP1WDQu)&NEjvsV*UKvoT=wtP`83B#|2kwyZ
zJTp!;-6xtJqa26dEGoHLx<V><7s+pcPR|iNF&5ajTrdy(VbH~`(GNM8+nveoxyGuo
z`W!0Kse@GZ&ywu%F~nEwtltb#K3S47c`G0pG4S>q@O`ErJaEJ!tV8hs8)LhMZufPP
z8jwAa=k`BDs^`guY-@`}b0@8|e#eToOX@r}9V$!hH`zP)O>XeF8>&0(|I}*3DobLB
zEA5z|lfuxX<Z9|g2q%4ve2YHK-nUYWs9p$klT*-s8VsThz_EzjhD8140;I0F;W*S=
z)*k9rP-j<_(vcMndaHQiPv_KGwUoTio|LSAAzuha_s9bP#%E#MNta5}>I~|8OS8&=
z@XuP6Uq%93f$2&`Zo(6DJ8%J@b6r?W$zk0*8>S&tc#PJ^jY{e8dpo_^8f%nBuh?BT
z1Gp%=vECmc1D)&+9r6Ol7uIkQ&R+#CcwbnbT+0(Tyjk+TkQAVo<sm=sPTqa2^LZ0V
zO}WZ9M)d>{DiTqqXG)hOsNSmDvZn%QMKD>^yq_T@y4C($S#{u7xN>jwAnlKpe{Rc1
zai7gn8Sn5mQkb@ze@xxJ2{GE;?DtH3x0^KsSXvZJ&VL8Pff^t_W0Oc?yax2$bMd+7
z{=4Tvd$^|XdfW*KH2%rwiC?PtH!j%Bc^7mW>EVawv(xaMxl!rg*2|##7kZjTnoyZ{
zXiJ;>^$d5=zKPJoOS{~EJ|P=1i&P*r7US%qz0&ly0T7dnQZBUe316R+N5*Kx3*kbN
z;Fdl8%D&d}J;?-aWb2;Jzc<U9g_tpEfCZSbtu0R5b6pp_X@1_9Ocr_AAfBUV&Q+Q<
zRS(4uTzFjhyecU@2@5#MAx_eyG1GFT&iRIJO-VzZZ;>a9ax_G>0e%RdDWOYcCfZZR
zHO%(@jGJhz30vT<+dLr@*L8v~i_e`2L8q~os=GVd!GSV)^AFjN{IXawXhyKvDtsN#
z`S7p+w?P(DHY7I#P(n2mSLK`NCF8c+Qy@_hp@lD-1gyqB3EjUYVAYF^+Qk35vZ}hx
z2cS8@xlspVu*evy6g{0A(679LLvULbL>(@7*p}MulPl7ArA*}?=4IC+WfHgNsAI45
z^UR?5L+C523{T#R=*{O@I1&7;crM(x@9MdfA54@hu>34*;<NL6e|mQbdEM5H?EdV9
z<0fQ~v7e&4_+2;As+^PWbuE#$Ly`qM1Ah~jp-3ccI4@skIAzS)VN|Qb>#A_y2x6T#
z=hbS{yVsicABUPSt{I}`Jz-R#NHS^OeJbpCa9jAvaPOL${U-0U&*x`&L`vm-$eHS&
zms|H*XP&WAg=iQ=GF6q0C?Y)sDUyD>cw-%rr-6sM!0Fc&Phs9o(aVAEUyL*@7QbjD
zHmq63u+RV;iNW-S1-;SmJCBb>+{C^at8zZAU`><t^?$&SgY^SxrJelnBr3w9g7TT?
z@T?(`q~VdTvC*bTtCMN=^n3$%b7#0o&5+Y^#Md!YGG@PvJh$ng&UCDulisL0qg@qE
zu15ZqrRtRmZKgHSDA4E1PuSG~C)A__CC5byn<vXlUtsMfvDZkpkL&~r`yVjb$VyWR
zK;GiEI^3sMkof@&63h)8RO^Aj^qhTgf5v1d6T+IkPVAbUCvJs1LqK(WFB506bsEKA
zo6gtCP~0ev9y3)8(9X-{Se<LXwI-ljk7nL<7Jxjku4J@|D8z`E%F>ar<t=(-d@oSC
z)7KQb+W>d;h$5=(%gG$GhQdja__TsPiHU1<?(HHSJll8*D?p4rk@QWP^|zB?lF#0C
z@cZr|Ay1#fMY#JX`wY{zsHJ{+`q^b}K4_5G-DtpnZfU!FZbtOZ_74e`ymeBjYxsAS
z3GX0lVV3ezOiSb#N|oFvu3>`5t|A;7yG-0%gKOpYxi`27Wl@z}nbx00tG_2vkUDep
z;+bE(y%SdBb1l)<YNlwm|IH}~Hv+z^A6biZ&+HgOZ2^oILER}QpNS4~y07L~FNQ5k
zI^Hgtv#vJgcNxaU(Q0{V8SLj?F3(UAQ~Myf0%=JLNRA-@3XK1RH5kiFsi(40O6;D|
zbGEpSfkLv0ej+j9d0`kh@(SC^K1g9Mb&`a|g<px$pqX=c{3g+i9q?W?+OJk7h3Ndb
zQ|>e1r71(HS3D(goPrAKOlJ#7(M%eo{7xV|uPAKO2;}7zrK8|4bLq2<zUzYY0paYk
zQz82mfGHO9MGL$)hN~y-H-ba9{!pK0ypVQifPktxIW)Ol3t`$e5we8X8KNteb}TcS
z#iFmCOB&qNfF{FVD31YIBlk4e;dI4k_0K4#t|P-#KBBPGNBC}TqXDZ3XYl^~z-k){
z>SI7JD$-`T-^Ob|q%ZeJY3zz(u_2aDd|T^QcMB`{+zZW51RKe9couH?CjZ{YZ-f4d
zb#AdAz=7N<DLd&G#?MkBid}M%mP_gN$q{O(5g1W1aa`|)Oc6*rhzTAduqly>aA?&s
z5KC~V&+R$43pO_e$vT02HE&WHGn6=9tKvf+Z4kiwd}>4b4(`=2GE2e|d%tuZ-H+4G
zdCv*BMC9KjLo;{NRapLRhGtvS!G`r$F0u=+i=&w6;mMd#FapX4Q|3_*kBPw1oeTxj
zlK{W#fTS2yX_K0wS9HkguZ}yfdkQSw_Lx_2OGnhp-u9y1S!!O<?4{ty&k($<2p>B%
z#=#ow&EC_9l0-gBKkExnk_c>pc~-K!wrR!m^L-qk2_=haz9&>lPw(!msXCM&w9GE>
z2)uq^-_Ead6TaQz7^7wjyp;fwS>sgXFeAw#GtoPHx6rDnKb;PEPI}y;U_SnaYhA|!
z1dBY}n3fy|xg~b@dodcM#?4)wGIhLfJeMwgUGOB)y-0_(i<<p>LWPqI&QnNv3nJ<q
zHj~^;u1IZ;AB~(r59MZe5=(*FTsf%Os$Y!<HnPiWOb_^ed{Lo{ZNeP~YYji2PL%Z=
z(E%52xiHh3Hb|K!X%dKq<rF68x(tVwj&#TL=np@#E0l#~yzE}O)6+z2zV<G|&F)$h
zGZ)4XxsozH&SYOVL?D0M-SQZ4&tx876;w5eg%$^VTIk>680^b{W+Djh{AL$+qLn~l
z7Hypbu!0RosT+R)X@P%o!@c0IzHW2B;WT~L8AZrs5YwU;_1Y44(gS+hu(^SsLoN<m
zv`~6aWDa;MqJq0a-6!dxxT@27x1=e%2K2anE2veZ9g4XELec{dXo^77Tm};+M+ZMl
zUONy0LI8OweS087oSwKyN=F()@J4aw(HR-+mBmQBO6J{Pn;aqh2{yPO5-@hMCf7Ht
zWVT?Agq6fs5OgJric-rLchHV@Vu)6&%cdXxygOyZMN|7+F{mokValih3%T|~eLYDM
zP{GM;8+jt~nvZ$!qF~~+X2s^RMyFgl_d6lhg%gf6DC)Ph;IE5Ti-sx-IBpy(#opzg
zgs9tJPcs6VxGF5xZQpMqU(iY91tq$Y=1-#<j(x18%Dqp6{Y*t7?mq;0>>qyiOc!E(
zH2QEXecxKurb3^!LIrSvV@pZ-1EFpbXQ4X_n_hC&erfwxYDv8>$eKIxY}o@ZOac^P
z=kAUW<_-pGxLJuG78~43njXwKc(wi$CF1wt6M^g*${*h*C2n^c2({;O9X~%WpWN>h
zWW{rC3G<#E@2n+pRSK?WloM*i1T5nCw_6r~0_22<Tr0E0_F5@EoA(;j?)n9T@F?}D
zc78-_rhyt*=1g37XZ`2uy!Ji~<38E8m?)ixAq8L_Z~fMlSBbOk-7EejiI_A>_c@#_
zBlE*B#ds;VuUo=psV?d~;2P>ZqQ9>55u0kwL^Gl9T5%6l)7Jbpcu${#Q7<O3HzXhY
zRlxZru@2=?`tUvtk_X8ZzG7<iwM*qaw5zkxOpeA_m`lui<JyOM9Z2AosZMBvB+YnU
zjBI;F+0^9m5qb^$t<FdmFe=OQD-tJA|F)$EPgHqp5YZR)7;~aQj9l;QKi4=gt@XP^
z#TPwZjaG{qx1v(IqI^cpKntF2qAod_5YuAd%lLS}1{Ow6%K^*7xH|aMsHSC_*!L<%
zB5>8J>#TTiV<9k)<bW0~a#t}>sP&i{zIi;bLdmof$jwM}cvS#nw02Y~+3N98w=c*g
zxKr^1!f|sCGoG}piTY<AQX(5MZd_;x4=Qd~F)%)wEJH-@+_)<x9V(b5N2brk(dAoM
zKz6I<1Khj8KVq<Gi+Vi>4U$ZqN30(fk}I56CuvoFxK?K;cOIKTRuYMfk=m@@poUw(
zAG)tm$uUg857mXGwQFCjU>Q#1|EW)9IzcdgM2!bf>Vr3$rwV<->iRWmzb!*c96uFq
zI~?BFwjy*mc@)#b>9HBrP#Y9)mM0JFFgo`fE4kc<Gi%6|{QE%th&$Nbu!R&2snd4Y
z8!}yDIA_;QNgoXiW~BoxR(~5lPudz`0ZJnBG9F%RQya?>0l{K=n={b6Uv89H&jV90
z0#Qd=iVyOjaB#RS9Z0Uz{jkIuz`4|eeFNV-iELCm;-(=#kqP7v9^12cR+W|DoKl{f
z={1#Xpen7=t_t62_+I6LtTXqE-)VEntGZbVEkGAiM$8%&(3SxUjSScP@n^2v=E*71
zzi-gTkf}!tdWng2&vV8wg;@or7W_%@>~L$urx!Iy?`^X};MEN}BYMvRLRs{z|Hu-x
zTnadOk*#f#w8>B_oJoGjnlgwZM#QuE{`G;5%bw4Sy`T&DBr_Mu()Z*OOY=F*#~}vC
z(76i2CY9lxvbj@R=PDd($$0hOxbngN*R8|rBU#S%g?TT0Uo7w#<nc%OJG>?ROhp)s
zkZlHq>`r)zKz8~i%&*>=4aja<QVa7vs);K>Rufpb6(fu8#~KoRO5`>N8?$Q|)Z7qp
zT%y5n4TFxR^3@CV>tA$T?H;pKpG+Ta$&}|{TfHocyUwy%H?@ax9#d^Wm16RPe+Y)h
zq2$<{HNx&0rS4?lB0k*akDC5WCZ=J`FfWm`gb)oK3ga0+o+!q%o_I6!uyE*MyWIxJ
z?ke@~ke5H1p`3S6*_zZ7Uz>5(+4%DmSe>mJc`c))nGx#yY6JBU?2`|EgdGa^ptdmU
z)iRgsjAYLo#y!wvf{%PB!LH!7GV9mgJHs0iZ^`1O_vq*Uc)ujPHqW~~CgT<fijsAn
z)-d}@+zJtTti~?ZuKKQv{c&wOMy#S%jXGDF%XU7bftygny~4P5<jxunnMD)21j#Jt
zU>QajwJq+wHdERda0C=wsgixf8tPnh&e4t%##bS$?-dI%8cAln@z!MXuF2r4k%HfO
zaUiOc(9<oSb5XdRey~CkOSiv)%qgvLeaYiF>g{_t|Ceaz<?)TMkw7A4sGrzD+_x+W
z*?k$OL-kfc5fgF-OsuGmYr{^&9Ph^rH`wbR+ajxC++W}w`*~a$J8vGk1A`e$Z9&oQ
zDnSY*T7)ZY#GdTv5`utJ-bR3Eb4~5g+f&fZn|*@ZGL8MKe(a&H{Y2&H=j@?2ccY!Y
z+Ds+wUOLl*R!vduwvOc>#Y&N%c!Cxj!k({NBs(#%X)@U%x0gK5A}VCU+YFwNm}!MU
zW&iB#94qe}pF6uzS8z6}EX5`nD&|PsthT&n5lRyrwSG@j1UZ-cd9Jbp8=Y)&=s?Pp
zf&<D4Vi5%;FN6<oZ+_;yVzR6^FKov1k`6{2ixvHoToro<;IIKYUUc=~_m2U~(!r`U
zVS4E8-(TM*UQN@l3J+a|y_n%iL-sBIs<e3aNZcml7`@YKrxYEjfmaqI509E~H<9vl
zHwRVmyV_;iJl|)lE_)6%TGMdxj0vME#z{TeWD(yPR7~m)KUm^F=swy=vDwU;0l>pm
z)2_GZi5N4O$-*y=Tl({pF^RrDC`#9}JQD<{iiF7~01ayzy)FgwQXqSSv)%W$(PU$g
zLW_TxTAj_F#Y6z4nZ~XWK2A7ko0W1(i32YN-33@dT9@+G5w-4X@UO#I)KHx<0OW)1
zQq8Xpnb%up6)`(jk((T+4l1-G87o$U3Jzw=d8GT~fZx6;omNGV%)EqYKO~gHKZ)0A
zSvfAWEN{$N?4~wQMUHz6DM!TB^!l}s3#GjAf9|N@EWOg*)rrGY&bMm7hl!IIBh?e2
z<^B&VBc7EN^7OdPg?YXlo~XRBo50;CMn*`PewhJxEH<SmiFbv06q;3pV{fY?*$`6L
zKAQUC%Gu=_Jgc69sD<&Db$eY2x0<Qp%#iAu5a?<})Op-V4CB6ZHSJOVG3ZbO2(PzN
zVZGsK-#W191r0hPq3!Y;kN%^sr-a^fWEYa~5Fb*+;?_+s>)BiG=rqT{s|JXq`&nF0
zj(6DmqS1JcGIazUbgIgc3{8gQv;*_K3c&16u9cu>Qw>Z*5{W#N6w%thfo<;Z7^@F*
zn~JRBi5BApL^nfp%o>;N4sK-=sy@9~ggYJvGdih^do;5ckJo8OG1=&4ooKU$cVRJ#
zW;51QXj|Huar2HACS0@)xzY!y^PG~W?;+F;O=topJm<P86G2IO=t*lR*!_obqJitv
zg4e*fgXCks_NOZ`VwySXfmn=FUK+Cst@0n<(JiA?+d>ky`urrGY@@vsQS@BzgA@f8
z{gVW%^&;1Jl}>cnoBP2K_N%y#2><Bf5C)Cc=b=$V-#AsrLCB%-abeMs;G%^4+7^+t
z<wsj_;?t{Xym;;_qn!xd8Gb+g30PG$nGjAL`@KmxvkIB{Eto9vHkWxfHlZd!8rwbD
zlm+f{{1?N{sBzIAx@A9-O~F0vCbDnXfH$oLQa7(l5p<xmi8rzolGju!jZoF!GCK^E
zyYR}bd&7|l)EGf3agm^RaFrxznBcOsBKS)tf1B!&m6R@79h2m|st-r?oxT2_n%p(<
z9%PvQQh}1qK=I)D^QS_fj5t!*`3N)h?(9BPi&tnCA-)ZLog1L4P6o`GX^xnh+b!y~
zObIO`GyBXpnhoAV-B$(W>X$|UfxY^q`@|1e@+XOSls{q=tE*{*aVjDq%03M%0ML=f
z%F}NS&mANhgvI{jwA*~hI=;kXr4}+frC_ogLVrc^4h8C<A5{kYa32}p28HB$Tb*zJ
zRAe$sMI}J~pp`0^b)enGQc3cf_#F8<amCt3M7Cr?H=yqXUIkp=jh1*W*`O{T7~<6G
zS~>R0=$GC=RU}Cq-}|1eG-SoYFSuTBv9$W!`DKy+JgY>VZH9jcZ|3P83Od?_q;}R3
zm;Y${KF`{C%H2lN&8$Ns3cC={`;E(k0#xMy^Y>~p*!OZ3zo^q<*w{EV$ubF#ioIJq
zWudLp->iyu0x$9WLQnWWtU7}i$)U$KnpNp2=`W?SxbWHV-~2;nV&r{!Yt-u&R)g4I
zDX~oAPC4DJPX%?!tKC%G>hi##BGFMIVghG^?h#I?0@Ac^d=Xr_*&>cWp~~ar_x+gj
z|5-g79pMX#+B#&}@=)O-BAZQMfg44j!JS~RSRyBBY4d2-L*R)Hw{CcKW-S4>qU7gt
z3ozO{{(u?mv{Fo2t`t4~Kl<x<Uy&^H5{;?7)5{z+>QC%M))m#}tll)FABW}2$Fpw&
zsfdD8z(*hPXpv6XTwmNLH`v*A44rl-)9(x&kqsbV-t_sgY$(2eYkM9@@kF>`szuQu
zN0&E=LT+tQD{BKuU934B`dp3Tmek?>x4XUSF^55{1uO=)tQZc~=SV}Vt{aAS&L4(G
z65n`tpMv{yW*k7d!u}ANo8~SpQ#pf}F-*^F&IZC5t$hbPxYge(*w`d0D;ewEA4%5}
z`)=NcH|ZR21rX)X8+#p8V5obxE-b;2#IoB_w@Il+?J>V%VdxE&a3Cu#*Yk-NNvhv?
zRnfUvSM=GQE$hPTanv>{B9b$pwr6*0_kDS()1wY_ShjJstdo;X@$LMdy0J!9Vz!7$
zaC^)i4gZ}&#MQ~hq1zLX9&CL7ADNumH<AsB<z$VS!DoO{UR;0<b~lueez&aMIFGSQ
z(@Dle`|&gABGS1pq_F6!3V@b;;EkHt?HfLQ;9W*m<MKZbF>Oi1JqG#`KALPc2s`Hl
znv6!oPSKvdjIYT|llFeQh4@qDQj&Q<SS0=n^n;7OuN|ruQNP1Rs^|W)dnqkdvUn7O
zQtp1gh&CyPf|QB|omMWOmk!<7`^FjHmT)AS_U#6bcZs*z<9N42>QeIs`-4g=do*v#
zO=Fzw_^C$YSoA*B;d85-h(oHC-e3fi!p$v0QH@I^AyQQ%FOlzpwff2vW!G*hAy3l+
zQR-Mr3LKvuw%d&8RQ!jrI^f*0+Sx}Fcl14uwe9Km^wk;U_KOwYD)`(RJzpHr5x{2D
zbo(B>lwHJy_jU)aZ-fL*+W|?%inlZ$xiZjnbvdnCj#`rIG0f|Gl@tiIcd=)*<u@$+
zl<|dbXw6H?q=C6np;W#jWP~`>prZ0$mr;qW37>PfnLVju`7U&qG&nS+Z1n~Bh6|e1
zIk1}eI$VY8;JS_AE<e(c&8&2ivuD`(=zV8k6|J<JhfORg)uYc?q@EG;DMIy^ec1g%
z;{<Dzn43@He#Ywrkw3ct6~ud1mRB^>?iYQ{=(`Z83vuKLU)y`9lKpmX*X`tm_h4=Z
z9&=-57J^vio7{|kMZDM0sfk9Tl@}dmmBe{S1`a<*fb?N$Vj`&RU(BE(#*rr>KPVM7
zg7OrxdX!}J{l6rWi6@+R<^bkmPAG_Nw!0j)jv=&>m3jAN8s`r0QXQ=>gfPc>>mNqt
zuj^0CNGK!oR~t=2vdZl|awYm<mqKZt3;Q_o7eD&UVu0ziDI@*{gg6D4{caj28|<=n
z_KD#u9O0ZW+uMMvbgxI)wvh?MerIXTKr<(Yck0B|og&tyOT(jM8bC+Dm&CgW@z7YA
zhzilAP@}j_WPLO$EPKK13#f8ftdd%tsxgyc58G5AAmn)Sdb%)mf^Xd_Oa~HFfxvF-
zCG3$^T%Ock80=$}4A=+boZ47Hi4S%SO6G>GA3_})fSy5oq#=>Hl^N_II(d_qo?;2h
zCwg|nBs-0|P~UHWvplJc>1$Zcz}_69n0D`nP|vS(Qie~yByOhIRDNxP$|(MJ^2S=v
zY~wDEHR{WP(BN){<@ybIFTyC?AESW=9R^+@$fW|oez(p^4u`X7nvC9Iwi;Nrw6g|^
zwY*?@;ZR|9Ldf)1DQutgFCJelm>`5u6QdCe<i~`T3En77_dPwajVx{IO#UV^hBLh1
z<s~<HjBX24g1acue;bkEP5wcwb<u6%hjP4PyXQB4qpErOyYubgIvxogc79vxFb_9I
z^U+2PRAr!fvhU5?+)5XqzaA#IrAqXSo>jT(Q4{~6a48RqJ3)2cslET*Xp-BU4A#>Y
z{`wj}R?5*_+219K6pn^a3yb$kjqRzGeI;ZEw1AGAeUf_FUE3u_h^`->@T@kJ#+eT|
zn#4D1`B|W`NwYH%ITy1o9YMoF!kRAcAy>y10__vI;!4`;B<=Gu2{&(c9Idq>DGupq
z!cAPhC>?YzoRxAFZ}@R?D0<|ocRBhj7v$-bzIZHmASR7bhUaUNR#0G#>6=}AS;9dD
z#uXT%b!Fb07cpkWJm^Ii>PkDM-sdADfLs*}*ETW(HN-*wEt}ZEY5(WWfE;VByV(R5
z)rRLJSw$6XT-y<oMM<TfVCnS0hHMmT4ZCxRwHs8pbtxx<Oh4H3xf9V)2w{ZXV=n2w
z5GL!mpIcPP>$X9Mqg6TjOpo4kes8!fVEsQ!=y$6FcuH+M7EJsUA->7N+N(5I92(%s
z=RD<)0Nu1oRCp6^IU9!3_d-$EJE-7cS&{0`RUqU99h*AcPIT>VQaO8^a1|j2)9?}I
zm}<9C*x%(-q_k<lL*PHGZq!|0Tey)rW3iyrOSm4b8}e3NCn>d2+~1f7&dgHi*l2D_
zoRf3R>dSyxe_G=<7V!C(F?StvQenVN&^Ai<7lsp6TnNH#w7%~3H$oxge}C-tCQbBx
zjNJUhgtw!<InSfn^^>ZHndA^i0!Y0$VG8YtI=g&czWQ1p>RV7f<|yWabbiI0%Jqai
z{Cq2&%C{%)F-Gu;ljWUfHB<MA&FbL!;?uesAH_8*(}8&M{i5nZ{o(oi>b4z=ie*JZ
zq`+QzLT(Dp?#CT#*<Oy-*8Voj*jx^Q)||3nJjsEu4v|<wkp$b*dgLf!uD1DkD~43^
zy0{Iz`m5=mQ8P=uZeXh*`JKY6ui5h(k2tiZU{tr~Go*cc-R@r^n6lCVJvr^U0m3E%
zWN;rO*WcWY{AiM_&k}uymW0!tTv&rQe$!wbS`lfc8p~MWX}Dz>acnp9TXf0vr1G<~
zeFk7`+z4ExyQo(clIxOyjbF#eTUk!$b`UDT0>WNBU&y@csZ-TKt#o&;!%g+5{AR%f
z3mU=wFfw=)Fif3}XpRF|x$<(iI8fjjs<T!}uj}8eXr7$k<P_ZUlCqM_L&{P{rQe%%
z_-eIXmCgC&X4Eb=v-$W&roIoT%SkL7xae}W|7(+5mV&>^>Ol)A;dYte_#4Z+L(uAb
z+<{AC=cmP{5le(!-ade3GFZmrW^xb^x?A2lpyXKSWP#GE=Y0O88PB#sx07FPeB&)!
z)GJ+;6FR4qhp6CI1y`QiB{oj91ap2MzS&0WI~g>Vou@vK9MZk1Dey-r!Q*%yBD#Oy
zPgPeL+bF6Wd0sXM69Fr7fB7`f3FOgo;34<f*+7R}v2e_7?sO%^N1ox1<Qjbj=IBV`
zRt;?^6P|{ajI`&VQj3lCT7Kf^@LU}{J|4cSocr4Jx}DxV(#7ZXOffCb8(h(y09soi
z@h*iV&P5U1UKB2PKvF=*jSa}Qr^)AKvos09wcNRRb7nHzS|`C~yY1;FyEI3#3&?+U
z_X*A2(wG8f?1=?fR0<BY==8KL0#7*kyN=B?v>yf7=w*^s%*@9LHL!d_Vq2yWz(v-g
z4K>RFeSWsO$+>48u7^fcA~5=5##ocMIGGRO$Ns2}6?#;#T1#4+XXI=(m;c)B<pe_7
zhpswumGpHHwdQ#XI&iPDhNMNvf1}>2I_$oXtfVtqkqm#}a3c>CEvm2UwKZ|`b`A#k
z$09{ByA?N>JRp_2F^jrqz*R7u*4jP%nvQi6g?PY+`hYo&`~hBJf?$cZHJ^Xs<)E#w
zYt<Ntrx(;{p<G6cdv5rsF|HsSSdqaCM@agCP3`f^gHoQY%VJFN<FCku_KF`bx<XMa
zA?>HP^5*6x2?56G+3cdO?z?U(pwyJdAEi`3pvm|#f>B8r*-9eI%u;GpY=X_0HD3Id
zc&Gqe&{8~ih&H(}<<njK&Ub1@p8Nqb-S0M&>2-#i-&Y+oD%E~@^vytRFa6OBOyq4L
zA1MaS;DE_<*lbPzao)$0a$^c=(DL5y;785(=t+bWbQQ@UG5f;N;kC^5{`+GhyD<_#
z9TN-fvYot(Ium@e95v&A*#x`WP<F!C7W7{C6xv)gVowa~Nd693c2)v-(rq`gBW^h^
z9%mp=<wz6eHKQ#nt@e8HfP>Z(Ui0I!sqGPyvck=p_h3?SDBu#L!T{N|g|nvc1kkC}
z<-Im@>*x;5{Ijwyi6{MsB|X1!ui|$wT*|0eP@@$wH1@H)+zp&wxTIz<@1@0xaSzy&
z`1`_hbhTNh?{pb+7!bXt%u#<k|MSXpiUV@+T2Avd?<-VvRI>sM>I%CpvG1dND}3F=
zSj`)ffAvcwF+wo(|2idf)as7}{!3xW5RWJelBiV<bf8vn(f3(7m@)Hr!FCc4nT*or
zvWZPcH!IO)KtNqJO?RDE1*W`-J?G_;%9O@08iiOU_(~2b2rqsQu!?=M;AyeFIE!Ld
zid|O!s63bw+r^$Nvwqco`%9P1@uJ<sRLAWluhKx0=1O06Nw=YFJ$+xy2!SPV?nKrc
zMxUo{O%>CPH8msUDZ$p{%bY?jeLA!_yK0wC{>iRPRJxw#s}8>gnblroobkM8i~R|8
zYkpVaR$fA%=*y;Z-e&56Oa-(5)xcVrK1U<`ll@>@XBE3J9}hAR>o6T|9-odCEhXjK
zg}4KLnxFntdqCcr-<=2x$XHEBT`Wv96O(qu2#iIDP{AZY^L0WlRSm!0_tL&*ZaVc@
z1$^)qQg^mk`$W~L{XIq~?y{;F8vN6>?hBk7fbA@ux~gnz+)H+Wc_%KYo#t|r#VZ5$
zig_#sA55+{O;IpZ8j~u+P#IfTnYGAJB<}$48HZ|atsL7A88Hu@y>S%M=Jibvjk8KH
zmLm1NJe3&%($Lq$#+x<gVVs*L<H!dMQ2Hiv2!#vU&z^c5+D3e})D>lKfGSd4p*y*C
z6JYg1!P#c?dsa0iWH5rmeFhwv)pSK$gxjf*sl(?fU@G?@20wF{=J*s;#XRc;m3g5Q
z%fb9I+Kc*$!Br|IT9+q+I8IDLpGzfaEh(VE_nU4C+edZA905eHUWtA~-Nr{vZ^McM
z%}23tXQJ*ksxK%b&i+8SLsGps+t!-#zz#6{@Fv)Vhj(nUzpR5T<_qDR7T?Zfe4yj>
zb*hJSduY)WEaCX=Za;$BoL$!SxIW~sUReBJ0E#+w#lv7DxQgJ}%HIwK%M1`botqaA
zOG?rkGHc?ua%$fiog}Ag23;lVN3T@zHfEf{q49a))dtCVT>bjFze~E?QdV11XQU`F
zG+chJO-ldQWkcZv;h2-f_d;uQ?cY-ZX*i=-SM^X9X8ml6!gSr06_)5Cz8KVn^W0oe
z<$+za9<pNQaA~M@dxksopLjsUVz-9lta-nE3B&WY&Qy;yyoM@6It~kC1dsjD)_gqx
z#n-(K6%6Ptmrn0DxoaWKjtZ22<*Dk{Be{BJAN10#Nd*shJ-%}Vo;{0mV9*X@SP|eR
zZ`aQq(1CAOY<mDJ*bIyrnNX-+P9In!xg$TdSIQ6!FRW^~bR3CHqJiitvwr_piq7vw
z>)1Z|X%Ub=o+7hm?ii;m$eY^&M~zk>uL*oks0u<ao4oEO8y8Gz)4u-Af$~;UQ6dG&
zKdQnJr;q=uRF&UVrBqT%k`l`AhLrmg`&Q}j1jo+k?Jr3G8NG}LPA8sCVP8ft-kLG0
zuX(6@wWsp@Ma~#Neehr!F5V|kpSAeyYOt)*A|6b8fYNlW-NQQ<WhuIyJks7g7ZW5e
ztlpy2P-P5!OLncvb-Ou`na|%~F|SOEOEq?_&V%9XBdJL|QHI9T6evo$64>sjT@a3=
z_U|JHw#?HhE;KNZ08~)hWq>kw;ly^(bmLOmwd^iSrVrBftS0LWsQ)aE{$}!e{`e;K
z%I2p06NZoHM7Ez!yllW?*`)DDa{BNV$b27oxUYpBhm(6&L4R3(dSWipQ$jl%ET1Vq
zPSr+WKo;8F`u_x0GM7CZ*gO{k@V+xrwneXYvDl(QP*te#T?bb)ewKST&S;C~7qd1O
zmPlF#%&i594)-Kr0&8zb9)%j^)PZ%9KJ*<`ATz81gQedS*na351js|?&=2MEsa;zC
zRwr7!`e_?54v&y)kj+a|K$8uQ>(ck_Ej!od!6?}|h0W<&dX)brxpC>ZZnJDJn)v(E
z%ht;b+9gE!w6W%~duR7b{=|PkN4rV>@83gzxfIUTMSxdN1MO?D_+h2kUz@XLmCOSB
zt5rA$)^A-sD*1HFDU=XKn^(nq^QdgBh=!`0WDos7j_q0;K5ER<#ouFjv9uV*kn031
zO7H33Q{i}lPn&@0__#nCuDjPx%B*pJgEG;;nnD?RMN8nbV8pAov68vT-|GPm=2crg
zXuVkVM1$6s59hD^IU*PJ_0>|Sr!_MjE|~5L@2$67g!kp&c550AEFJqzX}RZ$`n2<b
zmMc(B>K41<hj%QME2nlw%1?Yo9<-~$dRow8Xn~xdgdXW}>)e~2!a;9}bG+>BqaVzs
z0kFAM+-rQ*tPxUHaw|$uiE+VOeC2gWuAMt5xuZXk-D{_#WwyaXeWnb4Iwn(~`8Kk;
z>Yl8gGZJ0d$PN#h|7OaUz$Zf;79cMv6G^>f<D%d7NO->4Q?J@Og7JZMEPN?MS#Wi(
z#>(m*Kd6UZ@!%$8;|rw2?q)Bf^?#B(>;oyed)d-?I`Qbd;B-*e7301=;iWKGY8EIk
z5RMRB?F(?{^TvK9JVwd}&mo|==Kwap+pB6SeJ_~-K{|hIJK}MdNHU6DQeH_lK9Hdl
z(56tW9N1bQDTDe*2GbbuwiFi~2Z_krO(pgeKy}eP(Ey@*acbXc$ry$%BKr3{B|DZ9
zCa~>jGQjC7pU8zH+awh7r(v4`YPIe(4B~`PKRk+F$Ga?^#U~w;fotavNXo$8s5eWK
zUBtOl{wa0U<xediofV85o`>zrn?KB8p*Ue-ppeiLsVFIy)w4%K7@a2qjGh``1E0L6
z^?yS)FG|sMjEo-^H1{#KMVMvZ@F4?Tx^?j4R?Yd<(X<mz==sb-zgyqxc!o#FJQ-*@
zyzmOefZ-~=drcN*_t&&k__cgYpJlY)65YjSs66p}GSqQQc&w{ujnX-A?9$Uy!awD=
zy^llvwNQE5U;(R2Z_2!^{!)DPxPJFCLf^pZjtyx@4sR{g{Ft1u!RaFF=8i{0YmFPd
z_NSJW&III{<9&Ox<Bu^|Dg<T>I8Tcc%8u_|A=x87Fi(nJRajVo_{|I#zxR;YlfILi
zmkvWv>|~R+fEPS9ZV<2sx6Z>b*<Rb>0ac$S(%Q5zS-mV88vJuqo*p9UL--r2<>cPw
zk~Qojcy(s9Od;t#vdf4(h4Yd?@`PP~Z_vr7ykEbP3rDxWJE~E>J`HffXG!s8nLgoL
zt%HKpe@i1gEj4@rl2&i@#Olzs|23Qk9ZyB$dUWRkc+e5gE&<OE{t$yjyUV^U$BMY6
z%!17SssQNQG#Vx<a9CLFJ15|!4|-4bZJMbAdiM6uc|dIdhO?a<LUQiVdOg3;T5C=+
zWg0F$3M226UYFa~PpN@<T7?J#Nrbx@92<e5u6%e~*3BCSZxLM$ZhPX6*iRU&Xf%1~
zqQ*Ua;M=lwd4^8XWqsO;g{On6iU*Q4>QlF9-?p4NzH_P33>Y5PKfhCEYib@!{>1N`
z>_8?5^pV5=e|y*A5Y@50|Fah*_7u}z^3vW*et9p+>q(4?*t^e8uZmq!vBioV6&qqf
z1r<RN0RicCcj5fbch1Zf*j<)r2(I^AhAnsI+_^L7d~>GUxo3BoAqlBulghzwf!~L)
zxKdr+tyFMiqujcnJCXX7Mm#C2to#{E6?UinObyldq+6vV;x|qa0pMA=T<vt`Kq`~b
zI60@blKc+BlJnv{hV%3;-M)N~$;}SPzPJ)X1mt+Tt}NGjdru!0(T=1a*^9tJJ9Ibv
zJWMA@-Na9wK>Ih&rTS{@nFjLEdQoB-di@|pFO$r{O+Jqab&rR9bmE3x|2miRXx*W{
z>Ym=GWcH5J=6pa8?_l`^@?&psesNuK5E{cqSk_3fLEq#1g|vCa-()EQlm%Tf+%S!Y
zl*)j*5C}Y<(eebCTbK8-QovPLg%F}LuaL?rhcqsT2e(+{q)d^nrM8ZIzA4z79kY(=
z-h(XG|L<$6uPo7X*z>8x7lP)Nl^*|Dpvt!I96UW#a{VN2TK&CVKk{ikPBADmI~v5G
zqasLyftBI7Ms2v{Ms{qMoi>%8Jh&!ZIMo6Fx(Qc1C}2#&AdY=kARP#(x#20L%$_V|
zEem|7jHcr|R<OS5n3(^0^fMaFUMefSN)0s+gskv8|HGfei$>`6tC#6<^?2_KwB<8g
z7)HYCrS`T4I<<2xCB*s+5y}dZ(%Tr&${|3BC(x0ti>S4!h6_fO1Ty%akvIsXAU)*f
zQ2C&U)-C)(3?4>+Svu@1kJ~166}lSCzU;Zw(OM_UI^2LELiuqELrEbM*YfXW6GV_G
z@~!L7;CV&oEk4i(G+y@M9`H7Ir%$I!ZrtP{4>F#Jy0>9)h>@X*kR)g-0_#-`&_h>G
zY~yo};&U1=d-_}Sq^wAcGnhfjZ>%Hg<>R<H5XHcCijI0b(n~2gnr*yXQ@+E5VI{2n
z+4F^*WQIjZ$pleUyrX4}p$$vFqVhWzxPYvije;=>8$sbn;lfR4MK3zDjgn&D=JR4H
z0iQ$e?E^`{gJI*C`UgskokRu4H|sO$?0JS6dYuR$XC_)t7d<FGN4rv|au;^Ic!J2Y
zmtbw#MM;o`ighC?ZW1?C%c!=ZSiDX(2umEOetks(#1an(<4ZDb=o^;;L{B)lx;kj{
zs&D!HmN-Yr<G4JoHgn#<^GQC;@Aeh#z_nt@QOVU~+|c88rEyevdK<aXkPKr3KdfEC
zx~dXNj>BL#NDE4eV8(3lId&qmce*ZBFs?R~mH$bw3gUzLT|b#<8n3IPnGSDV$_0zA
zrs?*vGJ?2l_X>CPr_cL@$?+l=x+O=1K*i=C{Eqno|HDCz^MVj@_IfzTcnK31Zgs#$
zaM(&Zbrxn(LAdIj!nnMFzYCE`P%l-CuOBh|<{=;-{y~5D<r%-hW7M5BvX}lv9)H!`
zP$ez5UcV`8yrh84XH#aupvSH5^igyDV>*9gtJJSQVL^t-HxnR_?iF&L#)+<I*^Z{7
zd<?(`X(%--awZm_KSUjHO<IN;JXG`OE~U)UTg}9Vr%j;S1;23lsi!#{7*@hUSL;&V
zCQ();5AL2#VYX&P-WvaJE|5DM$1DIf>B1=k6vn?mrR&I{{%IL)TJ@cr2eNfFGzRb4
zXl!9~E4m}`ztsG!QU-AY%RBI#l6O{IS?j|tvEHL*D=BpThJpd7_mgcsjPCa5vK(S(
z@=ug7W0DYnPFSFus{yO9rECpp1tpc=GI$9~4If=^tXtANp+4}AHFYtRI`0E{RQ}_V
ztGaNLuTg^cHFRiQVVtFniq7w&lsO-A7jHc4!~-cuf5;h3Im5F)v~>yROUo^u%Q9om
zN7T|-BRch~GV@BqmW$eLTT=~XE&1G6KJxI5Hz|4gM5>S{{|rw74J%=x<@EG)$u_kh
z4s>&pXTKvm5@JglkN}h|(u<cO<+xBpEOS7?mR`@J)Vc3@yHM7U#CSQN>xl=np4hdV
zy8>-8#-&RnRAw+BUx?S;-a;q#rBYXWqn;0W9S%*FYc$I;5coP<8Y<~}eh%d%|Ch<@
z9l0h|Chq29u%55=_wcY}97wwTAW$8X(tIglWi9xWj%;5cHz&I~Tg;3f>RcOuNb5cn
zwBhQbW4ZB~CzFp8dslN8v!Cbe2b>qTcBRdpEaZwbn^%5I_0<nW-f&d&NCa#POE&hb
zpUY)}Arw=;a5lJJaXVW_bIl9aTcj91!ZL0;wxGaMc2j15Kzp)hP~)@5?6u&S9=Goi
z0ntnvS9d$*|B}LPDwZsaHHPDFuxc<#GbdB=Wp-mdaP`$tq-zjTBS8`#>gi~q-5Ieg
zcNFbgH<w%RPWe4_x|atn7X&qGAuT8p2Y7rPE%j7dbd-+nTte%Xd`j`L6Xg1R*FKCv
zh!P&v7+T9+hLpLJX;<3Mbouxes;RuA4U-x7@Lkgo>U<DbS$D4;<NC$`KI;JML(1F_
zsk805i8T<C7uLhV)7vS5b)?|vdg_sfqguT*5nmgKahdY;P<2Hyd#jU`w4@;#BX=6y
zyLn#pakwyygoTS&V?!Z4udQGOvC0a==XbwXXc+gL({VzP*Vb4|yHlr0t0<m@w5n=6
z;$_MEXv$vp71chzZ9FOjH5$lKp$a)a{v=+n+)%qOGfoH)9s^q76S)a8sITdf2>&qn
zi1(pGv!Py;PT%VomgZBhRZb%r!|xhj%Mb7R9Yow*|Ag)p9j7z<l4w`TPqNvedSHf7
zq@2`?u%ETe{DUn!EmIJnU9;v*XFMq!UpsX?d&}?BwzYq!V>^~nQGPDfa9O*%J2_*1
z<57}PlXp{>=BF^gQN-6593K3`wf8p`k;VT|XPJw1W>|G1hOXuB=3{oO68h$Y{SA9v
zHPqmyW?QZ%n0T)baK*mshdw?oxlGBk-jd!C$~7-%6+0j(&nO&pe_4R)sM0Cf;TE0D
zC7<c|6pYNY^g2$aM3um;J-nj!);c8wPRIX@#2^r*cMGv$25DdRZ1&t>m>B<pp~i6Q
zGDgPZ`ubcdOXS%wbm(>U$%8uJe&4=wh>g8V@*8Mc;bG;Vd@$~Y0I#Oy`4cKHy+k((
z_EY|$G&;C>KJ8BVL7vW?x!^NOX0IYC?j1^;@fIb-PNKxvi86bd#NU(S-lde8?=$iJ
ziMFi#t1RL@ym=Aj?@yx}=l4)~$$4t5En|{E7Y|DixNblw82cGQ-a|o3RsLz6<N8o8
zJ=jKw&*gs#y><{;FI{9W3H62LE6|M%E50F54<4L~5=D6NyuB`vGGh<444WFx7)P6y
z|CPEs8i&0cUp>MSWn^P?xv22mZrNQSY0790m}+Iuzz`M`HF?S?N|-*8E*#q|T{x@E
zgHZtDq2)$56RWH3%$$yGs7E1VVN6=3x6g~wAkB*bdF!JpcD=EsEY@9ZT>ceRlw2H|
zY+RoNsFAr|d=3a|(0a_x-U^e9t3$ST?rLkK_Lc_Ocn;eE<0&)l?iN;742s)jA1V`N
zq;mB7{pHJV@Swt$bY!q{(SV?f21CL4-IlfgCOix^@C+Q6&x^QiO;0H~_FZjYxGRJ1
zeEIDHZ{85oL1d8f=laJGL`mUssxH4tZvG8Dp5ZLTSAej%IE=#DfTu1W+P0X91FO|R
zByds9IxFJ=fmG7w{n6Yyp+=?#X5|?14F2YojQ}Hb_jJ-Pn->_OQn_o*%m~hlnXjDW
zDQrAVQi(_>dHt0@au^Z@p?f-->B^}b%9!^N-MFyd$X4{vtDI63dyffe*_VmuBN6}K
z{DV0z0iOrP;eY(6WaleK`@4UzvXHsp;8-Rv_-w!HyZq=6n;))6>^z&v^@_DXiCphk
z@?p=5bo%1>*b|Ezl0#dUaovp)!ore;+^krRX1j$(zJtLb#fyeObrdt^(opLG6Y00d
z$R{jOL}LJ4Pz}`&Y15kTm^8E>t!u38xD4La{ofw{FKVo>kaR{6idKT}gF=-T=YS!4
z$ko%uijD_K=&XpYh__?~LS(W^`bjn!RH-iuCXaH>9+uxkJ>BTS_|AbC{`tjc@p8<V
zj!NhU73z0He$bD<0+19+g8pug28*HaT?1m{UB~V8vr4e={>Cl*!A*;~&T*H5&N5$O
z0<*GM0LL{c`Hg?3s`48`Y}%NOqLc++QU`mDauC76kbzRuayF$sjKw(O2@A?7ip*Zj
z{TpZGhEv>HBjh2jKHhbpSO<Z}(}|oF<mznGbfT2#njnM#$AQ74yMgVMk8WGe-jq(o
z>n$6jv|ETZT-+7hp70M=`a1H+&X&JHZ9%5wiSy6-lJ5rAIQ88nT{r*D3xAXR{1(7v
zah3S;?H>ZmmA{$aJap^A0n>22$zA@@l$$<{>ltKc%Er%n@Y&5>+3g8GQWhTOdvY^%
zwm#!{I5G6$6)7tRUc3^7<?896a|csp$pRD=tt+~L`jlt1oH~u395<P6T|6KIzgF>8
zDaA5GUNBf=z#6e*J65wSoe9%cS=Th_%*Y$GHQ_(h)lzQ;@7=$V&f9zg{+}80RY|=3
z?s-}>eG+X?{6TJ$XsUZE*YYX=WWqJ1lL}mp9(M;ltGp{)z6>B~yd+*9HP$?$gy|E!
z^^-dLU9;IDVxf!TgQQ{7Z>+B(cXz9dx$vLJ(+12xwu4szBa*O`KoH#2-cn0@@I+}Q
zBxzaMi$Yfb-2(Bh%u4U9rC(DG?mvT9V$$<JNYl_yH(@UFvmv%#Zi(}DF<GG-$a00W
z<Tf72M~I=VtN+RQ!NXYn<@<ndFhYA=y0H>3JYfz5;@bHBpBY9rjQrxsZL&QN#?+G8
z>pY$t&&Oei!GUy2v>G4_q2C$wi~Me0Ccc&#(rB~+z#)l?ckW(GYUIb3gGK|a%&PL6
zbZYl1TEFbiT;3Dt?v=xmM-gIxPa+9v+%C#q{1w-Sb_-Eok4y28Qp8|SOOq%>3^zom
z2dfwOQDXVzzgCd4wKf9J6z}%?$S;$TNm$Z7b5Yg9TeN=B=Q8Uj-7^_W!kCqgR|%2u
z=e?P;sZ+cj_IM(NsVH<OJg#m!zBf?}K)p3|G3`y#d=B=mwyye?+PV8BUR4O7zP0jM
zCiVx1k&qqW{q<|K0^rRzzxTSSr=yW>v61ggol4aecjR25fOIaoq1VOUhRRSw*OwRg
zD8K8qXuxM&PrtbSKpKgMcMe>S)?1Q%@i7be%HQ)3uagEy_d<)Iv-?uG9t|<}gOz)1
z*K+Z8?d<KjLun#QkDJI2f&k^CjfapsmsvHQW^L9JB8+s5NW#MXgxAmS<}Th_UPZQq
zWl03%SLh;MIGQa}+uBk@Uf@D19I(*x^u8oE01V<PImwt6pGORd$qRdTwKdn6a|E>E
z0l+aK0Va}jY>3zMbJ<4qL7tkom!J?VLX}GuPRDQ9SUq@GatsFiimjP9EdM+0PX38b
zvR8BM>>ehtPN=bop%D2(HXs4+uJL!d2K*-H4t@^E=<aN#TJGAF+{&lRr?yck9*2c8
zLmIzy_=vohUO&xst96QoVt2|E`90V<?72${Pe>XpS;<NLk?s_o;4;TC5Nhc9abU^_
z<;Z$}>*9V&h<%3%Ka<NZc$tqhj7Y+AyLu>h-E1Kb9r(5ZN)6>6Md@=trn2IESyEsN
z8%7)&s0?3)h_So7>Fj|NJ_m?Uy*BUd9Qe)#v|+_})Y|xzJtjVfcuPirKjb$xCgi28
z_?+Bu3oq^bk#*ADRHCza2qq*l=ylqF>sC_nwwxS-qfc&wN}4*6uMgvYqbOtEXH51j
zn#M03zJmZB6c^CZ9ZTrc&ee1(cP*6`og755`{?H7LoD0Q;EtvvTNiVD<WUX90v|!J
z$kSTvv}*1kz_TT_yh5FWWM8#ge4dV$T5o=oyaUhSpg*jRy6E!pjqCtunWJ&Of*mcy
zez^SPZ)BF^$n>yS@jBX?XbX44&_(knEO=I1*ZzYVYs<OCw?+yBKoN&4WQoLo#w+0#
zCjU@6%QLfoXt9}~Yz2Z8H!S;xS{kZEwxksqMjQhl<u`F4)L5FIS5n4;PgoYbG$z<-
zqbYC48glh;SByOt@l+&%$`~p%7bYKgGx-v6CZEC4M|IU@(sjhDb?oekT_1Ff8di(@
z(m^J?&pU;ALTp+#F?4XlLMb~bkD%zI@{$5BL+!eQ_;)7%VCo6ML<9H>$_xv7Q|Erj
z-Yl0nd${P9H#IyCjN1=5CfD6B@IPe1K`3zfV141q+(a(#aa>23S=YuId#>F$uRHsq
zEMbEq5hIeYFn)#G0GjG6DQn?phD2Zl6X;mZO1%Yy4Zz-*8VOjXC9V*br;9zG^|WT{
zc<}--9s;sbqEd3)u<Xy&$cCdgW`{n9%EgVyT*>ZECIsBm$ayv1ni}sLv?nc&I@vRj
zZWX^ck&!Tb&~9E2D{ULqJT9ikWjBOGm26EU0N28CD<5Ews4+|;Oe9RaJJ<e;6`2VR
z`40m8-cVC!mV}I^q@Tu7=F%^v`(ZsmFQf>N9}n$F`H|Mfj-|ADA5u=j4^;c4G%&7%
zmjf=-V@y`E1-0lqlNAWdgk<b*bu~}xitB$QVq^}wLy?)Zu%Z?_Po~fQh>~Yar0WHH
zsm~3AfdL>62EZdLSj1N%bkoISo8`6|@!sT?9`y!f)jX5d`lU=(brsUe=y{BgAduti
zF~QBgVD4Sh8BCQAvc(P4@FFn1{(BM@pIq}Qc}6R$`Os_d<p)3GSnKmD+O*>Dv~J!<
z+{K;5p5vdrEpRa4_l}l2x&IJlimqYG?Dxpk*{tXAPba75dgSuJ{$)*dk7X<p1ZMN+
z;3b30wc+UluE#G}|8Zvs>!>9xAun#MXT8hyUMrI_BM~E%u#8c8n40)=1-JAy6}P0-
z$NfxJ`Ryw>%uz86yu-6{(WR42R@hlm2G^NT;0cLq49{v5WiI}b8lRPkho|S@)`nl9
zU}a+yx`bF=AEaYpkc)?0Fd<GKO{LdQasDk?{Q558ivW4$3&RI<ZPJ(3;GZEm4&uNq
z7<k}7JGr{ssI{qD2u0)s0VKNI-E{BzNqTVe993|cJSo3LZg-F0c?{$$%0tg1<-+e;
zo*EpyY-m@%w(<_8&-qC7AH4u+xY1~Hx3DOG7uy^f5{Iyc89v3An|9f=!XxQXDe$DU
z>xY&F1cQo;k?tp+gd$@)5r8F&!C|#|#zO4I$TC5E-d0P!tdo0^n5-~$Y!W(f@H+uI
zi-w`{{#8nzHJSAuU4H2Qc)D;nQ<vj#BRx`;HHrxfWe!4d%K&>Jw;b^@W@QG$g{(%)
z7#4^obN;7P&tw(pxR@nF+{&{DGnzrh1mI<DU;90Ecejgo$hzXd!S4#S2@dQjSKPTk
zNpTZdZ^zQ9z45HeX5V{wSP|I3?|~@yu$X*$-Bffgm%C-St;cv(vRpz53&fSS;4`YP
zDwQ!aC8ELIVX1hIfBD2#Av{?Z)Q_-IX1}kS!I^H9!&eS|Z)msMjsf@5-J%new{s1-
zd+^*(_*O<&IgCU^6=5-jcnceqfmY;Z!9FId3ET}-PfB-o09j%7ZWN`>`<R|RxhwG{
z9cU#?W#JIw!DFf_yDppDL6#2O>!MS6^2)R^boc5}i6;Z?BHIthAI^r~A<tu1$Ma{K
z7r)@Zfdy*>>qLJYvEzW@bw!SwVAI-XK1z@{_TR`ubP<-+0}394h8`-ubdc6gf7^IK
z2p|>^my%b;+>fc|@h$PfBCa5ghH<No)@QVS=@<RHDwaD1TM@@_tF@XH!8bwBA5aZ@
z48(Q+);T(`aXz&)KjU;}U>gI{64QYLAD|D=3+RU>E^h5iLuVF$Mk%7JODF`OYq;)Q
zJxqzy(LcxZt#8jPkP5nisdGM}>Ix<++cHI1$xseFruzVPA_ZB2{0w1fmotVot^S6(
zJ6pV-QZUG`=G<MK4YW}nq4XwYE&7DYZeI{@3u%?kM&^u-gWm_Lt^8vBfOmw&x;wLG
zQdbL}=Hw98$OZ_()Q=EEFZau@9bvM<5(D+9bm~^g1R-V4AE~OmNIW3jy&!xg>nV(a
z@HvXk?i6ye54*5kO#GHI>piM_a*t$3MkEXYAtRQBWgF)XrIXxvJtc<LOau9ir4u>J
zsk5z4$ux`{2d@iM53JruL)YF&r+2TBnQx5C?#qsohiG`?iB3nC?!5AZCB`iE0y1$^
zY0(KvoH0qr1fG=62KoXBrSd_MRJtgE_kVDxXjK5TUf9AWaV8#jWXTGPL$Sv@#;?Xu
zalt+%PEnZ95LcebwW0O_#m8~CRn~!lU`?KxytXC%?De!9yza0%h_!Jpd9I@!lF$Yd
zi$G)O{E-c;GrEo{oQMCa;?*ZC1ds!F1@GTHOGy|6pZW*!cC<3#VWHbLno?)IOO^Ku
zrP3p<NR_YT($U^P8~*n-%ff<CofWhm9NrIYT`G%Hb&#FYgrO{)AG=}ZX2h{P+!}=L
zDk~m>+|n~jb|n}}UL8a?RL|XXpUEm=>O@NY3HpLb9^D%(0Xy-sw^dqnTo#Dx;@{}f
zov84zG<fJ<aXux+y~o}Ohzg4~(dsavaAhXNy-yX~*SAx;5mzKflU9w%<*4lQuAUHf
z7qCki5~hr!?B!qUy@K*mWl=9KIFN^XMJG9LSZ={`0thRHcBM{d@-w%=IDF**dL??!
zy6Enr0~_YC&b-0ixK8rG%h&zE-joHQbx%rIf8b>eVUM_108ulBWl8ACgDaFV_am-M
zB`xf6l{D)es<?~CWig4EB?gi%6pSo+;WHD~%?k&ZO!WRM+;RgCNM{_!P|A!6RP*SL
z*Bi3w{Lg_;a!i&jxT(9nnbs}&jMJm*3Ubw%Ol-B195;#TpOk7I2FTIh1_m6|Zmxr9
zgjBG%zPsC-Xw$0iSZ{P8v`qMbz&Kzr^oC_$QCmwL$BnKDn^&K({2*lD@zArUrE&u^
zT;#;KiBxv$0w0U)b{jytbJnG1C8=ZbNSgUB%fpS**iaAy<T{X#&qZf<Fj-;T0OVqX
z^aBV5iUtyr4gL;h$(Wb_B36Bmq5K1BEX!}>KLi8*MSfFRcASEh5_!e%p)%kgY9Mvb
zI@C~opVH=hC_1D1sM~vEXARtRe_-PRi5pFbF2drvk^P#OI9i)(C?_?R9^5*^-;Gg6
z2r+t2gGHR(olUfHC0a7w$-(Y(Wp^X}W#c?@nGO2FDhD63`KzzG&t23>vcMEOIp}Po
z?(mSk@Kfr-vkp13S7v}%{T;`#3+k!;8GNl(GTRvL#$*T410gKYfnIu8e4Y|!VEGQ~
zC3H#jll5rHmu5k9bm>EM5tfV{p(5dJ;7Kgq(vKgMO!@&a5g#*j$8%P&5`b7R3kcU+
zyMfrcIcv#R)X`F}-WA6WcMdDF&(lM@GN!T&_0CkDb_e6RJ9xJ!kL788A&ylO6s1A{
z{AR8ZyP1MCQ)j<N1xK=|vsE9EAqn-2lElGCf!0a*n$aWSY7P=?qvc`UyK;ORdsRA9
z4G(L3!oR5Xc@684+CwxUst8M}QVcyXNbQHyfPR37hILeTuN-4S&_PWdCqS1?y{zOJ
zlc=ifnkbE&2PX(~4#WWwm0ZJq<d6qBER)F)axpQmmx)ZgHIBy#M4n3a3C7P*Qan-~
zPlnd<FU?!}oXK?l=tk;nd#*GWWy<=h!|J2YduBrM^l^PXqn3smb6guM)L$szh?Rwa
zh0K_tMgw?c+j8pe!h=S9$D;{RMp!QfTe)zx@r3CVCIH`nCX<x}^{_6V+{)e?$B#fE
ztm1UFH&N!|&na14ca|d_8^|k$l4B>yZV@_m7FwpXtW0QyXLotY$}5N8li5qd(}t|#
zI~X}&EfCLG>W1sEt*M&MA6`dkb3c|Rm16@#eZ(2)D)Pn#JB;AYid)>kdOTP-8ohPz
z5SAY-v0w}4t!w{9zU2`<!h$EXCo5K#IY9ZsG=yG=T=v+`97q*;`XnGrfROnno%<!j
zyR{7zE);Ow-Q7m(mV7aQOd&HTWeU0F9!Bk^Iv6=Xee}9L^o$#(<GWW-^2~R*4##rc
zy&<#1=MQCZV}!bcUJaq{48e(f4tSXZCPWV$!eU4jqoNU*SWfPVS0dn`T{azS!j`|8
zi$15eMm(R;#5Xd6fe-U>9UQHzDy5`YJhn{7!fZDapD{q%-O<GHjdz6*0Gtay<Gq*e
zUPV_Gvx*>7-|QmDwCwgdRayj-+5*4ecO3V|kv#HwO(#Ut^iS#FWdP-kt+$hAP1Z>p
zt~1^BR)-yurca=%2N-4u?`8Lg)G6M%9;HIP@YQIvz#%M#HDnM*>GhL(Z<g^|)N^5S
z!7~e|kEh3_SG<GbgF$6t(P<CuN}DR4lvgeY1|AZBzJL9c#0w2WEc_1-(Ad2CpWfBY
zDhE^AqiEC0zwz<#d#>X=&5bqG{QNOr2c9`-y*j;q90zqpmzs|ZNEv%PRB&{IX=Hr*
zfQAv@*Dw7)89G3N;$R>g!eWRbF$pz2tEANVX#JQ7EU_T4B4J(2g`=Cq$gP1729@ik
zyM=kGpaC*LIOAw<#&o$iESx-%!!Mb}zFi=m6qZEbo<nSJYoFg(eC3c|-UiCU?=S>B
zI5T0!+q7q0oDg(R7YxL#<1%p^bBP>U-VuPK$?SDc7wt&;59>f+cV6#%9Zg4bR&m3l
zIuWt#*8~n>F`yJ~R~v0l{I9s`vV1{E1wp%pyV9oXQ(f4wLj#6xjGg~ME^gP!TJ$F)
z%NO)^p|_~M`u?CEoA^BNeAs)+P5X({gP@?~+O0syTJmQZds8{^)&_cPI0kQT+p6z5
zjV`A^mn3c8A1N<qB|WdLkT~M)1!M<ba6$U*wS_5$Kq#q5FyBMLmaR<c)Ra-mtoMyR
zsCOl^#^~Ztn?R*E^r0n46Gr4~2Zyj2P>R|o_bGM3A6ao=$U3$pT|o}%3qF>0El@U5
zppbylqC<s`{FxQ*^!{Y=fY5q^WOVETUAQrne>jVy!DB<3&~oJ{$EhyAB}8YH8+lXD
zZ4_NSwL_L-s2m#t0Yho3dqj!TaQ~vcJ|l<aRafXj!~WMOzX@sLn2xUm1e}XyhdAvk
z557bb_)57>QI4pOp3YV(FS$s^cdwzF1^d-AMLC3kl$6BLc(NO==z=yLQYWTsm^S}o
z87tLuMQOqQ3OIztfI_(05L=&D)Bg3d<!Q~b>;O+9j-5zlx6iWTn1SgqdK0LSee|sA
zE_c1&6@}C%A%i4zpgemq2HKx{l{~CmK8UfVLmTG_$%s;eusEP=m^}A=>S||MvQRL%
zApDAR73J?W`QYm_G9WW!;iob_rg;gJf$x&f-X1LniDQGkUJw?iLx?uWb%CgGcfm8d
zedz%GvT;78&Bbjo+JIy&_>-A92~Al3kTT_N-~Md75hR8oeD#Wk>A*V7Mx)H5v|N7$
z9Kr%v8Pq7z?dqc9i$}Segd3<wQ~tqpX;sB{fq{zY2M3NI4iwDe?x3BiQ$!i%MrqT6
z!gIsZdmh}>fp#@^lQ;y>H9!{vvq&;K=%?6_fA&zOk;6hl$idGbv_0uqWv_$umaOoO
zEuD2s5+x#kz^iI&d`25r|5F}wUcz~AZG0jIr`;AMN+I-c7xIciidD)N3xAJu*<n@>
zUeOy|epmpE`W;7C&g@Wfi4f4Ywx(K2U-*f)9&Et(q`1jc^XNXGSG{lt4q*wbv15h1
z+(6yyqSl5QI(ImmTrzH@Ml6aO#voM=X5RYf&ecQGN}}b|N9}9C8mxU;v&>p4$V3_>
zRv7@!Aul<`<j16Na@Q&|{jF=bY?m-`<~!8V@WdMzFAEiG|6@GuIVI10OSZ#-!9kAX
zkL5fp&NnlLnkRq2tEzca!q@SJbZ^BQh<%H)mw!Vi_9Yq5jL#s!B=UprSYY6P`Wdev
z=`1t`43_gIFAIF~g}`G9IpQs6{$_&xjv(G6hfuIGKrk+Dh&HbL8<&NaA3Rm9-%*sY
z;1lj9>Qk<f$h?Jw+)=@0d;jJ+ipNu(L=NPQr5y?Xp=VD@I1V1Y#rX>>>Ggp_ST7N(
z{Jk>Jp1$xiR=~h+7rK~9Ofb)}qMemB6jVL=1x4k6CoZSXoNUIyU?{$|TzR`z5*`xk
zUAyBa79ZIpkTD6R*H246kk(EvAWtcC-jnW3D8N|n-8jo>5npE~En#k6{XJg`x-Cj}
z{^z%_*8xuzyHHpH5l<AqQ}{)$Ha-6f_^c<xIT0WSgys*#)qLR=7|h0Eme<wYN=@~T
zsl2p+iq7q&9(hE5V9H>SJo7b_7M`HB(`*-CyXZ;$8NU^t+G)-yS?ZUcKp@A6i(9Qu
zaDxO{sdGM{Yx%pW*WGDiIq-)=ST7Nx&>r@N_N`??fKf9^!LY@+)z~kv*QSpG53R~L
z0!7xP2ECkSosffcFD1as;g)#XTlBp8o*2H@=>5gws~C?O#?kG|I8WHi3&w_kag#sL
z-mEzsG4$*w@^J0+F1;R3qaL0b?16Q&_*(Sb1J3V<?(S|Ty?i>kH<68c2bEsSqsj-@
zsG+)?y%N3mEflP5xfbr$GHW1He87;A1dSJXeoX^X?CEN!gBuso=9S-3I<{n)I!?+F
z<CTx@UY4>R3^pHbR~Kzv@r{(9?e6RLE~6-O;pf!d+31ZM`l?J;rH-*HNHd+<lgi$5
zh2%x9#lZkLg!K{u9eeh;Shi^vB?d|P5!U);UsJbPdJs+_aRi12MegdTqqMmn3CU>p
z5?uzBw{OE-j%UZ6IF$_+^3@nwcN=BQ|C5n}V7fFc@8$(vzZD7~tTTI)IX;XNWQl7+
zKE}}LJqeuFoL_S;Y5K$Mb~EX1^X475q989={Cers7LgGOklp;eiVkdABs*>H&z{93
zJDql?|3o=yQ)LSvy-q~dG=O}S-|@`HZrZj6%Q@6T1X;=W6MxRzxl+1jkpgi`3b9)(
zu0=gn@uvARh#Z8hWfI)u^n&vyyo(oq_Q(#Q_>6Rs=jU~TLs%~W=pw5ne^3vj*WE=q
z$yg@^B~}kajgtvt>Ui06-nO22g@PIxl$kvnJfR1&U=%PkHVk>6HlCi87fC#L8X^v#
z{pI427>-9C`kDZekUS}A$pAjfX=%igjqo1Uq3qdW;J6;m3uaNrP~qwAk_X9$W<t{V
z!ydnJ9@F@Ge!N@4D3IkH1JhaHkgKyr?!ChUalMTJd$I99kEQDJ+mc5;kB|5yH|96&
zZFVVdi#flKT#$#%`Ja%BJusy3y+Q+J1utvUivRPK2g;J)F>9MSpS>(@m}Gn6@Pasw
zIjhO1l9e2C5Cjfky#Sz7qG(K87#J_Ue2CU!V4Mv}42lh7EgMwQ&wrr(>)9K^{#>G%
zl2Bv>gDP*IjJ2#=`WG=S>#13?*p>1F6J(FX3ki{<9$5Y_8U5tISVz<Lwf~TDop5qM
zvfJ0fI{{%CG6o6r_tG0DO{~FDeB}tIF~%)qrQS*YzNE0{$1zNVY>WSg>1yjW*z&lZ
zzhAr_#6w;5hy2c=vF0HqOdrqnfv&Kb;p6<kQ!KxG(Zn|KrFMe@$HmLKhI={<dD=YT
z`nb*uPh%HaJ+Fh82Zyj;5Ku^XSsg9UC~N+wYz+ED9hpf3VX+dY#l1_7&mO8FNRWgo
zAPB@DdhLE(IxFaJ5a>>o6`%FW3k4XRwAxHan^t_oX$KP4g<~5vP8hqwv+mX{{6xGn
zB^m5$iS+E<RNOYP21n`jQ*tfv619Ak{4fI=_B!M`d+Efk1Wu!5=PQpG%G>cjJ|5n4
zm18J}_`h?5!i|cTu=INJa+b^ZnB>ET5I`I>JZ@Jfm+N0S4<;{?AB0hIcSCmvysXf2
z91I-}VZ9*KnEI%_<vE?qji;ozcbE*+AYsrjh5{x9S+69<q(;?WjqMTn4};+D<>uAj
zibr9`owPd>Lz`B8%f~U>1`kV;2ZiR%Lk+bRl*C;>f8vw<<oUg(@-7>yo--71Gj1Zr
z<%Hy5;J7{}FZNbi8>>yM!GR}Q3rQfokh;n`vSl%!f1qb%A?3m4cl#21XhPs)z1M+!
zY+Ct^*Gtqg3=Ul9<x`tYSt1`=t|;I1IiHZb+c&-#t~~TOd!Bqw?3`i8<$TYUWSK1g
zs_8B}czJLL>t#T65=z|5o>T>$*twDt<K7ZuShxHu>gj6cmevy1K;T!Ht2Gp~%H=R_
zF$55w8n?cWq1%@aNF0z+Xfs!NSX*`N%x+E_=$Sxv_L9%3N1hanag)%7^}M>A)=a~>
zksl>383&4ck34RS{X~Yx_peGGK%7bzD(^t{9L+-rpxki0?&&>Fi_H%?t+@`!z_vYI
z9nDI-VM+w$(O6ebNmIuWyi}aq2IQ;k&Uuj`WgE6+6_Dq4b<@U`@UrZTA-|jTav2N%
zLcQ#TIe2++2<s(6$cDQWcpyY`!(%$RCy^fBIcJQ(bT>i)Mq)y*$4xua^(JTO0!bGP
zk1UI!^^3nCS63Soks5J$ksPPDN1k!mf73vC6(@GDRL@VyBDjG<Mn%aLHgHQ+=oTvB
zWH0-gkN23EgX3w1y%!SX33*Cbx#`ncPUt~@Tq5#_F}<|e`Up3B9gqQU=E=kBl2^P!
zLCdy_w#A#B68y>o*K=gYQZ6qY^9v`(Le9tG&eh{mp13a55oU=GZ&^UKl_hfA!OMd~
zST7M)fm!S29fPhqd&Ne;pTpXKNei;7F25nOfS7TDVPjlOrq0>GuAI)1c)oLm7K&4L
zw$#dMcqJ<~DzAaQ$z;kNh2)RPDvX@siw8NrKgno!YFFA%nl?hzRo#<WJ@L*!G={u(
zB>k7=gnr;B&VVw+K=;nXA0(~+bwCDYQ>C0WNl=LA!~}hb%TT>4e>pLfG53$+4M$2?
z0P4WSUev}Ff1~7?AJWO)YpA}ajQa5K6KM=0lj9&VIE3{w0fS&=7X!l!2E@O?PzEyr
zjmK#{E_rmAz28r}P-wl!Qp!Bs<g9Cs_@BOq>AJuRE0vinB|9Y>HO`b-lVu+)n@5$U
z(7Yq4!P$kYNM}h4A#caBfOLZa+t<jGu7&)xYl!@8S^XW$2~AiwFDRcg`;sJ$Khc1&
zj%-;d$HV1E<#@PT_?Qx><Iz}tawIR<vGqL52|sJ<50n+oTleHXwKvxaNohVbFA<7y
z5Fs4G8WHf3!}Hp5ijQSuGKS<e$|-MB{vo{)J5oU2;jN2gfZML$f{~*8av*y)A2*xC
znU{rpvqs0~JF;ytr&Y32;!?sXIGQc#BSmw=QznXWa(<*&FJ}yGSoRl|6XucXd=7C?
zIX`y`j|LEp^^`XK?`v{1*&}Xf;L4bw*^Awt_>TZNdTnpg;cfqu8QP&-mxJMhLs%mM
zFeDI!NA^|{g0cq50bRqynQv2TgYJ(MDLk%rN}cyH6BcGG&CDJLbj5C7^4p!%1_ON3
zV<0RK<)m;o%+IJTVPW0bPz<}hxsDQ<jCH(6Jx9n{zX)5~bemW~z~|6O2JBk#KsLDZ
zmJhCnLvrj})Y1BEko@TNLQdfsv+CXinYm;+DRVv~w|65%2O|v*VT};LK)O4cDShFm
zY)F37_6Tg$c{!_PK!0$;vPRiQmG_IpC_xIAu!JmPCs0e{Q$tLWM1z5TRgVweNY>IX
z0`j9oGnO9Rzruv(mv9htwKr1IjJG*0%VDoi<gmQV`5%$HC(LXkpMrBD-X3;_O_zPB
zKzd4`x~yOfJu1B_c@760#{@`oT_q);TWA^wl##A^<8I-t(^@VLMjRZ%8X-`U>7~xr
zIx4<+m~zvnQT&XFV%$m7CQ)7WJw6`3tAZoq6>-4q-`NAW|4+M2@Y;0Y=UDCz{gaQo
zO?;b>g9U%Ka@^hRloa=N0AYbBuq*&eI0hpKf4I9_DQPC2^$4N@fhyso&3>PHx>`-F
zAV7Zb;&b7;a#MenYr)u+TpQ#t0bV(=RXnk9@XGP9=a_^6eDxOfn&8cjqQhI3avbMg
zzL5xrutp4ENF)XcW5K{L9<+J0AeYV`*&yGA90oH;K92MrtPfi8H$S3Ll7Mku%ERjR
zFmjL&k%Q$KRRf+PBt#SU4s~_tt^|>y&(lT8vpx`#(!797V<?%uE=(p22EDdE%Ks(J
zcvVWq;x#g1VHZ&3c`#Txg=euo4RSaykTHEcZCm?Kx^^~~y}2-BY7TxkID|D~z(yqh
ztwEVCS-;N`AtY>E4?V9b3m_U8q=aeXsJ0T`S{OlmObN?FPs(oy$@vHiUQrBXE&75<
zu`|4!{^;$Yw0WO!db8_<5Dt4<(<e|zYrTmyIPic5>B4b(?GkEtH*4u<GUgT$INQzj
zPbgu|hm@P~qmUGy8R+3Wddu3uh=W5|BLr$5{9lX(Z<c&yG)X_pafuiLHjRg_oZc;-
zgC!X8M)-5~lFwwT6~qe#Yp{@W`&yomK>+cwtnG>a7B6HdhK<ep)-C>0<iRVFE-E}N
z?q0SwJ~gohM^nQi@vy`@!dRHO#x=3yWMJRse=uNXvZu2}NDlFJaj%y7P_E0t@WCOh
zD1(xli*}?;V<Y~97&T@E<yMp_F?2FFfejNz8HTVVXq-!@HWPN!^bwYl)-RjpgMm1X
zrilc|*T&`8lEt^D7xvY{e&|@v5h>g~U6i@tW4<O_8=mi|gcbku1bTGmBA>@0oM?qZ
zSWyPpDLkWxcQ4U}!x^+EZ7OBX`x7NioxsLDmdZ;Cytnm)0w2{E$IHuIWr)Q`Sn*6a
z`3KVF_)vHO9?iBje;0C*!E*7|(48AYwNLJvSc3x|(Vom1lr&|m+#D|X;}AdXO}Z>w
z6l>lcL?0Z&iZWPZMexY2K^|E$@cdZ?mEJr<-96Zjc(8?$Mn-Qh?ahLx7D!m=65h<;
zE1nuhG-(D0NOGsl%o&f!47}rW<-_YH*5JS`I{C-eQ`X|oDK~2ho!Os6cdj0zx~HYo
z)74=nE*!#&MmU5OWnh|75&_}(z54<pNykwW1Objo+}<9_UiCc_%Nrb&SkSG6S5$T@
z-^d$$R?Y$hw>N#7At@z3yra8X&K_Z;z<K3S?g)~H;K4!k!67UM0|8?fqwl4<sxm6S
zb5S-EEIge<=MQIcH!+bK>nn#$4DftT?@y;4DL=Aj6iWv;E}#=TS5W>hDRQ5o0|$e_
zAuI<2VE9T13tkcS)I!%%ZsHb_(gAr5krS2@9A*}|OUm6<OLz!FSTOJ4HHJf24hDcJ
zL}nZ1Pl7+W7?P5pq!lR;*GG7EDS=O}0|$e_AuI<2z*HomKbThJ<wK~LA>fUw>3peu
upBy*{2Zyj6IB@XFz#%LL4jjB9Ao_nt9q^PImZcv60000<MNUMnLSTaO64OBd

literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

diff --git a/src/api/custom-query/adapter.js b/src/api/custom-query/adapter.js
deleted file mode 100644
index 0d821bc..0000000
--- a/src/api/custom-query/adapter.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import request from '@/utils/request.js'
-
-// 请求数据源适配器list
-export const getDataAdapterList = (params) => {
-  return request({
-    url: '/custom/query/query/adapter',
-    method: 'get',
-    params
-  })
-}
-
-//获取到option列表
-export const getDataAdapterOpt = () => {
-  return request({
-    url: '/custom/query/query/adapter/option',
-    method: 'get',
-  })
-}
-
-// 获取数据源适配器详情
-export const getDataAdapterDetails = (dataAdapterId) => {
-  return request({
-    url: '/custom/query/query/adapter/' + dataAdapterId,
-    method: 'get'
-  })
-}
-
-// 新增数据源适配器
-export const addDataAdapter = (data) => {
-  return request({
-    url: '/custom/query/query/adapter',
-    method: 'post',
-    data
-  })
-}
-//模拟执行适配器函数
-export const executeAdapterMockData = (data) => {
-  return request({
-    url: '/custom/query/query/adapter/mock/execute',
-    method: 'post',
-    data
-  })
-}
-
-// 修改数据源适配器
-export const editDataAdapter = (data) => {
-  return request({
-    url: '/custom/query/query/adapter',
-    method: 'put',
-    data
-  })
-}
-
-// 删除数据源适配器
-export const delDataAdapter =(dataAdapterId) => {
-  return request({
-    url: '/custom/query/query/adapter/' + dataAdapterId,
-    method: 'delete'
-  })
-}
-
diff --git a/src/api/custom-query/datamodel.js b/src/api/custom-query/datamodel.js
deleted file mode 100644
index 45ad7c0..0000000
--- a/src/api/custom-query/datamodel.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import request from '@/utils/request.js'
-
-// 请求数据源管理list
-export const getDataSourceManageList = (params) => {
-    return request({
-        url: '/custom/query/datasource',
-        method: 'get',
-        params
-    })
-}
-
-//获取到option列表
-export const getDataSourceManageOpt = () => {
-    return request({
-        url: '/custom/query/datasource/option',
-        method: 'get',
-    })
-}
-
-// 获取数据源管理详情
-export const getDataSourceManageDetails = (queryDataSourceId) => {
-    return request({
-        url: '/custom/query/datasource/' + queryDataSourceId,
-        method: 'get'
-    })
-}
-// 获取数据源管理详情
-export const getDataSourceType = () => {
-    return request({
-        url: '/custom/query/datasource/option/type',
-        method: 'get'
-    })
-}
-// 获取校验规则option
-export const getDataSourceOption = () => {
-    return request({
-        url: '/custom/query/datasource/option',
-        method: 'get'
-    })
-}
-// 新增数据源管理
-export const addDataSourceManage = (data) => {
-    return request({
-        url: '/custom/query/datasource',
-        method: 'post',
-        data
-    })
-}
-
-// 修改数据源管理
-export const editDataSourceManage = (data) => {
-    return request({
-        url: '/custom/query/datasource',
-        method: 'put',
-        data
-    })
-}
-
-// 删除数据源管理
-export const delDataSourceManage =(queryDataSourceId) => {
-    return request({
-        url: '/custom/query/datasource/' + queryDataSourceId,
-        method: 'delete'
-    })
-}
-
diff --git a/src/api/custom-query/echarts.js b/src/api/custom-query/echarts.js
deleted file mode 100644
index 5102760..0000000
--- a/src/api/custom-query/echarts.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import request from '@/utils/request.js'
-
-export const getEchartsList = (params) => {
-  return request({
-    url: '/custom/query/echarts',
-    method: 'get',
-    params
-  })
-}
-export const getEchartsDetails = (echartsId) => {
-  return request({
-    url: '/custom/query/echarts/' + echartsId,
-    method: 'get'
-  })
-}
-
-export const addEcharts = (data) => {
-  return request({
-    url: '/custom/query/echarts',
-    method: 'post',
-    data
-  })
-}
-export const editEcharts = (data) => {
-  return request({
-    url: '/custom/query/echarts',
-    method: 'put',
-    data
-  })
-}
-export const delEcharts=(echartsIdList) => {
-  return request({
-    url: '/custom/query/echarts/' + echartsIdList,
-    method: 'delete'
-  })
-}
diff --git a/src/api/custom-query/query-page.js b/src/api/custom-query/query-page.js
deleted file mode 100644
index f25073d..0000000
--- a/src/api/custom-query/query-page.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import request from '@/utils/request.js'
-
-// 获取查询页面信息
-export const getPageInfo = (queryId, params) => {
-    return request({
-        url: '/custom/query/page/' + queryId,
-        method: 'get',
-        params: params
-    })
-}
-
-// 获取到页面数据
-export const getPageData = (params, data) => {
-    return request({
-        url: '/custom/query/page/data',
-        method: 'post',
-        params: params,
-        data: data
-    })
-}
-
-
diff --git a/src/api/custom-query/sql-search.js b/src/api/custom-query/sql-search.js
deleted file mode 100644
index 1d14914..0000000
--- a/src/api/custom-query/sql-search.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request.js'
-
-export const getSqlInfo = (queryId) => {
-    return request({
-        url: '/custom/query/sql/search/' + queryId,
-        method: 'get'
-    })
-}
-
-export const previewSql= (data,pageInfo) => {
-    return request({
-        url:'/custom/query/sql/search/preview' ,
-        method: 'put',
-        data,
-        params:pageInfo
-    })
-}
-export const saveSqlQueryParams = (data) => {
-    return request({
-        url: '/custom/query/sql/search',
-        method: 'post',
-        data
-    })
-}
-export const sqlToLine = (data) => {
-    return request({
-        url: '/custom/query/sql/search/publish',
-        method: 'post',
-        data
-    })
-}
-export const sqlDownLine = (queryId) => {
-    return request({
-        url: '/custom/query/sql/search/cancel/'+queryId,
-        method: 'put'
-    })
-}
diff --git a/src/api/custom-query/sql.js b/src/api/custom-query/sql.js
deleted file mode 100644
index d66bda8..0000000
--- a/src/api/custom-query/sql.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import request from '@/utils/request.js'
-
-// 获取Sql List
-export const getSqlList = (params) => {
-    return request({
-        url: '/custom/query/sql/uni',
-        method: 'get',
-        params
-    })
-}
-// 获取Sql详情
-export const getSqlDetails = (sqlId) => {
-    return request({
-        url: '/custom/query/sql/uni/' + sqlId,
-        method: 'get'
-    })
-}
-// 新增Sql
-export const addSql = (data) => {
-    return request({
-        url: '/custom/query/sql/uni',
-        method: 'post',
-        data
-    })
-}
-
-// 修改Sql
-export const editSql = (data) => {
-    return request({
-        url: '/custom/query/sql/uni',
-        method: 'put',
-        data
-    })
-}
-
-// 删除Sql
-export const delSql =(idList) => {
-    return request({
-        url: '/custom/query/sql/uni/' + idList,
-        method: 'delete'
-    })
-}
diff --git a/src/api/custom-query/table.js b/src/api/custom-query/table.js
deleted file mode 100644
index 63335e1..0000000
--- a/src/api/custom-query/table.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import request from '@/utils/request.js'
-
-//获取表格维护列表
-export const getTableInfo = (params) => {
-    return request({
-        url: '/custom/query/table',
-        method: 'get',
-        params
-    })
-}
-export const getDynamicTableList = (params) => {
-    return request({
-        url: '/custom/query/dynamic/table',
-        method: 'get',
-        params
-    })
-}
-//根据数据源获取到表格option信息
-export const getAssociationTableOption = (datasourceId) => {
-    return request({
-        url: '/custom/query/table/option/' + datasourceId,
-        method: 'get'
-    })
-}
-//获取表格字段option信息
-export const getAssociationFieldOption = (tableId) => {
-    return request({
-        url: '/custom/query/table/column/option/' + tableId,
-        method: 'get'
-    })
-}
-// 获取详细信息
-export const getTableDetails = (tableId) => {
-    return request({
-        url: '/custom/query/table/' + tableId,
-        method: 'get'
-    })
-}
-// 导入表信息
-export const addTableInfo= (data) => {
-    return request({
-        url: '/custom/query/table/import',
-        method: 'post',
-        data
-    })
-}
-
-// 修改自定义查询表格维护
-export const editTable = (data) => {
-    return request({
-        url: '/custom/query/table',
-        method: 'put',
-        data
-    })
-}
-// 同步数据库
-export const syncDatabase = (tableId) => {
-    return request({
-        url: '/custom/query/table/sync/'+ tableId,
-        method: 'put'
-    })
-}
-
-// 删除自定义查询表格维护
-export const delTable=(tableId) => {
-    return request({
-        url: '/custom/query/table/' + tableId,
-        method: 'delete'
-    })
-}
diff --git a/src/api/custom-query/topo-search.js b/src/api/custom-query/topo-search.js
deleted file mode 100644
index a4cb4df..0000000
--- a/src/api/custom-query/topo-search.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import request from '@/utils/request.js'
-
-// 获取topo拖拽数据信息
-export const getTopoDragInfo = (queryId) => {
-    return request({
-        url: '/custom/query/topo/search/' + queryId,
-        method: 'get'
-    })
-}
-export const saveTopo = (data) => {
-    return request({
-        url: '/custom/query/topo/search',
-        method: 'post',
-        data
-    })
-}
-export const previewTopo = (data,pageInfo) => {
-    return request({
-        url: '/custom/query/topo/search/preview',
-        method: 'post',
-        data,
-        params:pageInfo,
-    })
-}
-export const previewTopologyData = (data,pageInfo) => {
-    return request({
-        url: '/custom/query/topo/search/preview/data',
-        method: 'post',
-        data,
-        params:pageInfo,
-    })
-}
-
-export const topoToLine = (data) => {
-    return request({
-        url: '/custom/query/topo/search/publish',
-        method: 'post',
-        data
-    })
-}
-
-export const topoDownLine = (queryId) => {
-    return request({
-        url: '/custom/query/topo/search/cancel/'+queryId,
-        method: 'put'
-    })
-}
diff --git a/src/api/custom-query/topo.js b/src/api/custom-query/topo.js
deleted file mode 100644
index 2de4b31..0000000
--- a/src/api/custom-query/topo.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import request from '@/utils/request.js'
-
-// 获取topoList
-export const getTopoList = (params) => {
-    return request({
-        url: '/custom/query/topo/uni',
-        method: 'get',
-        params
-    })
-}
-// 获取topo详情
-export const getTopoDetails = (topoId) => {
-    return request({
-        url: '/custom/query/topo/uni/' + topoId,
-        method: 'get'
-    })
-}
-// 新增topo
-export const addTopo = (data) => {
-    return request({
-        url: '/custom/query/topo/uni',
-        method: 'post',
-        data
-    })
-}
-
-// 修改topo
-export const editTopo = (data) => {
-    return request({
-        url: '/custom/query/topo/uni',
-        method: 'put',
-        data
-    })
-}
-
-// 删除topo
-export const delTopo =(idList) => {
-    return request({
-        url: '/custom/query/topo/uni/' + idList,
-        method: 'delete'
-    })
-}
diff --git a/src/router/index.js b/src/router/index.js
index 270b259..751d995 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -82,15 +82,6 @@ const router = createRouter({
                         breadcrumb: true
                     }
                 },
-                {
-                    path: '/rapid/gen/edit/:tableId(\\d+)',
-                    name: 'genEdit',
-                    component: () => import('@/views/rapid/gen/editTable.vue'),
-                    meta: {
-                        title: '数据库生成配置',
-                        breadcrumb: true
-                    }
-                },
                 {
                     path: '/workflow/process/edit/:deploymentId',
                     name: 'processEdit',
@@ -154,53 +145,8 @@ const router = createRouter({
                         breadcrumb: false
                     }
                 },
-                {
-                    path: '/custom/query/sql/design/:queryId',
-                    name: 'sql',
-                    component: () => import('@/views/custom-query/sql/SqlDesign.vue'),
-                    meta: {
-                        title: '自定义sql查询配置',
-                        breadcrumb: true
-                    }
-                },
-                {
-                    path: '/custom/query/data/adapter/design/:queryId',
-                    name: 'dataAdapter',
-                    component: () => import('@/views/custom-query/data-adapter/DataAdapterDesign.vue'),
-                    meta: {
-                        title: '自定义数据适配器',
-                        breadcrumb: true
-                    }
-                },
-                {
-                    path: '/custom/query/echarts/design/:queryId',
-                    name: 'echarts',
-                    component: () => import('@/views/custom-query/echarts-editor/EchartsDesign.vue'),
-                    meta: {
-                        title: '自定义echarts查询配置',
-                        breadcrumb: true
-                    }
-                },
-                {
-                    path: '/rapid/data/:dsId(\\d+)',
-                    name: 'rapid',
-                    component: () => import('@/views/rapid/gen/index.vue'),
-                    meta: {
-                        title: '数据源关联数据',
-                        breadcrumb: true
-                    }
-                },
             ]
         },
-        {
-            path: '/topo/design/:queryId',
-            name: 'topEdit',
-            component: () => import('@/views/custom-query/topo/topologyDesign.vue'),
-            meta: {
-                title: 'top',
-                breadcrumb: false
-            }
-        },
         {
             path: '/forbidden',
             name: 'forbidden',
diff --git a/src/views/custom-query/data-adapter/DataAdapterDesign.vue b/src/views/custom-query/data-adapter/DataAdapterDesign.vue
deleted file mode 100644
index fdfe570..0000000
--- a/src/views/custom-query/data-adapter/DataAdapterDesign.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <el-form ref="queryForm" class="query-form" :model="queryParams">
-    <el-row :gutter="20">
-      <el-col :span="16">
-        <div class="code-editor">
-          <java-code-edit v-model="queryParams.code" :editor-placeholder="'请输入java代码'" :editor-height="250"
-                          :tab-size="2"/>
-        </div>
-      </el-col>
-      <el-col :span="8">
-        <el-form-item label="模拟数据" prop="mockData">
-          <el-input v-model="queryParams.mockData" placeholder="请输入模拟数据" :rows="4" type="textarea" clearable>
-          </el-input>
-        </el-form-item>
-        <el-button type="primary" @click="handleSave">保存</el-button>
-        <el-button type="primary" @click="handleExecute">执行</el-button>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-
-<script setup>
-import JavaCodeEdit from "@/components/codeEdit/JavaCodeEdit.vue";
-import {ElMessage} from "element-plus";
-import {executeAdapterMockData, getDataAdapterDetails,editDataAdapter} from "@/api/custom-query/adapter";
-import {useRouter} from "vue-router";
-
-const router = useRouter();
-const queryId = reactive(router.currentRoute.value.params.queryId)
-const queryParams = ref({
-  adapterName:null,
-  type:null,
-  source:"CUSTOM",
-  code: null,
-  mockData: null
-})
-
-const getDetails = async () => {
-  await getDataAdapterDetails(queryId).then(res => {
-    if (res.code === 1000) {
-      queryParams.value = res.data
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-getDetails()
-const handleSave=()=>{
-  editDataAdapter(queryParams.value).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const handleExecute = () => {
-  executeAdapterMockData(queryParams.value).then(res => {
-    console.log('handleExecute',res)
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/custom-query/data-adapter/index.vue b/src/views/custom-query/data-adapter/index.vue
deleted file mode 100644
index cf07e13..0000000
--- a/src/views/custom-query/data-adapter/index.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-<template>
-  <el-form :model="queryParams" inline class="query-form" ref="queryForm">
-    <el-form-item label="适配器名称" prop="adapterName">
-      <el-input v-model="queryParams.adapterName" placeholder="请输适配器名称"></el-input>
-    </el-form-item>
-    <el-form-item label="适配器来源" prop="source">
-      <el-select v-model="queryParams.source" placeholder="请选择适配器来源" clearable filterable>
-        <el-option
-            v-for="item in cacheStore.getDict('data_adapter_source')"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="代码类型" prop="type">
-      <el-select v-model="queryParams.type" placeholder="请选择数据适配器代码类型" clearable filterable>
-        <el-option
-            v-for="item in cacheStore.getDict('data_adapter_type')"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-      <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-    </el-form-item>
-  </el-form>
-  <div class="query-btn">
-    <el-button type="primary" v-perm="['query:adapter:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-    <el-button type="danger" :icon="Delete" v-perm="['query:adapter:del']"
-               @click="handleMoreDelete(adapterIds)" :disabled="disabled" plain>删除
-    </el-button>
-    <el-button type="warning" v-perm="['query:adapter:export']" @click="handleExport" :icon="Download" plain>导出
-    </el-button>
-  </div>
-  <div class="table">
-    <el-table
-        :data="list"
-        row-key="adapterId"
-        :lazy="true"
-        ref="singleTable"
-        v-loading="loading"
-        @select="handleSelect"
-        v-tabh
-    >
-      <el-table-column type="selection" width="55"/>
-      <el-table-column label="序号" type="index" width="60"/>
-      <el-table-column prop="adapterName" label="适配器名称" align="center"/>
-      <el-table-column prop="type" label="代码类型" align="center">
-        <template #default="scope">
-          <tag dict-type="data_adapter_type" :value="scope.row.type"/>
-        </template>
-      </el-table-column>
-      <el-table-column prop="source" label="适配器来源" align="center">
-        <template #default="scope">
-          <tag dict-type="data_adapter_source" :value="scope.row.source"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button type="primary" size="mini" v-perm="['query:adapter:edit']"
-                     @click="handleEdit(scope.row.adapterId)" link>编辑
-          </el-button>
-          <el-button type="primary" size="mini"
-                     @click="handleDesign(scope.row)" link>设计
-          </el-button>
-          <popover-delete :name="scope.row.adapterName" :type="'适配器'" :perm="['query:adapter:del']"
-                          @delete="handleDelete(scope.row.adapterId)"/>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-          :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-  <el-dialog v-model="isVisited" :title="title" width="700px">
-    <el-form :model="form" ref="formInstance" class="dialog-form">
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="适配器名称" prop="adapterName">
-            <el-input v-model="form.adapterName" placeholder="请输入适配器名称"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="数据适配器代码类型" prop="type">
-            <el-select v-model="form.type" placeholder="请选择数据适配器代码类型" clearable filterable>
-              <el-option
-                  v-for="item in cacheStore.getDict('data_adapter_type')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="适配器来源" prop="source">
-            <el-select v-model="form.source" placeholder="请选择适配器来源" clearable filterable>
-              <el-option
-                  v-for="item in cacheStore.getDict('data_adapter_source')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="11">
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import {
-  getDataAdapterList,
-  getDataAdapterDetails,
-  addDataAdapter,
-  editDataAdapter,
-  delDataAdapter
-} from "@/api/custom-query/adapter";
-import {ElMessage, ElMessageBox} from "element-plus";
-import {Search, Refresh, Delete, Plus, Edit, Download} from '@element-plus/icons-vue'
-import Paging from "@/components/pagination/index.vue";
-import {useCacheStore} from "@/stores/cache";
-import {useRouter} from "vue-router";
-
-const router = useRouter()
-const cacheStore = useCacheStore()
-const queryParams = reactive({
-  adapterName: '',
-  source: '',
-  type: '',
-})
-
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const list = ref([])
-const queryForm = ref([])
-const loading = ref(true)
-const disabled = ref(true)
-const total = ref()
-const title = ref('')
-const isVisited = ref(false)
-const form = ref()
-const formInstance = ref()
-const adapterIds = ref([])
-const adapterNameList = ref([])
-//获取数据
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  loading.value = true
-  getDataAdapterList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//重置from表单
-const restFrom = () => {
-  form.value = {
-    adapterName: null,
-    source: "CUSTOM",
-    type: null
-  }
-}
-//添加
-const handleAdd = async () => {
-  restFrom()
-  title.value = "新增数据源适配器"
-  isVisited.value = true
-  nextTick(() => {
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-}
-//修改
-const handleEdit = async (id) => {
-  restFrom()
-  getDataAdapterDetails(id).then(res => {
-    if (res.code === 1000) {
-      form.value = res.data
-      title.value = "编辑数据源适配器"
-      isVisited.value = true
-      nextTick(() => {
-        // 清空校验
-        formInstance.value.clearValidate()
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//设计
-const handleDesign = (row) => {
-  router.push({path: `/custom/query/data/adapter/design/${row.adapterId}`})
-}
-//删除
-const handleDelete = async (adapterId) => {
-  delDataAdapter(adapterId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//多删
-const handleMoreDelete=(adapterIds)=>{
-  ElMessageBox.confirm(`确认删除名称为${adapterNameList.value}的适配器吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    handleDelete(adapterIds)
-  })
-}
-//勾选table数据行事件
-const handleSelect = async (selection) => {
-  if (selection.length !== 0) {
-    disabled.value = false
-    adapterIds.value = selection.map(item => item.adapterId).join()
-    adapterNameList.value = selection.map(item => item.adapterName).join()
-  } else {
-    disabled.value = true
-  }
-}
-//取消
-const handleCancel = () => {
-  restFrom()
-  isVisited.value = false
-}
-//提交
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    if (title.value === '新增数据源适配器') {
-      addDataAdapter(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    } else {
-      editDataAdapter(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    }
-  })
-}
-getList()
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/custom-query/datamodel/index.vue b/src/views/custom-query/datamodel/index.vue
deleted file mode 100644
index 1c3e130..0000000
--- a/src/views/custom-query/datamodel/index.vue
+++ /dev/null
@@ -1,392 +0,0 @@
-<template>
-  <div>
-    <el-form :model="queryParams" inline class="query-form" ref="queryForm">
-      <el-form-item label="数据模型名称" prop="dsName">
-        <el-input v-model="queryParams.dsName" placeholder="请输入数据模型名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="数据库名称" prop="dbName">
-        <el-input v-model="queryParams.dbName" placeholder="请输入数据库名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="配置类型" prop="configType">
-        <el-select v-model="queryParams.configType" placeholder="请选择配置类型" clearable filterable>
-          <el-option label="主机" value="1"/>
-          <el-option label="JDBC" value="2"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="handleSearch" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="query-btn">
-      <el-button type="primary" v-perm="['query:source:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <el-button type="danger" :icon="Delete" v-perm="['query:source:del']"
-                 @click="handleMoreDelete(sourceId,sourceName)" :disabled="disabled" plain>删除
-      </el-button>
-      <el-button type="warning" v-perm="['query:source:export']" @click="handleExport" :icon="Download" plain>导出
-      </el-button>
-    </div>
-    <div class="table">
-      <el-table
-          :data="list"
-          row-key="id"
-          :lazy="true"
-          ref="singleTable"
-          v-loading="loading"
-          @select="handleSelect"
-          v-tabh
-      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column label="序号" type="index" width="60" align="center"/>
-        <el-table-column prop="dsName" label="数据模型名称" align="center"/>
-        <el-table-column prop="dbName" label="数据库名称" align="center"/>
-        <el-table-column prop="username" label="数据模型用户名" align="center"/>
-        <el-table-column prop="type" label="数据模型类型" align="center"/>
-        <el-table-column prop="confType" label="数据模型配置类型" align="center">
-          <template #default="scope">
-            <tag dict-type="data_source_config" :value="scope.row.configType"/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="url" label="数据模型连接地址" align="center">
-          <template #default="scope">
-            <div class="formatterUrl">{{ scope.row.url }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center">
-          <template #default="scope">
-            <el-button type="primary" size="mini" v-perm="['query:source:edit']"
-                       @click="handleEdit(scope.row.id)" link>编辑
-            </el-button>
-            <popover-delete :name="scope.row.dsName" :type="'数据模型'" :perm="['query:source:del']"
-                            @delete="handleDelete(scope.row.id)"/>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    <el-dialog v-model="isVisited" :title="title" width="900px">
-      <el-form :model="form" ref="formInstance" :rules="formRules" class="dialog-form" :validate-on-rule-change="false">
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="数据模型名称" prop="dsName">
-              <el-input v-model="form.dsName" placeholder="请输入数据模型名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-form-item label="数据模型用户名" prop="username">
-              <el-input v-model="form.username" placeholder="请输入数据模型用户名"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="数据模型密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入数据模型密码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-form-item label="数据模型类型" prop="type">
-              <el-select v-model="form.type" placeholder="请选择数据模型类型" filterable @change="handleTypeChange(form.type)">
-                <el-option
-                    v-for="typeItem in typeList"
-                    :key="typeItem.value"
-                    :label="typeItem.label"
-                    :value="typeItem.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="配置类型" prop="configType">
-              <el-radio-group v-model="form.configType">
-                <el-radio border :label="1">主机</el-radio>
-                <el-radio border :label="2">JDBC</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2" v-if="form.configType === 1">
-            <el-form-item label="数据模型端口" prop="port">
-              <el-input-number v-model="form.port"></el-input-number>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" v-if="form.configType === 1">
-            <el-form-item label="数据模型服务地址" prop="host">
-              <el-input v-model="form.host" placeholder="请输入数据模型服务地址"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-form-item label="数据库名称" prop="dbName" v-if="form.configType === 1">
-              <el-input v-model="form.dbName" placeholder="请输入数据库名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.configType === 2">
-            <el-form-item label="数据模型连接地址" prop="url">
-              <el-input v-model="form.url" :rows="4"
-                        type="textarea" placeholder="请输入数据模型连接地址"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.configType === 1">
-            <el-form-item label="配置参数" prop="args">
-              <el-input v-model="form.args" :rows="4"
-                        type="textarea" placeholder="请输入配置参数"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="服务名称" prop="params.serviceName" v-if="form.type === 'ORACLE' && form.configType===1">
-              <el-input v-model="form.params.serviceName" placeholder="请输入服务名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="命名空间" prop="params.namespace" v-if="form.type === 'POSTGRES' && form.configType===1">
-              <el-input v-model="form.params.namespace" placeholder="请输入命名空间"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import {
-  getDataSourceManageList,
-  getDataSourceManageDetails,
-  addDataSourceManage,
-  editDataSourceManage,
-  delDataSourceManage,
-  getDataSourceType
-} from "@/api/custom-query/datamodel";
-import {Search, Refresh, Delete, Plus, Edit, Download} from '@element-plus/icons-vue'
-import {ElMessage, ElMessageBox} from "element-plus";
-import {downLoadExcel} from "@/utils/downloadZip";
-import Paging from "@/components/pagination/index.vue";
-
-//查询参数
-const queryParams = reactive({
-  dsName: '',
-  dbName: '',
-  type: '',
-})
-//页面信息
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const disabled = ref(true)
-const typeList = ref([])
-const list = ref([])
-const queryForm = ref([])
-const loading = ref(true)
-const total = ref()
-const sourceId = ref()
-const sourceName = ref()
-const singleTable = ref()
-const title = ref('')
-const isVisited = ref(false)
-const form = ref()
-const formInstance = ref()
-const formRules = ref({
-  dsName: [{required: true, message: '请输入数据模型名称', trigger: 'blur'}],
-  username: [{required: true, message: '请输入数据模型用户名', trigger: 'blur'}],
-  password: [{required: true, message: '请输入数据模型密码', trigger: 'blur'}],
-  type: [{required: true, message: '请选择数据模型类型', trigger: 'blur'}],
-  configType: [{required: true, message: '请选择配置类型', trigger: 'blur'}],
-  port: [{required: true, message: '请输入数据模型端口', trigger: 'blur'}],
-  host: [{required: true, message: '请输入数据模型服务地址', trigger: 'blur'}],
-  dbName: [{required: true, message: '请输入数据库名称', trigger: 'blur'}],
-  url: [{required: true, message: '请输入数据模型连接地址', trigger: 'blur'}],
-  params: {
-    serviceName: [{required: true, message: '请输入服务名称', trigger: 'blur'}],
-    namespace: [{required: true, message: '请输入命名空间', trigger: 'blur'}]
-  }
-})
-const getTypeOption = () => {
-  getDataSourceType().then(res => {
-    typeList.value = res.data
-  })
-}
-
-const handleTypeChange = (type) => {
-  if (form.value.configType !== 1) {
-    return;
-  }
-  if (type === 'ORACLE') {
-    form.value.params = {
-      serviceName: ''
-    }
-  }
-  if (type === 'POSTGRES') {
-    form.value.params = {
-      namespace: ''
-    }
-  }
-}
-
-
-//搜索功能
-const handleSearch = () => {
-  getList()
-}
-//重置搜索
-const handleReset = () => {
-  queryForm.value.resetFields()
-  getList()
-}
-//获取数据
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  loading.value = true
-  getDataSourceManageList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//重置from表单
-const restFrom = () => {
-  form.value = {
-    dsName: null,
-    username: null,
-    password: null,
-    host: null,
-    port: 0,
-    type: null,
-    dbName: null,
-    configType: 1,
-    url: null,
-    args: null,
-    params: {}
-  }
-}
-//取消
-const handleCancel = () => {
-  restFrom()
-  isVisited.value = false
-}
-//提交
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    if (title.value === '新增数据模型管理') {
-      addDataSourceManage(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    } else {
-      editDataSourceManage(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    }
-  })
-}
-//添加
-const handleAdd = async () => {
-  formRules.value.password[0].required = true
-  restFrom()
-  title.value = "新增数据模型管理"
-  isVisited.value = true
-  nextTick(() => {
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-}
-//修改
-const handleEdit = async (id) => {
-  restFrom()
-  getDataSourceManageDetails(id).then(res => {
-    if (res.code === 1000) {
-      // console.log('res', res.data)
-      formRules.value.password[0].required = false
-      form.value = res.data
-      title.value = "编辑数据模型管理"
-      isVisited.value = true
-      nextTick(() => {
-        // 清空校验
-        formInstance.value.clearValidate()
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//导出excel
-const handleExport = () => {
-  downLoadExcel('/query/query/source/export', {...queryParams})
-}
-
-//勾选table数据行的 Checkbox
-const handleSelect = async (selection) => {
-  if (selection.length !== 0) {
-    disabled.value = false
-    sourceId.value = selection.map(item => item.id).join()
-    sourceName.value = selection.map(item => item.dsName).join()
-  } else {
-    disabled.value = true
-  }
-}
-
-//切换每页显示条数
-const handleSizeChange = async (val) => {
-  pageInfo.pageSize = val
-  await getList()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = async (val) => {
-  pageInfo.pageNum = val
-  await getList()
-}
-//删除
-const handleDelete = async (id) => {
-  delDataSourceManage(id).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//多删
-const handleMoreDelete = (sourceId, sourceName) => {
-  ElMessageBox.confirm(`确认删除名称为${sourceName}的数据模型吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    handleDelete(sourceId)
-  })
-}
-getTypeOption()
-getList()
-</script>
-<style scoped>
-.formatterUrl {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/custom-query/echarts-editor/EchartsDesign.vue b/src/views/custom-query/echarts-editor/EchartsDesign.vue
deleted file mode 100644
index f2e7f7c..0000000
--- a/src/views/custom-query/echarts-editor/EchartsDesign.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-  <div>
-    <EchartsEditor :info="initInfo" :line-data="lineChartsItem" :bar-data="barChartsItem" :pie-data="pieChartsItem"
-                   :radar-data="radarChartsItem" :radar-indicator="indicator" @getFinalInfo="getFinalInfo"/>
-  </div>
-</template>
-
-<script setup>
-import EchartsEditor from "./components/EchartsEditor.vue";
-//入参
-const lineChartsItem = ref([
-  {
-    id: 1,
-    unit: '年份',
-    type: '',
-    dataType: 'key',
-    color: '',
-    label: '年份',
-    symbol: "",
-    symbolSize: 0,
-    showSymbol: false,
-    lineStyle: {
-      shadowColor: '',//阴影颜色
-      shadowBlur: 0,//图形阴影的模糊大小
-      opacity: 1
-    },
-    data: ['2013', '2014', '2015', '2016', '2017', '2018']
-  },
-  {
-    id: 2,
-    unit: '年销量',
-    type: 'line',
-    dataType: 'value',
-    color: '#9a60b4',//图形颜色
-    label: '华北',
-    symbol: "triangle",//标记的图形circle:圆形,rect:矩形,triangle:三角形,diamond:钻石形,roundRect:圆角矩形,pin:圆钉形,arrow:箭头形,none:不显示标记
-    symbolSize: 8,//标记的大小
-    showSymbol: true,//是否显示标记,如果 false 则只有在 tooltip hover 的时候显示。
-    lineStyle: {
-      shadowColor: '',//阴影颜色
-      shadowBlur: 0,//图形阴影的模糊大小
-      opacity: 1//图形透明度
-    },
-    data: [40, 80, 20, 120, 140, 50]
-  },
-  {
-    id: 3,
-    unit: '年销量',
-    type: 'line',
-    dataType: 'value',
-    color: '#3ba272',
-    label: '华东',
-    symbol: "circle",
-    symbolSize: 8,
-    showSymbol: true,
-    lineStyle: {
-      shadowColor: '',//阴影颜色
-      shadowBlur: 0,//图形阴影的模糊大小
-      opacity: 1
-    },
-    data: [140, 180, 120, 40, 50, 150]
-  },
-  {
-    id: 4,
-    unit: '年销量',
-    type: 'line',
-    dataType: 'value',
-    color: '#5470c6',
-    label: '华南',
-    symbol: "rect",
-    symbolSize: 8,
-    showSymbol: true,
-    lineStyle: {
-      shadowColor: '',//阴影颜色
-      shadowBlur: 0,//图形阴影的模糊大小
-      opacity: 1
-    },
-    data: [110, 143, 68, 90, 120, 130]
-  }
-])
-const barChartsItem = ref([
-  {
-    id: 1,
-    unit: '年份',
-    type: '',
-    dataType: 'key',
-    color: '',
-    label: '年份',
-    showBackground: false,
-    backgroundStyle: {
-      color: '',
-      borderWidth: 0,
-      borderColor: '',
-      borderType: 'solid',
-    },
-    data: ['2013', '2014', '2015', '2016', '2017', '2018']
-  },
-  {
-    id: 2,
-    unit: '销售金额',
-    type: 'bar',
-    dataType: 'value',
-    color: '#9a60b4',//图形颜色
-    label: '王五',
-    showBackground: true,//是否显示柱条的背景色
-    backgroundStyle: {
-      color: '#e5e2e2',//柱条的颜色
-      borderWidth: 0,//柱条的描边宽度，默认不描边。
-      borderColor: '#000',//柱条的描边颜色
-      borderType: 'dotted',//柱条的描边类型，默认为实线，支持 'dashed', 'dotted'
-    },
-    data: [40, 80, 20, 120, 140, 50]
-  },
-  {
-    id: 3,
-    unit: '销售金额',
-    type: 'bar',
-    dataType: 'value',
-    color: '#3ba272',
-    label: '李四',
-    showBackground: true,
-    backgroundStyle: {
-      color: '#e5e2e2',
-      borderWidth: 0,
-      borderColor: '#000',
-      borderType: 'dashed',
-    },
-    data: [140, 180, 120, 40, 50, 150]
-  },
-  {
-    id: 4,
-    unit: '销售金额',
-    type: 'bar',
-    dataType: 'value',
-    color: '#2644a4',
-    label: '张三',
-    showBackground: true,
-    backgroundStyle: {
-      color: '#e5e2e2',
-      borderWidth: 0,
-      borderColor: '#000',
-      borderType: 'solid',
-    },
-    data: [110, 143, 68, 90, 120, 130]
-  }
-])
-const pieChartsItem = ref([
-  {id: 1, label: '京东', dataType: 'value', value: 335},
-  {id: 2, label: '菜鸟', dataType: 'value', value: 310},
-  {id: 3, label: '总部', dataType: 'value', value: 234},
-  {id: 4, label: '小电商', dataType: 'value', value: 135},
-])
-const radarChartsItem = ref([
-  {label: 'Allocated Budget', dataType: 'value', data: [4200, 3000, 20000, 35000, 50000, 18000]},
-  {label: 'Actual Spending', dataType: 'value', data: [5000, 14000, 28000, 26000, 42000, 21000]},
-])
-//定义好echarts的配置数据
-let initInfo = reactive({
-  xValueAxis: [],
-  yValueAxis: [],
-  //echarts配置数据
-  echartsOptions: {
-    //图例
-    legend: {
-      data: [],
-      selected: {},
-      selectedMode: false
-    },
-    //离容器四侧的距离
-    grid: {
-      left: 40, // 左边距
-      right: 60, // 右边距
-      top: 40, // 顶边距
-      bottom: 20, // 底边距
-      // containLabel: true,
-    },
-    //提示框组件
-    tooltip: {
-      show: true,
-      trigger: 'axis'
-    },
-    //工具栏
-    // toolbox: {
-    //   feature: {
-    //     //重置按钮显示
-    //     restore: {
-    //       show: true,
-    //       title: '重置'
-    //     }
-    //   }
-    // },
-    //X轴
-    xAxis: {
-      name: '',
-      type: 'category',
-      data: [],
-      axisLine: {
-        show: true
-      }
-    },
-    //Y轴
-    yAxis: {
-      name: '',
-      type: 'value',
-      data: [],
-      axisLine: {
-        show: true
-      }
-    },
-    radar: {
-      // shape: 'circle',
-    },
-    //配置项
-    series: []
-  }
-})
-const indicator=  ref([
-  { name: 'Sales', max: 6500 },
-  { name: 'Administration', max: 16000 },
-  { name: 'Information Technology', max: 30000 },
-  { name: 'Customer Support', max: 38000 },
-  { name: 'Development', max: 52000 },
-  { name: 'Marketing', max: 25000 }
-])
-//获取到拖拽后的数据
-const getFinalInfo = (val) => {
-  // console.log('父组件获取最终数据', val)
-  if (val !== undefined) {
-    initInfo = val
-  }
-}
-getFinalInfo()
-</script>
diff --git a/src/views/custom-query/echarts-editor/components/AxisBox.vue b/src/views/custom-query/echarts-editor/components/AxisBox.vue
deleted file mode 100644
index 459077f..0000000
--- a/src/views/custom-query/echarts-editor/components/AxisBox.vue
+++ /dev/null
@@ -1,538 +0,0 @@
-<template>
-  <div>
-    <el-card class="box-card box-card-h">
-      <el-row justify="space-between" class="x-y-axis">
-        <el-text>值轴/{{ boxName }}</el-text>
-        <el-tooltip
-            effect="dark"
-            :content="boxName+'，数据类型必须一致！'"
-            placement="bottom"
-        >
-          <el-icon>
-            <Warning/>
-          </el-icon>
-        </el-tooltip>
-      </el-row>
-      <div class="drag-block">
-        <draggable
-            class="list-group"
-            :list="dragList"
-            itemKey="id"
-            :group="group"
-            @start="startDrag"
-            @change="dragChartItem"
-        >
-          <template #item="{ element,index }">
-            <div :id="element.dataType==='value'?'card_'+index:''" tabindex="1"
-                 @click.stop="handleClickValueCard(element,index)">
-              <el-card shadow="hover" class="cards x-y-cards"
-                       :style="{borderWidth:1,borderColor:element.dataType==='value'?element.color:'#e4e7ed'}">
-                <el-col :span="3">
-                  <div>{{ element.label }}</div>
-                </el-col>
-                <el-col :span="13">
-                  <div v-if="element.dataType==='value'" class="update-color">
-                    <div class="update-color" @click.stop>
-                      <span>图形：</span>
-                      <el-color-picker v-model="element.color" :color="element.color"
-                                       @change="changeEchartsColor($event,index)" @active-change="handleActiveChange"/>
-                    </div>
-                    <div v-if="currentChart==='line'" class="update-color" @click.stop>
-                      <span>阴影：</span>
-                      <el-color-picker v-model="element.lineStyle.shadowColor" :color="element.lineStyle.shadowColor"
-                                       @change="changeShadowColor($event,index)" @active-change="handleActiveChange"/>
-                    </div>
-                    <div v-if="currentChart==='bar'" class="update-color" @click.stop>
-                      <span>背景: </span>
-                      <el-color-picker v-model="element.backgroundStyle.color" :color="element.backgroundStyle.color"
-                                       @change="changeBackgroundColor($event,index)" @active-change="handleActiveChange"/>
-                    </div>
-                    <div v-if="currentChart==='bar'" class="update-color" @click.stop>
-                      <span >描边: </span>
-                      <el-color-picker v-model="element.backgroundStyle.borderColor" :color="element.backgroundStyle.borderColor"
-                                       @change="changeBackgroundBorderColor($event,index)" @active-change="handleActiveChange"/>
-                    </div>
-                  </div>
-                </el-col>
-                <el-col :span="4">
-                  <div class="cards-right">
-                    <span>{{ element.dataType }}</span>
-                    <el-icon size="20" color="red" @click.stop="handleCancelAxis(element,index)"
-                             style="cursor: pointer">
-                      <CircleClose/>
-                    </el-icon>
-                  </div>
-                </el-col>
-              </el-card>
-            </div>
-          </template>
-        </draggable>
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script setup>
-import draggable from 'vuedraggable'
-
-const emit = defineEmits(["editBasicSettingList"])
-const props = defineProps({
-  //box名字
-  boxName: {
-    type: String,
-    default: ''
-  },
-  //可供拖动的选项列表
-  dragOptions: {
-    type: Array,
-    default: []
-  },
-  //用于拖拽区域存放选项列表
-  dragList: {
-    type: Array,
-    default: []
-  },
-  //用于X轴区域存放拖动的选项
-  xAxisList: {
-    type: Array,
-    default: []
-  },
-  //用于Y轴区域存放拖动的选项
-  yAxisList: {
-    type: Array,
-    default: []
-  },
-  //标记正在拖动选项的数据类型是否value
-  flag: {
-    type: Boolean,
-    default: false
-  },
-  //获取正在拖动选项的数据类型
-  startDataType: {
-    type: String,
-    default: ''
-  },
-  //初始化加载echarts函数
-  initCharts: {
-    type: Function,
-    default: null
-  },
-  //echarts的配置属性
-  chartOption: {
-    type: Array,
-    default: []
-  },
-  //当前echarts图形
-  currentChart: {
-    type: String,
-    default: 'line'
-  }
-})
-//基础设置列表
-const lineChartBasicSettingList = ref()
-const barChartBasicSettingList = ref()
-//选中类型为value的item所处的list列表
-const valueCardInList = ref([])
-//简化代码
-let xList = reactive(props.xAxisList)
-let yList = reactive(props.yAxisList)
-let option = reactive(props.chartOption)
-//路由刷新
-const reload = inject("reload")
-//自定义X/Y分组的拖入拖出事件
-const group = ref({
-  name: 'people',
-  pull: true,
-  put: props.flag === true ? false : (props.boxName === 'X轴' ? () => handleGroupPut(xList, yList) : () => handleGroupPut(yList, xList))
-})
-//将改变的数据传到父组件
-watch(() => lineChartBasicSettingList.value, (newVal) => {
-  emit("getLineChartBasicSettingList", newVal)
-})
-//将改变的数据传到父组件
-watch(() => barChartBasicSettingList.value, (newVal) => {
-  emit("getBarChartBasicSettingList", newVal)
-})
-onMounted(() => {
-  document.addEventListener('click', nullBlockClick)
-})
-onBeforeUnmount(() => {
-  document.removeEventListener('click', nullBlockClick)
-})
-/**
- * 设置chart的lineStyle
- * @param sItem chartItem
- * @param opacity 透明度
- */
-const handleChangeLineStyle = (sItem, opacity) => {
-  sItem.lineStyle = {
-    shadowColor: sItem.lineStyle.shadowColor,
-    shadowBlur: sItem.lineStyle.shadowBlur,
-    opacity: opacity
-  }
-}
-/**
- * 用于取消charts选中透明度
- */
-const handleChangeOpacity = (type, item) => {
-  if (props.currentChart === 'line') {
-    option.series.forEach((sItem) => {
-      if (type === 'more') {
-        if (sItem.name === item.label) {
-          handleChangeLineStyle(sItem, 1)
-        } else {
-          handleChangeLineStyle(sItem, 0.2)
-        }
-      } else if (type === 'single') {
-        handleChangeLineStyle(sItem, 1)
-      } else {
-        if (sItem.name !== item.label) {
-          handleChangeLineStyle(sItem, 1)
-        }
-      }
-    })
-  }
-}
-/**
- * 点击空白处, 清除选项选中状态
- */
-const nullBlockClick = () => {
-  if (valueCardInList.value.length === 0) return;
-  valueCardInList.value.forEach((aItem, aIndex) => {
-    const card = document.getElementById('card_' + aIndex)
-    card.classList.remove('card-active')
-  })
-  clearBasicSetting()
-  //加载echarts
-  props.initCharts()
-}
-/**
- * 封装自定义X/Y分组的拖入事件
- * @param aType 传入x/y区域数组
- * @param bType 传入x/y区域数组
- * @returns {boolean} 返回 true/false
- */
-const handleGroupPut = (aType, bType) => {
-  let flag = false
-  let aLen = aType.length
-  let bLen = bType.length
-  if (aLen === 0 && bLen === 0) {
-    flag = props.startDataType === 'key';
-  } else if (aLen === 0 && bLen !== 0) {
-    flag = bType[0].dataType === 'key';
-  } else if (aLen !== 0 && bLen !== 0) {
-    const dragType = localStorage.getItem('dragType')
-    flag = props.startDataType === aType[0].dataType;
-    if (dragType === 'key') {
-      flag = aType[0].dataType !== 'value';
-    }
-  }
-  return flag
-}
-/**
- * 封装切换坐标轴数据类型为Category
- * @param item 拖动的项
- * @param label 坐标轴名称
- * @param type 切换x/y轴
- */
-const changeTypeToCategory = (item, label, type) => {
-  let axis
-  if (type === 'xAxis') {
-    axis = option.xAxis
-  } else {
-    axis = option.yAxis
-  }
-  axis.type = 'category'
-  axis.name = label
-  axis.data = item.data
-}
-
-/**
- * 封装清除坐标轴数据
- * @param type 标志清除x/y轴
- */
-const clearAxisData = (type) => {
-  let axis
-  if (type === 'xAxis') {
-    axis = option.xAxis
-  } else {
-    axis = option.yAxis
-  }
-  axis.name = ''
-  axis.data = []
-}
-/**
- * 封装key拖入左侧时的重置事件
- * @param aList x/yList
- * @param type x/yAxis
- * @param item 选项item
- * @param label 选项名
- */
-const restoreChart = (aList, type,item,label) => {
-  let axis
-  if (type === 'xAxis') {
-    axis = option.xAxis
-  } else {
-    axis = option.yAxis
-  }
-  if (aList[0].dataType === 'value') {
-    aList.map((item) => {
-      props.dragOptions.unshift(item)
-      option.legend.selected[item.label] = false
-    })
-    aList.splice(0, aList.length)
-    option.legend.data.splice(0, option.legend.data.length)
-    option.series.splice(0, option.series.length)
-    axis.name = ''
-    option.xAxis.type = 'category'
-    option.yAxis.type = 'value'
-  } else {
-    changeTypeToCategory(item, label, type)
-  }
-}
-
-/**
- * 拖拽类型为key的选项事件
- * @param item 选项item
- * @param label 选项名
- */
-const dragTypeToKey = (item, label) => {
-  if (xList.length !== 0 && yList.length === 0) {
-    restoreChart(xList, 'xAxis',item,label)
-    clearAxisData('yAxis')
-  } else if (xList.length === 0 && yList.length !== 0) {
-    restoreChart(yList, 'yAxis',item,label)
-    clearAxisData('xAxis')
-  } else if (xList.length === 0 && yList.length === 0) {
-    //移入左侧待选列表
-    clearAxisData('xAxis')
-    clearAxisData('yAxis')
-  }
-}
-/**
- * 拖拽类型为value的选项事件
- * @param label 选项名
- */
-const dragTypeToValue = (label) => {
-  //删除选中选项的图例
-  const legendIndex = option.legend.data.findIndex(object => object === label);
-  option.legend.data.splice(legendIndex, 1)
-  //删除echarts配置项series中符合该拖拽选项的item
-  const objectIndex = option.series.findIndex(object => object.name === label);
-  option.legend.selected[label] = false
-  option.series.splice(objectIndex, 1)
-  if (xList.length === 0) {
-    option.xAxis.name = ''
-  } else if (yList.length === 0) {
-    option.yAxis.name = ''
-  }
-  clearBasicSetting()
-  handleDeleteClassName(xList, yList)
-}
-/**
- * 封装清空基本设置
- */
-const clearBasicSetting=()=>{
-  if(props.currentChart==='line'){
-    lineChartBasicSettingList.value = []
-    handleChangeOpacity('single')
-  }else if(props.currentChart==='bar'){
-    barChartBasicSettingList.value=[]
-  }
-}
-
-/**
- * 开始拖拽事件
- * @param event event事件
- */
-const startDrag = (event) => {
-  localStorage.setItem('dragType', event.item._underlying_vm_.dataType)
-}
-
-/**
- * 从X轴/Y轴区域移动选项到左/右侧结束事件
- * @param event event事件
- */
-const dragChartItem = (event) => {
-  if (event.removed === undefined) return;
-  let item = event.removed.element
-  let label = item.label
-  //拖动key的选项
-  if (item.dataType === "key") {
-    dragTypeToKey(item, label)
-  } else {
-    dragTypeToValue(label)
-  }
-  props.initCharts()
-  localStorage.removeItem('dragType')
-}
-
-/**
- * 选中数据类型为value的点击事件
- * @param item 点击的选项item
- * @param index 点击选项的下标
- */
-const handleClickValueCard = (item, index) => {
-  document.addEventListener('click', nullBlockClick)
-  if (item.dataType === 'value' ) {
-    if(props.currentChart === 'line'){
-      changeCardActive(props.dragList, item)
-      lineChartBasicSettingList.value = [item]
-    }else  if(props.currentChart === 'bar'){
-      changeCardActive(props.dragList, item)
-      barChartBasicSettingList.value = [item]
-    }
-  }
-  props.initCharts()
-}
-
-/**
- * 封装选中类型为value的数据高亮
- * @param list x/y区域list
- * @param item 点击选项的item
- */
-const changeCardActive = (list, item) => {
-  valueCardInList.value = list
-  emit('getCardActiveList',list)
-  if (list.length !== 0 && list[0].dataType === 'value') {
-    handleChangeOpacity('more', item)
-    list.forEach((aItem, aIndex) => {
-      const card = document.getElementById('card_' + aIndex)
-      if (aItem.label === item.label) {
-        card.classList.add('card-active')
-      } else {
-        card.classList.remove('card-active')
-      }
-    })
-  }
-}
-
-/**
- * 基础设置: 修改echarts数据颜色
- * @param val 修改的标记大小
- * @param index 修改的chart项下标
- */
-const changeEchartsColor = (val, index) => {
-  document.addEventListener('click', nullBlockClick)
-  option.series[index].color = val
-  props.initCharts()
-}
-/**
- * 当选择颜色时移除空白点击事件
- */
-const handleActiveChange = () => {
-  document.removeEventListener('click', nullBlockClick)
-}
-
-/**
- * 基础设置: 修改echarts数据颜色
- * @param val 修改的标记大小
- * @param index 修改的chart项下标
- */
-const changeShadowColor = (val, index) => {
-  option.series[index].lineStyle.shadowColor = val
-  props.initCharts()
-}
-/**
- * 基础设置:修改柱条背景颜色
- * @param val 柱条颜色
- * @param index 修改的chart项下标
- */
-const changeBackgroundColor = (val, index) => {
-  option.series[index].backgroundStyle.color = val
-  props.initCharts()
-}
-/**
- * 基础设置:修改柱条描边颜色
- * @param val 柱条描边颜色
- * @param index 修改的chart项下标
- */
-const changeBackgroundBorderColor = (val, index) => {
-  option.series[index].backgroundStyle.borderColor = val
-  props.initCharts()
-}
-/**
- * 封装从右侧区域拖出事件
- * @param element 获取点击该拖出的选项事件
- * @param index 点击该拖出选项的索引
- * @param aList x/y区域的值
- * @param bList x/y区域的值
- * @param aAxis echarts配置项的x/y轴
- * @param bAxis echarts配置项的x/y轴
- */
-const handleCancel = (element, index, aList, bList, aAxis, bAxis) => {
-  aList.splice(index, 1)
-  props.dragOptions.push(element)
-  if (element.dataType === "key") {
-    aAxis.name = ''
-    aAxis.data = []
-    bAxis.name=''
-    bList.map((item) => {
-      props.dragOptions.unshift(item)
-      option.legend.selected[item.label] = false
-    })
-    bList.splice(0, bList.length)
-    option.legend.data.splice(0, option.legend.data.length)
-    option.series.splice(0, option.series.length)
-    // reload
-    props.initCharts()
-  } else {
-    if (bList.length !== 0 && aList.length === 0) {
-      if (bList[0].dataType === 'key') {
-        aAxis.name = ''
-      } else {
-        bAxis.name = ''
-      }
-    }
-
-    option.legend.data.splice(index, 1)
-    const objectIndex = option.series.findIndex(object => object.name === element.label);
-    option.legend.selected[element.label] = false
-    option.series.splice(objectIndex, 1)
-    props.initCharts()
-  }
-  if(props.currentChart==='line'){
-    handleChangeOpacity('not', element)
-    if (lineChartBasicSettingList.value === undefined) return;
-    lineChartBasicSettingList.value.splice(0, 1)
-  }else if(props.currentChart==='bar'){
-    if (barChartBasicSettingList.value === undefined) return;
-    barChartBasicSettingList.value.splice(0, 1)
-  }
-  //   const basicIndex = lineChartBasicSettingList.value.findIndex(object => object.label === element.label)
-  //   if (basicIndex !== -1) {
-  //     lineChartBasicSettingList.value.splice(basicIndex, 1)
-  //   }
-  handleDeleteClassName(aList, bList)
-  props.initCharts()
-}
-/**
- * 拖拽选项后,清除选中选项阴影
- * @param aList x/y list
- * @param bList x/y list
- */
-const handleDeleteClassName = (aList, bList) => {
-  let axis = []
-  if (aList.length !== 0 && aList[0].dataType === 'value') {
-    axis = aList
-  } else if (bList.length !== 0 && bList[0].dataType === 'value') {
-    axis = bList
-  }
-  axis.forEach((aItem, aIndex) => {
-    const card = document.getElementById('card_' + aIndex)
-    card.classList.remove('card-active')
-  })
-}
-/**
- * 从右侧x/y轴区域取消选项
- * @param element 该取消的项
- * @param index 该取消项的下标
- */
-const handleCancelAxis = (element, index) => {
-  if (props.boxName === 'X轴') {
-    handleCancel(element, index, xList, yList, option.xAxis, option.yAxis)
-  } else {
-    handleCancel(element, index, yList, xList, option.yAxis, option.xAxis)
-  }
-}
-</script>
diff --git a/src/views/custom-query/echarts-editor/components/ChartsOptions.vue b/src/views/custom-query/echarts-editor/components/ChartsOptions.vue
deleted file mode 100644
index f7332c7..0000000
--- a/src/views/custom-query/echarts-editor/components/ChartsOptions.vue
+++ /dev/null
@@ -1,307 +0,0 @@
-<template>
-  <div>
-    <el-card class="box-card">
-      <div class="drag-block">
-        <draggable
-            class="list-group"
-            :list="dragOptions"
-            itemKey="id"
-            group="people"
-            @start="startDrag"
-            @change="changeChartItem"
-        >
-          <template #item="{element}">
-            <el-card shadow="hover" class="cards">
-              <el-row justify="space-between">
-                <span>{{ element.label }}</span>
-                <span>{{ element.dataType }}</span>
-              </el-row>
-            </el-card>
-          </template>
-        </draggable>
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script setup>
-import draggable from 'vuedraggable'
-import {ElMessage} from "element-plus";
-
-const emit = defineEmits(["editValueFlag", "editStartDataType"])
-const props = defineProps({
-  //可供拖动的选项列表
-  dragOptions: {
-    type: Array,
-    default: []
-  },
-  //echarts的配置属性
-  chartOption: {
-    type: Object,
-    default: {}
-  },
-  //初始化加载echarts函数
-  initCharts: {
-    type: Function,
-    default: null
-  },
-  //用于X轴区域存放拖动的选项
-  xAxisList: {
-    type: Array,
-    default: []
-  },
-  //用于Y轴区域存放拖动的选项
-  yAxisList: {
-    type: Array,
-    default: []
-  },
-  //当前echarts图形
-  currentChart: {
-    type: String,
-    default: 'line'
-  },
-  //雷达图指示器
-  radarIndicator: {
-    type: Array,
-    default: []
-  }
-})
-//简化代码
-let xList = reactive(props.xAxisList)
-let yList = reactive(props.yAxisList)
-let option = reactive(props.chartOption)
-let chart = reactive(props.currentChart)
-//获取正在拖动选项的数据类型
-const startDragType = ref()
-//标记正在拖动选项的数据类型是否value
-const flag = ref(false)
-//将改变的数据传到父组件
-watch(() => flag.value, (newVal) => {
-  emit("editValueFlag", newVal)
-})
-watch(() => props.currentChart, (newVal) => {
-  chart = newVal
-})
-watch(() => startDragType.value, (newVal) => {
-  emit("editStartDataType", newVal)
-})
-
-/**
- * 设置修改后的echarts属性
- * @param item 拖动的项
- * @param label 拖拽选项的名称
- * @returns Object
- */
-const settingChartItem = (item, label) => {
-  if (chart === 'line') {
-    return {
-      id: item.id,//组件 ID
-      name: label,
-      // type: echartsValue.value ? echartsValue.value : item.type,
-      type: chart,
-      data: item.data,
-      smooth: true,
-      color: item.color,
-      symbol: item.symbol,
-      symbolSize: item.symbolSize,
-      showSymbol: item.showSymbol,
-      lineStyle: item.lineStyle,
-      // emphasis: item.emphasis
-    }
-  } else if (chart === 'bar') {
-    return {
-      id: item.id,
-      name: label,
-      type: chart,
-      data: item.data,
-      color: item.color,
-      showBackground: item.showBackground,
-      backgroundStyle: item.backgroundStyle
-    }
-  }
-}
-/**
- * 封拖拽数据类型为value
- * @param item 拖动的项
- * @param label 拖拽选项的名称
- * @param selectedObj 图例选中状态表
- */
-const dragValue = (item, label, selectedObj) => {
-  dragChart(item, label, 2)
-  option.legend.data.push(label)
-  let chartItem = settingChartItem(item, label)
-  option.series.push(chartItem)
-  for (const propertyName in selectedObj) {
-    if (propertyName === label) {
-      selectedObj[propertyName] = true
-    }
-  }
-}
-/**
- * 封装切换坐标轴数据类型为Category
- * @param item 拖动的项
- * @param label 坐标轴名称
- * @param type 切换x/y轴
- */
-const changeTypeToCategory = (item, label, type) => {
-  let axis
-  if (type === 'xAxis') {
-    axis = option.xAxis
-  } else {
-    axis = option.yAxis
-  }
-  axis.type = 'category'
-  axis.name = item.unit
-  axis.data = item.data
-}
-/**
- * 封装切换坐标轴数据类型为Value
- * @param item 拖动的项item
- * @param type 切换x/y轴
- */
-const changeTypeToValue = (item, type) => {
-  let axis
-  if (type === 'xAxis') {
-    axis = option.xAxis
-  } else {
-    axis = option.yAxis
-  }
-  axis.type = 'value'
-  axis.name = item.unit
-}
-/**
- * 封装拖拽选项修改echarts属性
- * @param item 拖动的项
- * @param label 拖拽选项的名称
- * @param index 区分拖的选项数据:1是key,2是value
- */
-const dragChart = (item, label, index) => {
-  if (xList.length !== 0 && yList.length === 0) {
-    // console.log('x轴有值')
-    if (index === 1) {
-      changeTypeToCategory(item, label, 'xAxis')
-    } else {
-      changeTypeToValue(item, 'xAxis')
-      option.yAxis.type = 'category'
-    }
-  } else if (xList.length !== 0 && yList.length !== 0) {
-    // console.log('xy有值')
-    if (xList[0].dataType === 'value') {
-      if (index === 1) {
-        changeTypeToCategory(item, label)
-      }
-      changeTypeToValue(item, 'xAxis')
-    } else if (yList[0].dataType === 'value') {
-      if (index === 1) {
-        changeTypeToCategory(item, label, 'xAxis')
-      }
-      changeTypeToValue(item)
-    }
-  } else if (xList.length === 0 && yList.length !== 0) {
-    // console.log('y轴有值')
-    if (index === 1) {
-      changeTypeToCategory(item, label, 'yAxis')
-    } else {
-      option.xAxis.type = 'category'
-      changeTypeToValue(item)
-    }
-  }
-}
-/**
- * 从左侧区域移动选项到右侧
- * @param event 拖拽成功event事件
- */
-const changeChartItem = (event) => {
-  if (event.removed === undefined) return;
-  let item = event.removed.element
-  if (chart === 'line'||chart === 'bar') {
-    let label = item.label
-    let selectedObj = option.legend.selected
-    if (item.dataType === "key") {
-      dragChart(item, label, 1)
-    } else {
-      if (flag.value) return;
-      dragValue(item, label, selectedObj)
-    }
-  } else if (chart === 'pie') {
-    let arr = []
-    xList.forEach(item => {
-      let obj = {
-        name: item.label,
-        value: item.value
-      }
-      arr.push(obj)
-    })
-    for (const propertyName in option.legend.selected) {
-      if (propertyName === item.label) {
-        option.legend.selected[propertyName] = true
-      }
-    }
-    if (item.dataType !== "key") {
-      option.legend.data.push(item.label)
-    }
-    option.series = [
-      {
-        type: 'pie',
-        radius: '50%',
-        data: arr
-      }
-    ]
-  } else if (chart === 'radar') {
-    let arr = []
-    xList.forEach(item => {
-      let obj = {
-        name: item.label,
-        value: item.data
-      }
-      arr.push(obj)
-    })
-    // console.log('arr',arr)
-    for (const propertyName in option.legend.selected) {
-      if (propertyName === item.label) {
-        option.legend.selected[propertyName] = true
-      }
-    }
-    if (item.dataType !== "key") {
-      option.legend.data.push(item.label)
-    }
-    option.radar={
-      indicator:props.radarIndicator
-    }
-    option.series = [
-      {
-        type: 'radar',
-        data: arr
-      }
-    ]
-  }
-  props.initCharts()
-}
-
-/**
- * 左侧区域开始拖拽事件
- * @param event 开始拖拽的event事件
- */
-const startDrag = (event) => {
-  startDragType.value = event.item._underlying_vm_.dataType
-  if (xList.length === 0 && yList.length === 0) {
-    if (chart === 'line' || chart === 'bar') {
-      if (startDragType.value === "value") {
-        flag.value = true
-        ElMessage({
-          message: '请先拖动数据类型为key的选项到x轴/y轴.',
-          type: 'warning',
-        })
-      } else {
-        flag.value = false
-      }
-    } else if (chart === 'pie') {
-      // console.log('拖动饼图')
-      flag.value = false
-    }else if (chart === 'radar') {
-      // console.log('拖动雷达')
-      flag.value = false
-    }
-  }
-}
-</script>
diff --git a/src/views/custom-query/echarts-editor/components/EchartsEditor.vue b/src/views/custom-query/echarts-editor/components/EchartsEditor.vue
deleted file mode 100644
index d1962db..0000000
--- a/src/views/custom-query/echarts-editor/components/EchartsEditor.vue
+++ /dev/null
@@ -1,307 +0,0 @@
-<template>
-  <div>
-    <el-row :gutter="6">
-      <el-col :span="6">
-        <el-select v-model="echartsValue" filterable placeholder="请选择图形状" style="width: 100%" size="large"
-                   @change="handleChangeEcharts">
-          <el-option v-for="chartItem in chartType"
-                     :key="chartItem.value"
-                     :label="chartItem.label"
-                     :value="chartItem.value"/>
-        </el-select>
-        <!--左侧选项区域-->
-        <charts-options @editValueFlag="editValueFlag" @editStartDataType="editStartDataType"
-                        :drag-options="ChartsItem" :chart-option="option" :init-charts="initChart"
-                        :x-axis-list="xValueAxis" :y-axis-list="yValueAxis"
-                        :current-chart="echartsValue" :radar-indicator="radarIndicator"/>
-      </el-col>
-      <!--X轴区域-->
-      <el-col :span="9" v-if="echartsValue==='bar'||echartsValue==='line'">
-        <axis-box :box-name="'X轴'" :drag-list="xValueAxis" :drag-options="ChartsItem" :x-axis-list="xValueAxis"
-                  :y-axis-list="yValueAxis" :flag="valueFlag"
-                  :start-data-type="startDataType" :chart-option="option" :init-charts="initChart"
-                  @getLineChartBasicSettingList="getLineChartBasicSettingList"
-                  @getBarChartBasicSettingList="getBarChartBasicSettingList" :current-chart="echartsValue"/>
-      </el-col>
-      <!--Y轴区域-->
-      <el-col :span="9" v-if="echartsValue==='bar'||echartsValue==='line'">
-        <axis-box :box-name="'Y轴'" :drag-list="yValueAxis" :drag-options="ChartsItem" :x-axis-list="xValueAxis"
-                  :y-axis-list="yValueAxis" :flag="valueFlag"
-                  :start-data-type="startDataType" :chart-option="option" :init-charts="initChart"
-                  @getLineChartBasicSettingList="getLineChartBasicSettingList"
-                  @getBarChartBasicSettingList="getBarChartBasicSettingList" :current-chart="echartsValue"/>
-      </el-col>
-      <el-col :span="9" v-if="echartsValue==='pie'">
-        <pie-box :drag-list="xValueAxis" :init-charts="initChart" :chart-option="option"/>
-      </el-col>
-      <el-col :span="9" v-if="echartsValue==='radar'">
-        <radar-box :drag-list="xValueAxis" :init-charts="initChart" :chart-option="option"/>
-      </el-col>
-    </el-row>
-    <el-button @click.stop="saveData">保存</el-button>
-    <el-button v-if="echartsValue==='line'" @click.stop="openAdvancedSettings">高级设置</el-button>
-    <el-row :gutter="6">
-      <el-col :span="16">
-        <div id="container" ref="chart" @click.stop></div>
-      </el-col>
-      <!--基础设置-->
-      <el-col :span="8">
-        <!-- 折线图基础设置-->
-        <line-chart-basic-setting v-if="echartsValue==='line'" :basic-list="lineChartBasicSettingList"
-                                  :init-charts="initChart"
-                                  :chart-option="option"/>
-        <!-- 柱状图基础设置-->
-        <bar-chart-basic-setting v-if="echartsValue==='bar'" :basic-list="barChartBasicSettingList"
-                                 :init-charts="initChart"
-                                 :chart-option="option"/>
-        <!-- 饼图基础设置-->
-<!--        <pie-chart-basic-setting v-if="echartsValue==='pie'"/>-->
-      </el-col>
-    </el-row>
-    <!--高级设置-->
-    <!-- 折线图高级设置-->
-    <line-chart-advanced-settings v-if="echartsValue==='line'" ref="advancedSettings" :init-charts="initChart"
-                                  :chart-option="option"/>
-  </div>
-</template>
-
-<script setup>
-import * as echarts from 'echarts'
-import draggable from 'vuedraggable'
-import ChartsOptions from "./ChartsOptions.vue";
-import AxisBox from "./AxisBox.vue";
-import LineChartBasicSetting from "./lineChart/BasicSetting.vue";
-import LineChartAdvancedSettings from "./lineChart/AdvancedSettings.vue";
-import BarChartBasicSetting from "./barChart/BasicSetting.vue";
-// import PieChartBasicSetting from "./pieChart/BasicSetting.vue";
-import PieBox from "./pieChart/PieBox.vue";
-import RadarBox from "./radarChart/RadarBox.vue";
-// import BarChartAdvancedSettings from "./barChart/AdvancedSettings.vue";
-
-const emit = defineEmits(["getFinalInfo"])
-const props = defineProps({
-  info: {
-    type: Object,
-    default: {}
-  },
-  lineData: {
-    type: Array,
-    default: []
-  },
-  barData: {
-    type: Array,
-    default: []
-  },
-  pieData: {
-    type: Array,
-    default: []
-  },
-  radarData: {
-    type: Array,
-    default: []
-  },
-  radarIndicator: {
-    type: Array,
-    default: []
-  }
-})
-//图形: 1:折线图 2.柱状图 3.饼图
-const chartType = reactive([
-  {
-    value: 'line',
-    label: '折线图',
-  },
-  {
-    value: 'bar',
-    label: '柱状图',
-  },
-  {
-    value: 'pie',
-    label: '饼图',
-  },
-  {
-    value: 'radar',
-    label: '雷达图',
-  }
-])
-//基础设置列表
-const lineChartBasicSettingList = ref([])
-const barChartBasicSettingList = ref([])
-const advancedSettings = ref()
-//获取父组件传来的初始数据
-const initInfo = reactive(props.info)
-//从左侧获取拖动的选项的数据类型
-const startDataType = ref()
-//标记从左侧拖动选项数据类型是否是value
-const valueFlag = ref(false)
-//简化代码
-let xValueAxis = reactive(initInfo.xValueAxis)
-let yValueAxis = reactive(initInfo.yValueAxis)
-const line_data = reactive(props.lineData)
-const bar_data = reactive(props.barData)
-const pie_data = reactive(props.pieData)
-const radar_data = reactive(props.radarData)
-let option = reactive(initInfo.echartsOptions)
-
-//页面左上角select选择框绑定数据
-const echartsValue = ref('line')
-//可供拖动的选项列表
-const ChartsItem = ref([])
-//获取到container容器实例
-const chart = ref(null);
-//定义echarts实例
-let myEcharts = reactive({});
-onMounted(() => {
-  if (ChartsItem.value.length === 0) {
-    ChartsItem.value = line_data
-  }
-  //初始化echarts(不显示图)
-  let selectLegend = {}
-  ChartsItem.value.forEach(item => {
-    if (item.dataType !== 'key') {
-      selectLegend[item.label] = false
-    }
-  })
-  option.legend.selected = selectLegend
-  if (echartsValue.value === 'pie'||echartsValue.value === 'radar') {
-    isShowAxisLine(false)
-  } else {
-    isShowAxisLine(true)
-  }
-  //加载echarts
-  initChart();
-})
-
-/**
- * 修改valueFlag
- * @param val 子组件传的动态值
- */
-const editValueFlag = (val) => {
-  valueFlag.value = val
-}
-/**
- * 修改startDataType
- * @param str 子组件传的动态值
- */
-const editStartDataType = (str) => {
-  startDataType.value = str
-}
-/**
- * 用于其他组件获取基础设置列表
- * @param str 子组件传的动态值
- */
-const getLineChartBasicSettingList = (str) => {
-  lineChartBasicSettingList.value = str
-}
-/**
- * 修改option
- * @param str 子组件传的动态值
- */
-const getBarChartBasicSettingList = (str) => {
-  barChartBasicSettingList.value = str
-}
-
-
-/**
- * 切换echarts图类型事件
- * @param e event事件
- */
-const handleChangeEcharts = (e) => {
-  if (xValueAxis.length !== 0 || yValueAxis.length !== 0) {
-
-    xValueAxis.map((item) => {
-      ChartsItem.value.unshift(item)
-      option.legend.selected[item.label] = false
-    })
-    xValueAxis.splice(0, xValueAxis.length)
-    yValueAxis.map((item) => {
-      ChartsItem.value.unshift(item)
-      option.legend.selected[item.label] = false
-    })
-    yValueAxis.splice(0, yValueAxis.length)
-    option.legend.data.splice(0, option.legend.data.length)
-    option.series.splice(0, option.series.length)
-    option.xAxis.name = ''
-    option.xAxis.data = []
-    option.xAxis.type = 'category'
-    option.yAxis.name = ''
-    option.yAxis.data = []
-    option.yAxis.type = 'value'
-    initChart()
-  }
-  echartsValue.value = e
-  if (e === 'line') {
-    ChartsItem.value = line_data
-    isShowAxisLine(true)
-    option.radar={}
-  } else if (e === 'bar') {
-    ChartsItem.value = bar_data
-    isShowAxisLine(true)
-    option.radar={}
-  } else if (e === 'pie') {
-    ChartsItem.value = pie_data
-    isShowAxisLine(false)
-    option.radar={}
-  }else if (e === 'radar') {
-    ChartsItem.value = radar_data
-    isShowAxisLine(false)
-    option.radar.indicator = props.radarIndicator
-  }
-  let selectLegend = {}
-  ChartsItem.value.forEach(item => {
-    if (item.dataType !== 'key') {
-      selectLegend[item.label] = false
-    }
-  })
-  option.legend.selected = selectLegend
-  initChart()
-}
-/**
- * 是否显示x/y轴线
- * @param type
- */
-const isShowAxisLine = (type) => {
-  option.xAxis.axisLine.show = type
-  option.yAxis.axisLine.show = type
-  if (type === false) {
-    option.tooltip.trigger = 'item'
-  } else {
-    option.tooltip.trigger = 'axis'
-  }
-}
-/**
- * 初始化echarts实例方法
- */
-const initChart = () => {
-  // console.log('initChartoption', option)
-  //3.初始化container容器
-  myEcharts = echarts.init(chart.value);
-  //5.传入数据
-  myEcharts.setOption(option,true);
-  //图表大小自适应窗口大小变化
-  window.onresize = () => {
-    myEcharts.resize();
-  }
-  //点击事件
-  // myEcharts.on('click', function (params) {
-  //   console.log('dddd点击事件', params);
-  // });
-  // myEcharts.restore();
-  localStorage.removeItem('dragType')
-}
-/**
- * 保存数据
- */
-const saveData = () => {
-  // console.log('最终initInfo', initInfo)
-  emit("getFinalInfo", initInfo)
-}
-/**
- * 打开高级设置弹框
- */
-const openAdvancedSettings = () => {
-  advancedSettings.value.showDrawer()
-}
-
-</script>
-
diff --git a/src/views/custom-query/echarts-editor/components/barChart/AdvancedSettings.vue b/src/views/custom-query/echarts-editor/components/barChart/AdvancedSettings.vue
deleted file mode 100644
index 91d15fd..0000000
--- a/src/views/custom-query/echarts-editor/components/barChart/AdvancedSettings.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <el-drawer v-model="drawerVisible" direction="rtl">
-    <template #header>
-      <h4>高级设置</h4>
-    </template>
-    <template #default>
-      <el-form :model="settingsForm" class="advanced-setting">
-        <el-form-item label="是否点击图例改变图显示状态">
-          <el-switch active-text="是" inactive-text="否" v-model="settingsForm.isClickLegendToShow"
-                     @change="changeIsClickLegend"/>
-        </el-form-item>
-        <el-form-item label="是否显示提示框组件">
-          <el-switch active-text="是" inactive-text="否" v-model="settingsForm.isShowTooltip"
-                     @change="changeIsShowTooltip"/>
-        </el-form-item>
-      </el-form>
-    </template>
-    <template #footer>
-      <el-button @click="cancelSettings">取消</el-button>
-      <el-button type="primary" @click="confirmSettings">确认</el-button>
-    </template>
-  </el-drawer>
-</template>
-
-<script setup>
-const props = defineProps({
-  //初始化加载echarts函数
-  initCharts: {
-    type: Function,
-    default: null
-  },
-  //echarts的配置属性
-  chartOption: {
-    type: Array,
-    default: []
-  },
-})
-let option = reactive(props.chartOption)
-//高级设置抽屉是否展开
-const drawerVisible = ref(false)
-//高级设置属性
-const settingsForm = reactive({
-  isClickLegendToShow: option.legend.selectedMode,//打开点击图例改变图显示状态
-  isShowTooltip: option.tooltip.show//是否显示提示框组件
-})
-/**
- * 打开高级设置弹窗
- */
-const showDrawer = () => {
-  drawerVisible.value = true
-}
-
-/**
- * 高级设置: 取消按钮
- */
-const cancelSettings = () => {
-  drawerVisible.value = false
-}
-/**
- * 高级设置: 确认按钮
- */
-const confirmSettings = () => {
-  drawerVisible.value = false
-  props.initCharts()
-}
-
-/**
- * 高级设置:打开点击图例改变图显示状态
- * @param val
- */
-const changeIsClickLegend = (val) => {
-  option.legend.selectedMode = val
-}
-
-/**
- * 高级设置:是否显示提示框组件
- * @param val
- */
-const changeIsShowTooltip = (val) => {
-  option.tooltip.show = val
-}
-
-defineExpose({
-  showDrawer
-})
-</script>
\ No newline at end of file
diff --git a/src/views/custom-query/echarts-editor/components/barChart/BasicSetting.vue b/src/views/custom-query/echarts-editor/components/barChart/BasicSetting.vue
deleted file mode 100644
index 48817c6..0000000
--- a/src/views/custom-query/echarts-editor/components/barChart/BasicSetting.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-  <el-scrollbar height="450px">
-    <div class="basic-setup" @click.stop>
-      柱状图基本设置
-    </div>
-    <div v-for="(settingItem) in basicList" class="setting" @click.stop>
-      <div class="setting-title">{{ settingItem.label }}</div>
-      <div class="setting-item">
-        <span>显示柱条背景: </span>
-        <el-switch active-text="是" inactive-text="否" v-model="settingItem.showBackground"
-                   @change="changeIsShowBackground($event,settingItem)"/>
-
-      </div>
-      <div v-if="settingItem.showBackground!==false">
-        <div class="setting-item">
-          <span>柱条描边宽度: </span>
-          <el-input-number v-model="settingItem.backgroundStyle.borderWidth" :min="0"
-                           @change="changeBorderWidth($event,settingItem)"/>
-        </div>
-
-<!--        <div class="setting-item"  v-if="settingItem.backgroundStyle.borderWidth!==0">-->
-<!--          <span>柱条描边颜色: </span>-->
-<!--          <el-color-picker v-model="settingItem.backgroundStyle.borderColor"-->
-<!--                           :color="settingItem.backgroundStyle.borderColor"-->
-<!--                           @change="changeBorderColor($event,settingItem)"/>-->
-<!--        </div>-->
-        <div class="setting-item" v-if="settingItem.backgroundStyle.borderWidth!==0">
-          <span>柱条描边类型: </span>
-          <el-select v-model="settingItem.backgroundStyle.borderType" @change="switchBorderType($event,settingItem)">
-            <el-option
-                v-for="symbolItem in borderTypeList"
-                :key="symbolItem.value"
-                :label="symbolItem.label"
-                :value="symbolItem.value"
-            />
-          </el-select>
-        </div>
-      </div>
-    </div>
-  </el-scrollbar>
-</template>
-
-<script setup>
-const props = defineProps({
-  //基础设置列表
-  basicList: {
-    type: Array,
-    default: []
-  },
-  //初始化加载echarts函数
-  initCharts: {
-    type: Function,
-    default: null
-  },
-  //echarts的配置属性
-  chartOption: {
-    type: Array,
-    default: []
-  },
-})
-let option = reactive(props.chartOption)
-//图形标记列表
-const borderTypeList = ref([
-  {value: 'solid', label: '实线'},
-  {value: 'dashed', label: '虚线'},
-  {value: 'dotted', label: '点线'}
-])
-/**
- * 封装基本设置修改echarts属性事件
- * @param item 修改的项
- * @param type option.series中的属性名
- * @param val 获取修改的值
- */
-const changeSingleParams = (item, type, val) => {
-  option.series.forEach((sItem, sIndex) => {
-    if (sItem.name === item.label) {
-      getSeriesParams(type, sIndex, val)
-    }
-  })
-}
-/**
- * 根据changeSingleParams方法传的动态type,封装数据修改事件
- * @param type option.series中的属性名
- * @param index 修改某项属性的下标
- * @param val 获取修改的值
- */
-const getSeriesParams = (type, index, val) => {
-  let seriesItem = option.series[index]
-  switch (type) {
-    case 'showBackground':
-      return seriesItem.showBackground = val
-    case 'color':
-      return seriesItem.backgroundStyle.color = val
-    case 'borderWidth':
-      return seriesItem.backgroundStyle.borderWidth = val
-    case 'borderColor':
-      return seriesItem.backgroundStyle.borderColor = val
-    case 'borderType':
-      return seriesItem.backgroundStyle.borderType = val
-  }
-}
-
-/**
- * 基础设置:修改是否显示柱条背景
- * @param val 是否显示
- * @param item 修改的chart项
- */
-const changeIsShowBackground = (val, item) => {
-  changeSingleParams(item, 'showBackground', val)
-  props.initCharts()
-}
-
-/**
- * 基础设置:修改柱条描边宽度
- * @param val 宽度
- * @param item 修改的chart项
- */
-const changeBorderWidth = (val, item) => {
-  changeSingleParams(item, 'borderWidth', val)
-  props.initCharts()
-}
-/**
- * 基础设置:修改柱条的描边颜色
- * @param val 颜色
- * @param item 修改的chart项
- */
-const changeBorderColor = (val, item) => {
-  changeSingleParams(item, 'borderColor', val)
-  props.initCharts()
-}
-/**
- * 基础设置:修改柱条的描边类型
- * @param val 类型
- * @param item 修改的chart项
- */
-const switchBorderType = (val, item) => {
-  changeSingleParams(item, 'borderType', val)
-  props.initCharts()
-}
-</script>
diff --git a/src/views/custom-query/echarts-editor/components/lineChart/AdvancedSettings.vue b/src/views/custom-query/echarts-editor/components/lineChart/AdvancedSettings.vue
deleted file mode 100644
index 91d15fd..0000000
--- a/src/views/custom-query/echarts-editor/components/lineChart/AdvancedSettings.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <el-drawer v-model="drawerVisible" direction="rtl">
-    <template #header>
-      <h4>高级设置</h4>
-    </template>
-    <template #default>
-      <el-form :model="settingsForm" class="advanced-setting">
-        <el-form-item label="是否点击图例改变图显示状态">
-          <el-switch active-text="是" inactive-text="否" v-model="settingsForm.isClickLegendToShow"
-                     @change="changeIsClickLegend"/>
-        </el-form-item>
-        <el-form-item label="是否显示提示框组件">
-          <el-switch active-text="是" inactive-text="否" v-model="settingsForm.isShowTooltip"
-                     @change="changeIsShowTooltip"/>
-        </el-form-item>
-      </el-form>
-    </template>
-    <template #footer>
-      <el-button @click="cancelSettings">取消</el-button>
-      <el-button type="primary" @click="confirmSettings">确认</el-button>
-    </template>
-  </el-drawer>
-</template>
-
-<script setup>
-const props = defineProps({
-  //初始化加载echarts函数
-  initCharts: {
-    type: Function,
-    default: null
-  },
-  //echarts的配置属性
-  chartOption: {
-    type: Array,
-    default: []
-  },
-})
-let option = reactive(props.chartOption)
-//高级设置抽屉是否展开
-const drawerVisible = ref(false)
-//高级设置属性
-const settingsForm = reactive({
-  isClickLegendToShow: option.legend.selectedMode,//打开点击图例改变图显示状态
-  isShowTooltip: option.tooltip.show//是否显示提示框组件
-})
-/**
- * 打开高级设置弹窗
- */
-const showDrawer = () => {
-  drawerVisible.value = true
-}
-
-/**
- * 高级设置: 取消按钮
- */
-const cancelSettings = () => {
-  drawerVisible.value = false
-}
-/**
- * 高级设置: 确认按钮
- */
-const confirmSettings = () => {
-  drawerVisible.value = false
-  props.initCharts()
-}
-
-/**
- * 高级设置:打开点击图例改变图显示状态
- * @param val
- */
-const changeIsClickLegend = (val) => {
-  option.legend.selectedMode = val
-}
-
-/**
- * 高级设置:是否显示提示框组件
- * @param val
- */
-const changeIsShowTooltip = (val) => {
-  option.tooltip.show = val
-}
-
-defineExpose({
-  showDrawer
-})
-</script>
\ No newline at end of file
diff --git a/src/views/custom-query/echarts-editor/components/lineChart/BasicSetting.vue b/src/views/custom-query/echarts-editor/components/lineChart/BasicSetting.vue
deleted file mode 100644
index dfce2e3..0000000
--- a/src/views/custom-query/echarts-editor/components/lineChart/BasicSetting.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<template>
-  <el-scrollbar height="450px">
-    <div class="basic-setup" @click.stop>
-      折线图基本设置
-    </div>
-    <div v-for="(settingItem) in basicList" class="setting" @click.stop>
-      <div class="setting-title">{{ settingItem.label }}</div>
-      <!--            <div class="setting-item">-->
-      <!--              <span>图形: </span>-->
-      <!--              <el-select v-model="settingItem.type" @change="switchChart($event,settingItem)">-->
-      <!--                <el-option-->
-      <!--                    v-for="chartItem in [{value: 'line',label: '折线图'},{value: 'bar',label: '柱状图'}]"-->
-      <!--                    :key="chartItem.value"-->
-      <!--                    :label="chartItem.label"-->
-      <!--                    :value="chartItem.value"-->
-      <!--                />-->
-      <!--              </el-select>-->
-      <!--            </div>-->
-      <div class="setting-item">
-        <span>显示标记: </span>
-        <el-switch active-text="是" inactive-text="否" v-model="settingItem.showSymbol"
-                   @change="changeIsShowSymbol($event,settingItem)"/>
-
-      </div>
-      <div class="setting-item" v-if="settingItem.showSymbol===true">
-        <span>标记: </span>
-        <el-select v-model="settingItem.symbol" @change="switchSymbol($event,settingItem)">
-          <el-option
-              v-for="symbolItem in symbolList"
-              :key="symbolItem.value"
-              :label="symbolItem.label"
-              :value="symbolItem.value"
-          />
-        </el-select>
-      </div>
-      <div class="setting-item" v-if="settingItem.showSymbol===true">
-        <span>标记大小: </span>
-        <el-input-number v-model="settingItem.symbolSize" :min="1" @change="changeSymbolSize($event,settingItem)"/>
-      </div>
-      <div class="setting-item">
-        <span>阴影模糊大小: </span>
-        <el-input-number v-model="settingItem.lineStyle.shadowBlur" :min="0" @change="changeShadowBlur($event,settingItem)"/>
-      </div>
-    </div>
-  </el-scrollbar>
-</template>
-
-<script setup>
-const props = defineProps({
-  //基础设置列表
-  basicList: {
-    type: Array,
-    default: []
-  },
-  //初始化加载echarts函数
-  initCharts: {
-    type: Function,
-    default: null
-  },
-  //echarts的配置属性
-  chartOption: {
-    type: Array,
-    default: []
-  },
-})
-//图形标记列表
-const symbolList = ref([
-  {value: 'none', label: '不显示标记'},
-  {value: 'circle', label: '圆形'},
-  {value: 'rect', label: '矩形'},
-  {value: 'triangle', label: '三角形'},
-  {value: 'diamond', label: '钻石形'},
-  {value: 'roundRect', label: '圆角矩形'},
-  {value: 'pin', label: '圆钉形'},
-  {value: 'arrow', label: '箭头形'},
-])
-let option = reactive(props.chartOption)
-
-/**
- * 封装基本设置修改echarts属性事件
- * @param item 修改的项
- * @param type option.series中的属性名
- * @param val 获取修改的值
- */
-const changeSingleParams = (item, type, val) => {
-  option.series.forEach((sItem, sIndex) => {
-    if (sItem.name === item.label) {
-      getSeriesParams(type, sIndex, val)
-    }
-  })
-}
-/**
- * 根据changeSingleParams方法传的动态type,封装数据修改事件
- * @param type option.series中的属性名
- * @param index 修改某项属性的下标
- * @param val 获取修改的值
- */
-const getSeriesParams = (type, index, val) => {
-  let seriesItem = option.series[index]
-  switch (type) {
-    case 'type':
-      return seriesItem.type = val
-    case 'showSymbol':
-      return seriesItem.showSymbol = val
-    case 'symbol':
-      return seriesItem.symbol = val
-    case 'symbolSize':
-      return seriesItem.symbolSize = val
-    case 'shadowBlur':
-      return seriesItem.lineStyle.shadowBlur = val
-  }
-}
-/**
- * 基础设置:是否显示标记
- * @param val 修改的标记大小
- * @param item 修改的chart项
- */
-const changeIsShowSymbol = (val, item) => {
-  changeSingleParams(item, 'showSymbol', val)
-  props.initCharts()
-}
-
-/**
- * 基础设置:切换chart的形状
- * @param val 修改的标记大小
- * @param item 修改的chart项
- */
-const switchChart = (val, item) => {
-  changeSingleParams(item, 'type', val)
-  props.initCharts()
-}
-/**
- * 基础设置:修改标记
- * @param val 修改的标记大小
- * @param item 修改的chart项
- */
-const switchSymbol = (val, item) => {
-  changeSingleParams(item, 'symbol', val)
-  props.initCharts()
-}
-/**
- * 基础设置:修改标记大小
- * @param val 修改的标记大小
- * @param item 修改的chart项
- */
-const changeSymbolSize = (val, item) => {
-  changeSingleParams(item, 'symbolSize', val)
-  props.initCharts()
-}
-
-/**
- * 基础设置:修改图形阴影的模糊大小
- * @param val 修改的阴影的模糊大小
- * @param item 修改的chart项
- */
-const changeShadowBlur = (val, item) => {
-  changeSingleParams(item, 'shadowBlur', val)
-  props.initCharts()
-}
-</script>
diff --git a/src/views/custom-query/echarts-editor/components/pieChart/BasicSetting.vue b/src/views/custom-query/echarts-editor/components/pieChart/BasicSetting.vue
deleted file mode 100644
index a8a4a35..0000000
--- a/src/views/custom-query/echarts-editor/components/pieChart/BasicSetting.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <el-scrollbar height="450px">
-    <div class="basic-setup" @click.stop>
-      饼图基本设置
-    </div>
-  </el-scrollbar>
-</template>
-
-<script>
-export default {
-  name: "BasicSetting"
-}
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/custom-query/echarts-editor/components/pieChart/PieBox.vue b/src/views/custom-query/echarts-editor/components/pieChart/PieBox.vue
deleted file mode 100644
index dfd79bc..0000000
--- a/src/views/custom-query/echarts-editor/components/pieChart/PieBox.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <el-card class="box-card box-card-h">
-    <el-row justify="space-between" class="x-y-axis">
-      <el-text>饼图数据项</el-text>
-      <el-tooltip
-          effect="dark"
-          :content="'数据类型必须是数字！'"
-          placement="bottom"
-      >
-        <el-icon>
-          <Warning/>
-        </el-icon>
-      </el-tooltip>
-    </el-row>
-    <div class="drag-block">
-      <draggable
-          class="list-group"
-          :list="dragList"
-          itemKey="id"
-          group="people"
-          @start="startDrag"
-          @change="dragChartItem"
-      >
-        <template #item="{ element,index }">
-          <div>
-            <el-card shadow="hover" class="cards x-y-cards">
-              <el-col :span="8">
-                <div>{{ element.label }}</div>
-              </el-col>
-              <el-col :span="8">
-              </el-col>
-              <el-col :span="8">
-                <div class="cards-right">
-                  <span>{{ element.dataType }}</span>
-<!--                  <el-icon size="20" color="red" @click.stop="handleCancelAxis(element,index)"-->
-<!--                           style="cursor: pointer">-->
-<!--                    <CircleClose/>-->
-<!--                  </el-icon>-->
-                </div>
-              </el-col>
-            </el-card>
-          </div>
-        </template>
-      </draggable>
-    </div>
-  </el-card>
-</template>
-
-<script setup>
-import draggable from 'vuedraggable'
-const props = defineProps({
-  //用于拖拽区域存放选项列表
-  dragList: {
-    type: Array,
-    default: []
-  },
-  //初始化加载echarts函数
-  initCharts: {
-    type: Function,
-    default: null
-  },
-  //echarts的配置属性
-  chartOption: {
-    type: Array,
-    default: []
-  },
-})
-let option = reactive(props.chartOption)
-/**
- * 开始拖拽事件
- * @param event event事件
- */
-const startDrag = (event) => {
-
-}
-/**
- * 从X轴/Y轴区域移动选项到左/右侧结束事件
- * @param event event事件
- */
-const dragChartItem = (event) => {
-  console.log('dragChartItem',event)
-  if (event.removed === undefined) return;
-  let item = event.removed.element
-  let label = item.label
-  dragTypeToValue(label)
-  props.initCharts()
-  // localStorage.removeItem('dragType')
-}
-/**
- * 拖拽类型为value的选项事件
- * @param label 选项名
- */
-const dragTypeToValue = (label) => {
-  console.log('dragTypeToValue',label,option)
-  //删除选中选项的图例
-  const legendIndex = option.legend.data.findIndex(object => object === label);
-  option.legend.data.splice(legendIndex, 1)
-  //删除echarts配置项series中符合该拖拽选项的item
-  const objectIndex = option.series[0].data.findIndex(object => object.name === label);
-  option.legend.selected[label] = false
-  option.series[0].data.splice(objectIndex, 1)
-  if(option.series[0].data.length===0){
-    option.series.splice(0,1)
-  }
-  // clearBasicSetting()
-}
-const handleCancelAxis = (element, index) => {
-  console.log('拖出xxx')
-  dragTypeToValue(element.label)
-  props.initCharts()
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/custom-query/echarts-editor/components/radarChart/RadarBox.vue b/src/views/custom-query/echarts-editor/components/radarChart/RadarBox.vue
deleted file mode 100644
index 4493dc0..0000000
--- a/src/views/custom-query/echarts-editor/components/radarChart/RadarBox.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-  <el-card class="box-card box-card-h">
-    <el-row justify="space-between" class="x-y-axis">
-      <el-text>雷达图数据项</el-text>
-      <el-tooltip
-          effect="dark"
-          :content="'数据类型必须是数字！'"
-          placement="bottom"
-      >
-        <el-icon>
-          <Warning/>
-        </el-icon>
-      </el-tooltip>
-    </el-row>
-    <div class="drag-block">
-      <draggable
-          class="list-group"
-          :list="dragList"
-          itemKey="id"
-          group="people"
-          @start="startDrag"
-          @change="dragChartItem"
-      >
-        <template #item="{ element,index }">
-          <div>
-            <el-card shadow="hover" class="cards x-y-cards">
-              <el-col :span="8">
-                <div>{{ element.label }}</div>
-              </el-col>
-              <el-col :span="8">
-              </el-col>
-              <el-col :span="8">
-                <div class="cards-right">
-                  <span>{{ element.dataType }}</span>
-<!--                  <el-icon size="20" color="red" @click.stop="handleCancelAxis(element,index)"-->
-<!--                           style="cursor: pointer">-->
-<!--                    <CircleClose/>-->
-<!--                  </el-icon>-->
-                </div>
-              </el-col>
-            </el-card>
-          </div>
-        </template>
-      </draggable>
-    </div>
-  </el-card>
-</template>
-
-<script setup>
-import draggable from 'vuedraggable'
-const props = defineProps({
-  //用于拖拽区域存放选项列表
-  dragList: {
-    type: Array,
-    default: []
-  },
-  //初始化加载echarts函数
-  initCharts: {
-    type: Function,
-    default: null
-  },
-  //echarts的配置属性
-  chartOption: {
-    type: Array,
-    default: []
-  },
-})
-let option = reactive(props.chartOption)
-/**
- * 开始拖拽事件
- * @param event event事件
- */
-const startDrag = (event) => {
-
-}
-/**
- * 从X轴/Y轴区域移动选项到左/右侧结束事件
- * @param event event事件
- */
-const dragChartItem = (event) => {
-  console.log('dragChartItem',event)
-  if (event.removed === undefined) return;
-  let item = event.removed.element
-  let label = item.label
-  dragTypeToValue(label)
-  props.initCharts()
-  // localStorage.removeItem('dragType')
-}
-/**
- * 拖拽类型为value的选项事件
- * @param label 选项名
- */
-const dragTypeToValue = (label) => {
-  //删除选中选项的图例
-  const legendIndex = option.legend.data.findIndex(object => object === label);
-  option.legend.data.splice(legendIndex, 1)
-  //删除echarts配置项series中符合该拖拽选项的item
-  const objectIndex = option.series[0].data.findIndex(object => object.name === label);
-  option.legend.selected[label] = false
-  option.series[0].data.splice(objectIndex, 1)
-  // clearBasicSetting()
-  if(option.series[0].data.length===0){
-    option.series.splice(0,1)
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/custom-query/echarts-editor/index.vue b/src/views/custom-query/echarts-editor/index.vue
deleted file mode 100644
index f2e7f7c..0000000
--- a/src/views/custom-query/echarts-editor/index.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-  <div>
-    <EchartsEditor :info="initInfo" :line-data="lineChartsItem" :bar-data="barChartsItem" :pie-data="pieChartsItem"
-                   :radar-data="radarChartsItem" :radar-indicator="indicator" @getFinalInfo="getFinalInfo"/>
-  </div>
-</template>
-
-<script setup>
-import EchartsEditor from "./components/EchartsEditor.vue";
-//入参
-const lineChartsItem = ref([
-  {
-    id: 1,
-    unit: '年份',
-    type: '',
-    dataType: 'key',
-    color: '',
-    label: '年份',
-    symbol: "",
-    symbolSize: 0,
-    showSymbol: false,
-    lineStyle: {
-      shadowColor: '',//阴影颜色
-      shadowBlur: 0,//图形阴影的模糊大小
-      opacity: 1
-    },
-    data: ['2013', '2014', '2015', '2016', '2017', '2018']
-  },
-  {
-    id: 2,
-    unit: '年销量',
-    type: 'line',
-    dataType: 'value',
-    color: '#9a60b4',//图形颜色
-    label: '华北',
-    symbol: "triangle",//标记的图形circle:圆形,rect:矩形,triangle:三角形,diamond:钻石形,roundRect:圆角矩形,pin:圆钉形,arrow:箭头形,none:不显示标记
-    symbolSize: 8,//标记的大小
-    showSymbol: true,//是否显示标记,如果 false 则只有在 tooltip hover 的时候显示。
-    lineStyle: {
-      shadowColor: '',//阴影颜色
-      shadowBlur: 0,//图形阴影的模糊大小
-      opacity: 1//图形透明度
-    },
-    data: [40, 80, 20, 120, 140, 50]
-  },
-  {
-    id: 3,
-    unit: '年销量',
-    type: 'line',
-    dataType: 'value',
-    color: '#3ba272',
-    label: '华东',
-    symbol: "circle",
-    symbolSize: 8,
-    showSymbol: true,
-    lineStyle: {
-      shadowColor: '',//阴影颜色
-      shadowBlur: 0,//图形阴影的模糊大小
-      opacity: 1
-    },
-    data: [140, 180, 120, 40, 50, 150]
-  },
-  {
-    id: 4,
-    unit: '年销量',
-    type: 'line',
-    dataType: 'value',
-    color: '#5470c6',
-    label: '华南',
-    symbol: "rect",
-    symbolSize: 8,
-    showSymbol: true,
-    lineStyle: {
-      shadowColor: '',//阴影颜色
-      shadowBlur: 0,//图形阴影的模糊大小
-      opacity: 1
-    },
-    data: [110, 143, 68, 90, 120, 130]
-  }
-])
-const barChartsItem = ref([
-  {
-    id: 1,
-    unit: '年份',
-    type: '',
-    dataType: 'key',
-    color: '',
-    label: '年份',
-    showBackground: false,
-    backgroundStyle: {
-      color: '',
-      borderWidth: 0,
-      borderColor: '',
-      borderType: 'solid',
-    },
-    data: ['2013', '2014', '2015', '2016', '2017', '2018']
-  },
-  {
-    id: 2,
-    unit: '销售金额',
-    type: 'bar',
-    dataType: 'value',
-    color: '#9a60b4',//图形颜色
-    label: '王五',
-    showBackground: true,//是否显示柱条的背景色
-    backgroundStyle: {
-      color: '#e5e2e2',//柱条的颜色
-      borderWidth: 0,//柱条的描边宽度，默认不描边。
-      borderColor: '#000',//柱条的描边颜色
-      borderType: 'dotted',//柱条的描边类型，默认为实线，支持 'dashed', 'dotted'
-    },
-    data: [40, 80, 20, 120, 140, 50]
-  },
-  {
-    id: 3,
-    unit: '销售金额',
-    type: 'bar',
-    dataType: 'value',
-    color: '#3ba272',
-    label: '李四',
-    showBackground: true,
-    backgroundStyle: {
-      color: '#e5e2e2',
-      borderWidth: 0,
-      borderColor: '#000',
-      borderType: 'dashed',
-    },
-    data: [140, 180, 120, 40, 50, 150]
-  },
-  {
-    id: 4,
-    unit: '销售金额',
-    type: 'bar',
-    dataType: 'value',
-    color: '#2644a4',
-    label: '张三',
-    showBackground: true,
-    backgroundStyle: {
-      color: '#e5e2e2',
-      borderWidth: 0,
-      borderColor: '#000',
-      borderType: 'solid',
-    },
-    data: [110, 143, 68, 90, 120, 130]
-  }
-])
-const pieChartsItem = ref([
-  {id: 1, label: '京东', dataType: 'value', value: 335},
-  {id: 2, label: '菜鸟', dataType: 'value', value: 310},
-  {id: 3, label: '总部', dataType: 'value', value: 234},
-  {id: 4, label: '小电商', dataType: 'value', value: 135},
-])
-const radarChartsItem = ref([
-  {label: 'Allocated Budget', dataType: 'value', data: [4200, 3000, 20000, 35000, 50000, 18000]},
-  {label: 'Actual Spending', dataType: 'value', data: [5000, 14000, 28000, 26000, 42000, 21000]},
-])
-//定义好echarts的配置数据
-let initInfo = reactive({
-  xValueAxis: [],
-  yValueAxis: [],
-  //echarts配置数据
-  echartsOptions: {
-    //图例
-    legend: {
-      data: [],
-      selected: {},
-      selectedMode: false
-    },
-    //离容器四侧的距离
-    grid: {
-      left: 40, // 左边距
-      right: 60, // 右边距
-      top: 40, // 顶边距
-      bottom: 20, // 底边距
-      // containLabel: true,
-    },
-    //提示框组件
-    tooltip: {
-      show: true,
-      trigger: 'axis'
-    },
-    //工具栏
-    // toolbox: {
-    //   feature: {
-    //     //重置按钮显示
-    //     restore: {
-    //       show: true,
-    //       title: '重置'
-    //     }
-    //   }
-    // },
-    //X轴
-    xAxis: {
-      name: '',
-      type: 'category',
-      data: [],
-      axisLine: {
-        show: true
-      }
-    },
-    //Y轴
-    yAxis: {
-      name: '',
-      type: 'value',
-      data: [],
-      axisLine: {
-        show: true
-      }
-    },
-    radar: {
-      // shape: 'circle',
-    },
-    //配置项
-    series: []
-  }
-})
-const indicator=  ref([
-  { name: 'Sales', max: 6500 },
-  { name: 'Administration', max: 16000 },
-  { name: 'Information Technology', max: 30000 },
-  { name: 'Customer Support', max: 38000 },
-  { name: 'Development', max: 52000 },
-  { name: 'Marketing', max: 25000 }
-])
-//获取到拖拽后的数据
-const getFinalInfo = (val) => {
-  // console.log('父组件获取最终数据', val)
-  if (val !== undefined) {
-    initInfo = val
-  }
-}
-getFinalInfo()
-</script>
diff --git a/src/views/custom-query/query-page/index.vue b/src/views/custom-query/query-page/index.vue
deleted file mode 100644
index aecc0b0..0000000
--- a/src/views/custom-query/query-page/index.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <el-form inline class="query-form" ref="queryForm"  @submit.prevent="getData">
-    <el-form-item v-for="column in uniCons" :key="column.ucId"
-                  :label="column.ucName" :prop="column.ucName">
-      <el-input :placeholder="column.ucDescribe" :type="column.ucType" v-model="column.query" clearable
-                ></el-input>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" @click="getData" :icon="Search">搜索</el-button>
-      <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-    </el-form-item>
-  </el-form>
-  <el-table :data="tableData" v-loading="tableLoading" :max-height="tableHeight" v-tabh>
-    <el-table-column v-for="column in uniColumns" :key="column.prop" :prop="column.prop"
-                     :label="column.label" align="center"/>
-  </el-table>
-  <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-          :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-</template>
-
-<script setup>
-import {Search, Refresh} from '@element-plus/icons-vue'
-import {getPageInfo,getPageData} from "@/api/custom-query/query-page";
-import {reactive} from "vue";
-import Paging from "@/components/pagination/index.vue";
-
-const router = useRouter()
-let path = router.currentRoute.value.path.split("/")
-const queryId = reactive(path[path.length-1])
-const queryForm = ref([])
-const tableData = ref([])
-const uniCons = ref([])
-const uniColumns = ref([])
-const tableLoading = ref(true)
-const total = ref()
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const tableHeight = ref(document.documentElement.scrollHeight - 245 + 'px')
-
-const initPage = () => {
-  tableLoading.value = true
-  getPageInfo(queryId,pageInfo).then(res=>{
-    let data = res.data
-    uniColumns.value = data.uniColumns
-    uniCons.value = data.uniCons
-    let table = data.table
-    tableData.value = table.rows
-    total.value = table.total
-    tableLoading.value = false
-
-  })
-}
-
-
-const changeInput = (val,column) => {
-  console.log(val,column)
-
-}
-
-const getData = () => {
-  tableLoading.value = true
-  let queryData = []
-  uniCons.value.forEach(con=>{
-    if (con.query){
-      let queryItem = {
-        query:con.query,
-        ucId: con.ucId
-      }
-      queryData.push(queryItem)
-    }
-  })
-  tableLoading.value = true
-  getPageData(pageInfo,{list:queryData,queryId}).then(res=>{
-    let data = res.data
-    tableData.value = data.rows
-    total.value = data.total
-    tableLoading.value = false
-  })
-}
-//重置搜索
-const handleReset = () => {
-  uniCons.value.forEach(con=>{
-    con.query=''
-  })
-  getData()
-}
-//切换每页显示条数
-const handleSizeChange = (val) => {
-  pageInfo.pageSize = val
-  getData()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = (val) => {
-  pageInfo.pageNum = val
-  getData()
-}
-
-initPage()
-
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/custom-query/sql/SqlDesign.vue b/src/views/custom-query/sql/SqlDesign.vue
deleted file mode 100644
index cf0a170..0000000
--- a/src/views/custom-query/sql/SqlDesign.vue
+++ /dev/null
@@ -1,486 +0,0 @@
-<template>
-  <div>
-    <el-form ref="queryForm" class="query-form" :model="sqlQueryParams">
-      <el-row :gutter="20">
-        <el-col :span="18">
-          <div class="code-editor"  v-if="editLoading">
-            <sql-code-edit v-model:value="sqlQueryParams.uniSql"  :editor-placeholder="'请输入sql语句进行查询'"
-                           :editor-height="300" :tab-size="2" @change="changeSqlCode"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="55px" label="名称" prop="uqName">
-            <el-input v-model="sqlQueryParams.uqName" placeholder="请输入名称" clearable :style="{width: '100%'}">
-            </el-input>
-          </el-form-item>
-          <el-form-item label-width="55px" label="描述" prop="uqDescribe">
-            <el-input v-model="sqlQueryParams.uqDescribe" placeholder="请输入描述" clearable :style="{width: '100%'}">
-            </el-input>
-          </el-form-item>
-          <!--        <el-form-item v-for="column in uniCons" :key="column.ucId"-->
-          <!--                      :label="column.ucName">-->
-          <!--          <el-input :placeholder="column.ucDescribe" :type="column.ucType" v-model="column.query" clearable-->
-          <!--                    @input="changeInput($event)"></el-input>-->
-          <!--        </el-form-item>-->
-<!--          <el-button type="primary" @click="getSqlQueryInfo" link>搜索</el-button>-->
-          <el-button type="primary" @click="handleReset" link>重置</el-button>
-          <el-button type="primary" @click="handleAdd" link>新增</el-button>
-          <el-button type="primary" @click="previewSqlHandle" link>预览</el-button>
-          <el-button type="primary" @click="submitForm" link>保存</el-button>
-          <el-button type="primary" @click="handleTopLine" link>上线</el-button>
-          <el-button v-if="previewTable.length!==0" type="primary" @click="handleGetParams" link>字段提取</el-button>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div class="table">
-      <el-table :data="columns" row-key="columnId" :max-height="tableHeight"
-                :header-cell-style="{'background':'#f5f7fa'}" >
-        <el-table-column label="序号" type="index" min-width="5%"/>
-        <el-table-column label="查询名称" min-width="10%">
-          <template #default="scope">
-            <el-input v-model="scope.row.ucName"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="条件描述" min-width="10%">
-          <template #default="scope">
-            <el-input v-model="scope.row.ucDescribe"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="key" min-width="10%">
-          <template #default="scope">
-            <el-input v-model="scope.row.ucKey"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="条件" min-width="10%">
-          <template #default="scope">
-            <el-select v-model="scope.row.ucCon" @change="ucTypeChang(scope.$index,scope.row)">
-              <el-option label="=" value="EQ"/>
-              <el-option label="!=" value="NE"/>
-              <el-option label=">" value="GT"/>
-              <el-option label=">=" value="GTE"/>
-              <el-option label="<" value="LT"/>
-              <el-option label="<=" value="LTE"/>
-              <el-option label="LIKE" value="LIKE"/>
-              <el-option label="BETWEEN" value="BETWEEN"/>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="显示类型" min-width="12%">
-          <template #default="scope">
-            <el-select v-model="scope.row.ucType" @change="ucTypeChang(scope.$index,scope.row)">
-              <el-option label="文本框" value="input"/>
-              <el-option label="日期控件" value="datetime"/>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="模拟数据" min-width="18%">
-          <template #default="scope">
-            <el-input v-if="scope.row.type == 1" placeholder="请输入模拟数据" v-model="scope.row.ucMock"></el-input>
-            <div v-else-if="scope.row.type == 2">
-              <el-row :gutter="15">
-                <el-col :span="12">
-                  <el-input placeholder="开始值" v-model="scope.row.ucMock.begin"></el-input>
-                </el-col>
-                <el-col :span="12">
-                  <el-input placeholder="结束值" v-model="scope.row.ucMock.end"></el-input>
-                </el-col>
-              </el-row>
-            </div>
-            <el-date-picker
-                v-else-if="scope.row.type ==3"
-                v-model="scope.row.ucMock"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="选择日期时间"
-            >
-            </el-date-picker>
-            <el-date-picker v-else-if="scope.row.type ==4"
-                            v-model="scope.row.ucMock"
-                            size="small"
-                            style="width: 240px"
-                            value-format="yyyy-MM-dd"
-                            type="daterange"
-                            range-separator="-"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-            ></el-date-picker>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" min-width="10%">
-          <template #default="scope">
-            <el-button type="primary" size="mini" @click="handleDelete(scope.$index,scope.row)" link>删除</el-button>
-            <el-button type="primary" @click="submitForm" link>提交</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div v-if="previewVisible">
-      <div class="table">
-        <el-table :data="previewTable" v-loading="previewLoading" :max-height="tableHeight"
-                  :header-cell-style="{'background':'#f5f7fa'}">
-          <el-table-column label="序号" type="index" min-width="6%"/>
-          <el-table-column v-for="column in uniColumns" :key="column.prop" :prop="column.prop"
-                           :label="column.label" align="center"  min-width="10%"/>
-        </el-table>
-      </div>
-      <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-              :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    </div>
-
-    <el-dialog v-model="isTopLineVisited" title="上线" width="700px">
-      <el-form :model="form" :rules="formRules" class="query-form" ref="formInstance">
-        <el-form-item label="上级菜单">
-          <el-tree-select v-model="form.parentId" :data="menuOpt" style="width: 100%;"
-                          filterable :check-strictly="true"/>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">
-          确定
-        </el-button>
-      </template>
-    </el-dialog>
-
-    <el-dialog v-model="isFieldVisited" title="字段提取" width="800px">
-      <el-button type="primary" @click="handleAddField">新增字段</el-button>
-      <el-table :data="uniColumns" row-key="columnId" :max-height="tableHeight"
-                :header-cell-style="{'background':'#f5f7fa'}">
-        <el-table-column label="字段名称" type="index" width="120px">
-          <template #default="scope">
-            {{ scope.row.prop }}
-          </template>
-        </el-table-column>
-        <el-table-column label="字段别名" >
-          <template #default="scope">
-            <el-input v-model="scope.row.label"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="显示类型" >
-          <template #default="scope">
-            <el-select v-model="scope.row.displayType" placeholder="请选择显示类型" clearable filterable @change="displayTypeChange(scope.$index,scope.row)">
-              <el-option
-                v-for="item in cacheStore.getDict('display_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="显示参数" >
-          <template #default="scope">
-            <el-select v-if="scope.row.displayType == 'date'" v-model="scope.row.displayParam" placeholder="请选择显示参数" clearable filterable>
-              <el-option
-                  v-for="item in cacheStore.getDict('date_format')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-            <el-select v-if="scope.row.displayType == 'dict'" v-model="scope.row.displayParam" placeholder="请选择显示参数" clearable filterable>
-              <el-option
-                  v-for="item in dictOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" >
-          <template #default="scope">
-            <el-button type="primary" size="mini" @click="handleFieldDelete(scope.$index,scope.row)" link>删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <template #footer>
-        <el-button @click="handleFieldCancel">取消</el-button>
-        <el-button type="primary" @click="handleFieldSubmit">
-          确定
-        </el-button>
-      </template>
-    </el-dialog>
-    <el-dialog v-model="isAddFieldVisited" title="新增字段" width="400px">
-      <el-form ref="queryForm" :model="addFieldParams" :rules="rules">
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item  label="字段名称" prop="prop">
-              <el-input v-model="addFieldParams.prop" placeholder="请输入字段名称" clearable >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="字段别名" prop="label">
-              <el-input v-model="addFieldParams.label" placeholder="请输入字段别名" clearable >
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import SqlCodeEdit from "@/components/codeEdit/SqlCodeEdit.vue";
-import {useRouter} from "vue-router";
-import {getSqlInfo, previewSql, saveSqlQueryParams, sqlToLine} from "@/api/custom-query/sql-search";
-import {getMenuOpt} from '@/api/system/menuman.js'
-import {ElMessage} from "element-plus";
-import {reactive} from "vue";
-import Paging from "@/components/pagination/index.vue";
-import {useCacheStore} from "@/stores/cache";
-import {getDictOption} from "@/api/system/dict-type";
-const cacheStore = useCacheStore()
-const previewTable = ref([])
-const uniColumns = ref([])
-const previewLoading = ref(false)
-const queryForm = ref()
-const dictOption = ref([])
-const menuOpt = ref([])
-const previewVisible = ref(false)
-const isTopLineVisited = ref(false)
-const isAddFieldVisited = ref(false)
-const isFieldVisited = ref(false)
-const form = ref({
-  parentId: ''
-})
-const total = ref(0)
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const formInstance = ref()
-const formRules = ref({
-  parentId: [{required: true, message: '请选择上级菜单', trigger: 'blur'}]
-})
-const router = useRouter();
-const queryId = reactive(router.currentRoute.value.params.queryId)
-const addFieldParams=reactive({
-  prop:'',
-  label:''
-})
-const sqlQueryParams = reactive({
-  uniSql: '',
-  uqName: null,
-  uqDescribe: null,
-  // columnList: []
-})
-const editLoading = ref(true)
-const loading = ref(false)
-const rules = ref({
-  uqName: [{required: true, message: '请输入名称', trigger: 'blur'}],
-  uqDescribe: [{required: true, message: '请输入描述', trigger: 'blur'}]
-})
-const tableHeight = ref(document.documentElement.scrollHeight - 245 + 'px')
-const list = ref([])
-const columns = ref([])
-const uniCons = ref([])
-const getDictInfo= async () => {
-  getDictOption().then(res => {
-    if (res.code === 1000) {
-      dictOption.value = res.data
-    }
-  })
-}
-const ucTypeChang = (index, row) => {
-  if (row.ucType == 'input' && row.ucCon != 'BETWEEN') {
-    if (typeof (row.ucMock) != 'string') {
-      row.ucMock = ''
-    }
-    row.type = 1
-  } else if (row.ucType == 'input' && row.ucCon == 'BETWEEN') {
-    row.type = 2
-    row.ucMock = {begin: '', end: ''}
-  } else if (row.ucType == 'datetime' && row.ucCon != 'BETWEEN') {
-    row.type = 3
-    row.ucMock = ''
-  } else if (row.ucType == 'datetime' && row.ucCon == 'BETWEEN') {
-    row.type = 4
-    row.ucMock = []
-  }
-}
-const displayTypeChange=(index, row)=>{
-  if(row.displayType=='dict'){
-
-  }else if(row.displayType=='date'){
-
-  }
-}
-const getSqlQueryInfo = () => {
-  getSqlInfo(queryId).then(res => {
-    if (res.code === 1000) {
-      columns.value = res.data.uniCons
-      sqlQueryParams.uniSql=res.data.uniSql
-      sqlQueryParams.uqName=res.data.uqName
-      sqlQueryParams.uqDescribe=res.data.uqDescribe
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//重置搜索
-const handleReset = () => {
-  sqlQueryParams.uniSql = ' '
-  queryForm.value.resetFields()
-}
-const handleAdd = () => {
-  let row = {
-    id: null,
-    uqId: queryId,
-    ucName: '',
-    ucCon: '',
-    ucDescribe: '',
-    ucKey: '',
-    ucMock: '',
-    ucType: '',
-    type: 1
-  }
-  columns.value.push(row)
-}
-const handleAddField=()=>{
-  // isAddFieldVisited.value=true
-  let row={
-    prop:'',
-    label:''
-  }
-  uniColumns.value.push(row)
-}
-const handleDelete = (index, row) => {
-  columns.value.splice(index, 1)
-}
-const submitForm = () => {
-  let data = {
-    queryId: queryId,
-    uniSql: sqlQueryParams.uniSql,
-    uniCons: columns.value,
-    uniColumns: uniColumns.value
-  }
-  editLoading.value = false;
-  saveSqlQueryParams(data).then(res => {
-    if (res.code === 1000) {
-      nextTick(() => {
-        editLoading.value = true;
-      })
-      ElMessage.success(res.msg)
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//实时获取sql语句
-const changeSqlCode = (val) => {
-  sqlQueryParams.uniSql = val
-}
-
-const previewSqlHandle = () => {
-  if (sqlQueryParams.uniSql == '') {
-    ElMessage({
-      message: '请先输入sql语句再进行预览!',
-      type: 'warning',
-    })
-    return;
-  }
-  previewLoading.value = true
-  let data = {
-    queryId: queryId,
-    uniSql: sqlQueryParams.uniSql,
-    uniCons: columns.value,
-    uniColumns: uniColumns.value
-  }
-  previewSql(data, pageInfo).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      previewLoading.value = false
-      previewVisible.value = true
-      previewTable.value = res.data.table.rows
-      total.value = res.data.table.total
-      let keyList = []
-      for (let key in res.data.table.rows[0]) {
-        let keyObject = {
-          label: key,
-          prop: key,
-        }
-        keyList.push(keyObject)
-      }
-      uniColumns.value = keyList
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//切换每页显示条数
-const handleSizeChange = (val) => {
-  pageInfo.pageSize = val
-  previewSqlHandle()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = (val) => {
-  pageInfo.pageNum = val
-  previewSqlHandle()
-}
-//点击上线按钮弹出选择菜单框
-const handleTopLine = () => {
-  getMenuOpt().then(res => {
-    menuOpt.value = [{
-      value: 0,
-      label: "一级目录",
-      children: res.data
-    }]
-  })
-  isTopLineVisited.value = true
-}
-//提取字段
-const handleGetParams = () => {
-  isFieldVisited.value = true
-}
-const restForm = () => {
-  form.value = {
-    parentId: ''
-  }
-}
-//取消
-const handleCancel = () => {
-  restForm();
-  isTopLineVisited.value = false;
-};
-const handleFieldCancel = () => {
-  isFieldVisited.value = false;
-};
-const handleFieldSubmit = () => {
-  isFieldVisited.value = false;
-}
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid, fields) => {
-    if (!valid) return
-    let data = {
-      menuId: form.value.parentId,
-      queryId: queryId,
-      uniSql: sqlQueryParams.uniSql,
-      uniCons: columns.value,
-      uniColumns: uniColumns.value
-    }
-    sqlToLine(data).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        router.push({path: `/custom/query/sql`})
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  })
-}
-getDictInfo()
-getSqlQueryInfo()
-</script>
-
-<style lang="scss" scoped>
-.code-editor {
-  border: 1px solid #b3b3b3;
-  border-radius: 10px;
-  overflow: hidden;
-  margin-bottom: 10px;
-}
-</style>
diff --git a/src/views/custom-query/sql/index.vue b/src/views/custom-query/sql/index.vue
deleted file mode 100644
index 4dee0f7..0000000
--- a/src/views/custom-query/sql/index.vue
+++ /dev/null
@@ -1,351 +0,0 @@
-<template>
-  <div>
-    <el-form :model="queryParams" inline class="query-form" ref="queryForm">
-      <el-form-item label="名称" prop="uqName">
-        <el-input v-model="queryParams.uqName" placeholder="请输入名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="是否发布" prop="publish">
-        <el-select v-model="queryParams.publish" placeholder="请选择发布类型" clearable filterable>
-          <el-option label="已发布" value="2"/>
-          <el-option label="未发布" value="0"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="query-btn">
-      <el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <el-button type="danger" :icon="Delete"
-                 @click="handleMoreDelete(uqIds)" :disabled="disabled" plain>删除
-      </el-button>
-    </div>
-    <div class="table">
-      <el-table
-          :data="list"
-          row-key="id"
-          :lazy="true"
-          ref="singleTable"
-          v-loading="loading"
-          @selection-change="handleSelect"
-          v-tabh
-      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column label="序号" type="index" width="60" align="center"/>
-        <el-table-column prop="uqName" label="名称" align="center"/>
-        <el-table-column prop="dataSourceId" label="数据源" align="center">
-          <template  #default="scope">
-            <el-tag >{{getDataSourceOptionItem(scope.row.dataSourceId)}}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="publish" label="发布类型" align="center">
-          <template #default="scope">
-            <tag dict-type="publish_type" :value="scope.row.publish"/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="uqDescribe" label="描述" align="center"/>
-        <el-table-column prop="createTime" label="创建时间" align="center"/>
-        <el-table-column prop="updateTime" label="更新时间" align="center"/>
-        <el-table-column label="操作">
-          <template #default="scope">
-            <div v-if="scope.row.publish == false">
-              <el-button type="primary" size="mini"
-                         @click="handleEdit(scope.row.id)"  link>编辑
-              </el-button>
-              <el-button type="primary" size="mini"
-                         @click="handleDesign(scope.row)"  link>设计
-              </el-button>
-              <popover-delete :name="scope.row.uqName"  :type="'SQL查询'"
-                              @delete="handleDelete(scope.row.id)"/>
-            </div>
-            <div v-else>
-              <el-button type="primary" size="mini" @click="handleDownLine(scope.row)"
-                         :icon="Bottom" style="color: red"  link>下线
-              </el-button>
-<!--              <el-button type="primary" size="mini"-->
-<!--                         @click="handleView(scope.row)" :icon="View" link>预览-->
-<!--              </el-button>-->
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    <el-dialog v-model="isVisited" :title="title" width="600px">
-      <el-form :model="form" ref="formInstance" :rules="formRules" class="dialog-form">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="数据源" prop="dataSourceId" v-if="title==='新增入Sql查询'">
-              <el-select v-model="form.dataSourceId" placeholder="数据源" clearable filterable>
-                <el-option
-                    v-for="item in dataSourceOption"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="数据源" prop="dataSourceId" v-else>
-              <el-text>{{ getDataSourceOptionItem(form.dataSourceId) }}</el-text>
-            </el-form-item>
-            <el-form-item label="名称" prop="uqName">
-              <el-input v-model="form.uqName" placeholder="请输入sql查询名称"></el-input>
-            </el-form-item>
-            <el-form-item label="描述" prop="uqDescribe">
-              <el-input v-model="form.uqDescribe" placeholder="请输入描述"></el-input>
-            </el-form-item>
-          </el-col>
-          <!--        <el-col :span="11" >-->
-          <!--          <el-form-item label="发布类型" prop="publish">-->
-          <!--            <el-radio-group v-model="form.publish">-->
-          <!--              <el-radio border :label="1">已发布</el-radio>-->
-          <!--              <el-radio border :label="0">未发布</el-radio>-->
-          <!--            </el-radio-group>-->
-          <!--          </el-form-item>-->
-          <!--        </el-col>-->
-        </el-row>
-      </el-form>
-      <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
-      </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import {Search, Refresh, Plus, Delete, Edit, Bottom, View} from '@element-plus/icons-vue'
-import {ElMessage, ElMessageBox} from "element-plus";
-import {useRouter} from "vue-router";
-import {getSqlList, delSql, addSql, editSql, getSqlDetails} from "@/api/custom-query/sql";
-import {getDataSourceOption} from "@/api/custom-query/datamodel";
-import {sqlDownLine} from "@/api/custom-query/sql-search";
-import Paging from "@/components/pagination/index.vue";
-
-const router = useRouter()
-const queryParams = reactive({
-  preview: '',
-  publish: '',
-  type: '',
-  uqName: '',
-})
-const dataSourceOption = ref([])
-const queryForm = ref([])
-const uqIds = ref([])
-const uqNameList = ref([])
-const list = ref([])
-const total = ref()
-const loading = ref(true)
-const disabled = ref(true)
-const title = ref('')
-const isVisited = ref(false)
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const form = ref()
-const formInstance = ref()
-const formRules = ref({
-  dataSourceId: [{required: true, message: '请选择数据源', trigger: "blur"}],
-  uqName: [{required: true, message: '请输入Sql查询名称', trigger: 'blur'}],
-  uqDescribe: [{required: true, message: '请输入描述', trigger: 'blur'}],
-})
-//获取数据源select的option
-const getOption =async () => {
-   await getDataSourceOption().then(res => {
-      if (res.code === 1000) {
-        dataSourceOption.value = res.data
-        // getList();
-      }
-    })
-}
-
-const getDataSourceOptionItem = (dataSourceId) => {
-  for (let item of dataSourceOption.value) {
-    if (item.value === dataSourceId) {
-      return item.label;
-    }
-  }
-  return "";
-}
-//重置搜索
-const handleReset = () => {
-  queryForm.value.resetFields()
-  getList()
-}
-//获取数据
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  loading.value = true
-  getSqlList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//重置from表单
-const restFrom = () => {
-  form.value = {
-    dataSourceId: null,
-    uqName: null,
-    uqDescribe: null
-  }
-  getOption()
-}
-//添加
-const handleAdd = async () => {
-  formRules.value.dataSourceId[0].required = true
-  restFrom()
-  title.value = "新增入Sql查询"
-  isVisited.value = true
-  nextTick(() => {
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-}
-//修改
-const handleEdit = async (id) => {
-  restFrom()
-  getSqlDetails(id).then(res => {
-    console.log('详情', res.data)
-    if (res.code === 1000) {
-      formRules.value.dataSourceId[0].required = false
-      form.value = res.data
-      title.value = "编辑入Sql查询"
-      isVisited.value = true
-      nextTick(() => {
-        // 清空校验
-        formInstance.value.clearValidate()
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//设计
-const handleDesign = (row) => {
-  //sql 设计页面
-  router.push({path: `/custom/query/sql/design/${row.id}`})
-}
-//下线
-const handleDownLine = (row) => {
-  ElMessageBox.confirm(`确认撤销名称为${row.uqName}的数据吗? 撤销后分配的查询权限将全部失效`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-    customClass: 'red-warning'
-  }).then(() => {
-    sqlDownLine(row.id).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        getList()
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  })
-}
-
-//单个删除
-const handleDelete = async (id) => {
-  delSql(id).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//多删
-const handleMoreDelete = (uqIds) => {
-  ElMessageBox.confirm(`确认删除名称为${uqNameList}的SQL查询吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    handleDelete(uqIds)
-  })
-}
-//取消
-const handleCancel = () => {
-  restFrom()
-  isVisited.value = false
-}
-
-//提交
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    if (title.value === '新增入Sql查询') {
-      addSql(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    } else {
-      editSql(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    }
-  })
-}
-
-//勾选table数据行事件
-const handleSelect = async (selection) => {
-  if (selection.length !== 0) {
-    disabled.value = false
-    uqIds.value=selection.map(item => item.id).join()
-    uqNameList.value = selection.map(item => item.uqName).join()
-  } else {
-    disabled.value = true
-  }
-}
-//切换每页显示条数
-const handleSizeChange = async (val) => {
-  pageInfo.pageSize = val
-  await getList()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = async (val) => {
-  pageInfo.pageNum = val
-  await getList()
-}
-getOption()
-getList()
-</script>
-
-<style lang="scss">
-.red-warning {
-  .el-message-box__content {
-    .el-message-box__container {
-      .el-icon {
-        color: red !important;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/custom-query/table-management/editTable.vue b/src/views/custom-query/table-management/editTable.vue
deleted file mode 100644
index f5a6b88..0000000
--- a/src/views/custom-query/table-management/editTable.vue
+++ /dev/null
@@ -1,316 +0,0 @@
-<template>
-  <el-dialog v-model="isVisited" title="编辑表格" width="1150px">
-    <el-form :model="queryParams" inline label-width="100px" :rules="rules">
-      <el-row>
-        <el-col :span="7">
-          <el-form-item label="表名: " prop="table.tableName">
-          <el-text>{{ queryParams.table.tableName }}</el-text>
-          </el-form-item>
-          <el-form-item label="数据源名称: ">
-            <el-text>{{ dataSourceName }}</el-text>
-          </el-form-item>
-          <el-form-item label="数据源类型: " prop="table.dataSourceType">
-            <el-text>{{ queryParams.table.dataSourceType }}</el-text>
-          </el-form-item>
-          <el-form-item label="角色: " prop="roleIds" style="width: 300px">
-            <el-select v-model="queryParams.roleIds"
-                       multiple
-                       placeholder="请选择角色" filterable clearable>
-              <el-option
-                  v-for="item in roleList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="表描述: " prop="table.tableComment"
-                        style="width: 300px">
-            <el-input v-model="queryParams.table.tableComment" :rows="2"
-                      type="textarea" placeholder="请输入表描述"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="17">
-          <el-form-item>
-            <el-button type="primary" @click="handleAddRelation" :icon="Plus">新增</el-button>
-            <el-button type="danger" @click="handleDelete" :icon="Delete">删除</el-button>
-          </el-form-item>
-          <div class="table">
-            <el-table
-                :data="queryParams.relationMappings"
-                row-key="mainId"
-                v-loading="loading"
-                @selection-change="handleSelectionChange"
-                :header-cell-style="{'background':'#f5f5f8'}"
-                ref="relationalMap">
-              <el-table-column type="selection" width="55" align="center" prop="index"/>
-              <el-table-column label="序号" align="center"  type="index" width="60"/>
-              <el-table-column label="外键" prop="mainKey" align="center">
-                <template #default="scope">
-                  <el-select v-model="scope.row.mainKey" placeholder="外键" filterable clearable>
-                    <el-option
-                        v-for="item in queryParams.columnList"
-                        :key="item.id"
-                        :label="item.columnName+':'+item.columnComment"
-                        :value="item.columnName">
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="关联表" prop="childId" align="center">
-                <template #default="scope">
-                  <el-select v-model="scope.row.childId" placeholder="关联表" filterable clearable>
-                    <el-option
-                        v-for="(item,index) in tableInfoList"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value">
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="关联字段" prop="childKey" align="center">
-                <template #default="scope">
-                  <el-select v-model="scope.row.childKey" placeholder="关联字段"
-                             @visible-change="handleVisibleChange(scope.row.childId,scope.$index,$event)" filterable
-                             clearable>
-                    <el-option
-                        v-for="(item,index) in scope.row.childListColumn"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value">
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="关联方式" prop="type" align="center">
-                <template #default="scope">
-                  <el-select v-model="scope.row.type" multiple placeholder="关联方式" filterable clearable>
-                    <el-option label="hasOne" value="1"/>
-                    <el-option label="hasMany" value="2"/>
-                    <el-option label="belongsTo" value="3"/>
-                  </el-select>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-col>
-      </el-row>
-      <el-divider content-position="center">ER可视化查询字段信息</el-divider>
-      <el-table
-          :data="queryParams.columnList"
-          row-key="columnId"
-          :lazy="true"
-          v-loading="loading"
-          :header-cell-style="{'background':'#f5f5f8'}"
-          style="height: 400px"
-          ref="topSearchColumn">
-        <el-table-column label="序号" align="center" type="index" width="60" />
-        <el-table-column label="列名称" prop="columnName" align="center">
-          <template #default="scope">
-            <span>{{ scope.row.columnName }}</span>
-            <span class="isPk" v-if="scope.row.pk">*</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="列描述" prop="columnComment" align="center">
-          <template #default="scope">
-            <el-input v-model="scope.row.columnComment" placeholder="请输入列描述"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="列类型" prop="columnType" align="center">
-          <template #default="scope">
-            <span>{{ scope.row.columnType }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="是否使用" prop="use" align="center">
-          <template #default="scope">
-            <el-checkbox v-model="scope.row.use"/>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-form>
-    <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit">确定</el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import {defineExpose, defineProps} from "vue";
-import {Plus, Delete} from '@element-plus/icons-vue'
-import {ElMessage} from "element-plus";
-import {
-  getTableDetails,
-  editTable,
-  getAssociationFieldOption,
-  getAssociationTableOption
-} from "@/api/custom-query/table";
-import {getRoleOption} from "@/api/role/role";
-
-const isVisited = ref(false)
-let queryParams = reactive({
-  table: {
-    dataSourceId: '',
-    dataSourceType: '',
-    tableName: '',
-    tableComment: '',
-  },
-  roleIds: [],
-  relationMappings: [],
-  columnList: []
-})
-const roleList = ref([]);
-const mainIdArray = ref([]);
-const loading = ref(true)
-const tableInfoList = ref([]);
-const rules = reactive({
-  roleIds: [
-    {required: true, message: '请选择角色', trigger: ["blur", 'change'], type: 'array'},
-  ]
-})
-
-const props = defineProps({
-  tableId: {
-    type: String,
-    default: ''
-  },
-  dataSourceName: {
-    type: String,
-    default: ''
-  }
-})
-const restForm = () => {
-  queryParams = {
-    table: {
-      dataSourceId: '',
-      dataSourceType: '',
-      tableName: '',
-      tableComment: '',
-    },
-    roleIds: [],
-    relationMappings: [],
-    columnList: []
-  }
-}
-//获取角色option
-const getRole = () => {
-  getRoleOption().then(res => {
-    if (res.code === 1000) {
-      roleList.value = res.data;
-    }
-  });
-};
-//获取关联表option
-const getAssociationOption = async (id) => {
-  getAssociationTableOption(id).then(res => {
-    if (res.code === 1000) {
-      tableInfoList.value = res.data;
-    }
-  });
-};
-//获取对应关联表的关联字段
-const handleVisibleChange = (id, index, e) => {
-  if (e === true) {
-    getAssociationFieldOption(id).then(res => {
-      if (res.code === 1000) {
-        queryParams.relationMappings[index].childListColumn = res.data
-      }
-    });
-  }
-}
-//获取表详情
-const getTableDetail = async () => {
-  loading.value = true
-  await getTableDetails(props.tableId).then(res => {
-    if (res.code === 1000) {
-      loading.value = false
-      if (res.data.roleIds) {
-        queryParams.table = res.data.table
-        getAssociationOption(res.data.table.dataSourceId)
-      }
-      if (res.data.roleIds) {
-        queryParams.roleIds = res.data.roleIds
-      }
-      if (res.data.relationMappings) {
-        queryParams.relationMappings = res.data.relationMappings
-      }
-      if (res.data.roleIds) {
-        queryParams.columnList = res.data.columnList
-      }
-      isVisited.value = true
-
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//编辑表格中的selection
-const handleSelectionChange = (selection) => {
-  console.log('selection', selection)
-  mainIdArray.value=selection.map(item => item.mainId)
-}
-//新增表之间关联关系
-const handleAddRelation = () => {
-  let obj = {
-    mainId: queryParams.table.tableId,
-    childId: null,
-    mainKey: null,
-    childKey: null,
-    type: [],
-    childListColumn: [],
-  };
-  queryParams.relationMappings.push(obj);
-}
-//删除表之间关联关系
-const handleDelete=()=>{
-  queryParams.relationMappings.forEach((item,index)=>{
-    mainIdArray.value.forEach(mainId=>{
-      if(item.mainId===mainId){
-        queryParams.relationMappings.splice(index,1)
-      }
-    })
-  })
-}
-//取消
-const handleCancel = () => {
-  isVisited.value = false
-}
-//提交
-const handleSubmit = async () => {
-  let params = {
-    ...queryParams
-  }
-  editTable(params).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      isVisited.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const show = () => {
-  isVisited.value = true
-  getTableDetail()
-  getRole()
-
-}
-defineExpose({
-  show,
-  restForm
-})
-</script>
-
-<style scoped>
-.isPk {
-  /*width: 5px;*/
-  /*height: 5px;*/
-  /*border-radius: 4px;*/
-  /*background-color: red;*/
-  position: absolute;
-  color: red;
-}
-</style>
diff --git a/src/views/custom-query/table-management/importTable.vue b/src/views/custom-query/table-management/importTable.vue
deleted file mode 100644
index 0bcfd2c..0000000
--- a/src/views/custom-query/table-management/importTable.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-  <el-dialog v-model="isVisited" title="导入表格" width="1000px">
-    <el-form :model="queryParams" inline ref="queryForm" class="query-form" style="margin: 0">
-      <el-form-item label="数据源" prop="dataSourceId">
-        <el-select v-model="queryParams.dataSourceId" placeholder="数据源" clearable  filterable>
-          <el-option
-              v-for="item in dataSourceOption"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="表名称" prop="tableName">
-        <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="表描述" prop="tableComment">
-        <el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="dateValue">
-        <el-config-provider>
-          <el-date-picker
-              v-model="dateValue"
-              type="datetimerange"
-              :shortcuts="shortcuts"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-config-provider>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="searchTableSearch" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="table">
-      <el-table
-          :data="list"
-          row-key="tableId"
-          :lazy="true"
-          v-loading="loading"
-          @selection-change="handleSelect"
-      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column label="序号" type="index" width="60"  align="center"/>
-        <el-table-column prop="tableName" label="表名称" align="center"/>
-        <el-table-column prop="tableComment" label="表描述"  align="center"/>
-        <el-table-column prop="createTime" label="创建时间" sortable align="center"/>
-        <el-table-column prop="updateTime" label="更新时间" sortable align="center"/>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit">确定</el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import {Search, Refresh} from '@element-plus/icons-vue'
-import {defineExpose, defineProps} from "vue";
-import {getDynamicTableList} from "@/api/custom-query/table";
-import {ElMessage} from "element-plus";
-import {addTableInfo} from "@/api/custom-query/table";
-import Paging from "@/components/pagination/index.vue";
-
-const emit = defineEmits(['importSuccess','changeEdit'])
-
-let queryParams = reactive({
-  dataSourceId: '',
-  tableName: '',
-  tableComment: ''
-})
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const list = ref([])
-const tableNameArray = ref([])
-const queryForm = ref()
-const loading = ref(true)
-const dateValue = ref();
-const shortcuts = [
-  {
-    text: "上周",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-      return [start, end];
-    }
-  },
-  {
-    text: "上月",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-      return [start, end];
-    }
-  },
-  {
-    text: "三月前",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-      return [start, end];
-    }
-  }
-];
-const total = ref(0)
-const isVisited = ref(false)
-const props = defineProps({
-  dataSourceOption: {
-    type: Array,
-    default: []
-  }
-})
-
-const show = () => {
-  isVisited.value = true
-  queryParams.dataSourceId = props.dataSourceOption[0].value
-  dateValue.value = []
-  searchTableSearch()
-}
-const searchTableSearch = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  const date = dateValue.value;
-  if (date !== undefined && date !== null) {
-    params.startTime = date[0];
-    params.endTime = date[1];
-  }
-  loading.value = true
-  getDynamicTableList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      list.value = []
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//确定
-const handleSubmit =async () => {
-  addTableInfo({
-    dataSourceId: queryParams.dataSourceId,
-    tables: tableNameArray.value
-  }).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      isVisited.value = false
-      emit("importSuccess")
-      if (tableNameArray.value.length === 1) {
-        if(res.data){
-          emit("changeEdit",res.data)
-        }
-      }
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//勾选table数据行事件
-const handleSelect = (selection) => {
-  tableNameArray.value=selection.map(item => item.tableName)
-}
-//重置功能
-const handleReset = () => {
-  queryParams.dataSourceId = props.dataSourceOption[0].value
-  queryForm.value.resetFields()
-  dateValue.value = []
-  searchTableSearch()
-}
-//切换每页显示条数
-const handleSizeChange =  (val) => {
-  pageInfo.pageSize = val
-   searchTableSearch()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = (val) => {
-  pageInfo.pageNum = val
-   searchTableSearch()
-}
-
-defineExpose({
-  show
-})
-</script>
-
diff --git a/src/views/custom-query/table-management/index.vue b/src/views/custom-query/table-management/index.vue
deleted file mode 100644
index f5c1df6..0000000
--- a/src/views/custom-query/table-management/index.vue
+++ /dev/null
@@ -1,249 +0,0 @@
-<template>
-  <div>
-    <el-form :model="queryParams" inline class="query-form" ref="queryForm">
-      <el-form-item label="数据源" prop="dataSourceId">
-        <el-select v-model="queryParams.dataSourceId" placeholder="数据源" clearable filterable>
-          <el-option
-              v-for="item in dataSourceOption"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="表名称" prop="tableName">
-        <el-input v-model="queryParams.tableName" placeholder="请输入名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="dateValue">
-        <el-config-provider>
-          <el-date-picker
-              v-model="dateValue"
-              type="datetimerange"
-              :shortcuts="shortcuts"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-config-provider>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="query-btn">
-      <el-button type="info" @click="handleImport" :icon="UploadFilled" plain>导入</el-button>
-      <el-button type="warning" :icon="Download" plain>导出</el-button>
-    </div>
-    <div class="table">
-      <el-table
-          :data="list"
-          row-key="tableId"
-          :lazy="true"
-          ref="singleTable"
-          v-loading="loading"
-          v-tabh
-      >
-        <!--        <el-table-column type="selection" width="55"/>-->
-        <el-table-column label="序号" type="index" width="60" align="center"/>
-        <el-table-column prop="tableName" label="表名" align="center"/>
-        <el-table-column prop="dataSourceId" label="数据源名称" align="center">
-          <template #default="scope">
-            <el-tag> {{ getDataSourceOptionItem(scope.row.dataSourceId) }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="dataSourceType" label="数据源类型" align="center"/>
-        <el-table-column prop="tableComment" label="表描述" align="center"/>
-        <el-table-column prop="createTime" label="创建时间" align="center"/>
-        <el-table-column label="操作">
-          <template #default="scope">
-            <el-button type="primary" size="mini"
-                       @click="handleEdit(scope.row.tableId)" link>编辑
-            </el-button>
-            <el-button type="primary" size="mini"
-                       @click="handleSynchronization(scope.row.tableId)" link>同步
-            </el-button>
-            <popover-delete :name="scope.row.tableName" :type="'表格'"
-                            @delete="handleDelete(scope.row.tableId)"/>
-
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    <import-table ref="importTableRef" :data-source-option="dataSourceOption" @importSuccess="getList"
-                  @changeEdit="changeEdit"/>
-
-    <edit-table ref="editTableRef" :data-source-name="dataSourceName" :table-id="editTableId"/>
-
-  </div>
-</template>
-
-<script setup>
-import ImportTable from './importTable.vue'
-import EditTable from "./editTable.vue";
-import {Search, Refresh, Delete, Edit, UploadFilled, Download} from '@element-plus/icons-vue'
-import {ElMessage, ElMessageBox} from "element-plus";
-import {useRouter} from "vue-router";
-import {getTableInfo, delTable} from "@/api/custom-query/table";
-import {getDataSourceOption} from "@/api/custom-query/datamodel";
-import Paging from "@/components/pagination/index.vue";
-import {syncDatabase} from "../../../api/custom-query/table";
-
-
-const router = useRouter()
-const queryParams = reactive({
-  dataSourceId: '',
-  tableName: '',
-  startTime: '',
-  endTime: ''
-})
-const importTableRef = ref(null)
-const editTableRef = ref(null)
-const editTableId = ref()
-const queryForm = ref([])
-const list = ref([])
-const dateValue = ref();
-const shortcuts = [
-  {
-    text: "上周",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-      return [start, end];
-    }
-  },
-  {
-    text: "上月",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-      return [start, end];
-    }
-  },
-  {
-    text: "三月前",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-      return [start, end];
-    }
-  }
-];
-const dataSourceName = ref()
-const dataSourceOption = ref()
-const total = ref()
-const loading = ref(true)
-const isVisited = ref(false)
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const formInstance = ref()
-
-//重置搜索
-const handleReset = () => {
-  queryForm.value.resetFields()
-  getList()
-}
-//获取数据
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  const date = dateValue.value;
-  if (date !== undefined && date !== null) {
-    params.startTime = date[0];
-    params.endTime = date[1];
-  }
-  loading.value = true
-  getTableInfo(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//获取数据源select的option
-const getOption = () => {
-  getDataSourceOption().then(res => {
-    if (res.code === 1000) {
-      dataSourceOption.value = res.data
-      getList();
-    }
-  })
-}
-//通过id查询数据源名称
-const getDataSourceOptionItem = (dataSourceId) => {
-  for (let item of dataSourceOption.value) {
-    if (item.value === dataSourceId) {
-      dataSourceName.value = item.label
-      return item.label;
-    }
-  }
-  return "";
-}
-//添加
-const handleImport = async () => {
-  nextTick(() => {
-    importTableRef.value.show()
-  })
-}
-//导入单个表格, 直接进入编辑页面
-const changeEdit = (data) => {
-  editTableId.value = data
-  nextTick(() => {
-    editTableRef.value.show()
-  })
-}
-//修改
-const handleEdit = async (tableId) => {
-  editTableId.value = tableId
-  nextTick(() => {
-    editTableRef.value.show()
-  })
-}
-//同步
-const handleSynchronization = async (tableId) => {
-  syncDatabase(tableId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-//删除
-const handleDelete = async (tableId) => {
-  delTable(tableId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//切换每页显示条数
-const handleSizeChange = (val) => {
-  pageInfo.pageSize = val
-  getList()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = (val) => {
-  pageInfo.pageNum = val
-  getList()
-}
-getOption();
-</script>
diff --git a/src/views/custom-query/topo/components/changeImage/ChangeImage.vue b/src/views/custom-query/topo/components/changeImage/ChangeImage.vue
deleted file mode 100644
index 3ba888e..0000000
--- a/src/views/custom-query/topo/components/changeImage/ChangeImage.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <div>
-    <template v-if="displayType === 'image'">
-      <el-image :src="columnProp" :style="{width: params.width+'px',height: params.height+'px',borderRadius:params.circle+'%'}">
-        <template #error>
-          <el-image :style="{width: params.width+'px',height: params.height+'px',borderRadius:params.circle+'%'}"
-                    :src="avatar"></el-image>
-        </template>
-      </el-image>
-    </template>
-  </div>
-</template>
-
-<script setup>
-import avatar from "@/assets/default_avatar.png"
-
-const props = defineProps({
-  displayType: {
-    type: String,
-    default: ""
-  },
-  columnProp: {
-    type: Object,
-    default: {}
-  },params: {
-    type: Object,
-    default: {}
-  }
-})
-watch(props.params,(val)=>{
-  props.params=val
-})
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/custom-query/topo/components/changeImage/SettingImageDialog.vue b/src/views/custom-query/topo/components/changeImage/SettingImageDialog.vue
deleted file mode 100644
index 1927844..0000000
--- a/src/views/custom-query/topo/components/changeImage/SettingImageDialog.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <div class="top-dialog">
-    <el-dialog v-model="isSettingImageVisited" title="图片设置" width="700px">
-      <el-form label-width="70px" :model="imageSettingParams">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="设置方式" prop="method">
-              <el-radio-group v-model="imageSettingParams.imgSettingMethod" @change="imgSettingMethodChange">
-                <el-radio-button label="default">默认</el-radio-button>
-                <el-radio-button label="custom">自定义</el-radio-button>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <template v-if="imageSettingParams.imgSettingMethod==='custom'">
-            <el-col :span="12">
-              <el-form-item label="宽度" prop="width">
-                <el-input-number v-model="imageSettingParams.width"  min="20"></el-input-number>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="高度" prop="height">
-                <el-input-number v-model="imageSettingParams.height"  min="20"></el-input-number>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="边框圆角" prop="circle">
-                <el-input-number v-model="imageSettingParams.circle" min="0" max="50"></el-input-number>
-              </el-form-item>
-            </el-col>
-          </template>
-          <el-col :span="24">
-            <el-form-item label="示例">
-              <template v-if="imageSettingParams.imgSettingMethod === 'custom'">
-                <el-image :src="defaultAvatar"
-                          :style="{height: imageSettingParams.width+'px',height: imageSettingParams.height+'px',borderRadius:imageSettingParams.circle+'%'}"
-                />
-              </template>
-              <template v-else>
-                <el-image :src="defaultAvatar"/>
-              </template>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import {reactive} from "vue";
-
-const imageSettingParams = reactive({
-  imgSettingMethod: "default",
-  width: 150,
-  height: 150,
-  circle:0
-})
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/custom-query/topo/index.vue b/src/views/custom-query/topo/index.vue
deleted file mode 100644
index 24c7dec..0000000
--- a/src/views/custom-query/topo/index.vue
+++ /dev/null
@@ -1,352 +0,0 @@
-<template>
-  <div>
-    <el-form :model="queryParams" inline class="query-form" ref="queryForm">
-      <el-form-item label="名称" prop="uqName">
-        <el-input v-model="queryParams.uqName" placeholder="请输入名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="是否发布" prop="publish">
-        <el-select v-model="queryParams.publish" placeholder="请选择发布类型" clearable filterable>
-          <el-option label="已发布" value="1"/>
-          <el-option label="未发布" value="0"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="query-btn">
-      <el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <el-button type="danger" :icon="Delete"
-                 @click="handleMoreDelete(uqIds)" :disabled="disabled" plain>删除
-      </el-button>
-    </div>
-
-    <div class="table">
-      <el-table
-          :data="list"
-          row-key="id"
-          :lazy="true"
-          ref="singleTable"
-          v-loading="loading"
-          @selection-change="handleSelect"
-          v-tabh
-      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column label="序号" type="index" width="60" align="center"/>
-        <el-table-column prop="uqName" label="名称" align="center"/>
-        <el-table-column prop="dataSourceId" label="数据源" align="center">
-          <template  #default="scope">
-            <el-tag >{{getDataSourceOptionItem(scope.row.dataSourceId)}}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="publish" label="发布类型" align="center">
-          <template #default="scope">
-            <tag dict-type="publish_type" :value="scope.row.publish"/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="uqDescribe" label="描述" align="center"/>
-        <el-table-column prop="createTime" label="创建时间" align="center"/>
-        <el-table-column prop="updateTime" label="更新时间" align="center"/>
-        <el-table-column label="操作" align="center">
-          <template #default="scope">
-            <div v-if="scope.row.publish == false">
-              <el-button type="primary" size="mini"
-                         @click="handleEdit(scope.row.id)" link>编辑
-              </el-button>
-              <el-button type="primary" size="mini"
-                         @click="handleDesign(scope.row)" link>设计
-              </el-button>
-              <popover-delete :name="scope.row.uqName"  :type="'拓扑图查询'"
-                              @delete="handleDelete(scope.row.id)"/>
-            </div>
-            <div v-else>
-              <el-button type="primary" size="mini" @click="handleDownLine(scope.row)"
-                         :icon="Bottom" style="color: red" link>下线
-              </el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    <el-dialog v-model="isVisited" :title="title" width="600px">
-      <el-form :model="form" ref="formInstance" :rules="formRules" class="dialog-form">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="数据源" prop="dataSourceId" v-if="title=='新增拓扑'">
-              <el-select v-model="form.dataSourceId" placeholder="数据源" clearable filterable>
-                <el-option
-                    v-for="item in dataSourceOption"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="数据源" prop="dataSourceId" v-else>
-              <el-text>{{ getDataSourceOptionItem(form.dataSourceId) }}</el-text>
-            </el-form-item>
-            <el-form-item label="名称" prop="uqName">
-              <el-input v-model="form.uqName" placeholder="请输入topo名称"></el-input>
-            </el-form-item>
-            <el-form-item label="描述" prop="uqDescribe">
-              <el-input v-model="form.uqDescribe" placeholder="请输入描述"></el-input>
-            </el-form-item>
-          </el-col>
-          <!--        <el-col :span="11" >-->
-          <!--          <el-form-item label="发布类型" prop="publish">-->
-          <!--            <el-radio-group v-model="form.publish">-->
-          <!--              <el-radio border :label="1">已发布</el-radio>-->
-          <!--              <el-radio border :label="0">未发布</el-radio>-->
-          <!--            </el-radio-group>-->
-          <!--          </el-form-item>-->
-          <!--        </el-col>-->
-        </el-row>
-      </el-form>
-      <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
-      </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import {Search, Refresh, Plus, Delete, Edit,Bottom,View} from '@element-plus/icons-vue'
-import {ElMessage, ElMessageBox} from "element-plus";
-import {useRouter} from "vue-router";
-import {getTopoList, delTopo, addTopo, editTopo, getTopoDetails} from "@/api/custom-query/topo";
-import {getDataSourceOption} from "@/api/custom-query/datamodel";
-import {topoDownLine} from "@/api/custom-query/topo-search";
-import Paging from "@/components/pagination/index.vue";
-import Tag from '@/components/Tag.vue'
-const router = useRouter()
-const queryParams = reactive({
-  preview: '',
-  publish: '',
-  type: '',
-  uqName: '',
-})
-const dataSourceOption = ref()
-const queryForm = ref([])
-const list = ref([])
-const uqIds = ref([])
-const uqNameList = ref([])
-const total = ref()
-const loading = ref(true)
-const disabled = ref(true)
-const title = ref('')
-const isVisited = ref(false)
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const form = ref()
-const formInstance = ref()
-const formRules = ref({
-  dataSourceId: [{required: true, message: '请选择数据源', trigger: "blur"}],
-  uqName: [{required: true, message: '请输入topo名称', trigger: 'blur'}],
-  uqDescribe: [{required: true, message: '请输入描述', trigger: 'blur'}],
-})
-//获取数据源select的option
-const getOption = () => {
-  console.log('getOpeion')
-  getDataSourceOption().then(res => {
-    if (res.code === 1000) {
-      dataSourceOption.value = res.data
-      // getList();
-    }
-  })
-}
-const getDataSourceOptionItem = (dataSourceId) => {
-  if(dataSourceOption.value===undefined)return;
-  for (let item of dataSourceOption.value) {
-    if (item.value === dataSourceId) {
-      return item.label;
-    }
-  }
-  return "";
-}
-//重置搜索
-const handleReset = () => {
-  queryForm.value.resetFields()
-  getList()
-}
-//获取数据
-const getList = async () => {
-  console.log('getList')
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  loading.value = true
-  getTopoList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//重置from表单
-const restFrom = () => {
-  form.value = {
-    dataSourceId: null,
-    uqName: null,
-    uqDescribe: null
-  }
-
-}
-//添加
-const handleAdd = async () => {
-  formRules.value.dataSourceId[0].required = true
-  restFrom()
-  title.value = "新增拓扑"
-  isVisited.value = true
-  nextTick(() => {
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-}
-//修改
-const handleEdit = async (id) => {
-  restFrom()
-  getTopoDetails(id).then(res => {
-    console.log('详情', res.data)
-    if (res.code === 1000) {
-      formRules.value.dataSourceId[0].required = false
-      form.value = res.data
-      title.value = "编辑拓扑"
-      isVisited.value = true
-      nextTick(() => {
-        // 清空校验
-        formInstance.value.clearValidate()
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//设计
-const handleDesign = (row) => {
-  router.push({path: `/topo/design/${row.id}`})
-}
-//下线
-const handleDownLine = (row) => {
-  ElMessageBox.confirm(`确认撤销名称为${row.uqName}的数据吗? 撤销后分配的查询权限将全部失效`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-    customClass: 'red-warning'
-  }).then(() => {
-    topoDownLine(row.id).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        getList()
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  })
-}
-//查看
-const handleView=(id)=>{
-  //router.push({path: `/custom/query/page/${id}`})
-}
-//单个删除
-const handleDelete = async (id) => {
-  delTopo(id).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//多删
-const handleMoreDelete = (uqIds) => {
-  ElMessageBox.confirm(`确认删除名称为${uqNameList.value}的拓扑图查询吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    handleDelete(uqIds)
-  })
-}
-//取消
-const handleCancel = () => {
-  restFrom()
-  isVisited.value = false
-}
-
-//提交
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    if (title.value === '新增拓扑') {
-      addTopo(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    } else {
-      editTopo(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    }
-  })
-}
-//勾选table数据行事件
-const handleSelect = async (selection) => {
-  if (selection.length !== 0) {
-    disabled.value = false
-    uqIds.value=selection.map(item => item.id).join()
-    uqNameList.value = selection.map(item => item.uqName).join()
-  } else {
-    disabled.value = true
-  }
-}
-//切换每页显示条数
-const handleSizeChange = async (val) => {
-  pageInfo.pageSize = val
-  await getList()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = async (val) => {
-  pageInfo.pageNum = val
-  await getList()
-}
-getOption()
-getList()
-</script>
-
-<style  lang="scss">
-.red-warning{
-  .el-message-box__content{
-    .el-message-box__container{
-      .el-icon{
-        color: red !important;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/custom-query/topo/top/behavior/click-er-edge.js b/src/views/custom-query/topo/top/behavior/click-er-edge.js
deleted file mode 100644
index 9668e04..0000000
--- a/src/views/custom-query/topo/top/behavior/click-er-edge.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * @author: clay
- * @data: 2021/5/14 23:20
- * @email: clay@hchyun.com
- * @description: node er图点击事件
- */
-let vm = null;
-
-const sendThis = (_this) => {
-  vm = _this;
-};
-
-export default {
-  sendThis,
-  name: "click-er-edge",
-  options: {
-    getEvents() {
-      return {
-        "edge:click": "onEdgeClick",
-        "edge:contextmenu": "onEdgeRightClick"
-      };
-    },
-    /**
-     * 点击连线函数
-     * @param event
-     */
-    onEdgeClick(event) {
-      let clickEdge = event.item;
-      clickEdge.setState("selected", !clickEdge.hasState("selected"));
-      this.singleClickEdge(event)
-      // vm.editCurrentFocus("edge")
-      // this.updateVmData(event);
-    },
-    /**
-     * 右键点击线
-     * @param event
-     */
-    onEdgeRightClick(event) {
-      this.singleClickEdge(event)
-    },
-    singleClickEdge(event) {
-      let graph = vm.getGraph();
-      let clickEdge = event.item;
-      let clickEdgeModel = toRaw(clickEdge.getModel());
-      let selectedEdges = graph.findAllByState("edge", "selected");
-      // 如果当前点击节点不是之前选中的单个节点，才进行下面的处理
-      if (!(selectedEdges.length === 1 && clickEdgeModel.id === selectedEdges[0].getModel().id)) {
-        // 先取消所有节点的选中状态
-        graph.findAllByState("edge", "selected").forEach(edge => {
-          edge.setState("selected", false);
-        });
-        // 再添加该节点的选中状态
-        clickEdge.setState("selected", true);
-        vm.editCurrentFocus("edge")
-        this.updateVmData(event);
-      }else {
-        vm.editCurrentFocus("edge")
-        this.updateVmData(event);
-      }
-    },
-    updateVmData(event) {
-      // 更新vm的data: selectedEdge 和 selectedEdgeParams
-      let clickEdge = event.item;
-      if (clickEdge.hasState("selected")) {
-        let clickEdgeModel = toRaw(clickEdge.getModel());
-        vm.editSelectedEdge(clickEdge)
-        let edgeAppConfig = { ...vm.getEdgeAppConfig() };
-        Object.keys(edgeAppConfig).forEach(function(key) {
-          edgeAppConfig[key] = "";
-        });
-        vm.editSelectedEdgeParams({
-          label: clickEdgeModel.label || "",
-          relationalItem: clickEdgeModel.relationalItem,
-          sourceColumn: clickEdgeModel.sourceColumn,
-          targetColumn: clickEdgeModel.targetColumn,
-          appConfig: { ...edgeAppConfig, ...clickEdgeModel.appConfig }
-        })
-      }
-    },
-  }
-};
diff --git a/src/views/custom-query/topo/top/behavior/click-er-node.js b/src/views/custom-query/topo/top/behavior/click-er-node.js
deleted file mode 100644
index b06e324..0000000
--- a/src/views/custom-query/topo/top/behavior/click-er-node.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * @author: clay
- * @data: 2021/5/14 23:20
- * @email: clay@hchyun.com
- * @description: node er图点击事件
- */
-const isInBBox = (point, bbox) => {
-  const {
-    x,
-    y
-  } = point;
-  const {
-    minX,
-    minY,
-    maxX,
-    maxY
-  } = bbox;
-
-  return x < maxX && x > minX && y > minY && y < maxY;
-};
-
-let vm = null;
-const sendThis = (_this) => {
-  vm = _this;
-};
-
-export default {
-  sendThis,
-  name: "click-er-node",
-  options: {
-    getEvents() {
-      return {
-        wheel: "scroll",
-        "node:click": "onNodeClick",
-        "node:contextmenu": "onNodeRightClick",
-        "canvas:click": "onCanvasClick"
-      };
-    },
-    //滚动事件监听
-    scroll(event) {
-      //禁止滚动的默认事件
-      event.preventDefault();
-      let graph = vm.getGraph()
-      // ↓|| vm.getClickCtrlValue() === true
-      if (vm.getClickCtrlValue()) {
-        if (graph && !graph.destroyed) {
-          if (event.deltaY > 0) {
-            graph.zoom(0.8, {x: event.x, y: event.y})
-          } else {
-            graph.zoom(1.2, {x: event.x, y: event.y})
-          }
-        }
-      } else {
-        //graph.getNodes()获取 Combo 中所有子节点
-        const nodes = graph.getNodes().filter((n) => {
-          const bbox = n.getBBox();//获取元素的包围盒。
-          //将 clientX/clientY 坐标系的坐标值转换为 pointX/pointY 的坐标值。
-          return isInBBox(graph.getPointByClient(event.clientX, event.clientY), bbox);
-        });
-        if (nodes) {
-          nodes.forEach((node) => {
-            const model = node.getModel();
-            if (model.columns.length < 9) {
-              return;
-            }
-            const idx = model.startIndex || 0;  // 获取model的startIndex属性，如果没有则使用0赋值给变量idx
-            // this.start = idx;  // 这里将idx赋值给变量this.start
-            let startX = model.startX || 0.5;  // 获取model的startX属性，如果没有则使用0.5赋值给变量startX
-            //正值向下滚动，负值向上滚动
-            let startIndex = idx + event.deltaY * 0.018;  // 计算startIndex值，将idx与event的deltaY属性值乘以0.018相加赋值给变量startIndex
-            if ((model.columns.length - idx) < 10 && startIndex > idx) {  // 判断条件，判断model的columns数组的长度减去idx的值是否小于10，并且startIndex的值是否大于idx
-              return;  // 如果条件满足，则结束函数的执行
-            }
-            startX -= event.deltaX;//deltaX 属性在向右滚动时返回正值，向左滚动时返回负值，否则为 0。
-
-            //对startIndex进行边界检查和调整
-            if (startIndex < 0) {
-              startIndex = 0;
-            }
-            if (startX > 0) {
-              startX = 0;
-            }
-            if (startIndex > model.columns.length - 1) {
-              startIndex = model.columns.length - 1;
-            }
-
-            graph.update(node, {
-              startIndex,
-              startX
-            });
-          });
-        }
-      }
-    },
-    //节点左键点击监听
-    onNodeClick(event) {
-      if (event) {
-        vm.editCurrentFocus("node")
-        vm.editRightMenuShow(false)
-        this.shrinkage(event);
-        this.updateVmData(event);
-      }
-    },
-    /**
-     * todo 右键打开设置面板
-     * @param event
-     */
-    onNodeRightClick(event) {
-      this.updateVmData(event);
-      vm.editTableColumnEditOpen(true)
-    },
-    onCanvasClick() {
-      vm.editCurrentFocus("canvas")
-      vm.editRightMenuShow(false)
-    },
-    updateVmData(event) {
-      let clickNode = event.item;
-      clickNode.setState("selected", true);
-      vm.editSelectedNode(clickNode);
-      let clickNodeModel = toRaw(clickNode.getModel());
-      let nodeAppConfig = {...vm.getNodeAppConfig()};
-      Object.keys(nodeAppConfig).forEach(function (key) {
-        nodeAppConfig[key] = "";
-      });
-      vm.editSelectedNodeParams({
-        label: clickNodeModel.label || "",
-        columns: clickNodeModel.columns,
-        appConfig: {...nodeAppConfig, ...clickNodeModel.appConfig}
-      })
-    },
-    shrinkage(e) {
-      if (!e.item) {
-        return;
-      }
-      const graph = vm.getGraph();
-      const name=e.shape.get("name")
-      if (name === "collapse") {
-        graph.updateItem(e.item, {
-          collapsed: true,
-          size: [300, 50],
-          height: 44
-        });
-        setTimeout(() => graph.layout(), 100);
-      } else if (name === "expand") {
-        graph.updateItem(e.item, {
-          collapsed: false,
-          size: [300, 500],
-          height: 316
-        });
-        setTimeout(() => graph.layout(), 100);
-      }
-      // else {
-      //   const model = e.item.getModel();
-      // }
-    },
-  }
-};
diff --git a/src/views/custom-query/topo/top/behavior/drag-add-edge.js b/src/views/custom-query/topo/top/behavior/drag-add-edge.js
deleted file mode 100644
index 8758774..0000000
--- a/src/views/custom-query/topo/top/behavior/drag-add-edge.js
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/07/16
- * @description: edit mode: 通过拖拽节点上的锚点添加连线
- */
-import utils from "../../utils";
-import theme from "../theme";
-import {ElMessage} from "element-plus";
-
-// 用来获取调用此js的vue组件实例（this）
-let vm = null;
-
-const sendThis = (_this) => {
-  vm = _this;
-};
-
-export default {
-  sendThis, // 暴露函数
-  name: "drag-add-edge",
-  options: {
-    getEvents() {
-      return {
-        "node:mousedown": "onNodeMousedown",
-        "node:mouseup": "onNodeMouseup",
-        "edge:mouseup": "onEdgeMouseup",
-        "mousemove": "onMousemove"
-      };
-    },
-    onNodeMousedown(event) {
-      let self = this;
-      // 交互过程中的信息
-      self.evtInfo = {
-        action: null,
-        node: event.item,
-        target: event.target,
-      };
-      if (self.evtInfo.target && self.evtInfo.target.attrs.name) {
-        // todo...未来可能针对锚点增加其它功能(例如拖拽调整大小)
-        switch (self.evtInfo.target.attrs.name) {
-          case "anchor"://点击锚点中间
-            self.evtInfo.action = "drawEdge";
-            break;
-          case "anchorBg"://点击锚点
-            self.evtInfo.action = "drawEdge";
-            break;
-        }
-      }
-      if (self.evtInfo && self.evtInfo.action) {
-        self[self.evtInfo.action].start.call(self, event);
-      }
-    },
-    onNodeMouseup(event) {
-      let self = this;
-      if (self.evtInfo && self.evtInfo.action) {
-        self[self.evtInfo.action].stop.call(self, event);
-      }
-    },
-    onEdgeMouseup(event) {
-      let self = this;
-      if (self.evtInfo && self.evtInfo.action === "drawEdge") {
-        self[self.evtInfo.action].stop.call(self, event);
-      }
-    },
-    onMousemove(event) {
-      let self = this;
-      if (self.evtInfo && self.evtInfo.action) {
-        self[self.evtInfo.action].move.call(self, event);
-      }
-    },
-    drawEdge: {
-      isMoving: false,
-      currentLine: null,
-      start: function (event) {
-        let self = this;
-        let themeStyle = theme.defaultStyle; // todo...先使用默认主题，后期可能增加其它风格的主体
-
-        // ************** 暂存【连线】前的数据状态 start **************
-        let graph = vm.getGraph();
-        self.historyData = JSON.stringify(graph.save());
-        // ************** 暂存【连线】前的数据状态 end **************
-
-        let sourceAnchor = self.evtInfo.node.getAnchorPoints();
-        let sourceNodeModel = toRaw(self.evtInfo.node.getModel());
-        // 锚点数据
-        let anchorPoints = self.evtInfo.node.getAnchorPoints();
-        // 处理线条目标点
-        if (anchorPoints && anchorPoints.length) {
-          // 获取距离指定坐标最近的一个锚点
-          sourceAnchor = self.evtInfo.node.getLinkPoint({
-            x: event.x,
-            y: event.y
-          })
-        }
-        // let relational = vm.getRelationalMap().get(sourceNodeModel.tableId)
-        let relational = vm.getRelationalMap().map(item => {
-          if (item.mainId === sourceNodeModel.tableId) {
-            return item
-          }
-        })
-        //item.columnName+':'+item.columnComment
-        let columns = []
-        sourceNodeModel.columns.forEach(item => {
-          let column = {
-            columnName: item.columnName,
-            columnComment: item.columnComment
-          }
-          columns.push(column)
-        })
-        self.drawEdge.currentLine = self.graph.addItem("edge", {
-          // id: G6.Util.uniqueId(),  // 这种生成id的方式有bug，会重复
-          id: utils.generateUUID(),
-          // 起始节点
-          source: sourceNodeModel.id,
-          sourceColumn: columns,
-          sourceAnchor: sourceAnchor ? sourceAnchor.anchorIndex : "",
-          // 终止节点/位置
-          relational: relational,
-          target: {
-            x: event.x,
-            y: event.y
-          },
-          type: self.graph.$C.edge.type || "top-cubic",
-          style: themeStyle.edgeStyle.default || self.graph.$C.edge.style
-        });
-        self.drawEdge.isMoving = true;
-      },
-      move(event) {
-        let self = this;
-        if (self.drawEdge.isMoving && self.drawEdge.currentLine) {
-          self.graph.updateItem(self.drawEdge.currentLine, {
-            target: {
-              x: event.x,
-              y: event.y
-            }
-          });
-        }
-      },
-      stop(event) {
-        let self = this;
-        if (self.drawEdge.isMoving) {
-          if (self.drawEdge.currentLine === event.item) {
-            // 画线过程中点击则移除当前画线
-            self.graph.removeItem(event.item);
-          } else {
-            let targetNode = event.item;
-            let targetNodeModel = toRaw(targetNode.getModel());//节点的数据模型
-            let targetAnchor = null;
-            // 锚点数据
-            let anchorPoints = targetNode.getAnchorPoints();
-            // 处理线条目标点
-            let relational = self.drawEdge.currentLine.getModel().relational//边的数据模型，start函数中定义的包含该节点的关联关系
-            let starts = false;
-            let relationalItem = null;
-            if (relational) {
-              relational.map(item => {
-                if (item) {
-                  if (item.childId === targetNodeModel.tableId) {
-                    starts = true
-                    relationalItem = item
-                  } else {
-                    starts = false
-                  }
-                }
-              })
-            }
-            // 去掉关系验证
-            // starts = true
-            if (starts) {
-              if (anchorPoints && anchorPoints.length > 0) {
-                // 获取距离指定坐标最近的一个锚点
-                targetAnchor = targetNode.getLinkPoint({
-                  x: event.x,
-                  y: event.y
-                });
-              }
-              let columns = []
-              targetNodeModel.columns.forEach(item => {
-                let column = {
-                  columnName: item.columnName,
-                  columnComment: item.columnComment
-                }
-                columns.push(column)
-              })
-              self.graph.updateItem(self.drawEdge.currentLine, {
-                target: targetNodeModel.id,
-                relationalItem: relationalItem,
-                targetAnchor: targetAnchor ? targetAnchor.anchorIndex : "",
-                targetColumn: columns,
-              });
-
-              // ************** 记录historyData的逻辑 start **************
-              if (self.historyData) {
-                let graph = self.graph;
-                // 如果当前点过【撤销】了，拖拽节点后没有【重做】功能
-                // 重置undoCount，拖拽后的数据给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-                if (vm.getUndoCount() > 0) {
-                  vm.editHistoryIndex(vm.getHistoryIndex() - vm.getUndoCount()); // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-                  for (let i = 1; i <= vm.getUndoCount(); i++) {
-                    let key = `graph_history_${vm.getHistoryIndex() + i}`;
-                    vm.removeHistoryData(key);
-                  }
-                  vm.editUndoCount(0)
-                } else {
-                  // 正常顺序执行的情况，记录拖拽线 前的数据状态
-                  let key = `graph_history_${vm.getHistoryIndex()}`;
-                  vm.addHistoryData(key, self.historyData);
-                }
-                // 记录拖线后的数据状态
-                const index = vm.getHistoryIndex() + 1;
-                vm.editHistoryIndex(index);
-                let key = `graph_history_${index}`;
-                let currentData = JSON.stringify(graph.save());
-                vm.addHistoryData(key, currentData);
-              }
-            } else {
-              if (self.evtInfo.node.getModel().tableId === targetNodeModel.tableId) {
-                ElMessage.warning("不可连接自身")
-              } else {
-                ElMessage.warning("两表之间无关联关系")
-              }
-              self.graph.removeItem(self.drawEdge.currentLine);
-            }
-            // ************** 记录historyData的逻辑 end **************
-          }
-        }
-        self.drawEdge.currentLine = null;
-        self.drawEdge.isMoving = false;
-        self.evtInfo = null;
-      }
-    }
-  }
-};
diff --git a/src/views/custom-query/topo/top/behavior/drag-event-edit.js b/src/views/custom-query/topo/top/behavior/drag-event-edit.js
deleted file mode 100644
index 10cfd43..0000000
--- a/src/views/custom-query/topo/top/behavior/drag-event-edit.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/07/16
- * @description: edit mode: 鼠标拖动节点的交互(记录拖拽前后的数据，用于【撤销】和【重做】)
- */
-
-// 用来获取调用此js的vue组件实例（this）
-let vm = null
-let historyData = null
-
-const sendThis = (_this) => {
-  vm = _this
-}
-
-export default {
-  sendThis, // 暴露函数
-  name: 'drag-event-edit',
-  options: {
-    getEvents() {
-      return {
-        'node:dragstart': 'onNodeDragstart',
-        'node:dragend': 'onNodeDragend'
-      }
-    },
-    onNodeDragstart() {
-      let graph = vm.getGraph()
-      if(graph.cfg){
-        historyData = JSON.stringify(graph.save())
-      }
-    },
-    onNodeDragend() {
-      if (historyData) {
-        let graph = vm.getGraph()
-        // 如果当前点过【撤销】了，拖拽节点后没有【重做】功能
-        // 重置undoCount，拖拽后的数据给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-        if (vm.getUndoCount() > 0) {
-          vm.editHistoryIndex( vm.getHistoryIndex() - vm.getUndoCount()) // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-          for (let i = 1; i <= vm.getUndoCount(); i++) {
-            let key = `graph_history_${vm.getHistoryIndex() + i}`
-            vm.removeHistoryData(key)
-          }
-          vm.editUndoCount(0);
-        } else {
-          // 正常顺序执行的情况，记录拖拽前的数据状态
-          let key = `graph_history_${vm.getHistoryIndex()}`
-          vm.addHistoryData(key, historyData)
-        }
-        // 记录拖拽后的数据状态
-        const index=vm.getHistoryIndex()+ 1;
-        vm.editHistoryIndex(index);
-        let key = `graph_history_${index}`
-        let currentData = JSON.stringify(graph.save())
-        vm.addHistoryData(key, currentData)
-      }
-    }
-  }
-}
diff --git a/src/views/custom-query/topo/top/behavior/hover-event-edit.js b/src/views/custom-query/topo/top/behavior/hover-event-edit.js
deleted file mode 100644
index c6bf0e6..0000000
--- a/src/views/custom-query/topo/top/behavior/hover-event-edit.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/07/16
- * @description: edit mode: 悬浮交互
- */
-// 用来获取调用此js的vue组件实例（this）
-let vm = null;
-let hourItem = null;
-const sendThis = (topo) => {
-  vm = topo;
-};
-export default {
-  sendThis, // 暴露函数
-  name: "hover-event-edit",
-  options: {
-    getEvents() {
-      return {
-        "node:mouseover": "onNodeHover",
-        // "node:mouseout": "onNodeOut",
-        // "mouseleave":"onNodeLeave",
-      };
-    },
-    onNodeHover(event) {
-      let graph = vm.getGraph();
-      let hoverNode = event.item;
-      const name = event.shape.get("name");//todo ??
-      const item = event.item;
-      if (name && name.startsWith("item")) {
-        graph.updateItem(item, {//更新元素，包括更新数据、样式等
-          selectedIndex: Number(name.split("-")[1])
-        });
-      } else {
-        graph.updateItem(item, {
-          selectedIndex: NaN
-        });
-      }
-      if (name && name.startsWith("marker")) {
-        hoverNode.setState("hover", true, graph);
-        hourItem=hoverNode;
-      }else {
-        if (hourItem!=null){
-          hourItem.setState("hover", false)
-        }
-      }
-    },
-    // onNodeOut(event) {
-    //   console.log('移出节点')
-      // const name = event.shape.get("name");
-      // let hoverNode = event.item;
-      // console.log('name',name)
-      // if (name && name.startsWith("marker")) {
-      //   hoverNode.setState("hover", false);
-      // }
-      // if (hourItem!=null){
-      //   hourItem.setState("hover", false)
-      // }
-      // hoverNode.setState("hover", false);
-    // },
-    // onNodeLeave(event) {
-    //   console.log('移出节点2')
-    //   if (hourItem!=null){
-    //     hourItem.setState("hover", false)
-    //   }
-    // }
-  }
-};
diff --git a/src/views/custom-query/topo/top/behavior/index.js b/src/views/custom-query/topo/top/behavior/index.js
deleted file mode 100644
index c67b1b0..0000000
--- a/src/views/custom-query/topo/top/behavior/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/07/16
- * @description: register behaviors
- */
-
-import dragAddEdge from './drag-add-edge'
-import hoverEventEdit from './hover-event-edit'
-import dragEventEdit from './drag-event-edit'
-import keyupEventEdit from './keyup-event-edit'
-import clickErNode from './click-er-node'
-import clickErEdge from './click-er-edge'
-
-const obj = {
-  dragAddEdge,
-  hoverEventEdit,
-  dragEventEdit,
-  keyupEventEdit,
-  clickErNode,
-  clickErEdge
-}
-
-export default {
-  obj,
-  register(G6) {
-    Object.values(obj).map(item => {
-      G6.registerBehavior(item.name, item.options)
-    })
-  }
-}
diff --git a/src/views/custom-query/topo/top/behavior/keyup-event-edit.js b/src/views/custom-query/topo/top/behavior/keyup-event-edit.js
deleted file mode 100644
index 181bd83..0000000
--- a/src/views/custom-query/topo/top/behavior/keyup-event-edit.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/07/16
- * @description: edit mode: 键盘事件的交互，主要是删除节点和连线(记录删除前后的数据，用于【撤销】和【重做】)
- */
-
-// 用来获取调用此js的vue组件实例（this）
-let vm = null;
-
-const sendThis = (_this) => {
-  vm = _this;
-};
-
-export default {
-  sendThis, // 暴露函数
-  name: "keyup-event-edit",
-  options: {
-    getEvents() {
-      return {
-        "keyup": "onKeyup",
-        "keydown": "onKeydown",
-      };
-    },
-    onKeyup(event) {
-      let graph = vm.getGraph();
-      let selectedNodes = graph.findAllByState("node", "selected");
-      let selectedEdges = graph.findAllByState("edge", "selected");
-      //按住键盘delete-46删除功能
-      if (event.keyCode === 46 && (selectedNodes.length > 0 || selectedEdges.length > 0)) {
-        // ************** 记录【删除】前的数据状态 start **************
-        let historyData = JSON.stringify(graph.save());
-        let key = `graph_history_${vm.getHistoryIndex()}`;
-        vm.addHistoryData(key, historyData);
-        // ************** 记录【删除】前的数据状态 end **************
-
-        // 开始删除
-        selectedNodes.forEach(item=>graph.removeItem(item))
-        selectedEdges.forEach(item=>graph.removeItem(item))
-        // ************** 记录【删除】后的数据状态 start **************
-        // 如果当前点过【撤销】了，拖拽节点后将取消【重做】功能
-        // 重置undoCount，【删除】后的数据状态给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-        if (vm.getUndoCount() > 0) {
-          vm.editHistoryIndex( vm.getHistoryIndex() - vm.getUndoCount()); // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-          for (let i = 1; i <= vm.getUndoCount(); i++) {
-            let key = `graph_history_${vm.getHistoryIndex() + i}`;
-            vm.removeHistoryData(key);
-          }
-          vm.editUndoCount(0);
-        }
-        // 记录【删除】后的数据状态
-        const index=vm.getHistoryIndex()+ 1;
-        vm.editHistoryIndex(index);
-        key = `graph_history_${index}`;
-        let currentData = JSON.stringify(graph.save());
-        vm.addHistoryData(key, currentData);
-        // ************** 记录【删除】后的数据状态 end **************
-      } else if (event.keyCode == 17) {//ctrl键，将状态传给父组件，在clickErNode里面编写功能（按住ctrl，滚动后放大缩小ER图）
-        vm.editClickCtrl(false)//松开则为false
-      }
-    },
-    onKeydown(event) {
-      if (event.keyCode == 17) {//ctrl键
-        vm.editClickCtrl(true)//为true时：一直按着ctrl，以实现滚轮放大缩小功能
-      }
-    }
-  }
-};
diff --git a/src/views/custom-query/topo/top/components/FooterBar.vue b/src/views/custom-query/topo/top/components/FooterBar.vue
deleted file mode 100644
index 4f5e008..0000000
--- a/src/views/custom-query/topo/top/components/FooterBar.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div class="footer-bar">
-    <div class="links">
-      <ul>
-        <li>
-          <a href="https://github.com/clay" target="_blank">
-            <i class="iconfont icon-github"></i>
-          </a>
-        </li>
-        <li>
-          <a href="javascript:void(0);">
-            <i class="fab fa-weixin"></i>
-          </a>
-        </li>
-        <li>
-          <a href="javascript:void(0);">更新日志</a>
-        </li>
-        <li>
-          <a href="https://github.com/clay/style-guide" target="_blank">代码规范</a>
-        </li>
-      </ul>
-    </div>
-    <div class="copyright">
-      <ul>
-        <li class="nav-item">
-          <span>ClayTop 0.1.0</span>
-        </li>
-        <li>
-          <span>|</span>
-        </li>
-        <li class="nav-item">
-          <span>ChainCloud FE</span>
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<script setup>
-const home = () => {
-  this.$router.push({
-    path: '/'
-  })
-}
-</script>
-
-<style lang="scss" scoped>
-.footer-bar {
-  .links {
-    float: left;
-
-    ul {
-      padding-left: 60px;
-    }
-
-    li {
-      display: inline;
-      padding: 10px;
-    }
-
-    i {
-      font-size: 16px;
-    }
-
-    a {
-      color: rgba(255, 255, 255, 0.45);
-    }
-  }
-
-  .copyright {
-    float: right;
-
-    ul {
-      padding-right: 60px;
-    }
-
-    li {
-      display: inline;
-      padding: 5px;
-    }
-
-    i {
-      font-size: 16px;
-    }
-
-    a {
-      color: rgba(255, 255, 255, 0.45);
-    }
-  }
-}
-</style>
diff --git a/src/views/custom-query/topo/top/components/HeaderBar.vue b/src/views/custom-query/topo/top/components/HeaderBar.vue
deleted file mode 100644
index eb4df07..0000000
--- a/src/views/custom-query/topo/top/components/HeaderBar.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div class="header-bar">
-    <el-row>
-      <el-col :span="8" style="text-align: left">
-        <router-link to="/">
-          <div class="navbar-brand">
-            <img id="logo" src="@/assets/logo.svg" width="38px" height="38px" alt="ClayTop"/>
-            <span> ClayTop </span>
-          </div>
-        </router-link>
-      </el-col>
-      <el-col :span="8" style="text-align: center">
-        <div class="navbar-title">&nbsp;</div>
-      </el-col>
-      <el-col :span="8" style="text-align: right">
-        <div class="navbar-btns">
-          <el-button type="primary" @click="home" link>首页</el-button>
-          <el-button type="primary" @click="about" link>关于ClayTop</el-button>
-          <el-button type="primary" @click="tutorial" link>使用教程</el-button>
-          <el-button type="primary" @click="$message('敬请期待...')" link>其它</el-button>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup>
-const home = () => {
-  this.$router.push({
-    path: '/'
-  })
-}
-const about = () => {
-  this.$router.push({
-    path: '/about'
-  })
-}
-const tutorial = () => {
-  this.$message({
-    dangerouslyUseHTMLString: true,
-    message: '<div style="text-align: left">时间原因，暂未编写。<br/><br/>目前【开发方式】和【使用方式】可先参考 README.md。 <br/><br/><div style="text-align: right">—— by clay</div></div>',
-    type: 'info',
-    center: true,
-    duration: 5000,
-    showClose: false,
-    offset: 100
-  })
-}
-
-</script>
-
-<style lang="scss" scoped>
-.header-bar {
-  .navbar-brand {
-    display: inline-block;
-    margin: 0 18px 0 35px;
-    /*padding: 0 0 0 8px;*/
-    line-height: 22px;
-    font-size: 20px;
-
-    img {
-      vertical-align: middle;
-    }
-
-    span {
-      vertical-align: middle;
-      /*font-family: "Microsoft YaHei";*/
-      color: #06080A;
-    }
-  }
-
-  .navbar-title {
-    vertical-align: middle;
-    text-align: center;
-    font-size: 20px;
-  }
-
-  .navbar-btns {
-    vertical-align: middle;
-    text-align: right;
-
-    .el-button:last-child {
-      margin-right: 20px;
-    }
-
-    .el-button--text {
-      color: #06080A;
-    }
-  }
-}
-</style>
diff --git a/src/views/custom-query/topo/top/config/edge.js b/src/views/custom-query/topo/top/config/edge.js
deleted file mode 100644
index e908144..0000000
--- a/src/views/custom-query/topo/top/config/edge.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/16
- * @description: 线条的后期设置
- */
-
-export default {
-  type: 'top-cubic',
-  style: {
-    startArrow: false,
-    endArrow: true
-  }
-}
diff --git a/src/views/custom-query/topo/top/config/index.js b/src/views/custom-query/topo/top/config/index.js
deleted file mode 100644
index abed973..0000000
--- a/src/views/custom-query/topo/top/config/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/16
- * @description: 配置
- */
-
-import edge from './edge'
-
-export default {
-  edge
-}
diff --git a/src/views/custom-query/topo/top/edge/base.js b/src/views/custom-query/topo/top/edge/base.js
deleted file mode 100644
index f2b5599..0000000
--- a/src/views/custom-query/topo/top/edge/base.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @author: Clay
- * @data: 2019/07/18
- * @description: 线公共方法
- */
-
-import utils from '../../utils'
-
-export default {
-  draw(cfg, group) {
-    const { startPoint, endPoint } = cfg
-    const keyShape = group.addShape('path', {
-      className: 'edge-shape',
-      attrs: {
-        ...cfg.style,
-        path: [
-          ['M', startPoint.x, startPoint.y],
-          ['L', endPoint.x, endPoint.y]
-        ]
-      },
-      name: 'edge-shape'
-    })
-    keyShape.attrs.endArrow = true
-    return keyShape
-  },
-  setState(name, value, item) {
-    // 设置边状态
-    utils.edge.setState(name, value, item)
-  }
-}
diff --git a/src/views/custom-query/topo/top/edge/index.js b/src/views/custom-query/topo/top/edge/index.js
deleted file mode 100644
index bcbbbe4..0000000
--- a/src/views/custom-query/topo/top/edge/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/07/18
- * @description: register edges
- */
-
-
-import topCubic from './top-cubic'
-
-const obj = {
-  topCubic
-}
-
-export default function(G6) {
-  Object.values(obj).map(item => {
-    G6.registerEdge(item.name, item.options, item.extendName)
-  })
-}
diff --git a/src/views/custom-query/topo/top/edge/top-cubic.js b/src/views/custom-query/topo/top/edge/top-cubic.js
deleted file mode 100644
index c53d53f..0000000
--- a/src/views/custom-query/topo/top/edge/top-cubic.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @author: Clay
- * @data: 2019/07/18
- * @description: 曲线
- */
-
-import base from './base'
-export default {
-  name: 'top-cubic',
-  extendName: 'cubic',
-  options: {
-    ...base
-  }
-}
diff --git a/src/views/custom-query/topo/top/elements/button.vue b/src/views/custom-query/topo/top/elements/button.vue
deleted file mode 100644
index f9969c1..0000000
--- a/src/views/custom-query/topo/top/elements/button.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <button
-      class="cc-button"
-      @click="handleClick"
-      :disabled="buttonDisabled"
-      :class="[
-      type ? 'cc-button--' + type : '',
-      buttonSize ? 'cc-button--' + buttonSize : '',
-      {
-        'is-disabled': buttonDisabled,
-        'is-plain': plain
-      }
-    ]"
-  >
-    <span><slot></slot></span>
-  </button>
-</template>
-
-<script setup>
-import {defineProps, computed} from "vue";
-
-const emit = defineEmits(['click'])
-const props = defineProps({
-  type: {
-    type: String,
-    default: 'default'
-  },
-  size: {
-    type: String,
-    default: ''
-  },
-  disabled: {
-    type: Boolean,
-    default: false
-  },
-  plain: {
-    type: Boolean,
-    default: false
-  }
-})
-
-
-const buttonSize = computed(() => {
-  return props.size
-})
-const buttonDisabled = computed(() => {
-  return props.disabled
-})
-
-const handleClick = (evt) => {
-  emit('click', evt)
-}
-</script>
-
-<style lang="scss" scoped>
-.cc-button {
-  display: inline-block;
-  line-height: 1;
-  white-space: nowrap;
-  cursor: pointer;
-  background: #fff;
-  border: 1px solid #dcdfe6;
-  color: #606266;
-  -webkit-appearance: none;
-  text-align: center;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  outline: 0;
-  margin: 0;
-  -webkit-transition: .1s;
-  transition: .1s;
-  font-weight: 500;
-  padding: 12px 20px;
-  font-size: 14px;
-  border-radius: 4px;
-}
-
-.cc-button:focus, .cc-button:hover {
-  color: #409eff;
-  border-color: #c6e2ff;
-  background-color: #ecf5ff;
-}
-
-.cc-button--mini, .cc-button--mini.is-round {
-  padding: 7px 15px;
-}
-
-.cc-button--mini, .cc-button--small {
-  font-size: 12px;
-  border-radius: 3px;
-}
-</style>
diff --git a/src/views/custom-query/topo/top/elements/checkbox.vue b/src/views/custom-query/topo/top/elements/checkbox.vue
deleted file mode 100644
index b32dc05..0000000
--- a/src/views/custom-query/topo/top/elements/checkbox.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <div class="cc-checkbox" :class="{ 'checkbox-checked': checkVal }">
-    <input
-        id="checkbox"
-        type="checkbox"
-        v-model="checkVal"
-        @change="handleChange"
-    />
-    <label for="checkbox"></label>
-    <slot></slot>
-  </div>
-</template>
-
-<script setup>
-import {ref} from "vue";
-
-const emit = defineEmits(['change'])
-const checkVal = ref(false);
-
-const handleChange = () => {
-  emit('change', checkVal.value)
-}
-
-</script>
-
-<style lang="scss" scoped>
-.cc-checkbox {
-  display: inline-block;
-  color: #606266;
-  font-size: 14px;
-
-  input[type='checkbox'] + label {
-    margin: 0 8px;
-    cursor: pointer;
-  }
-
-  input[type='checkbox'] + label::before {
-    content: '\a0';
-    display: inline-block;
-    position: relative;
-    border: 1px solid #dcdfe6;
-    border-radius: 2px;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    width: 14px;
-    height: 14px;
-    line-height: 0.9;
-    background-color: #fff;
-    z-index: 1;
-    -webkit-transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
-    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
-  }
-
-  input[type='checkbox']:checked + label::before {
-    content: '\2714';
-    color: #fff;
-    background-color: #409eff;
-    border-color: #409eff;
-  }
-
-  input[type='checkbox'] {
-    opacity: 0;
-    outline: 0;
-    position: absolute;
-    margin: 0;
-    width: 0;
-    height: 0;
-    z-index: -1;
-  }
-}
-
-.checkbox-checked {
-  color: #409eff;
-}
-</style>
diff --git a/src/views/custom-query/topo/top/elements/dropdown.vue b/src/views/custom-query/topo/top/elements/dropdown.vue
deleted file mode 100644
index 4e995c3..0000000
--- a/src/views/custom-query/topo/top/elements/dropdown.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <div class="graph-op">
-    <span v-for="edgeItem in dropdownItems" @click="onItemClick(edgeItem.value, $event)">{{ edgeItem.label }}</span>
-  </div>
-</template>
-
-<script setup>
-import $ from 'jquery'
-import {defineProps, ref, watch} from "vue";
-
-const emit = defineEmits(['change'])
-const props = defineProps({
-  dropdownItems: {
-    type: Array,
-    default() {
-      return []
-    }
-  },
-  defaultIndex: {
-    type: Number,
-    default() {
-      return 0
-    }
-  }
-})
-const activeIndex = ref(props.defaultIndex)
-const timeout = ref(null)
-//todo 可能有问题
-watch(() => activeIndex.value, (value) => {
-  emit('change', activeIndex.value)
-})
-
-const onItemClick = (index, e) => {
-  let lineList = $('.iconfonts')
-  for (let i = 0; i < lineList.length; i++) {
-    lineList[i].style.backgroundColor = '#ffffff'
-  }
-  // if (e.path[0].style.backgroundColor == 'rgb(255, 255, 255)') {
-  //   e.path[0].style.backgroundColor = '#ebeef2'
-  // }
-  if (index !== activeIndex.value) {
-    activeIndex.value = index
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.iconfonts {
-  color: #666666;
-  font-size: 12px;
-  line-height: 20px;
-  height: 20px;
-  padding-bottom: 2px;
-
-}
-
-.graph-op {
-  display: inline-block;
-  vertical-align: middle;
-  span {
-    width: 120px;
-    margin: 0 6px;
-    color: #a8a8a8;
-    text-align: center;
-    border-radius: 2px;
-    display: inline-block;
-    border: 1px solid rgba(2, 2, 2, 0);
-  }
-
-  span:hover {
-    cursor: pointer;
-    border: 1px solid #E9E9E9;
-  }
-}
-</style>
diff --git a/src/views/custom-query/topo/top/elements/index.js b/src/views/custom-query/topo/top/elements/index.js
deleted file mode 100644
index ff793df..0000000
--- a/src/views/custom-query/topo/top/elements/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/11/14
- * @description: ClayTop内部的通用组件
- */
-
-import Checkbox from './checkbox.vue'
-import Button from './button.vue'
-import Dropdown from './dropdown.vue'
-import Loading from './loading.vue'
-
-export {
-  Checkbox,
-  Button,
-  Dropdown,
-  Loading
-}
diff --git a/src/views/custom-query/topo/top/elements/loading.vue b/src/views/custom-query/topo/top/elements/loading.vue
deleted file mode 100644
index fc14dd1..0000000
--- a/src/views/custom-query/topo/top/elements/loading.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div class="model-overlay">
-    <div class="cc-loading">
-      <svg class="circular" viewBox="0 0 50 50">
-        <circle cx="25" cy="25" r="20" fill="none" stroke="#409EFF" stroke-width="5%" stroke-linecap="round"/>
-      </svg>
-    </div>
-    <span class="loading-text">{{ loadingText }}</span>
-  </div>
-</template>
-
-<script setup>
-import {defineProps} from "vue";
-
-const props = defineProps({
-  loadingText: {
-    type: String,
-    default: '加载中...'
-  }
-})
-</script>
-
-<style lang="scss" scoped>
-.model-overlay {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  text-align: center;
-  z-index: 1000;
-  overflow: auto;
-  background-color: transparent;
-}
-
-.cc-loading {
-  position: absolute;
-  width: 50px;
-  top: 45%;
-  left: 50%;
-
-  &:before {
-    content: '';
-    display: block;
-    padding-top: 100%;
-  }
-
-  .circular {
-    position: absolute;
-    top: 0;
-    left: 0;
-    animation: rotate 2s linear infinite;
-  }
-
-  circle {
-    animation: circle-dash 1.5s ease-in-out infinite;
-  }
-}
-
-@keyframes circle-dash {
-  0% {
-    stroke-dasharray: 1, 125;
-    stroke-dashoffset: 0;
-  }
-  50% {
-    stroke-dasharray: 100, 125;
-    stroke-dashoffset: -25px;
-  }
-  100% {
-    stroke-dasharray: 100, 125;
-    stroke-dashoffset: -125px;
-  }
-}
-
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-.loading-text {
-  position: absolute;
-  top: calc(45% + 60px);
-  left: calc(50% - 10px);
-  color: #409EFF;
-  font-size: 14px;
-}
-</style>
diff --git a/src/views/custom-query/topo/top/graph/index.js b/src/views/custom-query/topo/top/graph/index.js
deleted file mode 100644
index 7f9801d..0000000
--- a/src/views/custom-query/topo/top/graph/index.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/07/05
- * @description: 图的布局方式/图的初始化
- */
-
-// import d3 from '../plugins/d3-installer'
-import  * as d3 from 'd3'
-import theme from '../theme'
-
-/**
- * 图的布局方式/图的初始化
- * @type {{commonGraph: (function(*, *): G6.Graph)}}
- */
-const initGraph = {
-  /**
-   * 一般布局
-   * @param G6
-   * @param options
-   * @returns {G6.Graph}
-   */
-  commonGraph: function(G6, options) {
-    let graphData = options.graphData
-    let themeStyle = theme.defaultStyle // todo...先使用默认主题，后期可能增加其它风格的主体
-    // 生成G6实例
-    let graph = new G6.Graph({
-      plugins: options.plugins,//向 graph 注册插件
-      container: options.container,//图的 DOM 容器，可以传入该 DOM 的 id 或者直接传入容器的 HTML 节点对象。
-      width: options.width,//指定画布宽度，单位为 'px'，默认为画布容器宽度。
-      height: options.height,//指定画布高度
-      // layout: {
-      //   type: 'random',
-      //   width: options.width,
-      //   height: options.height
-      // },
-      defaultNode: {//默认状态下节点的配置
-        type: 'dice-er-box',
-        labelCfg: {
-          position: 'bottom'
-        }
-      },
-      defaultEdge: {//默认状态下线的配置
-        type: 'top-cubic',
-        labelCfg: {
-          position: 'center',
-          autoRotate: false
-        }
-      },
-      nodeStateStyles: themeStyle.nodeStyle,//各个状态下节点的样式
-      // nodeStyle: {
-      //   selected: {
-      //     shadowColor: '#626262',
-      //     shadowBlur: 8,
-      //     shadowOffsetX: -1,
-      //     shadowOffsetY: 3
-      //   }
-      // },
-      edgeStateStyles:{
-        edgeStyle: {
-          default: {
-            stroke: '#e2e2e2',
-            lineWidth: 3,
-            lineAppendWidth: 10
-          },
-          selected: {
-            shadowColor: '#626262',
-            shadowBlur: 3
-          }
-        },
-      },//各个状态下边的样式
-      modes: options.modes//设置画布的交互模式
-    })
-    // 将 read 方法分解成 data() 和 render 方法，便于整个生命周期的管理
-    graph.read(graphData)
-    // 渲染图
-    graph.render()
-    // 返回G6实例
-    return graph
-  },
-  /**
-   * 力导布局
-   * @param G6
-   * @param options
-   * @returns {*}
-   */
-  forceLayoutGraph: function(resolve, G6, options) {
-    let graphData = options.graphData
-    let themeStyle = theme.defaultStyle // todo...先使用默认主题，后期可能增加其它风格的主体
-    // 生成G6实例
-    let graph = new G6.Graph({
-      container: options.container,
-      width: options.width,
-      height: options.height,
-      nodeStateStyles: themeStyle.nodeStyle,
-      edgeStateStyles: themeStyle.edgeStyle
-    })
-    // 初始化力导布局
-    let simulation = d3
-      .forceSimulation()
-      .force(
-        'link',
-        d3
-          .forceLink()
-          .id(function(d) {
-            return d.id
-          })
-          .distance(linkDistance)
-          .strength(0.5)
-      )
-      .force('charge', d3.forceManyBody().strength(-500).distanceMax(500).distanceMin(100))
-      .force('center', d3.forceCenter(options.width / 2, options.height / 2))
-    // 定义节点数据
-    simulation.nodes(graphData.nodes).on('tick', ticked)
-    // 定义连线数据
-    let edges = []
-    for (let i = 0; i < graphData.edges.length; i++) {
-      edges.push({
-        id: graphData.edges[i].id,
-        source: graphData.edges[i].source,
-        target: graphData.edges[i].target
-      })
-    }
-    simulation.force('link').links(edges)
-    graph.data(graphData)
-    graph.render()
-
-    function linkDistance(d) {
-      return 150
-    }
-
-    function ticked() {
-      // protect: planA: 移除事件监听器 planB: 手动停止力模拟
-      if (graph.destroyed) {
-        // simulation.nodes(graphData.nodes).on('tick', null)
-        simulation.stop()
-        return
-      }
-      if (!graph.get('data')) {
-        // 若是第一次渲染，定义数据，渲染
-        graph.data(graphData)
-        graph.render()
-      } else {
-        // 后续渲染，直接刷新所有点和边的位置
-        graph.refreshPositions()
-      }
-    }
-
-    // 控制时间: 只布局10秒
-    let t = setTimeout(function() {
-      simulation.stop()
-      resolve(graph)
-    }, 10000)
-
-    // 判断force-layout结束
-    simulation.on('end', () => {
-      clearTimeout(t)
-      resolve(graph)
-    })
-  }
-}
-
-export default initGraph
diff --git a/src/views/custom-query/topo/top/index.vue b/src/views/custom-query/topo/top/index.vue
deleted file mode 100644
index fa3d9fc..0000000
--- a/src/views/custom-query/topo/top/index.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
- <el-button @click="handleClick">设计</el-button>
-</template>
-
-<script setup>
-import {useRouter} from "vue-router";
-
-const router = useRouter()
-const handleClick=()=>{
-  router.push('/top/edit/1')
-}
-</script>
diff --git a/src/views/custom-query/topo/top/node/dice-er-box.js b/src/views/custom-query/topo/top/node/dice-er-box.js
deleted file mode 100644
index 41bd657..0000000
--- a/src/views/custom-query/topo/top/node/dice-er-box.js
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * @author: clay
- * @data: 2021/5/15 0:16
- * @email: clay@hchyun.com
- * @description: draw anchor 绘制锚点
- */
-import utils from '../../utils/index'
-
-const itemHeight = 30;
-export default {
-  name: 'dice-er-box',
-  options: {
-    /**
-     * 响应节点的状态变化。
-     * 在需要使用动画来响应状态变化时需要被复写
-     * @param  {String} name 状态名称
-     * @param  {Object} value 状态值
-     * @param  {item} item 节点
-     */
-    setState(name, value, item) {
-      // 设置节点状态
-      utils.node.setState(name, value, item);
-      // 设置锚点状态
-      utils.anchor.setState(name, value, item);
-    },
-    draw(cfg, group) {
-      const width = 250;
-      const height = 316;
-      const itemCount = 10;
-      const boxStyle = {
-        stroke: "#096DD9",
-        radius: 4,
-      };
-
-      const {
-        columns = [],
-        startIndex = 0,
-        selectedIndex,
-        collapsed,
-        icon,
-      } = cfg;
-      const list = columns;
-      const afterList = list.slice(
-        Math.floor(startIndex),
-        Math.floor(startIndex + itemCount - 1)
-      );
-      const offsetY = (0.5 - (startIndex % 1)) * itemHeight + 30;
-
-      //设置表名的容器
-      group.addShape("rect", {
-        attrs: {
-          fill: boxStyle.stroke,
-          height: 30,
-          width,
-          radius: [boxStyle.radius, boxStyle.radius, 0, 0],
-        },
-        draggable: true,
-      });
-
-      //设置左侧字体的边距
-      let fontLeft = 12;
-
-      // 设置图标
-      if (icon && icon.show !== false) {
-        group.addShape("image", {
-          attrs: {
-            x: 8,
-            y: 8,
-            height: 16,
-            width: 16,
-            ...icon,
-          },
-        });
-        fontLeft += 18;
-      }
-
-      //设置表名
-      group.addShape("text", {
-        attrs: {
-          y: 22,
-          x: fontLeft,
-          fill: "#fff",
-          text: cfg.label,
-          fontSize: 12,
-          fontWeight: 500,
-        },
-      });
-
-      //设置收缩部分的容器
-      group.addShape("rect", {
-        attrs: {
-          x: 0,
-          y: collapsed ? 30 : 300,
-          height: 15,
-          width,
-          fill: "#eee",
-          radius: [0, 0, boxStyle.radius, boxStyle.radius],
-          cursor: "pointer",
-        },
-        name: collapsed ? "expand" : "collapse",
-      });
-
-      //设置收缩显示字符
-      group.addShape("text", {
-        attrs: {
-          x: width / 2 - 6,
-          y: (collapsed ? 30 : 300) + 12,
-          text: collapsed ? "+" : "-",
-          width,
-          fill: "#000",
-          radius: [0, 0, boxStyle.radius, boxStyle.radius],
-          cursor: "pointer",
-        },
-        name: collapsed ? "expand" : "collapse",
-      });
-
-      //设置外边框
-      const keyshape = group.addShape("rect", {
-        attrs: {
-          name: 'border',
-          x: 0,
-          y: 0,
-          width,
-          height: collapsed ? 45 : height,
-          ...boxStyle,
-        },
-        //是否被允许拖拽
-        draggable: true
-      });
-
-      //如果收缩状态,则返回当前图形
-      if (collapsed) {
-        return keyshape;
-      }
-      //添加空白组
-      const listContainer = group.addGroup({});
-      //todo 设置裁剪对象,字体加粗?
-      listContainer.setClip({
-        type: "rect",
-        attrs: {
-          x: -8,
-          y: 30,
-          width: width + 16,
-          height: 300 - 30,
-        },
-      });
-      listContainer.addShape({
-        type: "rect",
-        attrs: {
-          x: 1,
-          y: 30,
-          width: width - 2,
-          height: 300 - 30,
-          fill: "#fff",
-        },
-        draggable: true,
-      });
-
-      //如果list中的column字段超过10个
-      if (list.length > itemCount) {
-        const barStyle = {
-          width: 4,
-          padding: 0,
-          boxStyle: {
-            stroke: "#00000022",
-          },
-          innerStyle: {
-            fill: "#00000022",
-          },
-        };
-
-        listContainer.addShape("rect", {
-          attrs: {
-            y: 30,
-            x: width - barStyle.padding - barStyle.width,
-            width: barStyle.width,
-            height: height - 30,
-            ...barStyle.boxStyle,
-          },
-        });
-
-        //设置矩形高度
-        const indexHeight =
-          afterList.length > itemCount ?
-            (afterList.length / list.length) * height :
-            10;
-
-        listContainer.addShape("rect", {
-          attrs: {
-            y: 30 +
-              barStyle.padding +
-              (startIndex / (list.length-8)) * (height - 30),
-            x: width - barStyle.padding - barStyle.width,
-            width: barStyle.width,
-            height: Math.min(height, indexHeight),
-            ...barStyle.innerStyle,
-          },
-        });
-      }
-      //渲染显示区域
-      if (afterList) {
-        afterList.forEach((e, i) => {
-          //设置选中的列
-          const isSelected = Math.floor(startIndex) + i === Number(selectedIndex);
-          let {
-            columnName = "", columnType,columnComment
-          } = e;
-          if (columnComment){
-            columnName+= " : " + columnComment
-          }
-          if (columnType) {
-            columnName += " - " + columnType;
-          }
-          const label = columnName.length > 26 ? columnName.slice(0, 24) + "..." : columnName;
-
-          listContainer.addShape("rect", {
-            attrs: {
-              x: 1,
-              y: i * itemHeight - itemHeight / 2 + offsetY,
-              width: width - 4,
-              height: itemHeight,
-              radius: 2,
-              fill:isSelected ? "#ddd" : "#fff",
-              lineWidth: 1,
-              cursor: "pointer",
-            },
-            name: `item-${Math.floor(startIndex) + i}-content`,
-            draggable: true,
-          });
-
-          listContainer.addShape("text", {
-            attrs: {
-              x: 12,
-              y: i * itemHeight + offsetY + 6,
-              text: label,
-              fontSize: 12,
-              fill: "#000",
-              fontFamily: "Avenir,-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol",
-              full: e,
-              fontWeight: isSelected ? 500 : 100,
-              cursor: "pointer",
-            },
-            name: `item-${Math.floor(startIndex) + i}`,
-          });
-
-          //未来设置字段之间有锚点
-          // if (!cfg.hideDot) {
-          //   utils.anchor.erDrawLeft(group, label, 0, i * itemHeight + offsetY)
-          //   utils.anchor.erDrawLeft(group,label,width,i * itemHeight + offsetY)
-          //   listContainer.addShape("marker", {
-          //     attrs: {
-          //       x: 0,
-          //       y: i * itemHeight + offsetY,
-          //       r: 3,
-          //       stroke: boxStyle.stroke,
-          //       fill: "white",
-          //       radius: 2,
-          //       lineWidth: 1,
-          //       cursor: "crosshair",
-          //     },
-          //
-          //     name: 'marker-shape'
-          //   });
-          //   listContainer.addShape("marker", {
-          //     attrs: {
-          //       x: width,
-          //       y: i * itemHeight + offsetY,
-          //       r: 3,
-          //       stroke: boxStyle.stroke,
-          //       fill: "white",
-          //       radius: 2,
-          //       lineWidth: 1,
-          //       cursor: "crosshair",
-          //
-          //
-          //     },
-          //     name: 'marker-shape'
-          //   });
-          // }
-        });
-      }
-      return keyshape;
-    },
-    // getAnchorPoints() {
-    //   return [
-    //     [0, 0],
-    //     [1, 0],
-    //   ];
-    // },
-    // 绘制后附加锚点
-    afterDraw(cfg, group) {
-      // 绘制锚点
-      utils.anchor.drawMark(cfg, group)
-    },
-
-  }
-}
-
-
-
-
-
diff --git a/src/views/custom-query/topo/top/node/index.js b/src/views/custom-query/topo/top/node/index.js
deleted file mode 100644
index 7ed5492..0000000
--- a/src/views/custom-query/topo/top/node/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/07/05
- * @description: register nodes
- */
-
-
-import diceErBox from './dice-er-box'
-const obj = {
-  diceErBox
-}
-
-export default {
-  obj,
-  register(G6) {
-    Object.values(obj).map(item => {
-      G6.registerNode(item.name, item.options, item.extendName)
-    })
-  }
-}
diff --git a/src/views/custom-query/topo/top/theme/dark-style.js b/src/views/custom-query/topo/top/theme/dark-style.js
deleted file mode 100644
index 5c04978..0000000
--- a/src/views/custom-query/topo/top/theme/dark-style.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/11/20
- * @description: dark style
- */
-
-export default {
-  // 节点样式
-  nodeStyle: {
-    default: {
-      stroke: '#CED4D9',
-      fill: 'transparent',
-      shadowOffsetX: 0,
-      shadowOffsetY: 4,
-      shadowBlur: 10,
-      shadowColor: 'rgba(13, 26, 38, 0.08)',
-      lineWidth: 1,
-      radius: 4,
-      strokeOpacity: 0.7
-    },
-    selected: {
-      shadowColor: '#ff240b',
-      shadowBlur: 4,
-      shadowOffsetX: 0,
-      shadowOffsetY: 0
-      // shadowColor: '#626262',
-      // shadowBlur: 8,
-      // shadowOffsetX: -1,
-      // shadowOffsetY: 3
-    },
-    unselected: {
-      shadowColor: ''
-    }
-  },
-  //todo 节点标签样式??修改不起
-  nodeLabelCfg: {
-    positions: 'center',
-    style: {
-      fill: '#fff'
-    }
-  },
-  // 连线样式
-  edgeStyle: {
-    default: {
-      stroke: '#000000',
-      lineWidth: 2,
-      strokeOpacity: 0.92,
-      lineAppendWidth: 10
-      // endArrow: true
-    },
-    active: {
-      shadowColor: 'red',
-      shadowBlur: 4,
-      shadowOffsetX: 0,
-      shadowOffsetY: 0
-    },
-    inactive: {
-      shadowColor: ''
-    },
-    selected: {
-      shadowColor: '#ff240b',
-      shadowBlur: 4,
-      shadowOffsetX: 0,
-      shadowOffsetY: 0
-    },
-    unselected: {
-      shadowColor: ''
-    }
-  },
-  // 锚点样式
-  anchorStyle: {
-    default: {
-      radius: 3,
-      symbol: 'circle',
-      fill: '#FFFFFF',
-      fillOpacity: 0,
-      stroke: '#1890FF',
-      strokeOpacity: 0,
-      cursor: 'crosshair'
-    },
-    hover: {
-      fillOpacity: 1,
-      strokeOpacity: 1
-    },
-    unhover: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    },
-    active: {
-      fillOpacity: 1,
-      strokeOpacity: 1
-    },
-    inactive: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    }
-  },
-  // 锚点背景样式
-  anchorBgStyle: {
-    default: {
-      radius: 10,
-      symbol: 'circle',
-      fill: '#1890FF',
-      fillOpacity: 0,
-      stroke: '#1890FF',
-      strokeOpacity: 0,
-      cursor: 'crosshair'
-    },
-    hover: {
-      fillOpacity: 1,
-      strokeOpacity: 1
-    },
-    unhover: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    },
-    active: {
-      fillOpacity: 0.3,
-      strokeOpacity: 0.5
-    },
-    inactive: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    }
-  },
-
-
-  nodeActivedOutterStyle: { lineWidth: 0 },
-  groupSelectedOutterStyle: { stroke: '#E0F0FF', lineWidth: 2 },
-  nodeSelectedOutterStyle: { stroke: '#E0F0FF', lineWidth: 2 },
-  edgeActivedStyle: { stroke: '#1890FF', strokeOpacity: .92 },
-  nodeActivedStyle: { fill: '#F3F9FF', stroke: '#1890FF' },
-  groupActivedStyle: { stroke: '#1890FF' },
-  edgeSelectedStyle: { lineWidth: 2, strokeOpacity: .92, stroke: '#A3B1BF' },
-  nodeSelectedStyle: { fill: '#F3F9FF', stroke: '#1890FF', fillOpacity: .4 },
-  groupSelectedStyle: { stroke: '#1890FF', fillOpacity: .92 },
-
-  groupBackgroundPadding: [40, 10, 10, 10],
-  groupLabelOffsetX: 10,
-  groupLabelOffsetY: 10,
-  edgeLabelStyle: { fill: '#666', textAlign: 'center', textBaseline: 'middle' },
-  edgeLabelRectPadding: 4,
-  edgeLabelRectStyle: { fill: 'white' },
-  nodeLabelStyle: { fill: '#666', textAlign: 'center', textBaseline: 'middle' },
-  groupStyle: { stroke: '#CED4D9', radius: 4 },
-  groupLabelStyle: { fill: '#666', textAlign: 'left', textBaseline: 'top' },
-  multiSelectRectStyle: { fill: '#1890FF', fillOpacity: .08, stroke: '#1890FF', opacity: .1 },
-  dragNodeHoverToGroupStyle: { stroke: '#1890FF', lineWidth: 2 },
-  dragNodeLeaveFromGroupStyle: { stroke: '#BAE7FF', lineWidth: 2 },
-  anchorPointStyle: { radius: 3.5, fill: '#fff', stroke: '#1890FF', lineAppendWidth: 12 },
-  anchorHotsoptStyle: { radius: 12, fill: '#1890FF', fillOpacity: .25 },
-  anchorHotsoptActivedStyle: { radius: 14 },
-  anchorPointHoverStyle: { radius: 4, fill: '#1890FF', fillOpacity: 1, stroke: '#1890FF' },
-  nodeControlPointStyle: { radius: 4, fill: '#fff', shadowBlur: 4, shadowColor: '#666' },
-  edgeControlPointStyle: { radius: 6, symbol: 'square', lineAppendWidth: 6, fillOpacity: 0, strokeOpacity: 0 },
-  nodeSelectedBoxStyle: { stroke: '#C2C2C2' },
-  cursor: {
-    panningCanvas: '-webkit-grabbing',
-    beforePanCanvas: '-webkit-grab',
-    hoverNode: 'move',
-    hoverEffectiveAnchor: 'crosshair',
-    hoverEdge: 'default',
-    hoverGroup: 'move',
-    hoverUnEffectiveAnchor: 'default',
-    hoverEdgeControllPoint: 'crosshair',
-    multiSelect: 'crosshair'
-  },
-  nodeDelegationStyle: {
-    stroke: '#1890FF',
-    fill: '#1890FF',
-    fillOpacity: .08,
-    lineDash: [4, 4],
-    radius: 4,
-    lineWidth: 1
-  },
-  edgeDelegationStyle: { stroke: '#1890FF', lineDash: [4, 4], lineWidth: 1 }
-}
diff --git a/src/views/custom-query/topo/top/theme/default-style.js b/src/views/custom-query/topo/top/theme/default-style.js
deleted file mode 100644
index 7838462..0000000
--- a/src/views/custom-query/topo/top/theme/default-style.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: default style
- */
-
-export default {
-  // 节点样式
-  nodeStyle: {
-    default: {
-      stroke: '#CED4D9',
-      fill: 'transparent',
-      // shadowOffsetX: 0,
-      // shadowOffsetY: 4,
-      shadowBlur: 10,
-      shadowColor: 'rgba(13, 26, 38, 0.08)',
-      lineWidth: 1,
-      radius: 4,
-      strokeOpacity: 0.7
-    },
-    selected: {
-      shadowColor: '#ff240b',
-      shadowBlur: 2,
-      // shadowOffsetX: 0,
-      // shadowOffsetY: 0,
-      // fontSize:'50'
-      // shadowColor: '#626262',
-      // shadowBlur: 8,
-      // shadowOffsetX: -1,
-      // shadowOffsetY: 3
-    },
-    unselected: {
-      shadowColor: ''
-    }
-  },
-  // 节点标签样式
-  nodeLabelCfg: {
-    positions: 'center',
-    style: {
-      fill: '#000'
-    }
-  },
-  // 连线样式
-  edgeStyle: {
-    default: {
-      stroke: '#A3B1BF',
-      lineWidth: 2,
-      strokeOpacity: 0.92,
-      lineAppendWidth: 10
-      // endArrow: true
-    },
-    active: {
-      shadowColor: 'red',
-      shadowBlur: 4,
-      shadowOffsetX: 0,
-      shadowOffsetY: 0
-    },
-    inactive: {
-      shadowColor: ''
-    },
-    selected: {
-      shadowColor: '#ff240b',
-      shadowBlur: 4,
-      shadowOffsetX: 0,
-      shadowOffsetY: 0
-    },
-    unselected: {
-      shadowColor: ''
-    }
-  },
-  // 锚点样式
-  anchorStyle: {
-    default: {
-      r: 3,
-      symbol: 'circle',
-      lineWidth: 1,
-      fill: '#FFFFFF',
-      fillOpacity: 1,
-      stroke: '#096DD9',
-      strokeOpacity: 1,
-      cursor: 'crosshair'
-    },
-    hover: {
-      fillOpacity: 0.3,
-      strokeOpacity: 0.5
-    },
-    unhover: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    },
-    active: {
-      fillOpacity: 1,
-      strokeOpacity: 1
-    },
-    inactive: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    }
-  },
-  // 锚点背景样式
-  anchorBgStyle: {
-    default: {
-      r: 10,
-      symbol: 'circle',
-      fill: '#1890FF',
-      fillOpacity: 0,
-      stroke: '#1890FF',
-      strokeOpacity: 0,
-      cursor: 'crosshair'
-    },
-    hover: {
-      fillOpacity: 1,
-      strokeOpacity: 1
-    },
-    unhover: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    },
-    active: {
-      fillOpacity: 0.3,
-      strokeOpacity: 0.5
-    },
-    inactive: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    }
-  },
-
-
-  nodeActivedOutterStyle: { lineWidth: 0 },
-  groupSelectedOutterStyle: { stroke: '#E0F0FF', lineWidth: 2 },
-  nodeSelectedOutterStyle: { stroke: '#E0F0FF', lineWidth: 2 },
-  edgeActivedStyle: { stroke: '#1890FF', strokeOpacity: .92 },
-  nodeActivedStyle: { fill: '#F3F9FF', stroke: '#1890FF' },
-  groupActivedStyle: { stroke: '#1890FF' },
-  edgeSelectedStyle: { lineWidth: 2, strokeOpacity: .92, stroke: '#A3B1BF' },
-  nodeSelectedStyle: { fill: '#F3F9FF', stroke: '#1890FF', fillOpacity: .4 },
-  groupSelectedStyle: { stroke: '#1890FF', fillOpacity: .92 },
-
-  groupBackgroundPadding: [40, 10, 10, 10],
-  groupLabelOffsetX: 10,
-  groupLabelOffsetY: 10,
-  edgeLabelStyle: { fill: '#666', textAlign: 'center', textBaseline: 'middle' },
-  edgeLabelRectPadding: 4,
-  edgeLabelRectStyle: { fill: 'white' },
-  nodeLabelStyle: { fill: '#666', textAlign: 'center', textBaseline: 'middle' },
-  groupStyle: { stroke: '#CED4D9', radius: 4 },
-  groupLabelStyle: { fill: '#666', textAlign: 'left', textBaseline: 'top' },
-  multiSelectRectStyle: { fill: '#1890FF', fillOpacity: .08, stroke: '#1890FF', opacity: .1 },
-  dragNodeHoverToGroupStyle: { stroke: '#1890FF', lineWidth: 2 },
-  dragNodeLeaveFromGroupStyle: { stroke: '#BAE7FF', lineWidth: 2 },
-  anchorPointStyle: { radius: 3.5, fill: '#fff', stroke: '#1890FF', lineAppendWidth: 12 },
-  anchorHotsoptStyle: { radius: 12, fill: '#1890FF', fillOpacity: .25 },
-  anchorHotsoptActivedStyle: { radius: 14 },
-  anchorPointHoverStyle: { radius: 4, fill: '#1890FF', fillOpacity: 1, stroke: '#1890FF' },
-  nodeControlPointStyle: { radius: 4, fill: '#fff', shadowBlur: 4, shadowColor: '#666' },
-  edgeControlPointStyle: { radius: 6, symbol: 'square', lineAppendWidth: 6, fillOpacity: 0, strokeOpacity: 0 },
-  nodeSelectedBoxStyle: { stroke: '#C2C2C2' },
-  cursor: {
-    panningCanvas: '-webkit-grabbing',
-    beforePanCanvas: '-webkit-grab',
-    hoverNode: 'move',
-    hoverEffectiveAnchor: 'crosshair',
-    hoverEdge: 'default',
-    hoverGroup: 'move',
-    hoverUnEffectiveAnchor: 'default',
-    hoverEdgeControllPoint: 'crosshair',
-    multiSelect: 'crosshair'
-  },
-  nodeDelegationStyle: {
-    stroke: '#1890FF',
-    fill: '#1890FF',
-    fillOpacity: .08,
-    lineDash: [4, 4],
-    radius: 4,
-    lineWidth: 1
-  },
-  edgeDelegationStyle: { stroke: '#1890FF', lineDash: [4, 4], lineWidth: 1 }
-}
diff --git a/src/views/custom-query/topo/top/theme/index.js b/src/views/custom-query/topo/top/theme/index.js
deleted file mode 100644
index 02e514a..0000000
--- a/src/views/custom-query/topo/top/theme/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: 编辑器主题样式 - 节点、连线的预设样式
- */
-
-import defaultStyle from './default-style'
-import darkStyle from './dark-style'
-import officeStyle from './office-style'
-
-export default {
-  defaultStyle,
-  darkStyle,
-  officeStyle
-}
diff --git a/src/views/custom-query/topo/top/theme/office-style.js b/src/views/custom-query/topo/top/theme/office-style.js
deleted file mode 100644
index b1e21a7..0000000
--- a/src/views/custom-query/topo/top/theme/office-style.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/11/21
- * @description: office style
- */
-
-export default {
-  // 节点样式
-  nodeStyle: {
-    default: {
-      stroke: '#CED4D9',
-      fill: '#FFFFFF',
-      shadowOffsetX: 0,
-      shadowOffsetY: 4,
-      shadowBlur: 10,
-      shadowColor: 'rgba(13, 26, 38, 0.08)',
-      lineWidth: 1,
-      radius: 4,
-      strokeOpacity: 0.7
-    },
-    selected: {
-      shadowColor: '#ff240b',
-      shadowBlur: 4,
-      shadowOffsetX: 1,
-      shadowOffsetY: 1
-      // shadowColor: '#626262',
-      // shadowBlur: 8,
-      // shadowOffsetX: -1,
-      // shadowOffsetY: 3
-    },
-    unselected: {
-      shadowColor: ''
-    }
-  },
-  // 节点标签样式
-  nodeLabelCfg: {
-    positions: 'center',
-    style: {
-      fill: '#000'
-    }
-  },
-  // 连线样式
-  edgeStyle: {
-    default: {
-      stroke: '#41c23a',
-      lineWidth: 2,
-      strokeOpacity: 0.92,
-      lineAppendWidth: 10
-      // endArrow: true
-    },
-    active: {
-      shadowColor: 'red',
-      shadowBlur: 4,
-      shadowOffsetX: 0,
-      shadowOffsetY: 0
-    },
-    inactive: {
-      shadowColor: ''
-    },
-    selected: {
-      shadowColor: '#ff240b',
-      shadowBlur: 4,
-      shadowOffsetX: 0,
-      shadowOffsetY: 0
-    },
-    unselected: {
-      shadowColor: ''
-    }
-  },
-  // 锚点样式
-  anchorStyle: {
-    default: {
-      radius: 3,
-      symbol: 'circle',
-      fill: '#FFFFFF',
-      fillOpacity: 0,
-      stroke: '#1890FF',
-      strokeOpacity: 0,
-      cursor: 'crosshair'
-    },
-    hover: {
-      fillOpacity: 1,
-      strokeOpacity: 1
-    },
-    unhover: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    },
-    active: {
-      fillOpacity: 1,
-      strokeOpacity: 1
-    },
-    inactive: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    }
-  },
-  // 锚点背景样式
-  anchorBgStyle: {
-    default: {
-      radius: 10,
-      symbol: 'circle',
-      fill: '#1890FF',
-      fillOpacity: 0,
-      stroke: '#1890FF',
-      strokeOpacity: 0,
-      cursor: 'crosshair'
-    },
-    hover: {
-      fillOpacity: 1,
-      strokeOpacity: 1
-    },
-    unhover: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    },
-    active: {
-      fillOpacity: 0.3,
-      strokeOpacity: 0.5
-    },
-    inactive: {
-      fillOpacity: 0,
-      strokeOpacity: 0
-    }
-  },
-
-
-  nodeActivedOutterStyle: { lineWidth: 0 },
-  groupSelectedOutterStyle: { stroke: '#E0F0FF', lineWidth: 2 },
-  nodeSelectedOutterStyle: { stroke: '#E0F0FF', lineWidth: 2 },
-  edgeActivedStyle: { stroke: '#1890FF', strokeOpacity: .92 },
-  nodeActivedStyle: { fill: '#F3F9FF', stroke: '#1890FF' },
-  groupActivedStyle: { stroke: '#1890FF' },
-  edgeSelectedStyle: { lineWidth: 2, strokeOpacity: .92, stroke: '#A3B1BF' },
-  nodeSelectedStyle: { fill: '#F3F9FF', stroke: '#1890FF', fillOpacity: .4 },
-  groupSelectedStyle: { stroke: '#1890FF', fillOpacity: .92 },
-
-  groupBackgroundPadding: [40, 10, 10, 10],
-  groupLabelOffsetX: 10,
-  groupLabelOffsetY: 10,
-  edgeLabelStyle: { fill: '#666', textAlign: 'center', textBaseline: 'middle' },
-  edgeLabelRectPadding: 4,
-  edgeLabelRectStyle: { fill: 'white' },
-  nodeLabelStyle: { fill: '#666', textAlign: 'center', textBaseline: 'middle' },
-  groupStyle: { stroke: '#CED4D9', radius: 4 },
-  groupLabelStyle: { fill: '#666', textAlign: 'left', textBaseline: 'top' },
-  multiSelectRectStyle: { fill: '#1890FF', fillOpacity: .08, stroke: '#1890FF', opacity: .1 },
-  dragNodeHoverToGroupStyle: { stroke: '#1890FF', lineWidth: 2 },
-  dragNodeLeaveFromGroupStyle: { stroke: '#BAE7FF', lineWidth: 2 },
-  anchorPointStyle: { radius: 3.5, fill: '#fff', stroke: '#1890FF', lineAppendWidth: 12 },
-  anchorHotsoptStyle: { radius: 12, fill: '#1890FF', fillOpacity: .25 },
-  anchorHotsoptActivedStyle: { radius: 14 },
-  anchorPointHoverStyle: { radius: 4, fill: '#1890FF', fillOpacity: 1, stroke: '#1890FF' },
-  nodeControlPointStyle: { radius: 4, fill: '#fff', shadowBlur: 4, shadowColor: '#666' },
-  edgeControlPointStyle: { radius: 6, symbol: 'square', lineAppendWidth: 6, fillOpacity: 0, strokeOpacity: 0 },
-  nodeSelectedBoxStyle: { stroke: '#C2C2C2' },
-  cursor: {
-    panningCanvas: '-webkit-grabbing',
-    beforePanCanvas: '-webkit-grab',
-    hoverNode: 'move',
-    hoverEffectiveAnchor: 'crosshair',
-    hoverEdge: 'default',
-    hoverGroup: 'move',
-    hoverUnEffectiveAnchor: 'default',
-    hoverEdgeControllPoint: 'crosshair',
-    multiSelect: 'crosshair'
-  },
-  nodeDelegationStyle: {
-    stroke: '#1890FF',
-    fill: '#1890FF',
-    fillOpacity: .08,
-    lineDash: [4, 4],
-    radius: 4,
-    lineWidth: 1
-  },
-  edgeDelegationStyle: { stroke: '#1890FF', lineDash: [4, 4], lineWidth: 1 }
-}
diff --git a/src/views/custom-query/topo/top/toolbar-edit.vue b/src/views/custom-query/topo/top/toolbar-edit.vue
deleted file mode 100644
index 57c9163..0000000
--- a/src/views/custom-query/topo/top/toolbar-edit.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div class="toolbar">
-    <div class="left">
-      <!--      <el-checkbox class="edge-enabled" title="连线模式" @change="$parent.enableEdgeHandler"></el-checkbox>-->
-      <!--      <dropdown-->
-      <!--          class="edge-shape"-->
-      <!--          :dropdown-items="edgeShapeList"-->
-      <!--          @change="changeEdgeShapeHandler"-->
-      <!--      >-->
-      <!--      </dropdown>-->
-      <el-button size="mini" @click="router.push('/custom/query/topo')">返回</el-button>
-    </div>
-    <div class="center">
-      <div class="graph-ops">
-        <svg-icon name="undo" title="撤回" :class-name="disableUndo ? 'disabled-icon':'er-icon'"
-                  @handle="undoHandler(disableUndo)"/>
-        <svg-icon name="redo" title="重做" :class-name="disableRedo ? 'disabled-icon':'er-icon'" @handle="redoHandler"/>
-        <span class="separator"></span>
-        <svg-icon name="copy" title="复制" :class-name="disableCopy ? 'disabled-icon':'er-icon'" @handle="copyHandler"/>
-        <svg-icon name="paste" title="粘贴" :class-name="disablePaste ? 'disabled-icon':'er-icon'"
-                  @handle="pasteHandler"/>
-        <svg-icon name="clear" title="删除" :class-name="disableDelete ? 'disabled-icon':'er-icon'"
-                  @handle="deleteHandler"/>
-        <span class="separator"></span>
-        <svg-icon name="zoom-in" title="放大" :class-name="'er-icon'" @handle="zoomInHandler"/>
-        <svg-icon name="zoom-out" title="缩小" :class-name="'er-icon'" @handle="zoomOutHandler"/>
-        <svg-icon name="fit" title="适应画布" :class-name="'er-icon'" @handle="autoZoomHandler"/>
-        <svg-icon name="actual_size" title="实际尺寸" :class-name="'er-icon'" @handle="resetZoomHandler"/>
-        <span class="separator"></span>
-        <!--id="multi-select"-->
-        <svg-icon name="selector" title="框选" id="multi-select" :class-name="'er-icon'" @handle="multiSelectHandler"/>
-
-        <!--        <div v-if="graphMode === 'edit'" class="iconfont zx">-->
-        <!--          <dropdown-->
-        <!--              class="edge-shape"-->
-        <!--              :dropdown-items="edgeShapeList"-->
-        <!--              @change="changeEdgeShapeHandler"-->
-        <!--          >-->
-        <!--          </dropdown>-->
-        <!--        </div>-->
-      </div>
-    </div>
-    <div class="right">
-      <el-button size="mini" @click="autoLayout">自动布局</el-button>
-      <!--<el-button size="mini" @click="circularLayoutHandler">环形布局</el-button>-->
-      <!--<el-button size="mini" @click="radialLayoutHandler">辐射</el-button>-->
-      <!--<el-button size="mini" @click="mdsLayoutHandler">MDS</el-button>-->
-      <!--<el-button size="mini" @click="dagreLayoutHandler">层次</el-button>-->
-      <!--<el-button size="mini" @click="autoLayoutHandler">自动（old）</el-button>-->
-      <!-- todo 返回到预览模式      -->
-      <el-button size="mini" @click="handlePreview('preview')">预览</el-button>
-      <el-button size="mini" @click="saveDataHandler">保存</el-button>
-      <el-button size="mini" @click="handleTopLine">上线</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import SvgIcon from '@/components/svgIcon/index.vue'
-import Dropdown from './elements/dropdown.vue'
-import {defineProps} from "vue";
-import {useRouter} from "vue-router";
-
-const router = useRouter()
-
-const emit = defineEmits(["autoLayout", "handlePreview", "saveDataHandler",
-  "undoHandler", "redoHandler", "copyHandler", "pasteHandler", "deleteHandler", "zoomInHandler",
-  "zoomOutHandler", "autoZoomHandler", "resetZoomHandler", "multiSelectHandler"]);
-const props = defineProps({
-  disableUndo: {
-    type: String, //参数类型
-    default: String, //默认值
-  },
-  disableRedo: {
-    type: String, //参数类型
-    default: String, //默认值
-  },
-  disableCopy: {
-    type: String, //参数类型
-    default: String, //默认值
-  },
-  disablePaste: {
-    type: String, //参数类型
-    default: String, //默认值
-  },
-  disableDelete: {
-    type: String, //参数类型
-    default: String, //默认值
-  },
-  graphMode: {
-    type: String, //参数类型
-    default: String, //默认值
-  },
-  edgeShapeList: {
-    type: Array, //参数类型
-    default: [], //默认值
-  }
-})
-const autoLayout = () => {
-  emit('autoLayout');
-}
-const handlePreview = (graphMode) => {
-  emit('handlePreview', graphMode);
-}
-const saveDataHandler = () => {
-  emit('saveDataHandler');
-}
-const handleTopLine = () => {
-  emit('handleTopLine');
-}
-const undoHandler = (flag) => {
-  if (flag) return
-  emit('undoHandler');
-}
-const redoHandler = () => {
-  emit('redoHandler');
-}
-const copyHandler = () => {
-  emit('copyHandler');
-}
-const pasteHandler = () => {
-  emit('pasteHandler');
-}
-const deleteHandler = () => {
-  emit('deleteHandler');
-}
-const zoomInHandler = () => {
-  emit('zoomInHandler');
-}
-const zoomOutHandler = () => {
-  emit('zoomOutHandler');
-}
-const autoZoomHandler = () => {
-  emit('autoZoomHandler');
-}
-const resetZoomHandler = () => {
-  emit('resetZoomHandler');
-}
-const multiSelectHandler = () => {
-  emit('multiSelectHandler');
-}
-const changeEdgeShapeHandler = () => {
-  emit('changeEdgeShapeHandler');
-}
-</script>
-<style>
-
-</style>
-<style lang="scss" scoped>
-.zx {
-  float: right;
-}
-
-.toolbar {
-  padding-right: 10px;
-  color: #333;
-  text-align: left;
-  vertical-align: middle;
-  line-height: 42px;
-  background-color: #ffffff;
-  border: 1px solid #E9E9E9;
-  box-shadow: 0 8px 12px 0 rgba(0, 52, 107, 0.04);
-  user-select: none;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-
-  .left {
-    display: inline-block;
-    width: 12%;
-    padding-left: 10px;
-  }
-
-  .center {
-    display: inline-block;
-    width: 58%;
-  }
-
-  .right {
-    display: inline-block;
-    width: 30%;
-    text-align: right;
-  }
-
-  .edge-enabled {
-    width: 40%;
-    text-align: center;
-  }
-
-  .edge-shape {
-    width: 100%;
-    /*margin-right: 20px;*/
-    line-height: 25px;
-    text-align: center;
-    /*border-right: 1px solid #E6E9ED;*/
-  }
-
-  .graph-ops {
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 20px;
-
-    .icon-select {
-      background-color: #EEEEEE;
-    }
-
-    .separator {
-      margin-right: 5px;
-      border-left: 1px solid #E9E9E9;
-    }
-  }
-
-  .button {
-    margin: 0 5px;
-  }
-}
-</style>
diff --git a/src/views/custom-query/topo/top/toolbar-preview.vue b/src/views/custom-query/topo/top/toolbar-preview.vue
deleted file mode 100644
index dadfb70..0000000
--- a/src/views/custom-query/topo/top/toolbar-preview.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <div class="toolbar">
-    <div class="left">
-      <dropdown
-          class="theme-style"
-          :dropdown-items="themeOptions"
-          @change="toggleThemeChange"
-      >
-      </dropdown>
-    </div>
-    <div class="center">
-      <div class="graph-ops">
-        <svg-icon name="zoom-in" title="放大" id="zoom-in" @handle="zoomInHandler"/>
-        <svg-icon name="zoom-out" title="缩小" @handle="zoomOutHandler"/>
-        <svg-icon name="fit" title="适应画布" @handle="autoZoomHandler"/>
-        <svg-icon name="actual_size" title="实际尺寸" @handle="resetZoomHandler"/>
-        <span class="separator"></span>
-        <el-checkbox @change="enableMinimapHandler">导航器</el-checkbox>
-        <dropdown :dropdown-items="refreshOptions" @change="toggleAutoRefresh"></dropdown>
-      </div>
-    <div class="right">
-      <el-button size="mini" @click="manualRefreshHandler">刷新</el-button>
-      <el-button size="mini" @click="handleEdit('edit')">编辑</el-button>
-    </div>
-  </div>
-  </div>
-</template>
-
-<script setup>
-import SvgIcon from '@/components/svgIcon/index.vue'
-import Dropdown from './elements/dropdown.vue'
-import {ref} from "vue";
-const emit = defineEmits([ "handleEdit","zoomInHandler",
-  "zoomOutHandler","autoZoomHandler","resetZoomHandler","enableMinimapHandler","autoRefreshHandler","manualRefreshHandler"]);
-
-const themeOptions = ref([
-  {value: 'defaultStyle', label: '默认主题'},
-  {value: 'darkStyle', label: '暗黑风格'},
-  {value: 'officeStyle', label: '办公风格'}
-])
-const refreshOptions = ref([
-  {value: -1, label: '不自动刷新'},
-  {value: 10000, label: '10秒自动刷新'},
-  {value: 30000, label: '30秒自动刷新'},
-  {value: 60000, label: '60秒自动刷新'}
-])
-
-const toggleThemeChange = (clickItem) => {
-  emit('changeGraphTheme',clickItem);
-}
-
-const changeThemeActiveIndex = (index) => {
-  // 给父组件调用（代码触发主题修改）
-  themeOptions.value.activeIndex = index
-}
-const zoomInHandler = () => {
-  emit('zoomInHandler');
-}
-const zoomOutHandler = () => {
-  emit('zoomOutHandler');
-}
-const autoZoomHandler = () => {
-  emit('autoZoomHandler');
-}
-const resetZoomHandler = () => {
-  emit('resetZoomHandler');
-}
-const enableMinimapHandler = (e) => {
-  emit('enableMinimapHandler',e);
-}
-const toggleAutoRefresh = (activeIndex) => {
-  emit('autoRefreshHandler',activeIndex);
-}
-const manualRefreshHandler = () => {
-  emit('manualRefreshHandler');
-}
-const handleEdit = (graphMode) => {
-  emit('handleEdit', graphMode);
-}
-</script>
-
-<style lang="scss" scoped>
-.toolbar {
-  padding-right: 10px;
-  color: #333;
-  text-align: left;
-  vertical-align: middle;
-  line-height: 42px;
-  background-color: #ffffff;
-  border: 1px solid #E9E9E9;
-  box-shadow: 0 8px 12px 0 rgba(0, 52, 107, 0.04);
-  user-select: none;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-
-  .left {
-    display: inline-block;
-    width: 12%;
-  }
-
-  .center {
-    display: inline-block;
-    width: 58%;
-  }
-
-  .right {
-    display: inline-block;
-    width: 30%;
-    text-align: right;
-  }
-
-  .edge-enabled {
-    width: 40%;
-    text-align: center;
-  }
-
-  .edge-type {
-    width: 60%;
-    line-height: 25px;
-    text-align: left;
-  }
-
-  .theme-style {
-    width: 100%;
-    line-height: 25px;
-    text-align: center;
-  }
-
-  .graph-ops {
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 20px;
-
-    i {
-      width: 20px;
-      height: 20px;
-      margin: 0 6px;
-      line-height: 20px;
-      color: #a8a8a8;
-      text-align: center;
-      border-radius: 2px;
-      display: inline-block;
-      border: 1px solid rgba(2, 2, 2, 0);
-    }
-
-    i:hover {
-      cursor: pointer;
-      border: 1px solid #E9E9E9;
-    }
-
-    .disabled {
-      color: rgba(0, 0, 0, 0.25);
-    }
-
-    .disabled:hover {
-      cursor: not-allowed;
-      border: 1px solid rgba(2, 2, 2, 0);
-    }
-
-    .icon-select {
-      background-color: #EEEEEE;
-    }
-
-    .separator {
-      margin: 4px;
-      border-left: 1px solid #E9E9E9;
-    }
-
-    .auto-refresh {
-      margin: 0 8px 0 12px;
-    }
-
-    .checkbox {
-      margin: 0 6px;
-    }
-  }
-
-  .button {
-    margin: 0 5px;
-  }
-}
-</style>
diff --git a/src/views/custom-query/topo/top/topology.vue b/src/views/custom-query/topo/top/topology.vue
deleted file mode 100644
index bbf7134..0000000
--- a/src/views/custom-query/topo/top/topology.vue
+++ /dev/null
@@ -1,1808 +0,0 @@
-<template>
-  <div class="topology">
-    <!-- toolbar -->
-    <div v-if="toolbarShow && graphMode === 'edit'">
-      <toolbar-edit @autoLayout="forceLayoutHandler"
-                    @handlePreview="handlePreview"
-                    @saveDataHandler="saveDataHandler"
-                    @handleTopLine="handleTopLine"
-                    @undoHandler="undoHandler"
-                    @redoHandler="redoHandler"
-                    @copyHandler="copyHandler"
-                    @pasteHandler="pasteHandler"
-                    @deleteHandler="deleteHandler"
-                    @zoomInHandler="zoomInHandler"
-                    @zoomOutHandler="zoomOutHandler"
-                    @autoZoomHandler="autoZoomHandler"
-                    @resetZoomHandler="resetZoomHandler"
-                    @multiSelectHandler="multiSelectHandler"
-                    @changeEdgeShapeHandler="changeEdgeShapeHandler"
-                    :disableUndo="disableUndo"
-                    :disableRedo="disableRedo"
-                    :disableCopy="disableCopy"
-                    :disablePaste="disablePaste"
-                    :disableDelete="disableDelete"
-                    :edgeShapeList="edgeShapeList"
-                    :graphMode="graphMode"
-      />
-    </div>
-    <!-- container -->
-    <div class="container" @contextmenu.prevent>
-      <!-- item-panel -->
-      <div v-if="graphMode === 'edit'" class="left">
-        <div
-            class="node-type"
-            v-for="nodeType in nodeTypeList"
-            :key="nodeType.tableName"
-        >
-          <div>
-            <img
-                :src="imgSrc"
-                :alt="nodeType.tableComment"
-                :title="nodeType.tableComment"
-                draggable="true"
-                @dragstart="dragstartHandler($event, nodeType)"
-            />
-          </div>
-          <div>{{ nodeType.tableComment }}</div>
-
-        </div>
-      </div>
-      <!-- graph-container -->
-      <div
-          class="center graph-container"
-          :style="{'width': graphMode === 'edit' ? '76%': '100%'}"
-          ref="graphContainer"
-      >
-        <div
-            id="mount-topology"
-            @dragenter="dragenterHandler"
-            @dragover="dragoverHandler"
-            @drop="dropHandler"
-        >
-        </div>
-      </div>
-      <!-- graph-panel -->
-      <div v-if="graphMode === 'edit'" class="right">
-        <div class="detail-pannel">
-          <div v-if="currentFocus === 'node'">
-            <div class="pannel-title">节点</div>
-            <div class="block-container">
-              <span>节点标签</span>
-              <el-input v-model="selectedNodeParams.label" @input="changeLabel($event)" size="small"/>
-              <!--              <div v-for="(value, key) in nodeAppConfig" :key="key">-->
-              <!--                <span>{{ value }}</span>-->
-              <!--                <el-input v-model="selectedNodeParams.appConfig[key]" size="small"/>-->
-              <!--              </div>-->
-            </div>
-          </div>
-          <div v-else-if="currentFocus === 'edge'">
-            <div class="pannel-title">连线</div>
-            <div class="block-container">
-              <div class="input-item">
-                <span>查询方式</span>
-                <div class="input-select">
-                  <el-select v-model="selectedEdgeParams.appConfig.associated"
-                             @change="associatedChange"
-                             size="small" filterable
-                  >
-                    <el-option label="left join" value="left"/>
-                    <el-option label="right join" value="right"/>
-                    <el-option label="inner join" value="inner"/>
-                  </el-select>
-                </div>
-              </div>
-              <div class="input-item">
-                <span>主表字段</span>
-                <div class="input-select">
-                  <el-select v-model="selectedEdgeParams.appConfig.sourceColumn" @change="tableCommentChange"
-                             size="small" filterable>
-                    <el-option
-                        v-for="(item ,index) in selectedEdgeParams.sourceColumn"
-                        :key="index"
-                        :label="item.columnName+':'+item.columnComment"
-                        :value="item.columnName"
-                    />
-                  </el-select>
-                </div>
-              </div>
-              <div class="input-item">
-                <span>关联字段</span>
-                <div class="input-select">
-                  <el-select v-model="selectedEdgeParams.appConfig.targetColumn" @change="relCommentChange" size="small"
-                             filterable>
-                    <el-option
-                        v-for="(item ,index) in selectedEdgeParams.targetColumn"
-                        :key="index"
-                        :label="item.columnName+':'+item.columnComment"
-                        :value="item.columnName"
-                    />
-                  </el-select>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div v-else-if="currentFocus === 'C'">
-            C
-          </div>
-          <div v-else>
-            <div class="pannel-title">画布</div>
-            <div class="block-container">
-              <el-checkbox @change="enableGridHandler">网格对齐</el-checkbox>
-            </div>
-          </div>
-        </div>
-        <!-- navigator-panel -->
-        <div class="navigator-pannel">
-          <div class="pannel-title">导航器</div>
-          <div class="navigator" ref="navigator">
-            <div id="g6-minimap"></div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <loading v-if="loading" loading-text="自动布局中..."></loading>
-    <!--    <div class="right-menu" ref="rightMenu" v-show="rightMenuShow" @contextmenu.prevent>-->
-    <!--      <ul v-if="currentFocus === 'node'">-->
-    <!--        &lt;!&ndash;         && selectedNodes.length > 1&ndash;&gt;-->
-    <!--        <li @click="alignHandler('horizontal')">水平对齐</li>-->
-    <!--        <li @click="alignHandler('vertical')">垂直对齐</li>-->
-    <!--        <li @click="addGroup">创建分组</li>-->
-    <!--      </ul>-->
-    <!--      <ul v-else-if="currentFocus === 'group'">-->
-    <!--        <li @click="removeGroup">移除分组</li>-->
-    <!--      </ul>-->
-    <!--    </div>-->
-    <div class="top-dialog">
-      <el-dialog :title="selectedNodeParams.label" width="1200px"
-                 v-model="tableColumnEditOpen"
-                 @close="closeEditColumns">
-        <el-table :data="selectedNodeParams.columns"
-                  row-key="columnId"
-                  ref="tableRef"
-                  :lazy="true" style="width: 100%" height="600" :header-cell-style="{'background':'#f5f7fa'}">
-          <el-table-column width="120px" prop="columnName" label="字段名称"/>
-          <el-table-column
-              prop="columnComment"
-              width="150px"
-              label="字段别名">
-            <template #default="scope">
-              <el-input v-model="scope.row.columnComment" placeholder="请输入列别名"/>
-            </template>
-          </el-table-column>
-          <el-table-column width="100px" prop="use" align="center">
-            <template #header>
-              <div style="display: flex; justify-content: space-between;">
-                <el-text style="color: #909399">是否使用</el-text>
-                <el-checkbox v-model="allChooseUse" @change="isAllChooseUse($event)"></el-checkbox>
-              </div>
-            </template>
-            <template #default="scope">
-              <el-checkbox :true-label="true" :false-label="false"
-                           v-model="scope.row.use"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="query" width="100px" align="center">
-            <template #header>
-              <div style="display: flex; justify-content: space-between;">
-                <el-text style="color: #909399">是否查询</el-text>
-                <el-checkbox v-model="allChooseQuery" @change="isAllChooseQuery($event)"></el-checkbox>
-              </div>
-            </template>
-            <template #default="scope">
-              <el-checkbox :true-label="true" :false-label="false" v-model="scope.row.query"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="ucDescribe"
-              width="170px"
-              label="条件描述">
-            <template #default="scope">
-              <el-select v-model="scope.row.ucDescribe" placeholder="请输入条件描述" filterable clearable>
-                <el-option :label="scope.row.columnComment" :value="scope.row.columnComment"/>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="条件" prop="ucCon" width="150px">
-            <template #default="scope">
-              <el-select v-model="scope.row.ucCon" @change="ucTypeChang(scope.$index,scope.row)" filterable clearable>
-                <el-option label="=" value="EQ"/>
-                <el-option label="!=" value="NE"/>
-                <el-option label=">" value="GT"/>
-                <el-option label=">=" value="GTE"/>
-                <el-option label="<" value="LT"/>
-                <el-option label="<=" value="LTE"/>
-                <el-option label="LIKE" value="LIKE"/>
-                <el-option label="BETWEEN" value="BETWEEN"/>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="搜索显示类型" prop="ucType" width="150px">
-            <template #default="scope">
-              <el-select v-model="scope.row.ucType" @change="ucTypeChang(scope.$index,scope.row)" filterable clearable>
-                <el-option label="文本框" value="input"/>
-                <el-option label="日期控件" value="datetime"/>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="列表显示类型" prop="displayType" width="150px">
-            <template #default="scope">
-              <el-select v-model="scope.row.displayType" placeholder="请选择显示类型" clearable filterable
-                         @change="displayTypeChange(scope.$index,scope.row)">
-                <el-option
-                    v-for="item in cacheStore.getDict('display_type')"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="列表显示参数" prop="displayParam" width="150px">
-            <template #default="scope">
-              <template v-if="scope.row.displayType === 'date'">
-                <el-select v-model="scope.row.displayParam" placeholder="请选择显示参数" clearable filterable>
-                  <el-option
-                      v-for="item in cacheStore.getDict('date_format')"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  />
-                </el-select>
-              </template>
-              <template v-if="scope.row.displayType === 'dict'">
-                <el-select v-model="scope.row.displayParam" placeholder="请选择显示参数" clearable filterable>
-                  <el-option
-                      v-for="item in dictOption"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  />
-                </el-select>
-              </template>
-              <template v-if="scope.row.displayType === 'image'">
-                <el-button type="primary" plain @click="isSettingImageVisited=true">设置</el-button>
-              </template>
-            </template>
-          </el-table-column>
-          <el-table-column label="模拟数据" width="250px" align="center" prop="ucMock">
-            <template #default="scope">
-              <el-input v-if="scope.row.type === 1" placeholder="请输入模拟数据" v-model="scope.row.ucMock"></el-input>
-              <div v-else-if="scope.row.type === 2">
-                <el-row :gutter="15">
-                  <el-col :span="12">
-                    <el-input placeholder="开始值" v-model="scope.row.ucMock.begin"></el-input>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-input placeholder="结束值" v-model="scope.row.ucMock.end"></el-input>
-                  </el-col>
-                </el-row>
-              </div>
-              <el-date-picker
-                  v-else-if="scope.row.type ===3"
-                  v-model="scope.row.ucMock"
-                  type="date"
-                  format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD"
-                  placeholder="选择日期时间">
-              </el-date-picker>
-              <el-date-picker v-else-if="scope.row.type ===4"
-                              v-model="scope.row.ucMock"
-                              size="small"
-                              style="width: 240px"
-                              value-format="YYYY-MM-DD"
-                              type="datetimerange"
-                              range-separator="-"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-              ></el-date-picker>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-dialog>
-      <el-dialog v-model="isSettingImageVisited" title="图片设置" width="700px">
-        <el-form label-width="70px" :model="imageSettingParams">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="设置方式" prop="method">
-                <el-radio-group v-model="imageSettingParams.imgSettingMethod" @change="imgSettingMethodChange">
-                  <el-radio-button label="default">默认</el-radio-button>
-                  <el-radio-button label="custom">自定义</el-radio-button>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <template v-if="imageSettingParams.imgSettingMethod==='custom'">
-              <el-col :span="12">
-                <el-form-item label="宽度" prop="width">
-                  <el-input-number v-model="imageSettingParams.width" min="20"></el-input-number>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="高度" prop="height">
-                  <el-input-number v-model="imageSettingParams.height" min="20"></el-input-number>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="边框圆角" prop="circle">
-                  <el-input-number v-model="imageSettingParams.circle" min="0" max="50"></el-input-number>
-                </el-form-item>
-              </el-col>
-            </template>
-            <el-col :span="24">
-              <el-form-item label="示例">
-                <template v-if="imageSettingParams.imgSettingMethod === 'custom'">
-                  <el-image :src="defaultAvatar"
-                            :style="{width: imageSettingParams.width+'px',height: imageSettingParams.height+'px',borderRadius:imageSettingParams.circle+'%'}"
-                  />
-                </template>
-                <template v-else>
-                  <el-image :src="defaultAvatar"/>
-                </template>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import G6 from '@antv/g6/dist/g6.min'
-import {computed, defineProps, onBeforeUnmount, onMounted, nextTick, reactive, ref, watch, defineExpose} from "vue";
-import Loading from './elements/loading.vue'
-import ToolbarEdit from './toolbar-edit.vue'
-import theme from "./theme";
-import utils from '../utils'
-import {onBeforeRouteLeave, onBeforeRouteUpdate} from "vue-router";
-import registerEdge from "./edge";
-import Behavior from "./behavior";
-import Node from "./node";
-import initGraph from "./graph";
-import config from "./config";
-import {ElMessage} from "element-plus";
-import {useCacheStore} from "@/stores/cache";
-import {getDictOption} from "@/api/system/dict-type";
-import defaultAvatar from "@/assets/default_avatar.png"
-
-registerEdge(G6)
-Node.register(G6)
-Behavior.register(G6)
-const cacheStore = useCacheStore()
-const imageSettingParams = reactive({
-  imgSettingMethod: "default",
-  width: 150,
-  height: 150,
-  circle: 0
-})
-const dictOption = ref([])
-const emit = defineEmits(["handleSave"])
-const imgSrc = reactive('data:image/png;base64,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',)
-const props = defineProps({
-  // graphData: {
-  //   type: Object,
-  //   default: () => {
-  //     return {}
-  //   }
-  // },
-  nodeTypeList: {
-    type: Array,
-    default: () => {
-      return []
-    }
-  },
-  nodeAppConfig: {
-    type: Object,
-    default: () => {
-      return {}
-    }
-  },
-  relationalMap: {
-    type: Map,
-    default: () => {
-      return []
-    }
-  },
-  edgeAppConfig: {
-    type: Object,
-    default: () => {
-      return {}
-    }
-  }
-})
-const toolbarShow = ref(true)
-const tableRef = ref()
-const graphContainer = ref()
-//todo 修改进去时页面状态
-const graphMode = ref('edit')
-let graph = reactive(Object)
-const graphBg = ref('default-style')
-const grid = ref(null)
-const disableUndo = ref(true)
-const disableRedo = ref(true)
-const disableCopy = ref(true)
-const disableDelete = ref(true)
-let historyIndex = reactive(0)
-let undoCount = 0
-const currentEdgeShape = reactive({
-  guid: 'top-cubic',
-  label: '曲线'
-})
-const nodesInClipboard = ref([])
-const pasteCount = ref(0)
-const onresizeTimeout = ref(null)
-const sourceNodeIds = ref([])
-const navigator = ref()
-const layoutType = ref(null)
-const allChooseUse = ref(false)
-const allChooseQuery = ref(false)
-const startFlag = ref(false)
-const isNodeFlag = ref(false)
-const clickCtrl = ref(false)
-let rightMenuShow = ref(false)
-// 表格Column设置弹窗开关
-const tableColumnEditOpen = ref(false)
-let isSettingImageVisited = ref(false)
-const loading = ref(false)
-const currentFocus = ref('canvas')
-//todo 设置线段的选择 er图中只有一种线
-const edgeShapeList = ref([
-  // { guid: "top-line", label: "直线", class: "iconfont icon-flow-line" },
-  // { guid: "dice-er-edge", label: "连线", class: "iconfont icon-flow-line" },
-  // { guid: "top-brokenline", label: "折线", class: "iconfont icon-flow-broken" },
-  // { guid: "top-polyline", label: "多段线", class: "iconfont icon-flow-broken" },
-  // { guid: "top-cubic", label: "曲线", class: "iconfont icon-flow-curve" }
-])
-const selectedGroupId = ref(null)
-const zoomValue = ref(1)
-const autoRefreshTimer = ref(null)
-const selectedNode = ref(null)
-let selectedNodeParams = ref({
-  label: '',
-  columns: [],
-  appConfig: props.nodeAppConfig
-})
-const selectedNodeParamsTimeout = ref(null)
-const selectedEdge = ref(null)
-let selectedEdgeParams = ref({
-  label: '',
-  relationalItem: '',
-  sourceColumn: [],
-  targetColumn: [],
-  appConfig: props.edgeAppConfig
-})
-const selectedEdgeParamsTimeout = ref(null)
-const disablePaste = computed(() => {
-  return nodesInClipboard.value.length === 0
-})
-watch(selectedNodeParams.value, (newVal) => {
-  // console.log('监听selectedNodeParams', selectedNodeParams.value);
-  let selectedNodeModel = selectedNode.value.getModel()
-  if (utils.isObjectValueEqual(selectedNodeModel.appConfig, newVal.appConfig) && selectedNodeModel.label === newVal.label) {
-    return
-  }
-  // 实时监听input值的变化，停止输入300ms后执行update，而不是时时update
-  clearTimeout(selectedNodeParamsTimeout.value)
-  selectedNodeParamsTimeout.value = setTimeout(() => {
-    selectedNodeModel.label = newVal.label
-    selectedNodeModel.appConfig = newVal.appConfig
-    selectedNodeModel.columns = newVal.columns
-    selectedNode.value.update(selectedNodeModel)
-  }, 300)
-}, {
-  deep: true
-})
-watch(() => selectedEdgeParams.value, (newVal) => {
-  let selectedEdgeModel = selectedEdge.value.getModel()
-  if (utils.isObjectValueEqual(selectedEdgeModel.appConfig, newVal.appConfig) && selectedEdgeModel.label === newVal.label) {
-    return
-  }
-  // 实时监听input值的变化，停止输入300ms后执行update，而不是时时update
-  clearTimeout(selectedEdgeParamsTimeout.value)
-  selectedEdgeParamsTimeout.value = setTimeout(() => {
-    let selectedEdgeModel = selectedEdge.value.getModel()
-    selectedEdgeModel.label = newVal.label
-    selectedEdgeModel.appConfig = newVal.appConfig
-    try {
-      selectedEdge.value.update(selectedEdgeModel)
-    } catch (e) {
-    }
-  }, 300)
-}, {
-  deep: true
-})
-
-onMounted(() => {
-  graph = new G6.Graph({
-    container: 'mount-topology',
-    // 画布宽高
-    width: graphContainer.value.clientWidth,
-    height: graphContainer.value.clientHeight
-  })
-  clearHistoryData()
-  window.onresize = () => {
-    return (() => {
-      onresizeHandler()
-    })()
-  }
-  Behavior.obj.hoverEventEdit.sendThis({getGraph})
-  Behavior.obj.keyupEventEdit.sendThis({
-    getGraph,
-    getHistoryIndex,
-    editHistoryIndex,
-    addHistoryData,
-    removeHistoryData,
-    getUndoCount,
-    editUndoCount,
-    editClickCtrl
-  })
-  Behavior.obj.dragEventEdit.sendThis({
-    getGraph,
-    getUndoCount,
-    editUndoCount,
-    getHistoryIndex,
-    editHistoryIndex,
-    removeHistoryData,
-    addHistoryData
-  })
-  Behavior.obj.dragAddEdge.sendThis({
-    getGraph,
-    getRelationalMap,
-    getHistoryIndex,
-    editHistoryIndex,
-    getUndoCount,
-    editUndoCount,
-    addHistoryData,
-    removeHistoryData
-  })
-  Behavior.obj.clickErEdge.sendThis({
-    getGraph,
-    editCurrentFocus,
-    editSelectedEdge,
-    editSelectedEdgeParams,
-    getEdgeAppConfig
-  })
-  Behavior.obj.clickErNode.sendThis({
-    editSelectedNodeParams,
-    editRightMenuShow,
-    editSelectedNode,
-    getNodeAppConfig,
-    editTableColumnEditOpen,
-    editCurrentFocus,
-    getClickCtrlValue,
-    getGraph
-  })
-})
-onBeforeRouteUpdate((to, from, next) => {
-  clearHistoryData()
-  next()
-})
-onBeforeRouteLeave((to, from, next) => {
-  clearHistoryData()
-  next()
-})
-onBeforeUnmount(() => {
-  clearHistoryData()
-  clearInterval(autoRefreshTimer.value);
-})
-const getDictInfo = () => {
-  getDictOption().then(res => {
-    if (res.code === 1000) {
-      dictOption.value = res.data
-    }
-  })
-}
-getDictInfo()
-//修改selectedEdge
-const editSelectedEdge = (str) => {
-  selectedEdge.value = str
-}
-//修改currentFocus
-const editCurrentFocus = (str) => {
-  currentFocus.value = str
-  if (str === "canvas") {
-    disableCopy.value = true
-    disableDelete.value = true
-  } else if (str === "edge") {
-    disableDelete.value = false
-  }
-}
-//修改tableColumnEditOpen
-const editTableColumnEditOpen = (str) => {
-  tableColumnEditOpen.value = str
-  if (str === true) {
-    let columns = toRaw(selectedNode.value.getModel()).columns
-    let flagQuery = []
-    let flagUse = []
-    for (let i = 0; i < columns.length; i++) {
-      flagQuery.push(columns[i].query)
-      flagUse.push(columns[i].use)
-    }
-    allChooseQuery.value = flagQuery.indexOf(false) === -1;
-    allChooseUse.value = flagUse.indexOf(false) === -1;
-  }
-}
-//修改rightMenuShow
-const editRightMenuShow = (str) => {
-  rightMenuShow.value = str
-}
-//修改clickCtrl
-const editClickCtrl = (str) => {
-  clickCtrl.value = str
-  getClickCtrlValue()
-}
-const getGraph = () => {
-  return graph
-}
-const getRelationalMap = () => {
-  return props.relationalMap
-}
-const getNodeAppConfig = () => {
-  return props.nodeAppConfig
-}
-const getEdgeAppConfig = () => {
-  return props.edgeAppConfig
-}
-//获取keydown修改的clickCtrl.value
-const getClickCtrlValue = () => {
-  return clickCtrl.value
-}
-//修改selectedNode
-const editSelectedNode = (str) => {
-  if (str.hasState("selected")) {
-    disableCopy.value = false
-    disableDelete.value = false
-  }
-  selectedNode.value = str
-}
-//修改selectedNodeParams
-const editSelectedNodeParams = (str) => {
-  selectedNodeParams.value = str
-}
-//修改selectedEdgeParams
-const editSelectedEdgeParams = (str) => {
-  selectedEdgeParams.value = str
-}
-
-//修改节点标签文字
-const changeLabel = (e) => {
-  graph.updateItem(selectedNode.value, {
-    label: e
-  })
-}
-//修改historyIndex
-const editHistoryIndex = (str) => {
-  historyIndex = str
-  console.log('editHistoryIndex', historyIndex)
-  disableUndo.value = str === 0 || str - (undoCount + 1) < 0;
-  disableRedo.value = str === 0 || str === 10 || undoCount < 1;
-}
-//获取historyIndex
-const getHistoryIndex = () => {
-  return historyIndex
-}
-//修改undoCount
-const editUndoCount = (str) => {
-  console.log('editUndoCount', str)
-  undoCount = str
-  if (str < 1) {
-    disableRedo.value = true
-  }
-  if (historyIndex - (str + 1) < 0) {
-    disableRedo.value = true
-  }
-}
-//获取historyIndex
-const getUndoCount = () => {
-  return undoCount
-}
-const onresizeHandler = () => {
-  // 实时监听窗口大小变化
-  // let self = this
-  clearTimeout(onresizeTimeout.value)
-  onresizeTimeout.value = setTimeout(() => {
-    let newGraph = graph
-    if (newGraph && !newGraph.destroyed) {
-      newGraph.changeSize(graphContainer.value.clientWidth, graphContainer.value.clientHeight)
-    }
-  }, 1000)
-}
-const openFullScreenLoading = () => {
-  loading.value = true
-}
-const closeFullScreenLoading = () => {
-  nextTick(() => {
-    loading.value = false
-  })
-}
-
-const initTopo = (graphData) => {
-  if (graphData) {
-    if (graph) {
-      graph.destroy()
-    }
-    // 【预览模式】 - 封装的节点展开/收缩交互
-    // G6.registerBehavior('my-collapse-expand', {
-    //   getEvents() {
-    //     return {
-    //       'node:click': 'onNodeClick'
-    //     }
-    //   },
-    //   onNodeClick(event) {
-    //     let clickNode = event.item
-    //     sourceNodeIds.value = [clickNode._cfg.id]
-    //     if (clickNode.hasState('collapse')) {
-    //       // 节点已收缩, 需要展开
-    //       let visible = true
-    //       this.collapseOrExpand(clickNode, visible)
-    //       clickNode.clearStates('collapse')
-    //     } else {
-    //       // 节点未收缩, 需要收缩
-    //       let visible = false
-    //       this.collapseOrExpand(clickNode, visible)
-    //       clickNode.setState('collapse', true)
-    //     }
-    //     graph.paint()
-    //   },
-    //   collapseOrExpand(sourceNode, visible) {
-    //     let outEdges = sourceNode.getOutEdges()
-    //     for (let i = 0; i < outEdges.length; i++) {
-    //       let targetNode = outEdges[i].getTarget()
-    //       let targetNodeId = targetNode._cfg.id
-    //       if (!sourceNodeIds.value.includes(targetNodeId)) {
-    //         targetNode.changeVisibility(visible)
-    //         // 如果一个节点隐藏/显示了，那么它关联的所有边都隐藏
-    //         let relationEdges = targetNode.getEdges()
-    //         for (let i = 0; i < relationEdges.length; i++) {
-    //           relationEdges[i].changeVisibility(visible)
-    //         }
-    //         sourceNodeIds.value.push(targetNodeId)
-    //         // 递归, 该节点的下属节点继续隐藏
-    //         if (targetNode.getOutEdges().length > 0) {
-    //           this.collapseOrExpand(targetNode, visible)
-    //         }
-    //       }
-    //     }
-    //   }
-    // })
-
-    // 图画布的定义
-    // let graphContainer = graphContainer.value
-    let graphWidth = graphContainer.value.clientWidth
-    let graphHeight = graphContainer.value.clientHeight
-    // Plugins
-    let plugins = []
-    let modes = {
-      // default: [//默认behavior
-      //   'drag-canvas',
-      //   'drag-node',
-      //   {
-      //     type: 'click-select',
-      //     trigger: 'ctrl',
-      //     multiple: true
-      //   }
-      // ],
-      //添加预览状态下的Behavior
-      // preview: [
-      //   'drag-canvas',
-      //   'zoom-canvas',
-      //   // "drag-node",
-      //   // 'click-select',
-      //   {
-      //     type: 'tooltip',
-      //     formatText(model) {
-      //       return model.description || model.label
-      //     }
-      //   },
-      //   {
-      //     type: 'edge-tooltip',
-      //     formatText(model) {
-      //       return model.description || 'source:' + graph.findById(model.source).getModel().label + ' target:' + graph.findById(model.target).getModel().label
-      //     }
-      //   }
-      //   // 自定义Behavior
-      //   // 'my-collapse-expand'
-      // ],
-      //添加编辑模式下的Behavior
-      edit: [
-        'drag-node',//拖拽节点行为
-        'drag-canvas',//拖拽画布行为
-        {
-          type: 'click-select',
-          // trigger: 'ctrl', // TODO... 疑似官方bug，ctrl无效
-          multiple: true
-        },
-        // 多选 ctrl＋鼠标左键
-        {
-          type: 'brush-select',
-          trigger: 'ctrl',
-          includeEdges: false
-        },
-        'right-click-node',
-        'right-click-edge',
-        // Group Behavior
-        // 'drag-group',
-        // 'collapse-expand-group',
-        // 'drag-node-with-group',
-        // 自定义Behavior
-        //悬浮交互
-        'hover-event-edit',
-        //键盘事件的交互
-        'keyup-event-edit',
-        //通过拖拽节点上的锚点添加连线
-        'drag-add-edge',
-        //鼠标拖动节点的交互
-        'drag-event-edit',
-        //图点击事件
-        'click-er-node',
-        'click-er-edge'
-      ],
-      // addEdge: [
-      //   'drag-canvas'
-      //   // 自定义Behavior
-      //   // "click-add-edge"
-      // ],
-      multiSelect: [
-        {
-          type: 'brush-select',
-          trigger: 'drag',
-          onSelect() {
-            graph.setMode('edit')
-            // window.document.getElementById('multi-select').style.backgroundColor = 'transparent'
-          }
-        }
-      ]
-    }
-    if (graphMode.value === 'edit') {
-      // let navigator = navigator.value
-      let minimapWidth = navigator.value ? navigator.value.clientWidth : 160
-      let minimapHeight = navigator.value ? navigator.value.clientHeight : 120
-      minimapWidth = minimapWidth > 160 ? minimapWidth : 120
-      minimapHeight = minimapHeight > 160 ? minimapHeight : 120
-      let minimap = new G6.Minimap({
-        size: [minimapWidth, minimapHeight],
-        container: 'g6-minimap',
-        type: 'default'
-      })
-      plugins.push(minimap)
-    }
-    /* 生成图 */
-    if (layoutType.value === 'force') {
-      /* 力导布局: force-layout */
-      graph = initGraph.forceLayoutGraph(G6, {
-        plugins: plugins,
-        container: 'mount-topology',
-        width: graphWidth,
-        height: graphHeight,
-        modes: modes,
-        graphData: graphData
-      })
-    } else {
-      /* 默认布局: 自由布局 */
-      graph = initGraph.commonGraph(G6, {
-        plugins: plugins,
-        container: 'mount-topology',
-        width: graphWidth,
-        height: graphHeight,
-        modes: modes,
-        graphData: graphData
-      })
-    }
-    graph.$C = config
-    graph.setMode(graphMode.value)
-    graph.refresh()
-    autoZoomHandler()
-  }
-}
-/**
- * 编辑模式下
- * 自动布局
- */
-const forceLayoutHandler = () => {
-  if (graph && !graph.destroyed) {
-    openFullScreenLoading()
-    graph.updateLayout({
-      type: 'force',
-      center: [200, 200],
-      preventOverlap: true,
-      linkDistance: 150,
-      nodeStrength: -200,
-      onLayoutEnd: () => {
-        closeFullScreenLoading()
-      }
-    })
-  }
-}
-//修改画布主题
-// const changeGraphTheme = (themeValue) => {
-//   if (graph && !graph.destroyed) {
-//     let nodes = graph.getNodes()
-//     let edges = graph.getEdges()
-//     switch (themeValue) {
-//       case 'darkStyle':
-//         graphBg.value = 'dark-style'
-//         graph.$T = theme.darkStyle
-//         for (let i = 0, len = edges.length; i < len; i++) {
-//           let edge = edges[i]
-//           let edgeModel = edge.getModel()
-//           edgeModel.style = graph.$T.edgeStyle.default
-//           edge.update(edgeModel)
-//         }
-//         for (let i = 0, len = nodes.length; i < len; i++) {
-//           let node = nodes[i]
-//           let nodeModel = node.getModel()
-//           nodeModel.labelCfg = graph.$T.nodeLabelCfg
-//           node.update(nodeModel)
-//         }
-//         graph.paint()
-//         break
-//       case 'officeStyle':
-//         graphBg.value = 'office-style'
-//         graph.$T = theme.officeStyle
-//         for (let i = 0, len = edges.length; i < len; i++) {
-//           let edge = edges[i]
-//           let edgeModel = edge.getModel()
-//           edgeModel.style = graph.$T.edgeStyle.default
-//           edge.update(edgeModel)
-//         }
-//         for (let i = 0, len = nodes.length; i < len; i++) {
-//           let node = nodes[i]
-//           let nodeModel = node.getModel()
-//           nodeModel.labelCfg = graph.$T.nodeLabelCfg
-//           node.update(nodeModel)
-//         }
-//         graph.paint()
-//         break
-//       default:
-//         graphBg.value = 'default-style'
-//         graph.$T = theme.defaultStyle
-//         for (let i = 0, len = edges.length; i < len; i++) {
-//           let edge = edges[i]
-//           let edgeModel = edge.getModel()
-//           edgeModel.style = graph.$T.edgeStyle.default
-//           edge.update(edgeModel)
-//         }
-//         for (let i = 0, len = nodes.length; i < len; i++) {
-//           let node = nodes[i]
-//           let nodeModel = node.getModel()
-//           nodeModel.labelCfg = graph.$T.nodeLabelCfg
-//           node.update(nodeModel)
-//         }
-//         graph.paint()
-//     }
-//   }
-// }
-//全选是否使用checkbox
-const isAllChooseUse = (e) => {
-  tableRef.value.data.forEach(item => {
-    item.use = e
-  })
-}
-//全选是否查询checkbox
-const isAllChooseQuery = (e) => {
-  tableRef.value.data.forEach(item => {
-    item.query = e
-  })
-}
-const getImageParams = () => {
-  emit("getImageParams", imageSettingParams)
-}
-/* 右侧的预览按钮*/
-const handlePreview = () => {
-  let graphData = getGraphData()
-  emit("handlePreview", JSON.stringify(graphData))
-}
-//拿到当前画布的ER图
-const getGraphData = () => {
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed) {
-    return newGraph.save()
-  } else {
-    return {nodes: [], edges: []}
-  }
-}
-/* 右侧的保存按钮*/
-const saveDataHandler = () => {
-  let graphData = getGraphData()
-  doSaveData(graphData)
-}
-/* 右侧的上线按钮*/
-const handleTopLine = () => {
-  let graphData = getGraphData()
-  emit("handleTopoLine", JSON.stringify(graphData))
-}
-const doSaveData = (graphData) => {
-  emit("handleSave", JSON.stringify(graphData))
-}
-
-const getHistoryData = (key) => {
-  return localStorage.getItem(key)
-}
-const changeGraphData = (data) => {
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed) {
-    newGraph.changeData(data)
-  }
-}
-/* 暴露给外部的接口 */
-const refreshGraph = () => {
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed) {
-    newGraph.refresh()
-  }
-}
-/* 撤回*/
-const undoHandler = () => {
-  //todo undoCount + 1???
-  if (historyIndex > 0 && historyIndex - (undoCount + 1) >= 0) {
-    undoCount += 1
-    if (undoCount > 0) {
-      disableRedo.value = false
-    }
-    let key = `graph_history_${historyIndex - undoCount}`
-    let historyData = getHistoryData(key)
-    changeGraphData(JSON.parse(historyData))
-    refreshGraph()
-  }
-  if (historyIndex - (undoCount + 1) < 0) {
-    disableUndo.value = true
-  }
-}
-/*重做*/
-const redoHandler = () => {
-  if (undoCount > 0) {
-    //todo ??
-    let key = `graph_history_${historyIndex - undoCount + 1}`
-    let historyData = getHistoryData(key)
-    changeGraphData(JSON.parse(historyData))
-    undoCount -= 1
-    refreshGraph()
-    if (historyIndex - (undoCount + 1) >= 0) {
-      disableUndo.value = false
-    }
-  }
-  if (undoCount === 0) {
-    disableRedo.value = true
-  }
-}
-
-//记录历史数据
-const addHistoryData = (key, value) => {
-  try {
-    localStorage.setItem(key, value)
-  } catch (oException) {
-    if (oException.name === 'QuotaExceededError') {
-      console.warn('已经超出本地存储限定大小，清空历史记录！')
-      // 可进行超出限定大小之后的操作，如下面可以先清除记录，再次保存
-      // localStorage.clear()
-      clearHistoryData()
-      historyIndex = 0
-      undoCount = 0
-      localStorage.setItem(key, value)
-    }
-  }
-}
-const clearHistoryData = () => {
-  let keys = Object.keys(localStorage)
-  keys.forEach(key => {
-    if (key.startsWith('graph_history')) {
-      localStorage.removeItem(key)
-    }
-  })
-}
-const removeHistoryData = (key) => {
-  // console.log('removeHistoryData', key)
-  localStorage.removeItem(key)
-}
-/* 复制*/
-const copyHandler = () => {
-  if (graph && !graph.destroyed) {
-    nodesInClipboard.value = graph.findAllByState('node', 'selected')
-  }
-  pasteCount.value = 0
-}
-/* 粘贴*/
-const pasteHandler = () => {
-  pasteCount.value += 1 // 连续paste次数统计
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed && nodesInClipboard.value.length > 0) {
-    // ************** 记录【粘贴】前的数据状态 start **************
-    let historyData = JSON.stringify(newGraph.save())
-    let key = `graph_history_${historyIndex}`
-    addHistoryData(key, historyData)
-    // ************** 记录【粘贴】前的数据状态 end **************
-
-    // 开始粘贴
-    let node = toRaw(nodesInClipboard.value)[0]
-    let model = node.getModel()
-    let newModel = {
-      ...model,
-      id: utils.generateUUID(),
-      x: model.x + 10 * pasteCount.value,
-      y: model.y + 10 * pasteCount.value
-    }
-    newGraph.addItem('node', newModel)
-
-    // ************** 记录【粘贴】后的数据状态 start **************
-    // 如果当前点过【撤销】了，【粘贴】后将取消【重做】功能
-    // 重置undoCount，【粘贴】后的数据状态给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-    if (undoCount > 0) {
-      historyIndex = historyIndex - undoCount // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-      for (let i = 1; i <= undoCount; i++) {
-        let key = `graph_history_${historyIndex + i}`
-        removeHistoryData(key)
-      }
-      undoCount = 0
-    }
-    // 存储【粘贴】后的数据状态
-    historyIndex += 1
-    key = `graph_history_${historyIndex}`
-    let currentData = JSON.stringify(graph.save())
-    addHistoryData(key, currentData)
-    // ************** 记录【粘贴】后的数据状态 end **************
-  }
-}
-
-/* 删除 */
-const deleteHandler = () => {
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed) {
-    let selectedNodes = newGraph.findAllByState('node', 'selected')
-    let selectedEdges = newGraph.findAllByState('edge', 'selected')
-    if (selectedNodes.length > 0 || selectedEdges.length > 0) {
-
-      // ************** 记录【删除】前的数据状态 start **************
-      let historyData = JSON.stringify(newGraph.save())
-      let key = `graph_history_${historyIndex}`
-      addHistoryData(key, historyData)
-      // ************** 记录【删除】前的数据状态 end **************
-
-      // 开始删除
-      selectedNodes.forEach(item => newGraph.removeItem(item))
-      selectedEdges.forEach(item => newGraph.removeItem(item))
-
-      // ************** 记录【删除】后的数据状态 start **************
-      // 如果当前点过【撤销】了，拖拽节点后将取消【重做】功能
-      // 重置undoCount，【删除】后的数据状态给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-      if (undoCount > 0) {
-        historyIndex = historyIndex - undoCount // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-        for (let i = 1; i <= undoCount; i++) {
-          let key = `graph_history_${historyIndex + i}`
-          removeHistoryData(key)
-        }
-        undoCount = 0
-      }
-      // 记录【删除】后的数据状态
-      historyIndex += 1
-      key = `graph_history_${historyIndex}`
-      let currentData = JSON.stringify(newGraph.save())
-      addHistoryData(key, currentData)
-      // ************** 记录【删除】后的数据状态 end **************
-    }
-    let nodes = graph.getNodes()
-    disableDelete.value = nodes.length === 0;
-  }
-}
-/* 放大*/
-const zoomInHandler = () => {
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed) {
-    newGraph.zoom(1.2)
-  }
-}
-/* 缩小*/
-const zoomOutHandler = () => {
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed) {
-    newGraph.zoom(0.8)
-  }
-}
-/*适应画布*/
-const autoZoomHandler = () => {
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed && newGraph.save().nodes.length > 0) {
-    newGraph.fitView(10)
-    // this.zoomValue = graph.getZoom();  // TODO...怎么处理changeZoomHandler的二次触发问题
-  }
-}
-/* 实际尺寸*/
-const resetZoomHandler = () => {
-  let newGraph = graph
-  if (newGraph && !newGraph.destroyed) {
-    newGraph.zoomTo(1)
-  }
-}
-/* todo 框选*/
-const multiSelectHandler = () => {
-  graph.setMode('multiSelect')
-}
-/*dropdown*/
-const changeEdgeShapeHandler = (edgeShape) => {
-  //todo $C 啥意思
-  graph.$C.edge.type = edgeShape
-  // this.currentEdgeShape = edgeShape;
-  //
-  // this.graph.$C.edge.type = this.currentEdgeShape["guid"];
-}
-
-
-/**
- * container区
- * 左侧表开始拖动函数
- */
-const dragstartHandler = (event, nodeType) => {
-  event.dataTransfer.setData('text', JSON.stringify(nodeType))
-  let mainIdItem = []
-  let childIdItem = []
-  let nodes = getGraphData().nodes;
-  let currentNodesMainId = []
-  for (let node of nodes) {
-    currentNodesMainId.push(node.tableId)
-  }
-  for (let relationalItem of props.relationalMap) {
-    //将item的mainId和childId集在一起, 然后对比node.tableId
-    mainIdItem.push(relationalItem.mainId)
-    childIdItem.push(relationalItem.childId)
-  }
-  let mainIdFlag = mainIdItem.indexOf(nodeType.tableId) !== -1;
-  let childIdFlag = childIdItem.indexOf(nodeType.tableId) !== -1;
-  let nodeFlag = currentNodesMainId.indexOf(nodeType.tableId) !== -1;
-  if (mainIdFlag === false && childIdFlag === false) {
-    startFlag.value = false
-  } else {
-    console.log('nodeFlag', nodeFlag)
-    if (nodeFlag) {
-      console.log('相等')
-      startFlag.value = false
-      isNodeFlag.value = false
-    } else {
-      startFlag.value = true
-      isNodeFlag.value = true
-    }
-    // startFlag.value = true
-  }
-}
-/* 中间 */
-const dragenterHandler = (event) => {
-  //阻止默认的点击事件执行
-  event.preventDefault()
-}
-const dragoverHandler = (event) => {
-  event.preventDefault()
-}
-/**
- * 拖入结束事件
- * @param event
- */
-const dropHandler = (event) => {
-  let nodeTypeStr = event.dataTransfer.getData('text')
-  let nodeType = JSON.parse(nodeTypeStr)
-  //拿到当前画布的topo图
-  let nodes = getGraphData().nodes;
-  //当前画布有topo图时,拖拽左侧表
-  if (nodes.length !== 0) {
-    let flag = false
-    let mainIdFlag = false
-    let childIdFlag = false
-    let mainIdItem = []
-    let childIdItem = []
-    for (let relationalItem of props.relationalMap) {
-      //将item的mainId和childId集在一起, 然后对比node.tableId
-      mainIdItem.push(relationalItem.mainId)
-      childIdItem.push(relationalItem.childId)
-    }
-    for (let node of nodes) {
-      mainIdFlag = mainIdItem.indexOf(node.tableId) !== -1;
-      childIdFlag = childIdItem.indexOf(node.tableId) !== -1;
-    }
-    console.log('mainIdFlag，childIdFlag', mainIdFlag, childIdFlag)
-    if (mainIdFlag === false && childIdFlag === false) {
-      ElMessage.warning('该表无关联关系! ')
-      flag = false
-    } else {
-      flag = true
-    }
-    //   let relational = props.relationalMap.get(node.tableId)
-    //   console.log('relational',relational)
-    //   if (relational) {
-    //     relational.forEach(item=>{
-    //       flag = item.childId=== nodeType.tableId
-    //     })
-    //   }
-    if (flag && startFlag.value) {
-      addNode(event.clientX, event.clientY, nodeType)
-    } else if (!startFlag.value && isNodeFlag.value) {
-      ElMessage.warning('该表无关联关系! ')
-      return;
-    } else if (!isNodeFlag.value && !startFlag.value) {
-      ElMessage.warning('该表已添加! ')
-      return;
-    }
-  } else {
-    //第一次拖入
-    addNode(event.clientX, event.clientY, nodeType)
-  }
-}
-/**
- * 添加节点
- */
-const addNode = (clientX, clientY, nodeType) => {
-  if (graph && !graph.destroyed) {
-    // ************** 记录【添加节点】前的数据状态 start **************
-    let historyData = JSON.stringify(graph.save())
-    let key = `graph_history_${historyIndex}`
-    addHistoryData(key, historyData)
-    // ************** 记录【添加节点】前的数据状态 end **************
-    // 开始添加
-    let dropPoint = graph.getPointByClient(clientX, clientY)
-    let columns = []
-    for (let column of nodeType.columns) {
-      //todo
-      let item = {
-        columnId: column.columnId,
-        columnName: column.columnName,
-        columnComment: column.columnComment,
-        columnType: column.columnType,
-        pk: column.pk,
-        use: column.use,
-        query: false,
-        ucDescribe: '',
-        ucCon: '',
-        ucType: '',
-        type: 1,
-        ucMock: null,
-        sort: null,
-        displayType: 'text',
-        displayParam: null
-      }
-      columns.push(item)
-    }
-
-    let node = graph.addItem('node', {
-      id: utils.generateUUID(),//元素的标识 ID，必须是唯一的 string
-      tableId: nodeType.tableId,
-      x: (dropPoint.x) - (125),//x 坐标
-      y: (dropPoint.y) - (158),//y 坐标
-      label: nodeType.tableName + ":" + nodeType.tableComment,//元素的文本标签，有该字段时默认会渲染 label 。
-      // labelCfg: {
-      //   position: "bottom"
-      // },
-      //todo 设置拖拽的属性
-      table: nodeType.tableName,
-      type: 'dice-er-box',//指定节点类型
-      columns: columns,
-      size: [300, 500],//节点的大小。
-      width: 250,//ER图宽度
-      height: 316,//高度
-      anchorPoints: [//指定边连入节点的连接点的位置
-        [0.5, 0], // top
-        [1, 0.5], // right
-        [0.5, 1], // bottom
-        [0, 0.5] // left
-      ],
-      // 自定义属性
-      appState: {
-        alert: false
-      }
-    })
-
-    // ************** 记录【添加节点】后的数据状态 start **************
-    if (node) {
-      // 如果当前点过【撤销】了，【添加节点】后将取消【重做】功能
-      // 重置undoCount，【添加节点】后的数据状态给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-      if (undoCount > 0) {
-        historyIndex = historyIndex - undoCount // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-        for (let i = 1; i <= undoCount; i++) {
-          let key = `graph_history_${historyIndex + i}`
-          removeHistoryData(key)
-        }
-        undoCount = 0
-      }
-      // 记录【添加节点】后的数据状态
-      historyIndex += 1
-      let key = `graph_history_${historyIndex}`
-      let currentData = JSON.stringify(graph.save())
-      addHistoryData(key, currentData)
-    }
-    // ************** 记录【添加节点】后的数据状态 end **************
-  }
-}
-//todo 关联关系判定  查询方式选择
-const associatedChange = (e) => {
-  selectedEdgeParams.value.label = null
-  // let type = selectedEdgeParams.value.relationalItem.type
-  let start = true
-  if (e == 'left') {
-    // console.log('left')
-    // if (type.indexOf('1') === -1 && type.indexOf('2') === -1) {
-    //   // this.msgError("查询方式有误")
-    //   start = false
-    // }
-  } else if (e === 'right') {
-    // console.log('right')
-    // console.log(type.indexOf('3'))
-    // if (type.indexOf('3') === -1) {
-    //   // this.msgError("查询方式有误")
-    //   start = false
-    // }
-  } else if (e === 'inner') {
-    // console.log('inner')
-    // console.log(type.indexOf('1'))
-    // if (type.indexOf('1') === -1) {
-    //   // this.msgError("查询方式有误")
-    //   start = false
-    // }
-  }
-  if (start) {//线条上的方式
-    selectedEdgeParams.value.label = selectedEdgeParams.value.appConfig.associated + ' join'
-  } else {
-    selectedEdgeParams.value.appConfig.associated = null
-  }
-}
-// 主表字段事件
-const tableCommentChange = (e) => {
-  // console.log('e', e)
-  // console.log('selectedEdgeParams.value', toRaw(selectedEdgeParams.value))
-  //todo childKey??
-  // if (selectedEdgeParams.value.relationalItem.mainKey !== e) {
-  //   selectedEdgeParams.value.appConfig.tableComment = null
-  //   //todo this.msgError啥意思
-  //   // this.msgError("主表关联字段为:" + selectedEdgeParams.value.relationalItem.mainKey)
-  // }
-}
-// 关联字段事件
-const relCommentChange = (e) => {
-  //todo childKey??
-  // if (selectedEdgeParams.value.relationalItem.childKey !== e) {
-  //   selectedEdgeParams.value.appConfig.relComment = null
-  //   // this.msgError("字表关联字段为:" + selectedEdgeParams.value.relationalItem.mainKey)
-  // }
-}
-//网络对齐
-const enableGridHandler = (enableGrid) => {
-  if (enableGrid) {
-    grid.value = new G6.Grid()
-    graph.addPlugin(grid.value)
-  } else {
-    graph.removePlugin(grid.value)
-  }
-}
-// 水平/垂直对齐
-// const alignHandler = (coordinate) => {
-//   let selectedNodes = graph.findAllByState('node', 'selected')
-//   if (selectedNodes.length > 1 && selectedNode.value) {
-//     // ************** 记录【节点对齐】前的数据状态 start **************
-//     let historyData = JSON.stringify(graph.save())
-//     let key = `graph_history_${historyIndex}`
-//     addHistoryData(key, historyData)
-//     // ************** 记录【节点对齐】前的数据状态 end **************
-//
-//     // 开始节点对齐
-//     let cfg = coordinate === 'horizontal' ? {y: selectedNode.value.getModel().y} : {x: selectedNode.value.getModel().x}
-//     for (let i = 0, len = selectedNodes.length; i < len; i++) {
-//       selectedNodes[i].updatePosition(cfg)
-//     }
-//     graph.refresh()
-//
-//     // ************** 记录【节点对齐】后的数据状态 start **************
-//     // 如果当前点过【撤销】了，节点对齐后将取消【重做】功能
-//     // 重置undoCount，【节点对齐】后的数据状态给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-//     if (undoCount > 0) {
-//       historyIndex = historyIndex - undoCount // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-//       for (let i = 1; i <= undoCount; i++) {
-//         let key = `graph_history_${historyIndex + i}`
-//         removeHistoryData(key)
-//       }
-//       undoCount = 0
-//     }
-//     // 记录【节点对齐】后的数据状态
-//     historyIndex += 1
-//     key = `graph_history_${historyIndex}`
-//     let currentData = JSON.stringify(graph.save())
-//     addHistoryData(key, currentData)
-//     // ************** 记录【节点对齐】后的数据状态 end **************
-//   }
-//   rightMenuShow = false
-// }
-// const addGroup = () => {
-//   let selectedNodes = graph.findAllByState('node', 'selected')
-//   if (graph && !graph.destroyed && selectedNodes.length > 1 && selectedNode.value) {
-//
-//     // ************** 记录【添加分组】前的数据状态 start **************
-//     let historyData = JSON.stringify(graph.save())
-//     let key = `graph_history_${historyIndex}`
-//     addHistoryData(key, historyData)
-//     // ************** 记录【添加分组】前的数据状态 end **************
-//
-//     let nodeIds = selectedNodes.map(item => {
-//       return item._cfg.id
-//     })
-//     // 创建分组
-//     let group = graph.addItem('group', {
-//       groupId: utils.generateUUID(),
-//       nodes: nodeIds,
-//       type: 'circle ',
-//       zIndex: 2,
-//       title: {
-//         text: '分组',
-//         stroke: '#87e8de',
-//         fill: '#87e8de',
-//         offsetX: 2,
-//         offsetY: 2
-//       }
-//     })
-//
-//     // ************** 记录【添加分组】后的数据状态 start **************
-//     if (group) {
-//       // 如果当前点过【撤销】了，【添加分组】后将取消【重做】功能
-//       // 重置undoCount，【添加分组】后的数据状态给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-//       if (undoCount > 0) {
-//         historyIndex = historyIndex - undoCount // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-//         for (let i = 1; i <= undoCount; i++) {
-//           let key = `graph_history_${historyIndex + i}`
-//           removeHistoryData(key)
-//         }
-//         undoCount = 0
-//       }
-//       // 记录【添加分组】后的数据状态
-//       historyIndex += 1
-//       let key = `graph_history_${historyIndex}`
-//       let currentData = JSON.stringify(graph.save())
-//       addHistoryData(key, currentData)
-//     }
-//     // ************** 记录【添加分组】后的数据状态 end **************
-//     rightMenuShow = false
-//   }
-// }
-// const removeGroup = () => {
-//   if (selectedGroupId.value) {
-//
-//     // ************** 记录【删除】前的数据状态 start **************
-//     let historyData = JSON.stringify(graph.save())
-//     let key = `graph_history_${historyIndex}`
-//     addHistoryData(key, historyData)
-//     // ************** 记录【删除】前的数据状态 end **************
-//
-//     // 开始删除
-//     graph.removeItem(selectedGroupId.value)
-//
-//     // ************** 记录【删除】后的数据状态 start **************
-//     // 如果当前点过【撤销】了，删除分组后将取消【重做】功能
-//     // 重置undoCount，【删除】后的数据状态给(当前所在historyIndex + 1)，且清空这个时间点之后的记录
-//     if (undoCount.value > 0) {
-//       historyIndex = historyIndex - undoCount // 此时的historyIndex应当更新为【撤销】后所在的索引位置
-//       for (let i = 1; i <= undoCount; i++) {
-//         let key = `graph_history_${historyIndex + i}`
-//         removeHistoryData(key)
-//       }
-//       undoCount = 0
-//     }
-//     // 记录【删除】后的数据状态
-//     historyIndex += 1
-//     key = `graph_history_${historyIndex}`
-//     let currentData = JSON.stringify(graph.save())
-//     addHistoryData(key, currentData)
-//     // ************** 记录【删除】后的数据状态 end **************
-//   }
-// }
-const closeEditColumns = () => {
-  tableColumnEditOpen.value = false
-}
-//todo 弹窗的显示类型
-const ucTypeChang = (index, row) => {
-  if (row.ucType == 'input' && row.ucCon != 'BETWEEN') {
-    selectedNodeParams.value.columns[index].type = 1
-    if (typeof (selectedNodeParams.value.columns[index].ucMock) != 'string') {
-      selectedNodeParams.value.columns[index].ucMock = ''
-    }
-  } else if (row.ucType == 'input' && row.ucCon == 'BETWEEN') {
-    selectedNodeParams.value.columns[index].type = 2
-    selectedNodeParams.value.columns[index].ucMock = {begin: '', end: ''}
-  } else if (row.ucType == 'datetime' && row.ucCon != 'BETWEEN') {
-    selectedNodeParams.value.columns[index].type = 3
-    selectedNodeParams.value.columns[index].ucMock = ''
-  } else if (row.ucType == 'datetime' && row.ucCon == 'BETWEEN') {
-    selectedNodeParams.value.columns[index].type = 4
-    selectedNodeParams.value.columns[index].ucMock = []
-  }
-}
-defineExpose({
-  initTopo,
-  imageSettingParams
-})
-</script>
-
-<style lang="scss" scoped>
-//*[draggable = true] {
-//  -khtml-user-drag: element;
-//}
-//
-.topology {
-  height: 100%;
-  margin: 0;
-  padding: 0;
-
-  .container {
-    height: 100%;
-
-    .left {
-      float: left;
-      display: inline-block;
-      width: 12%;
-      height: 100%;
-      min-height: calc(600px - 55px);
-      padding-top: 0;
-      color: #333;
-      font-size: 12px;
-      text-align: center;
-      background-color: #F7F9FB;
-      border-right: 1px solid #E6E9ED;
-
-      .node-type {
-        display: inline-block;
-        width: 55px;
-        //height: 55px;
-        text-align: center;
-        vertical-align: top;
-        border: 1px solid transparent;
-        margin: 3px;
-
-        img {
-          height: 48px;
-          width: 48px;
-          //padding-top: 5px;
-        }
-      }
-
-      .node-type:hover {
-        cursor: move;
-        border: 1px solid #ccc;
-      }
-    }
-
-    .center {
-      display: inline-block;
-      height: calc(100% - 55px);
-    }
-
-    .input-item {
-      margin-top: 8px;
-
-      .input-select {
-        margin-top: 8px;
-      }
-    }
-
-    .right {
-      float: right;
-      display: inline-block;
-      width: 12%;
-      height: 100%;
-      min-height: calc(600px - 55px);
-      padding-top: 0;
-      color: #333;
-      font-size: 12px;
-      text-align: left;
-      background-color: #F7F9FB;
-      border-left: 1px solid #E6E9ED;
-      user-select: none;
-      -webkit-user-select: none;
-      -moz-user-select: none;
-      -ms-user-select: none;
-
-      .detail-pannel {
-        height: 60%;
-        min-height: 360px;
-
-        .block-container {
-          padding: 16px 8px;
-
-          .params-input {
-            -webkit-appearance: none;
-            background-color: #FFF;
-            background-image: none;
-            border-radius: 4px;
-            border: 1px solid #DCDFE6;
-            box-sizing: border-box;
-            color: #606266;
-            display: inline-block;
-            outline: 0;
-            transition: border-color .2s cubic-bezier(.645, .045, .355, 1);
-            padding: 0 5px;
-            width: 100%;
-            height: 25px;
-            line-height: 25px;
-            font-size: 12px;
-          }
-        }
-      }
-
-      .navigator-pannel {
-        height: 40%;
-        min-height: 135px;
-
-        .navigator {
-          padding: 1px;
-          height: 55%;
-          min-height: 135px;
-        }
-      }
-
-      .pannel-title {
-        padding-left: 12px;
-        height: 32px;
-        color: #000;
-        line-height: 32px;
-        background-color: #EBEEF2;
-        border-top: 1px solid #DCE3E8;
-        border-bottom: 1px solid #DCE3E8;
-      }
-    }
-
-    .graph-container {
-      height: 100%;
-      min-height: calc(600px - 55px);
-
-      #mount-topology {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-
-
-  .right-menu {
-    position: absolute;
-    padding: 10px 5px;
-    list-style: none;
-    background-color: #fff;
-    opacity: 1;
-    border: 1px solid #DCDFE6;
-    border-radius: 10px;
-
-    li {
-      padding: 5px;
-      list-style-type: none;
-      cursor: pointer;
-    }
-
-    li:hover {
-      color: #409EFF;
-    }
-  }
-
-  // 背景主题
-  .default-style {
-    background: #fff;
-  }
-
-  .dark-style {
-    background: linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(0, 0, 0, 0.15) 100%), radial-gradient(at top center, rgba(255, 255, 255, 0.40) 0%, rgba(0, 0, 0, 0.40) 120%) #989898;
-    background-blend-mode: multiply, multiply;
-  }
-
-  .office-style {
-    background-image: linear-gradient(to right, #fef6de 0%, #f3ebd3 100%);
-  }
-}
-</style>
-<style lang="scss">
-.g6-tooltip {
-  padding: 10px 6px;
-  color: #444;
-  background-color: rgba(255, 255, 255, 0.9);
-  border: 1px solid #e2e2e2;
-  border-radius: 4px;
-}
-
-// 预览模式自动生成的节点
-.graph-container {
-  #mount-topology .g6-minimap-preview {
-    position: absolute;
-    right: 10px;
-    bottom: 60px;
-    border: 1px solid #e2e2e2;
-  }
-}
-</style>
diff --git a/src/views/custom-query/topo/topologyDesign.vue b/src/views/custom-query/topo/topologyDesign.vue
deleted file mode 100644
index aedb4b9..0000000
--- a/src/views/custom-query/topo/topologyDesign.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<template>
-  <topology
-      ref="topologyRef"
-      @handleSave="handleSave"
-      @handlePreview="handlePreview"
-      @handleTopoLine="handleTopoLine"
-      :node-type-list="nodeTypeList"
-      :node-app-config="nodeAppConfig"
-      :edge-app-config="edgeAppConfig"
-      :relational-map="relationalMap"
-  >
-  </topology>
-  <div class="top-dialog">
-    <el-dialog title="预览" width="1500px" v-model="previewShow" @close="closePreview" @submit.prevent="handlePreviewData">
-      <el-form inline class="query-form" ref="queryForm" >
-        <el-form-item v-for="column in uniCons" :key="column.ucId"
-                      :label="column.ucName">
-          <el-input :placeholder="column.ucDescribe" :type="column.ucType" v-model="column.query" clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handlePreviewData" :icon="Search">搜索</el-button>
-          <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <div class="table">
-        <el-table :data="previewTable" v-loading="previewLoading">
-          <el-table-column v-for="column in uniColumns" :key="column.prop" :prop="column.prop"
-                           :label="column.label" align="center">
-            <template #default="scope">
-              <template v-if="column.displayType === 'date'">
-                {{ simpleDateMoreFormat(scope.row[column.prop], column.displayParam) }}
-              </template>
-              <template v-if="column.displayType === 'text'">
-                {{ scope.row[column.prop] }}
-              </template>
-              <template v-if="column.displayType === 'image'">
-                <change-image :displayType="'image'" :column-prop="scope.row[column.prop]" :params="imageSettingParams"></change-image>
-<!--                <el-image :src="scope.row[column.prop]">-->
-<!--                  <template #error>-->
-<!--                    <div class="image-slot">-->
-<!--                      <el-image :src="avatar"></el-image>-->
-<!--                    </div>-->
-<!--                  </template>-->
-<!--                </el-image>-->
-              </template>
-              <template v-if="column.displayType === 'dict'">
-                {{ scope.row[column.prop] }} 字典
-              </template>
-              <template v-if="column.displayType === 'html'">
-                <div v-html="scope.row[column.prop]"></div>
-                超文本标记
-              </template>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-              :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    </el-dialog>
-  </div>
-  <div class="top-dialog">
-    <el-dialog v-model="isTopLineVisited" title="上线" width="700px">
-      <el-form :model="form" :rules="formRules" class="query-form" ref="formInstance">
-        <el-form-item label="上级菜单">
-          <el-tree-select v-model="form.parentId" :data="menuOpt" style="width: 100%;"
-                          :filter-node-method="filterNodeMethod" filterable :check-strictly="true"/>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span>
-          <el-button @click="handleCancel">取消</el-button>
-          <el-button type="primary" @click="handleSubmit(formInstance)">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import Topology from "@/views/custom-query/topo/top/topology.vue"
-import {getTopoDragInfo, saveTopo, previewTopo, previewTopologyData, topoToLine} from "@/api/custom-query/topo-search"
-import {simpleDateMoreFormat} from "./utils/date.js";
-import {reactive} from "vue";
-import {ElMessage} from "element-plus";
-import {Search, Refresh} from '@element-plus/icons-vue'
-import {getMenuOpt} from '@/api/system/menuman.js'
-import Paging from "@/components/pagination/index.vue";
-import ChangeImage from "./components/changeImage/ChangeImage.vue";
-const router = useRouter()
-const params = reactive(router.currentRoute.value.params)
-const isTopLineVisited = ref(false)
-const form = ref({
-  parentId: ''
-})
-const formRules = ref({
-  parentId: [{required: true, message: '请选择上级菜单', trigger: 'blur'}]
-})
-const imageSettingParams = ref({})
-const formInstance = ref()
-const menuOpt = ref([])
-const topologyRef = ref()
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const jsonData = ref()
-const queryForm = ref([])
-const queryValue = ref(null)
-const total = ref(0)
-const previewLoading = ref(true)
-const nodeTypeList = ref([])
-const relationalMap = ref(new Map())
-const graphDefaultData = ref([])
-const previewShow = ref(false)
-const previewTable = ref({})
-const uniColumns = ref({})
-const uniCons = ref({})
-const ucId = ref(null)
-
-const nodeAppConfig = reactive({
-  // ip: '节点IP',
-  // port: '节点端口',
-  // sysName: '设备名称'
-})
-const edgeAppConfig = reactive({
-  associated: "查询方式",
-  sourceColumn: "主表字段",
-  targetColumn: "关联字段"
-})
-
-const closePreview = () => {
-  previewShow.value = false
-}
-const handleSave = (json) => {
-  // if(JSON.parse(json).edges.length!==JSON.parse(json).nodes.length-1){
-  //   ElMessage.warning('图与图之间尚未构成联系, 请检查后保存')
-  // }else {
-  saveTopo({
-    queryId: params.queryId,
-    topJson: json
-  }).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-  // }
-}
-//点击上线按钮弹框
-const handleTopoLine = (json) => {
-  getMenuOpt().then(res => {
-    menuOpt.value = [{
-      value: 0,
-      label: "一级目录",
-      children: res.data
-    }]
-  })
-  jsonData.value = json
-  isTopLineVisited.value = true
-}
-const filterNodeMethod = (value, data) => data.label.includes(value)
-
-const restForm = () => {
-  form.value = {
-    parentId: ''
-  }
-}
-//取消
-const handleCancel = () => {
-  restForm();
-  isTopLineVisited.value = false;
-};
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid, fields) => {
-    if (!valid) return
-    topoToLine({
-      menuId: form.value.parentId,
-      queryId: params.queryId,
-      topJson: jsonData.value
-    }).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        router.push('/custom/query/topo')
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  })
-}
-
-const handlePreview = (json) => {
-  imageSettingParams.value=topologyRef.value.imageSettingParams
-  previewLoading.value = true
-  previewTopo({
-    queryId: params.queryId,
-    topJson: json,
-  }).then(res => {
-    console.log('预览', res)
-    if (res.code === 1000) {
-      previewShow.value = true
-      previewTable.value = res.data.table.rows
-      uniColumns.value = res.data.uniColumns
-      uniCons.value = res.data.uniCons
-      total.value = res.data.table.total
-      previewLoading.value = false
-      uniCons.value.forEach(item => {
-        ucId.value = item.ucId
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-//重置搜索
-const handleReset = () => {
-  uniCons.value.forEach(con => {
-    con.query = ''
-  })
-  handlePreviewData()
-}
-
-const handlePreviewData = () => {
-  previewLoading.value = true
-  let queryData = []
-  uniCons.value.forEach(con => {
-    if (con.query) {
-      let queryItem = {
-        query: con.query,
-        ucId: con.ucId
-      }
-      queryData.push(queryItem)
-    }
-  })
-  previewTopologyData({
-    list: queryData,
-    queryId: params.queryId
-  }, pageInfo).then(res => {
-    previewTable.value = res.data.rows
-    total.value = res.data.total
-    previewLoading.value = false
-  })
-}
-
-
-const getDragInfo = async () => {
-  let queryId = params.queryId
-  getTopoDragInfo(queryId).then(res => {
-    if (res.code === 1000) {
-      // console.log('拖拽数据', res.data)
-      nodeTypeList.value = res.data.tableList
-      // for (let relationalItem of res.data.relational) {
-      //   let item = relationalMap.value.get(relationalItem.mainId)
-      //   if (null == item) {
-      //     item = [];
-      //   }
-      //   item.push(relationalItem)
-      //   relationalMap.value.set(relationalItem.mainId,item)
-      // }
-      // console.log('res.data.relational', res.data.relational)
-      if (res.data.relational.length === 0) {
-        relationalMap.value = []
-      } else {
-        relationalMap.value = res.data.relational
-      }
-      if (res.data.topJson === null) {
-        let data = {
-          nodes: [],
-          edges: [],
-          combos: [],
-          groups: []
-        }
-        topologyRef.value.initTopo(data);
-      } else {
-        graphDefaultData.value = JSON.parse(res.data.topJson)
-        topologyRef.value.initTopo(graphDefaultData.value);
-      }
-    }
-  })
-}
-//切换每页显示条数
-const handleSizeChange = (val) => {
-  pageInfo.pageSize = val
-  handlePreviewData()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = (val) => {
-  pageInfo.pageNum = val
-  handlePreviewData()
-}
-getDragInfo()
-</script>
-<style lang="scss" scoped>
-.demo-topology {
-  width: 100%;
-  height: 100%;
-}
-</style>
-
-<style lang="scss">
-html {
-  overflow-x: hidden;
-  overflow-y: hidden;
-}
-</style>
-
diff --git a/src/views/custom-query/topo/utils/anchor/draw_mark.js b/src/views/custom-query/topo/utils/anchor/draw_mark.js
deleted file mode 100644
index ee23076..0000000
--- a/src/views/custom-query/topo/utils/anchor/draw_mark.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: 画锚点
- */
-
- import theme from '@/views/custom-query/topo/top/theme'
-export default function(cfg, group) {
-  const themeStyle = theme.defaultStyle // todo...先使用默认主题，后期可能增加其它风格的主体
-  let { anchorPoints, width, height, id } = cfg
-  if (anchorPoints && anchorPoints.length) {
-    for (let i = 0, len = anchorPoints.length; i < len; i++) {
-      let [x, y] = anchorPoints[i]
-      // 计算Marker中心点坐标
-      let anchorX = x * width
-      let anchorY = y * height
-      // 添加锚点背景
-      let anchorBgShape = group.addShape('marker', {
-        id: id + '_anchor_bg_' + i,
-        attrs: {
-          name: 'anchorBg',
-          x: anchorX,
-          y: anchorY,
-          // 锚点默认样式
-          ...themeStyle.anchorBgStyle.default
-        },
-        draggable: false,
-        name: 'markerBg-shape'
-      })
-      // 添加锚点Marker形状
-      let anchorShape = group.addShape('marker', {
-        id: id + '_anchor_' + i,
-        attrs: {
-          name: 'anchor',
-          x: anchorX,
-          y: anchorY,
-          // 锚点默认样式
-          ...themeStyle.anchorStyle.default
-        },
-        draggable: false,
-        name: 'marker-shape'
-      })
-
-      anchorShape.on('mouseenter', function() {
-        anchorBgShape.attr({
-          ...themeStyle.anchorBgStyle.active
-        })
-      })
-      anchorShape.on('mouseleave', function() {
-        anchorBgShape.attr({
-          ...themeStyle.anchorBgStyle.inactive
-        })
-      })
-    }
-  }
-}
diff --git a/src/views/custom-query/topo/utils/anchor/index.js b/src/views/custom-query/topo/utils/anchor/index.js
deleted file mode 100644
index e272fab..0000000
--- a/src/views/custom-query/topo/utils/anchor/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: anchor
- */
-
-import setState from './set-state'
-import drawMark from './draw_mark'
-
-export default {
-  setState,
-  drawMark,
-}
diff --git a/src/views/custom-query/topo/utils/anchor/set-state.js b/src/views/custom-query/topo/utils/anchor/set-state.js
deleted file mode 100644
index e1ea5f8..0000000
--- a/src/views/custom-query/topo/utils/anchor/set-state.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: set anchor state
- */
-import theme from '@/views/custom-query/topo/top/theme'
-
-export default function (name, value, item) {
-  const themeStyle = theme.defaultStyle
-  if (name === 'hover') {
-    let group = item.getContainer()
-    let children = group.get('children')
-    for (let i = 0, len = children.length; i < len; i++) {
-      let child = children[i]
-      // 处理锚点状态
-      if (child.attrs.name === 'anchorBg') {
-        if (value) {
-          child.attr(themeStyle.anchorStyle.hover)
-        } else {
-          child.attr(themeStyle.anchorStyle.unhover)
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/custom-query/topo/utils/anchor/update.js b/src/views/custom-query/topo/utils/anchor/update.js
deleted file mode 100644
index 5de0430..0000000
--- a/src/views/custom-query/topo/utils/anchor/update.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: update anchor
- */
-
-export default function(cfg, group) {
-  let { anchorPoints, width, height, id } = cfg
-  if (anchorPoints && anchorPoints.length) {
-    for (let i = 0, len = anchorPoints.length; i < len; i++) {
-      let [x, y] = anchorPoints[i]
-      // 计算Marker中心点坐标
-      let originX = -width / 2
-      let originY = -height / 2
-      let anchorX = x * width + originX
-      let anchorY = y * height + originY
-      // 锚点背景
-      let anchorBgShape = group.findById(id + '_anchor_bg_' + i)
-      // 锚点
-      let anchorShape = group.findById(id + '_anchor_' + i)
-      anchorBgShape.attr({
-        x: anchorX,
-        y: anchorY
-      })
-      anchorShape.attr({
-        x: anchorX,
-        y: anchorY
-      })
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/custom-query/topo/utils/collapse/index.js b/src/views/custom-query/topo/utils/collapse/index.js
deleted file mode 100644
index d43dc28..0000000
--- a/src/views/custom-query/topo/utils/collapse/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @author: clay
- * @data: 2021/5/11 17:28
- * @email: clay@hchyun.com
- * @description: node
- */
-import setState from './set-state'
-
-export default {
-  setState
-}
diff --git a/src/views/custom-query/topo/utils/collapse/set-state.js b/src/views/custom-query/topo/utils/collapse/set-state.js
deleted file mode 100644
index 67e19f5..0000000
--- a/src/views/custom-query/topo/utils/collapse/set-state.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @author: clay
- * @data: 2021/5/11 17:28
- * @email: clay@hchyun.com
- * @description: node 节点收缩和放大
- */
-export default function(e){
-  const {
-    graph
-  } = this;
-  const item = e.item;
-  const shape = e.shape;
-  if (!item) {
-    return;
-  }
-
-  //收缩
-  if (shape.get("name") === "collapse") {
-    graph.updateItem(item, {
-      collapsed: true,
-      size: [300, 50],
-    });
-    setTimeout(() => graph.layout(), 100);
-    //展开
-  } else if (shape.get("name") === "expand") {
-    graph.updateItem(item, {
-      collapsed: false,
-      size: [300, 500],
-    });
-    setTimeout(() => graph.layout(), 100);
-  }
-}
diff --git a/src/views/custom-query/topo/utils/date.js b/src/views/custom-query/topo/utils/date.js
deleted file mode 100644
index 92dbc30..0000000
--- a/src/views/custom-query/topo/utils/date.js
+++ /dev/null
@@ -1,106 +0,0 @@
-//时间转换为String类型
-const simpleDateFormat=(pattern)=> {
-  const fmt = new Object();
-  fmt.pattern = pattern;
-  fmt.parse = function (source) {
-    try {
-      return new Date(source);
-    } catch (e) {
-      console.log("字符串 " + source + " 转时间格式失败！");
-      return null;
-    }
-  };
-  fmt.format = function (date) {
-    if (typeof (date) == "undefined" || date == null || date == "") {
-      return "";
-    }
-    try {
-      date = new Date(date);
-    } catch (e) {
-      console.log("时间 " + date + " 格式化失败！");
-      return "";
-    }
-    let strTime = this.pattern;//时间表达式的正则
-
-    const o = {
-      "M+": date.getMonth() + 1, //月份
-      "d+": date.getDate(), //日
-      "H+": date.getHours(), //小时
-      "m+": date.getMinutes(), //分
-      "s+": date.getSeconds(), //秒
-      "q+": Math.floor((date.getMonth() + 3) / 3), //季度
-      "S": date.getMilliseconds() //毫秒
-    };
-    if (/(y+)/.test(strTime)) {
-      strTime = strTime
-        .replace(RegExp.$1, (date.getFullYear() + "")
-          .substr(4 - RegExp.$1.length));
-    }
-    for (const k in o) {
-      if (new RegExp("(" + k + ")").test(strTime)) {
-        strTime = strTime.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-      }
-    }
-    return strTime;
-  };
-  return fmt;
-}
-
-//用于一个函数有多个时间格式转换
-export const simpleDateMoreFormat=(date, formatStr) =>{
-  console.log(date,formatStr)
-  const fmt = simpleDateFormat(formatStr);
-  date = fmt.parse(date)
-  return fmt.format(date)
-}
-
-//时间格式化为yyyy.MM
-const simpleDateFormatByDot=(date) =>{
-  const fmt = simpleDateFormat("yyyy.MM");
-  date = fmt.parse(date)
-  return fmt.format(date)
-}
-
-//时间格式化为yyyy-MM
-const  simpleDateFormatByLine=(date) =>{
-  const fmt = simpleDateFormat("yyyy-MM");
-  date = fmt.parse(date)
-  return fmt.format(date)
-}
-
-//时间格式化为yyyy-MM-dd
-const simpleDateFormatByMoreLine=(date) =>{
-  const fmt = simpleDateFormat("yyyy-MM-dd");
-  date = fmt.parse(date)
-  return fmt.format(date)
-}
-
-//用于list表里每条记录中的startDate,endDate,格式化为yyyy.MM
-const converListDateByDot=(list) =>{
-  for (const item of list) {
-    item.startDate = simpleDateFormatByDot(item.startDate);
-    item.endDate = simpleDateFormatByDot(item.endDate);
-  }
-}
-
-//用于data.startDate,data.endDate,格式化为yyyy-MM
-const converListDateByLine=(date) =>{
-  data.startDate = simpleDateFormatByLine(data.startDate);
-  data.endDate = simpleDateFormatByLine(data.endDate);
-}
-
-
-export default {
-  simpleDateFormat,
-  simpleDateMoreFormat,
-  simpleDateFormatByDot,
-  simpleDateFormatByLine,
-  simpleDateFormatByMoreLine,
-  converListDateByDot,
-  converListDateByLine
-}
-
-
-
-
-
diff --git a/src/views/custom-query/topo/utils/edge/index.js b/src/views/custom-query/topo/utils/edge/index.js
deleted file mode 100644
index 8002373..0000000
--- a/src/views/custom-query/topo/utils/edge/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: edge
- */
-
-import setState from './set-state'
-
-export default {
-  setState
-}
diff --git a/src/views/custom-query/topo/utils/edge/set-state.js b/src/views/custom-query/topo/utils/edge/set-state.js
deleted file mode 100644
index fde37f7..0000000
--- a/src/views/custom-query/topo/utils/edge/set-state.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: set edge state
- */
-
-import theme from '@/views/custom-query/topo/top/theme'
-
-export default function(name, value, item) {
-  const group = item.getContainer()
-  const shape = group.get('children')[0] // 顺序根据 draw 时确定
-  const themeStyle = theme.defaultStyle // todo...先使用默认主题，后期可能增加其它风格的主体
-  if (name === 'selected') {
-    if (value) {
-      shape.attr(themeStyle.edgeStyle.selected)
-    } else {
-      shape.attr(themeStyle.edgeStyle.unselected)
-    }
-  }
-}
diff --git a/src/views/custom-query/topo/utils/index.js b/src/views/custom-query/topo/utils/index.js
deleted file mode 100644
index 8cd64c9..0000000
--- a/src/views/custom-query/topo/utils/index.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Created by clay on 2019/10/14
- * Description: common utils
- */
-
-/**
- * This is just a simple version of deep copy
- * Has a lot of edge cases bug
- * If you want to use a perfect deep copy, use lodash's _.cloneDeep
- * @param {Object} source
- * @returns {Object} targetObj
- */
-const deepClone = function(source) {
-  if (!source && typeof source !== 'object') {
-    throw new Error('error arguments: deepClone')
-  }
-  let targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach(key => {
-    if (source[key] && typeof source[key] === 'object') {
-      targetObj[key] = deepClone(source[key])
-    } else {
-      targetObj[key] = source[key]
-    }
-  })
-  return targetObj
-}
-
-/**
- * Randomly extract one or more elements from an array
- * If you want to use a perfect solution, use lodash's _.sample or _.sampleSize
- * @param {Array} arr
- * @param {number} count
- * @returns {Array} arr
- */
-const getRandomArrayElements = function(arr, count = 1) {
-  if (count > arr.length) {
-    throw new Error('error arguments: count is greater than length of array')
-  }
-  let shuffled = arr.slice(0), i = arr.length, min = i - count, temp, index
-  while (i-- > min) {
-    index = Math.floor((i + 1) * Math.random())
-    temp = shuffled[index]
-    shuffled[index] = shuffled[i]
-    shuffled[i] = temp
-  }
-  return shuffled.slice(min)
-}
-
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: graph utils
- */
-
-import node from './node'
-import anchor from './anchor'
-import edge from './edge'
-import collapse from './collapse'
-
-/**
- * 比较两个对象的内容是否相同（两个对象的键值都相同）
- * @param obj1
- * @param obj2
- * @returns {*}
- */
-const isObjectValueEqual = function(obj1, obj2) {
-  let o1 = obj1 instanceof Object
-  let o2 = obj2 instanceof Object
-  // 不是对象的情况
-  if (!o1 || !o2) {
-    return obj1 === obj2
-  }
-  // 对象的属性（key值）个数不相等
-  if (Object.keys(obj1).length !== Object.keys(obj2).length) {
-    return false
-  }
-  // 判断每个属性（如果属性值也是对象则需要递归）
-  for (let attr in obj1) {
-    let t1 = obj1[attr] instanceof Object
-    let t2 = obj2[attr] instanceof Object
-    if (t1 && t2) {
-      return isObjectValueEqual(obj1[attr], obj2[attr])
-    } else if (obj1[attr] !== obj2[attr]) {
-      return false
-    }
-  }
-  return true
-}
-
-
-/**
- * 生成uuid算法,碰撞率低于1/2^^122
- * @returns {string}
- */
-const generateUUID = function() {
-  let d = new Date().getTime()
-  //  x 是 0-9 或 a-f 范围内的一个32位十六进制数
-  let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    let r = (d + Math.random() * 16) % 16 | 0
-    d = Math.floor(d / 16)
-    return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16)
-  })
-  return uuid
-}
-
-export default {
-  node,
-  anchor,
-  edge,
-  collapse,
-  // 通用工具类函数
-  isObjectValueEqual,
-  generateUUID,
-  deepClone,
-  getRandomArrayElements
-}
-
diff --git a/src/views/custom-query/topo/utils/node/index.js b/src/views/custom-query/topo/utils/node/index.js
deleted file mode 100644
index 61e5741..0000000
--- a/src/views/custom-query/topo/utils/node/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: node
- */
-
-import setState from './set-state'
-
-export default {
-  setState
-}
diff --git a/src/views/custom-query/topo/utils/node/set-state.js b/src/views/custom-query/topo/utils/node/set-state.js
deleted file mode 100644
index b489c94..0000000
--- a/src/views/custom-query/topo/utils/node/set-state.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @author: clay
- * @data: 2019/08/15
- * @description: set node state
- */
-
-import theme from '@/views/custom-query/topo/top/theme'
-
-export default function(name, value, item) {
-  const group = item.getContainer()
-  const themeStyle = theme.defaultStyle // todo...先使用默认主题，后期可能增加其它风格的主体
-  let children = group.get('children')
-  for (let i = 0; i < children.length; i++) {
-    let child = children[i]
-    //判断是否为er图的外围,是则改变样式
-    if (child.attrs.name === 'border') {
-      if (name === 'selected') {
-        if (value) {
-          child.attr(themeStyle.nodeStyle.selected)
-        } else {
-          child.attr(themeStyle.nodeStyle.default)
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/rapid/gen/basicInfoForm.vue b/src/views/rapid/gen/basicInfoForm.vue
deleted file mode 100644
index de9e4fd..0000000
--- a/src/views/rapid/gen/basicInfoForm.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="150px">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="表名称" prop="tableName">
-          <el-input placeholder="请输入仓库名称" v-model="info.tableName"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="表描述" prop="tableComment">
-          <el-input placeholder="请输入" v-model="info.tableComment"/>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item label="实体类名称" prop="className">
-          <el-input placeholder="请输入" v-model="info.className"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="作者" prop="functionAuthor">
-          <el-input placeholder="请输入" v-model="info.functionAuthor"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" :rows="3" v-model="info.remark"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-
-<script setup>
-import {defineExpose, defineProps} from "vue";
-
-const props = defineProps({
-  info: {
-    type: Object,
-    default: null
-  }
-})
-const basicInfoForm = ref()
-const rules = ref({
-  tableName: [
-    {required: true, message: "请输入表名称", trigger: "blur"}
-  ],
-  tableComment: [
-    {required: true, message: "请输入表描述", trigger: "blur"}
-  ],
-  className: [
-    {required: true, message: "请输入实体类名称", trigger: "blur"}
-  ],
-  functionAuthor: [
-    {required: true, message: "请输入作者", trigger: "blur"}
-  ]
-})
-defineExpose({
-  basicInfoForm
-})
-
-</script>
-
-<style scoped>
-
-
-</style>
\ No newline at end of file
diff --git a/src/views/rapid/gen/editTable.vue b/src/views/rapid/gen/editTable.vue
deleted file mode 100644
index ab9a19d..0000000
--- a/src/views/rapid/gen/editTable.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-card style="margin-top: 15px">
-    <el-tabs v-model="activeName">
-      <el-tab-pane label="基本信息" name="info">
-        <basic-info-form :info="info" ref="infoRef"/>
-      </el-tab-pane>
-      <el-tab-pane label="字段信息" name="column">
-        <el-table ref="columnRef" :data="columns" row-key="columnId" :max-height="tableHeight">
-          <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag"/>
-          <el-table-column
-              label="字段列名"
-              prop="columnName"
-              min-width="10%"
-              :show-overflow-tooltip="true"
-          />
-          <el-table-column label="字段描述" min-width="10%">
-            <template #default="scope">
-              <el-input v-model="scope.row.columnComment"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column
-              label="物理类型"
-              prop="columnType"
-              min-width="10%"
-              :show-overflow-tooltip="true"
-          />
-          <el-table-column label="Java类型" min-width="11%">
-            <template #default="scope">
-              <el-select v-model="scope.row.javaType"  filterable>
-                <el-option label="Long" value="Long"/>
-                <el-option label="String" value="String"/>
-                <el-option label="Integer" value="Integer"/>
-                <el-option label="Double" value="Double"/>
-                <el-option label="BigDecimal" value="BigDecimal"/>
-                <el-option label="Date" value="Date"/>
-                <el-option label="Boolean" value="Boolean"/>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="java属性" min-width="10%">
-            <template #default="scope">
-              <el-input v-model="scope.row.javaField"></el-input>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="插入" min-width="5%">
-            <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isInsert"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="编辑" min-width="5%">
-            <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isEdit"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="列表" min-width="5%">
-            <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isList"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="查询" min-width="5%">
-            <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="查询方式" min-width="10%">
-            <template #default="scope">
-              <el-select v-model="scope.row.queryType"  filterable>
-                <el-option label="=" value="EQ"/>
-                <el-option label="!=" value="NE"/>
-                <el-option label=">" value="GT"/>
-                <el-option label=">=" value="GE"/>
-                <el-option label="<" value="LT"/>
-                <el-option label="<=" value="LE"/>
-                <el-option label="LIKE" value="LIKE"/>
-                <el-option label="BETWEEN" value="BETWEEN"/>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="是否正则" min-width="10%">
-            <template #default="scope">
-              <el-select v-model="scope.row.isRegular" filterable>
-                <el-option v-for="item in regularOptions"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value"/>
-                <span></span>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="必填" min-width="5%">
-            <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="显示类型" min-width="12%">
-            <template #default="scope">
-              <el-select v-model="scope.row.htmlType" filterable>
-                <el-option label="文本框" value="input"/>
-                <el-option label="文本域" value="textarea"/>
-                <el-option label="下拉框" value="select"/>
-                <el-option label="单选框" value="radio"/>
-                <el-option label="复选框" value="checkbox"/>
-                <el-option label="日期控件" value="datetime"/>
-                <el-option label="图片上传" value="imageUpload"/>
-                <el-option label="文件上传" value="fileUpload"/>
-                <el-option label="富文本控件" value="editor"/>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="字典类型" min-width="12%">
-            <template #default="scope">
-              <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择" >
-                <el-option
-                    v-for="dict in dictOption"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value">
-                  <span style="float: left">{{ dict.value }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.label }}</span>
-                </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="生成信息" name="table">
-        <table-info :table="tables" :info="info" :columns="columns" :option-info="optionInfo" :dict-options="dictOption" ref="tableRef"/>
-      </el-tab-pane>
-      <el-form label-width="100px">
-        <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
-          <el-button type="primary" @click="submitForm()">提交</el-button>
-          <el-button @click="close()">返回</el-button>
-        </el-form-item>
-      </el-form>
-    </el-tabs>
-  </el-card>
-</template>
-
-<script setup>
-import {getTableDetail, editCodeGen} from "@/api/rapid/code-gen";
-import {getRegularOpt} from "@/api/rapid/regular";
-import {getDictOption} from "@/api/system/dict-type";
-import BasicInfoForm from "./basicInfoForm.vue"
-import TableInfo from './tableInfo.vue'
-import {ElMessage} from "element-plus";
-
-const router = useRouter()
-const params = reactive(router.currentRoute.value.params)
-
-const activeName = ref("column")
-const columns = ref([])
-const info = ref([])
-const regularOptions = ref([])
-const tables = ref([])
-const dictOption = ref([])
-const optionInfo = ref()
-const tableHeight = ref(document.documentElement.scrollHeight - 245 + 'px')
-
-const getRegularOption = async () => {
-  getRegularOpt().then(res => {
-    if (res.code === 1000) {
-      let def = [{
-        value: 0,
-        label: "无"
-      }]
-      def.push(...res.data)
-      regularOptions.value = def
-    }
-  })
-}
-
-const getInfo = async () => {
-  getDictOption().then(res => {
-    if (res.code === 1000) {
-      dictOption.value = res.data
-      getDetail()
-    }
-  })
-}
-
-const submitForm = async () => {
-  const infoData = {...info.value}
-  infoData.optionInfo = {...optionInfo.value}
-  const obj = {
-    ...infoData,
-    columns: [...columns.value]
-  }
-  await editCodeGen(obj).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      return
-    }
-    ElMessage.error(res.msg)
-  })
-}
-const getDetail = async () => {
-  getTableDetail(params.tableId).then(res => {
-    if (res.code === 1000) {
-      columns.value = res.data.columns
-      info.value = res.data.info
-      tables.value = res.data.tables
-      optionInfo.value = res.data.optionInfo
-    }else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-
-const close = async () => {
-  router.push({
-    path: '/rapid/gen',
-  })
-}
-
-const getFormPromise = async (form) => {
-  return new Promise(resolve => {
-    form.validate(res => {
-      resolve(res);
-    });
-  });
-}
-
-getRegularOption()
-
-getInfo()
-
-
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/rapid/gen/importTable.vue b/src/views/rapid/gen/importTable.vue
deleted file mode 100644
index a8b34e1..0000000
--- a/src/views/rapid/gen/importTable.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-  <el-dialog v-model="isVisited" title="导入表" width="1000px">
-    <el-form :model="queryParams" inline class="query-form" ref="dataSourceFrom" style="margin: 0">
-      <el-form-item label="数据源" prop="businessType">
-        <el-select v-model="queryParams.dataSourceId" placeholder="数据源" clearable filterable>
-          <el-option
-              v-for="item in dataSourceOption"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="表名称" prop="title">
-        <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="表备注" prop="title">
-        <el-input v-model="queryParams.tableComment" placeholder="请输入表备注" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="dateValue">
-        <el-config-provider>
-          <el-date-picker
-              v-model="queryParams"
-              type="daterange"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="YYYY-MM-DD"
-          />
-        </el-config-provider>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="searchTableSearch()" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="table">
-      <el-table
-          :data="list"
-          row-key="operId"
-          :lazy="true"
-          ref="singleTable"
-          v-loading="loading"
-          @select="handleSelect"
-      >
-        <el-table-column type="selection" width="80"/>
-        <el-table-column prop="tableName" label="表名称" align="center"/>
-        <el-table-column prop="tableComment" label="表描述" align="center"/>
-        <el-table-column prop="createTime" label="创建时间" sortable align="center"/>
-        <el-table-column prop="updateTime" label="更新时间" sortable align="center"/>
-        <el-table-column label="操作">
-          <template #default="scope">
-            <el-button type="primary" size="mini" @click="handleImport(scope.row)" link>导入</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-  </el-dialog>
-</template>
-
-<script setup>
-import {getDynamicTable, importTable} from "@/api/rapid/code-gen";
-import {Search, Refresh, View} from '@element-plus/icons-vue'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {defineExpose, defineProps} from "vue";
-import Paging from "@/components/pagination/index.vue";
-
-const emit = defineEmits(['importSuccess'])
-
-const queryParams = reactive({
-  dataSourceId: null,
-  tableName: '',
-  tableComment: '',
-  startTime: '',
-  endTime: ''
-})
-
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const list = ref([])
-const dataSourceIds = ref()
-const loading = ref(true)
-const total = ref(0)
-const isVisited = ref(false)
-
-const props = defineProps({
-  dataSourceOption: {
-    type: Array,
-    default: []
-  },
-  queryId: {
-    type: Number,
-    default: 0
-  },
-})
-
-const searchTableSearch = async () => {
-  let params = {
-    ...queryParams,
-    pageNum: pageInfo.pageNum,
-    pageSize: pageInfo.pageSize
-  }
-  loading.value = true
-  getDynamicTable(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-
-const handleImportTable = async (data) => {
-  importTable(data).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      isVisited.value = false
-      emit("importSuccess")
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-const handleImport = (item) => {
-  let data = {
-    dataSourceId: queryParams.dataSourceId,
-    tables: [item.tableName]
-  }
-  handleImportTable(data)
-}
-
-
-//勾选table数据行的 Checkbox
-const handleSelect = async (selection, row) => {
-  if (selection.length !== 0) {
-    disabled.value = false
-    if (selection.length > 1) {
-      const del_row = selection.shift();
-      dataSourceIds.value.toggleRowSelection(del_row, false);
-    }
-  }
-}
-
-//重置功能
-const handleReset = () => {
-  queryParams.dataSourceId = props.dataSourceOption[0].value
-  queryParams.tableName = ''
-  queryParams.tableComment = ''
-  queryParams.startTime = ''
-  queryParams.endTime = ''
-  searchTableSearch()
-}
-//切换每页显示条数
-const handleSizeChange = async (val) => {
-  pageInfo.pageSize = val
-  await searchTableSearch()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = async (val) => {
-  pageInfo.pageNum = val
-  await searchTableSearch()
-}
-
-const show = () => {
-  isVisited.value = true
-  if (props.queryId !== null) {
-    queryParams.dataSourceId = props.queryId
-  } else {
-    queryParams.dataSourceId = props.dataSourceOption[0].value
-  }
-  searchTableSearch()
-}
-
-defineExpose({
-  show
-})
-</script>
diff --git a/src/views/rapid/gen/index.vue b/src/views/rapid/gen/index.vue
deleted file mode 100644
index d9bce77..0000000
--- a/src/views/rapid/gen/index.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
-  <div>
-    <el-form :model="queryParams" inline class="query-form" ref="genForm">
-      <el-form-item label="数据源" prop="dataSourceId">
-        <el-select v-model="queryParams.dataSourceId" placeholder="数据源" clearable filterable>
-          <el-option
-              v-for="item in dataSourceOption"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="表名称" prop="tableName">
-        <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="表备注" prop="tableComment">
-        <el-input v-model="queryParams.tableComment" placeholder="请输入表备注" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="dateValue">
-        <el-config-provider>
-          <el-date-picker
-              v-model="dateValue"
-              type="datetimerange"
-              :shortcuts="shortcuts"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-config-provider>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <div class="query-btn">
-      <el-button type="primary" plain :icon="UploadFilled" @click="handleImport(queryParams.dataSourceId)">导入
-      </el-button>
-      <el-button type="warning" @click="handleExport" :icon="Download" plain>导出</el-button>
-      <el-button type="danger" :icon="Delete"
-                 @click="handleMoreDelete(tableId,tableName)" :disabled="disabled" plain>删除
-      </el-button>
-    </div>
-
-    <div class="table">
-      <el-table
-          :data="list"
-          :lazy="true"
-          v-loading="loading"
-          @select="handleSelect"
-          v-tabh
-      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column label="序号" type="index" align="center" width="60"/>
-        <el-table-column prop="tableName" label="表名称" align="center"/>
-        <el-table-column prop="tableComment" label="表描述" align="center"/>
-        <el-table-column prop="className" label="实体类" align="center"/>
-        <el-table-column prop="dataSourceId" label="数据源" align="center">
-          <template #default="scope">
-            <el-tag v-if="getDataSourceOptionItem(scope.row.dataSourceId)!==''">
-              {{ getDataSourceOptionItem(scope.row.dataSourceId) }}
-            </el-tag>
-            <span v-else></span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" sortable align="center"/>
-        <el-table-column prop="updateTime" label="更新时间" sortable align="center"/>
-        <el-table-column label="操作" width="260" align="center">
-          <template #default="scope">
-            <el-button type="primary" size="mini" @click="handlePreview(scope.row.tableId)" link>预览</el-button>
-            <el-button type="primary" size="mini" @click="handleEdit(scope.row.tableId)" link>编辑</el-button>
-            <el-button type="primary" size="mini"
-                       @click="handleSynchronization(scope.row.tableId)" link>同步
-            </el-button>
-            <el-button type="primary" size="mini" @click="handleDownLoad(scope.row.tableId)" link>下载
-            </el-button>
-            <popover-delete :name="scope.row.tableName" :type="'表'"
-                            @delete="handleDeleteTable(scope.row.tableId)"/>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    <import-table ref="importTableRef" :data-source-option="dataSourceOption" :query-id="importQueryId"
-                  @importSuccess="getList"/>
-
-    <el-dialog v-model="preview.isVisited" title="预览代码" width="1500px">
-      <el-tabs v-model="preview.activeName" class="demo-tabs">
-        <el-tab-pane
-            v-for="(value,key) in preview.code"
-            :label="key" :name="key">
-          <el-link :underline="false" :icon="CopyDocument" @click="clipboardSuccess(value)"
-                   style="float:right">复制
-          </el-link>
-          <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
-        </el-tab-pane>
-      </el-tabs>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script setup>
-import {getTableList, deleteTable, deleteMoreTable, previewCode} from "@/api/rapid/code-gen";
-import {getDataSourceOption} from '@/api/rapid/data-source'
-import {downLoadZip} from "@/utils/downloadZip";
-import {Search, Refresh, Delete, Edit, View, Download, CopyDocument, UploadFilled} from '@element-plus/icons-vue'
-import Paging from "@/components/pagination/index.vue";
-import ImportTable from './importTable.vue'
-import java from 'highlight.js/lib/languages/java'
-import xml from 'highlight.js/lib/languages/xml'
-import javascript from 'highlight.js/lib/languages/javascript'
-import sql from 'highlight.js/lib/languages/sql'
-import hljs from "highlight.js/lib/highlight";
-import "highlight.js/styles/github-gist.css";
-import {ElMessage, ElMessageBox} from "element-plus";
-import useClipboard from "vue-clipboard3"
-import {syncDatabase} from "@/api/rapid/code-gen";
-import {downLoadExcel} from "@/utils/downloadZip";
-
-hljs.registerLanguage("java", java);
-hljs.registerLanguage("xml", xml);
-hljs.registerLanguage("html", xml);
-hljs.registerLanguage("vue", javascript);
-hljs.registerLanguage("ts", javascript);
-hljs.registerLanguage("tsx", javascript);
-hljs.registerLanguage("js", javascript);
-hljs.registerLanguage("sql", sql);
-
-const router = useRouter()
-const dsId = reactive(router.currentRoute.value.params.dsId)
-const queryParams = reactive({
-  dataSourceId: null,
-  dataSourceType: '',
-  tableName: '',
-  tableComment: '',
-  startTime: '',
-  endTime: ''
-})
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10
-})
-const disabled = ref(true)
-const importQueryId = ref()
-const tableId = ref()
-const tableName = ref()
-const list = ref([])
-const loading = ref(true)
-const total = ref()
-const dateValue = ref()
-const shortcuts = [
-  {
-    text: "上周",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-      return [start, end];
-    }
-  },
-  {
-    text: "上月",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-      return [start, end];
-    }
-  },
-  {
-    text: "三月前",
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-      return [start, end];
-    }
-  }
-];
-const dataSourceOption = ref()
-const code = ref()
-const genForm = ref()
-const preview = ref({
-  code: null,
-  isVisited: false,
-  activeName: null
-})
-const importTableRef = ref(null)
-const title = ref('')
-const {toClipboard} = useClipboard()
-onMounted(() => {
-  if (dsId) {
-    queryParams.dataSourceId = parseInt(dsId)
-    getList()
-  }
-})
-const handleExport = () => {
-  downLoadExcel('/code-gen/table/export', {...queryParams})
-}
-const clipboardSuccess = (value) => {
-  try {
-    toClipboard(value)
-    ElMessage.success("复制成功")
-  } catch (e) {
-    ElMessage.error("复制失败")
-  }
-}
-const getOption = () => {
-  getDataSourceOption().then(res => {
-    if (res.code === 1000) {
-      dataSourceOption.value = res.data
-      getList();
-    }
-  })
-}
-
-const getDataSourceOptionItem = (dataSourceId) => {
-  for (let item of dataSourceOption.value) {
-    if (item.value === dataSourceId) {
-      return item.label;
-    }
-  }
-  return "";
-}
-/** 下载代码 */
-const handleDownLoad = async (tableId) => {
-  downLoadZip(`/code-gen/table/downloads/${[tableId]}`)
-}
-const handleEdit = (tableId) => {
-  router.push({
-    path: `/rapid/gen/edit/${tableId}`,
-  })
-
-}
-//同步
-const handleSynchronization = async (tableId) => {
-  syncDatabase(tableId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-/** 高亮显示 */
-const highlightedCode = (code, key) => {
-  let language = key.split(".")[1];
-  const result = hljs.highlight(language, code || "", true);
-  // console.log(result.value)
-  return result.value;
-}
-
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  const date = dateValue.value
-  if (date !== undefined && date !== null) {
-    params.startTime = date[0]
-    params.endTime = date[1]
-  }
-  loading.value = true
-  getTableList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    }else {
-      ElMessage.error(res.msg);
-    }
-  })
-}
-
-//重置功能
-const handleReset = () => {
-  genForm.value.resetFields()
-  dateValue.value = []
-  getList()
-}
-
-//切换每页显示条数
-const handleSizeChange = (val) => {
-  pageInfo.pageSize = val
-  getList()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = (val) => {
-  pageInfo.pageNum = val
-  getList()
-}
-//勾选table数据行的 Checkbox
-const handleSelect = async (selection) => {
-  if (selection.length !== 0) {
-    disabled.value = false
-    tableId.value = selection.map(item => item.tableId).join()
-    tableName.value = selection.map(item => item.tableName).join()
-  } else {
-    disabled.value = true
-  }
-}
-const handleDeleteTable = (tableId) => {
-  deleteTable(tableId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//多删
-const handleMoreDelete = (tableId, tableName) => {
-  ElMessageBox.confirm(`确认删除名称为${tableName}的表格吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    deleteMoreTable({
-      tables: tableId
-    }).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        getList()
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  })
-}
-//预览功能
-const handlePreview = async (tableId) => {
-  previewCode(tableId).then(res => {
-    if (res.code === 1000) {
-      let code = res.data;
-      preview.value = {
-        isVisited: true,
-        activeName: Object.keys(code)[0],
-        code: code
-      }
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const handleImport = async (val) => {
-  title.value = "导入数据源"
-  importQueryId.value = val
-  nextTick(() => {
-    importTableRef.value.show()
-  })
-}
-
-
-getOption();
-</script>
diff --git a/src/views/rapid/gen/tableInfo.vue b/src/views/rapid/gen/tableInfo.vue
deleted file mode 100644
index cd78788..0000000
--- a/src/views/rapid/gen/tableInfo.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-  <el-form ref="tableForm" :model="info" :rules="rules" label-width="130px">
-    <el-row>
-      <el-col :span="11">
-        <el-form-item prop="tplCategory" label="生成模板">
-          <!--          <el-select v-model="info.tplCategory" @change="tplSelectChange" filterable>-->
-          <el-select v-model="info.tplCategory" filterable>
-            <el-option label="单表（增删改查）" value="crud"/>
-            <el-option label="树表（增删改查）" value="tree"/>
-            <el-option label="多表关联（增删改查）" value="rel"/>
-            <el-option label="主子表（增删改查）" value="sub"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-form-item prop="packageName" label="生成包路径">
-          <el-tooltip content="生成在哪个java包下，例如 cn.odliken.system" placement="top">
-          </el-tooltip>
-          <el-input v-model="info.packageName"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item prop="tplCategory" label="后端模板">
-          <el-select v-model="info.backTemplate" filterable>
-            <el-option label="Mybatis" value="0"/>
-            <el-option label="Mybatis-Plus" value="1"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-form-item prop="tplCategory" label="前端模板">
-          <el-select v-model="info.frontTemplate" filterable>
-            <el-option label="Vue" value="0"/>
-            <el-option label="React" value="1"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item prop="moduleName" label="生成模块名">
-          <el-tooltip content="可理解为子系统名，例如 system" placement="top">
-            <i class="el-icon-question"></i>
-          </el-tooltip>
-          <el-input v-model="info.moduleName"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-form-item prop="businessName" label="生成业务名">
-          <el-tooltip content="可理解为功能英文名，例如 user" placement="top">
-            <i class="el-icon-question"></i>
-          </el-tooltip>
-          <el-input v-model="info.businessName"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item prop="functionName" label="生成功能名">
-          <el-tooltip content="用作类描述，例如 用户" placement="top">
-            <i class="el-icon-question"></i>
-          </el-tooltip>
-          <el-input v-model="info.functionName"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-form-item prop="parentMenuId" label="上级菜单">
-          <el-tree-select v-model="info.parentMenuId" :data="menus" style="width: 100%;"
-                          :filter-node-method="filterNodeMethod"
-                          filterable
-                          :check-strictly="true"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item prop="serviceName" label="服务名称">
-          <el-tooltip content="用作类描述，例如 用户" placement="top">
-            <i class="el-icon-question"></i>
-          </el-tooltip>
-          <el-input v-model="info.serviceName"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-form-item prop="optionInfoEnable" label="option接口生成">
-          <el-radio-group v-model="optionInfo.enabled">
-            <el-radio :label="true" border>启用option接口</el-radio>
-            <el-radio :label="false" border>关闭option接口</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11" v-if="optionInfo.enabled">
-        <el-form-item prop="optionInfoValueField" label="值映射">
-          <el-select v-model="optionInfo.valueField">
-            <el-option
-                v-for="column in columns"
-                :key="column.id"
-                :label="column.javaField"
-                :value="column.javaField">
-              <span style="float: left">{{ column.javaField }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ column.columnComment }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11" :offset="2" v-if="optionInfo.enabled">
-        <el-form-item prop="optionInfoLabelFiled" label="标签映射">
-          <el-select v-model="optionInfo.labelFiled">
-            <el-option
-                v-for="column in columns"
-                :key="column.id"
-                :label="column.javaField"
-                :value="column.javaField">
-              <span style="float: left">{{ column.javaField }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ column.columnComment }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-
-<script setup>
-import {defineExpose, defineProps} from "vue";
-import {getMenuOpt} from '@/api/system/menuman.js'
-
-
-const props = defineProps({
-  info: {
-    type: Object,
-    default: {}
-  },
-  optionInfo: {
-    type: Object,
-    default: {
-      enabled: 0
-    }
-  },
-  tables: {
-    type: Array,
-    default: []
-  },
-  dictOptions: {
-    type: Array,
-    default: []
-  },
-  columns: {
-    type: Array,
-    default: []
-  }
-})
-const menus = ref([])
-const tableForm = ref()
-const rules = ref({
-  tplCategory: [
-    {required: true, message: "请选择生成模板", trigger: "blur"}
-  ],
-  packageName: [
-    {required: true, message: "请输入生成包路径", trigger: "blur"}
-  ],
-  moduleName: [
-    {required: true, message: "请输入生成模块名", trigger: "blur"}
-  ],
-  businessName: [
-    {required: true, message: "请输入生成业务名", trigger: "blur"}
-  ],
-  functionName: [
-    {required: false, message: "请输入生成功能名", trigger: "blur"}
-  ],
-  backTemplate: [
-    {required: true, message: "请选择后端模板", trigger: "blur"}
-  ],
-  frontTemplate: [
-    {required: true, message: "请选择前端模板", trigger: "blur"}
-  ],
-  serviceName: [
-    {required: true, message: "请选输入服务名称", trigger: "blur"}
-  ],
-  optionInfoEnable: [
-    {required: true, message: "请选择前端模板", trigger: "blur"}
-  ],
-  optionInfoValueField: [
-    {required: true, message: "请选择值映射字段", trigger: "blur"}
-  ],
-  optionInfoLabelFiled: [
-    {required: true, message: "请选择前端模板标签映射字段", trigger: "blur"}
-  ],
-})
-
-const handleSearch = async () => {
-  getMenuOpt().then(res => {
-    if (res.code === 1000) {
-      menus.value = [{
-        value: 0,
-        label: "一级目录",
-        children: res.data
-      }]
-    }
-  })
-}
-
-const filterNodeMethod = (value, data) => data.label.includes(value)
-
-
-defineExpose({
-  tableForm
-})
-
-
-handleSearch()
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/rapid/regular/index.vue b/src/views/rapid/regular/index.vue
deleted file mode 100644
index afa5ebc..0000000
--- a/src/views/rapid/regular/index.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
-  <div>
-    <el-form :model="queryParams" inline class="query-form" ref="queryForm">
-      <el-form-item label="正则名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输正则名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="正则内容" prop="regular">
-        <el-input v-model="queryParams.regular" placeholder="请输正则内容" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="验证内容" prop="validation">
-        <el-input v-model="queryParams.validation" placeholder="请输验证内容" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="是否启用" prop="enable">
-        <el-select v-model="queryParams.enable" placeholder="请选择是否启用" clearable  filterable>
-          <el-option
-              v-for="dict in cacheStore.getDict('regular_enable')"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="query-btn">
-      <el-button type="primary" v-perm="['rapid:regular:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <el-button type="warning" v-perm="['rapid:regular:export']" @click="handleExport" :icon="Download" plain>导出
-      </el-button>
-      <el-button type="danger" v-perm="['rapid:regular:del']" @click="handleMoreDelete(regularId,regularNameList)" :icon="Delete" plain
-                 :disabled="disabled">删除
-      </el-button>
-    </div>
-    <div class="table">
-      <el-table
-          :data="list"
-          row-key="id"
-          :lazy="true"
-          ref="singleTable"
-          v-loading="loading"
-          @select="handleSelect"
-          v-tabh
-      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column label="序号" type="index" align="center" width="60"/>
-        <el-table-column prop="name" label="正则名称" align="center"/>
-        <el-table-column prop="regular" label="正则内容" align="center"/>
-        <el-table-column prop="enable" label="是否启用" align="center">
-          <template #default="scope">
-            <tag dict-type="regular_enable" :value="scope.row.enable"/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" align="center"/>
-        <el-table-column prop="updateTime" label="更新时间" align="center"/>
-        <el-table-column label="操作">
-          <template #default="scope">
-            <el-button type="primary" size="mini" v-perm="['rapid:regular:edit']"
-                       @click="handleEdit(scope.row.id)"  link>编辑
-            </el-button>
-            <popover-delete :name="scope.row.name" :type="'正则校验'" :perm="['rapid:regular:del']"
-                            @delete="handleDelete(scope.row.id)"/>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-
-    <el-dialog v-model="isVisited" :title="title" width="900px">
-      <el-form :model="form" ref="formInstance" :rules="formRules" label-width="100px" class="dialog-form">
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="正则名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入正则名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-form-item label="正则内容" prop="regular">
-              <el-input v-model="form.regular" placeholder="请输入正则内容"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="验证内容" prop="validation">
-              <el-input v-model="form.validation" placeholder="请输入验证内容"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-form-item label="是否启用" prop="enable">
-              <el-select v-model="form.enable" placeholder="请选择是否启用" clearable  filterable>
-                <el-option
-                    v-for="dict in cacheStore.getDict('regular_enable')"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
-      </span>
-      </template>
-
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import {getRegularList, getRegularDetails, addRegular, editRegular, delRegular} from "@/api/rapid/regular";
-import {Search, Refresh, Delete, Plus, Edit, Download} from '@element-plus/icons-vue'
-import {ElMessage, ElMessageBox} from "element-plus";
-import {useCacheStore} from '@/stores/cache.js'
-import Paging from "@/components/pagination/index.vue";
-
-const cacheStore = useCacheStore()
-cacheStore.setCacheKey(['regular_enable'])
-import {downLoadExcel} from "@/utils/downloadZip";
-import Tag from '@/components/Tag.vue'
-//查询参数
-const queryParams = reactive({
-  name: '',
-  regular: '',
-  validation: '',
-  enable: undefined,
-})
-//页面信息
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const disabled = ref(true)
-const list = ref([])
-const queryForm = ref([])
-const regularId = ref([])
-const regularNameList = ref([])
-const loading = ref(true)
-const total = ref()
-const singleTable = ref()
-const title = ref('')
-const isVisited = ref(false)
-const form = ref()
-const formInstance = ref()
-const formRules = ref({
-  name: [
-    {required: true, message: "正则名称不能为空", trigger: "blur"},
-  ],
-  regular: [
-    {required: true, message: "正则内容不能为空", trigger: "blur"},
-  ],
-  validation: [
-    {required: true, message: "验证内容不能为空", trigger: "blur"},
-  ],
-  enable: [
-    {required: true, message: "是否启用 1:启动 2:关闭不能为空", trigger: "change"},
-  ],
-})
-//重置搜索
-const handleReset = () => {
-  queryForm.value.resetFields()
-  getList()
-}
-//获取数据
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  loading.value = true
-  getRegularList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//重置from表单
-const restFrom = () => {
-  form.value = {
-    name: null,
-    regular: null,
-    validation: null,
-    enable: null,
-  }
-}
-//取消
-const handleCancel = () => {
-  restFrom()
-  isVisited.value = false
-}
-//提交
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    if (title.value === '新增校验规则表') {
-      addRegular(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    } else {
-      editRegular(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    }
-  })
-}
-//添加
-const handleAdd = async () => {
-  restFrom()
-  title.value = "新增校验规则表"
-  isVisited.value = true
-  nextTick(()=>{
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-}
-//修改
-const handleEdit = async (id) => {
-  restFrom()
-  getRegularDetails(id).then(res => {
-    if (res.code === 1000) {
-      form.value = res.data
-      title.value = "编辑校验规则表"
-      isVisited.value = true
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-  nextTick(()=>{
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-}
-//导出excel
-const handleExport = () => {
-  downLoadExcel('/code-gen/rapid/regular/export', {...queryParams})
-}
-
-//勾选table数据行的 Checkbox
-const handleSelect = async (selection, row) => {
-  if (selection.length !== 0) {
-    disabled.value = false
-    regularId.value = selection.map(item => item.id).join()
-    regularNameList.value = selection.map(item => item.name).join()
-  } else {
-    disabled.value = true
-  }
-}
-
-//切换每页显示条数
-const handleSizeChange = async (val) => {
-  pageInfo.pageSize = val
-  await getList()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = async (val) => {
-  pageInfo.pageNum = val
-  await getList()
-}
-const handleMoreDelete=(regularId,regularNameList)=>{
-  ElMessageBox.confirm(`确认删除名称为${regularNameList}的校验规则表吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    handleDelete(regularId)
-  })
-}
-//删除
-const handleDelete = async (id) => {
-    delRegular(id).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        getList()
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-}
-getList()
-</script>
diff --git a/src/views/rapid/source/index.vue b/src/views/rapid/source/index.vue
deleted file mode 100644
index 5c53de6..0000000
--- a/src/views/rapid/source/index.vue
+++ /dev/null
@@ -1,380 +0,0 @@
-<template>
-  <div>
-    <el-form :model="queryParams" inline class="query-form" ref="sourceForm" @submit.prevent="getList">
-      <el-form-item label="数据源名称" prop="dsName">
-        <el-input v-model="queryParams.dsName" placeholder="请输入数据源名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="query-btn">
-      <el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <el-button type="warning" @click="handleExport" :icon="Download" plain>导出</el-button>
-      <el-button type="danger" @click="handleMoreDelete(sourceId,sourceNameList)" :icon="Delete" plain
-                 :disabled="disabled">删除
-      </el-button>
-    </div>
-    <div class="table">
-      <el-table
-          :data="list"
-          row-key="dsId"
-          :lazy="true"
-          ref="singleTable"
-          v-loading="loading"
-          @select="handleSelect"
-          v-tabh
-      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column label="序号" type="index" width="60" align="center"/>
-        <el-table-column prop="dsName" label="数据源名称" align="center"/>
-        <el-table-column prop="dbName" label="数据库名称" align="center"/>
-        <el-table-column prop="username" label="用户名称" align="center"/>
-        <el-table-column prop="jdbcUrl" label="数据库连接url" align="center" width="140">
-          <template #default="scope">
-            <div class="formatterJdbcUrl">{{ scope.row.jdbcUrl }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="confType" label="数据源配置类型" align="center">
-          <template #default="scope">
-            <tag dict-type="data_source_config" :value="scope.row.confType"/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" align="center"/>
-        <el-table-column label="操作" align="center">
-          <template #default="scope">
-            <el-button type="primary" size="mini" @click="handleEdit(scope.row.dsId)" link>编辑</el-button>
-            <el-button type="primary" size="mini" @click="handleAssociatedData(scope.row.dsId)" link>关联数据</el-button>
-            <popover-delete :name="scope.row.dsName" :type="'数据源信息'"
-                            @delete="handleDelete(scope.row.dsId)"/>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-    <el-dialog v-model="isVisited" :title="title" width="900px">
-      <el-form :model="form" ref="formInstance" :rules="formRules" class="dialog-form">
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="类型" prop="type">
-              <el-select v-model="form.type" placeholder="请选择数据源类型" filterable @change="handleTypeChange(form.type)">
-                <el-option
-                    v-for="typeItem in typeList"
-                    :key="typeItem.value"
-                    :label="typeItem.label"
-                    :value="typeItem.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-form-item label="数据源名称" prop="dsName">
-              <el-input v-model="form.dsName" placeholder="请输入数据源名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="用户名" prop="username">
-              <el-input v-model="form.username" placeholder="请输入用户名"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-form-item label="密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入密码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="配置类型" prop="confType">
-              <el-radio-group v-model="form.confType">
-                <el-radio border :label="1">主机</el-radio>
-                <el-radio border :label="2">JDBC</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2" v-if="form.confType === 1">
-            <el-form-item label="端口" prop="port">
-              <el-input-number v-model="form.port"></el-input-number>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" v-if="form.confType === 1">
-            <el-form-item label="主机" prop="host">
-              <el-input v-model="form.host" placeholder="请输入主机"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="2" v-if="form.confType === 1">
-            <el-form-item label="数据库名称" prop="dbName">
-              <el-input v-model="form.dbName" placeholder="请输入数据库名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.confType === 2">
-            <el-form-item label="连接地址" prop="jdbcUrl">
-              <el-input v-model="form.jdbcUrl"
-                        :rows="4"
-                        type="textarea" placeholder="请输入连接地址"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="form.confType === 1">
-            <el-form-item label="配置参数" prop="args">
-              <el-input v-model="form.args" :rows="4"
-                        type="textarea" placeholder="请输入配置参数"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="服务名称" prop="params.serviceName" v-if="form.type === 'ORACLE' && form.confType===1">
-              <el-input v-model="form.params.serviceName" placeholder="请输入服务名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="命名空间" prop="params.namespace" v-if="form.type === 'POSTGRES' && form.confType===1">
-              <el-input v-model="form.params.namespace" placeholder="请输入命名空间"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
-      </span>
-      </template>
-
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import {
-  getDataSourceList,
-  deleteDataSource,
-  getDataSource,
-  addDataSource,
-  editDataSource,
-  getDataSourceOptionType
-} from "@/api/rapid/data-source";
-import {Search, Refresh, Delete, Plus, Edit, Download} from '@element-plus/icons-vue'
-import {ElMessage, ElMessageBox} from "element-plus";
-import Paging from "@/components/pagination/index.vue";
-import {downLoadExcel} from "@/utils/downloadZip";
-
-const router = useRouter()
-const queryParams = reactive({
-  dsName: '',
-})
-
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-
-const disabled = ref(true)
-const typeList = ref([])
-const list = ref([])
-const sourceForm = ref([])
-const loading = ref(true)
-const total = ref()
-const title = ref('')
-const isVisited = ref(false)
-const sourceId = ref();
-const sourceNameList = ref();
-const singleTable = ref();
-const form = ref()
-const formInstance = ref()
-const formRules = ref({
-  type: [{required: true, message: '请输选择数据库类型', trigger: 'blur'}],
-  dsName: [{required: true, message: '请输入数据源名称', trigger: 'blur'}],
-  username: [{required: true, message: '请输入用户名', trigger: 'blur'}],
-  password: [{required: true, message: '请输入密码', trigger: 'blur'}],
-  confType: [{required: true, message: '请输选择配置类型', trigger: 'blur'}],
-  port: [{required: true, message: '请输入服务端口', trigger: 'blur'}],
-  host: [{required: true, message: '请输入主机', trigger: 'blur'}],
-  dbName: [{required: true, message: '请输入数据库名称', trigger: 'blur'}],
-  jdbcUrl: [{required: true, message: '请输入连接地址', trigger: 'blur'}],
-  params: {
-    serviceName: [{required: true, message: '请输入服务名称', trigger: 'blur'}],
-    namespace: [{required: true, message: '请输入命名空间', trigger: 'blur'}]
-  }
-})
-
-const handleReset = () => {
-  sourceForm.value.resetFields()
-  getList()
-}
-const getTypeOption = () => {
-  getDataSourceOptionType().then(res => {
-    typeList.value = res.data
-  })
-}
-const handleTypeChange = (type) => {
-  if (form.value.confType !== 1) {
-    return;
-  }
-  if (type === 'ORACLE') {
-    form.value.params = {
-      serviceName: ''
-    }
-  }
-  if (type === 'POSTGRES') {
-    form.value.params = {
-      namespace: ''
-    }
-  }
-}
-
-
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  loading.value = true
-  getDataSourceList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-const restFrom = () => {
-  form.value = {
-    remark: null,
-    dsId: null,
-    dsName: "",
-    username: "",
-    password: "",
-    host: "",
-    port: 0,
-    type: "",
-    dbName: "",
-    jdbcUrl: null,
-    confType: 1,
-    args: null,
-    params: null
-  }
-  getTypeOption()
-}
-
-const handleCancel = () => {
-  restFrom()
-  isVisited.value = false
-}
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid, fields) => {
-    if (!valid) return
-    if (title.value === '新增数据源') {
-      console.log('form.value', form.value)
-      addDataSource(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    } else {
-      editDataSource(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          isVisited.value = false
-        } else {
-          ElMessage.error(res.msg)
-        }
-      })
-    }
-  })
-}
-
-const handleAdd = () => {
-  formRules.value.password[0].required = true
-  restFrom()
-  title.value = "新增数据源"
-  isVisited.value = true
-  nextTick(() => {
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-}
-const handleAssociatedData = (dsId) => {
-  router.push('/rapid/data/' + dsId)
-}
-const handleEdit = async (dsId) => {
-  restFrom()
-  getDataSource(dsId).then(res => {
-    if (res.code === 1000) {
-      formRules.value.password[0].required = false
-      form.value = res.data
-      title.value = "编辑数据源"
-      isVisited.value = true
-      nextTick(() => {
-        // 清空校验
-        formInstance.value.clearValidate()
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-const handleExport = () => {
-  downLoadExcel('/code-gen/data-source/export', {...queryParams})
-}
-
-//勾选table数据行的 Checkbox
-const handleSelect = async (selection) => {
-  if (selection.length !== 0) {
-    disabled.value = false
-    sourceId.value = selection.map(item => item.dsId).join()
-    sourceNameList.value = selection.map(item => item.dsName).join()
-  } else {
-    disabled.value = true
-  }
-}
-
-//切换每页显示条数
-const handleSizeChange = async (val) => {
-  pageInfo.pageSize = val
-  await getList()
-}
-
-//点击页码进行分页功能
-const handleCurrentChange = async (val) => {
-  pageInfo.pageNum = val
-  await getList()
-}
-const handleMoreDelete = (dsId, sourceNameList) => {
-  ElMessageBox.confirm(`确认删除名称为${sourceNameList}的数据源信息吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    handleDelete(dsId)
-  })
-}
-const handleDelete = async (dsId) => {
-  deleteDataSource(dsId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      getList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-getList()
-</script>
-
-<style scoped>
-.formatterJdbcUrl {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/steps/step/Step1.vue b/src/views/steps/step/Step1.vue
deleted file mode 100644
index 62a314c..0000000
--- a/src/views/steps/step/Step1.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div>
-    步骤1
-  </div>
-</template>
-
-<script setup>
-import { onMounted } from 'vue';
-
-onMounted(()=>{
-  // console.log('步骤一挂载');
-})
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/views/steps/step/Step2.vue b/src/views/steps/step/Step2.vue
deleted file mode 100644
index 9cbe328..0000000
--- a/src/views/steps/step/Step2.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div>
-    步骤2
-  </div>
-</template>
-
-<script setup>
-import { onMounted } from 'vue';
-
-onMounted(()=>{
-  // console.log('步骤一挂载');
-})
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/views/steps/step/Step3.vue b/src/views/steps/step/Step3.vue
deleted file mode 100644
index 62a314c..0000000
--- a/src/views/steps/step/Step3.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div>
-    步骤1
-  </div>
-</template>
-
-<script setup>
-import { onMounted } from 'vue';
-
-onMounted(()=>{
-  // console.log('步骤一挂载');
-})
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/views/steps/step/Step4.vue b/src/views/steps/step/Step4.vue
deleted file mode 100644
index 62a314c..0000000
--- a/src/views/steps/step/Step4.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div>
-    步骤1
-  </div>
-</template>
-
-<script setup>
-import { onMounted } from 'vue';
-
-onMounted(()=>{
-  // console.log('步骤一挂载');
-})
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/views/steps/step/Step5.vue b/src/views/steps/step/Step5.vue
deleted file mode 100644
index 21f837e..0000000
--- a/src/views/steps/step/Step5.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div>
-    步骤1
-  </div>
-</template>
-
-<script setup>
-import { onMounted } from 'vue';
-
-onMounted(()=>{
-  // console.log('步骤1-5挂载');
-})
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/views/steps/step/index.vue b/src/views/steps/step/index.vue
deleted file mode 100644
index 111cea2..0000000
--- a/src/views/steps/step/index.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<template>
-  <steps :stepList="stepList" :stepSuccess="[0,1]"></steps>
-</template>
-
-<script setup lang="jsx">
-import { reactive, shallowRef } from 'vue';
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import Step1 from './Step1.vue'
-import Step2 from './Step2.vue'
-import Step3 from './Step3.vue'
-import Step4 from './Step4.vue'
-import Step5 from './Step5.vue'
-const stepList = reactive([
-  {
-    key: 'collect',
-    component: markRaw(Step1)
-  },
-  {
-    key: 'report',
-    component: markRaw(Step2)
-  },
-  {
-    key: 'approve',
-    component: markRaw(Step3)
-  },
-  {
-    key: 'execute',
-    component: markRaw(Step4)
-  },
-  {
-    key: 'archivist',
-    component: markRaw(Step5)
-  },
-])
-</script>
-
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file

From 928f41112c2252ea5741992a6c5988e1e837bca3 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 1 Jul 2024 20:53:03 +0800
Subject: [PATCH 48/60] =?UTF-8?q?fix=20:=20=E8=B0=83=E6=95=B4=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8icon,=E5=88=A0=E9=99=A4=E6=B2=A1=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/auth/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/auth/index.vue b/src/views/auth/index.vue
index 7adfb49..dda3c87 100644
--- a/src/views/auth/index.vue
+++ b/src/views/auth/index.vue
@@ -95,6 +95,7 @@
               </el-form>
             </el-tab-pane>
           </el-tabs>
+
         </el-card>
       </el-col>
     </el-row>

From 0d7c3033973dd765b477dba90cd321f45cf30674 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 00:38:21 +0800
Subject: [PATCH 49/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/auth/index.vue                          |  1 -
 src/views/expense-management/share/add.vue        |  6 ++++--
 src/views/project-demand/requirement/add.vue      | 15 ++++++++++-----
 src/views/project-demand/summary/add.vue          |  7 ++++---
 .../project-management/implementation/check.vue   |  6 ++++--
 .../project-management/implementation/upload.vue  |  3 ++-
 .../implementation/uploadFee.vue                  |  3 ++-
 src/views/project-management/initiation/apply.vue |  3 ++-
 src/views/special-fund/add.vue                    |  3 ++-
 9 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/views/auth/index.vue b/src/views/auth/index.vue
index dda3c87..7adfb49 100644
--- a/src/views/auth/index.vue
+++ b/src/views/auth/index.vue
@@ -95,7 +95,6 @@
               </el-form>
             </el-tab-pane>
           </el-tabs>
-
         </el-card>
       </el-col>
     </el-row>
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 28dbf61..2730e08 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -279,11 +279,12 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let researchPersonnelId = ''
     formData.value.tableData.forEach(item => {
@@ -326,11 +327,12 @@ const handleResubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let newUsrAllocationsObj = {}
     let newUsrAllocationsObjArray = []
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index cdb13c4..11ff89f 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData"  ref="demandForm" :rules="rules">
+    <el-form :model="formData" ref="demandForm" :rules="rules">
       <el-row gutter="30">
         <el-col :span="8">
           <el-form-item label="征集名称" prop="requirementName" label-width="96">
@@ -42,7 +42,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="专项资金名称" prop="specialFundId" v-if="formData.isSpecialFund">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable >
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -58,7 +58,10 @@
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
               </el-button>
             </div>
-            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
+            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{
+                getName(selectedCompanyList)
+              }}
+            </div>
             <div v-else :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
                  @click="handleExpend">
@@ -365,14 +368,16 @@ const submitParam = (item) => {
   }
 }
 const handleSubmit = async (instance) => {
+  console.log('submitParam(formData.value)', submitParam(formData.value))
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     const {msg, code} = await addRequirement(submitParam(formData.value))
     ElNotification({
@@ -427,7 +432,7 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds)
       formData.value = res.data
-      if(res.data.fileList.length!==0){
+      if (res.data.fileList.length !== 0) {
         showTable.value = false
         nextTick(() => {
           showTable.value = true
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 6d19535..a76ba5c 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -214,7 +214,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="16" v-if="formData.isSpecialFund">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
@@ -294,7 +294,7 @@ const formData = ref({
 
 const rules = reactive({
   projectName: [{required: true, message: '请输入项目名称', trigger: 'blur'}],
-  // specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
+  specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
   startTime: [{required: true, message: '请选择开始时间', trigger: ['blur', 'change']}],
   endTime: [{required: true, message: '请选择结束时间', trigger: ['blur', 'change']}],
   rdSubject: [{required: true, message: '请选择研发主体', trigger: ['blur', 'change']}],
@@ -401,11 +401,12 @@ const handleSubmit = debounce(async (instance) => {
   if (!instance) return
   instance.validate(async (valid, fields) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let otherFiles = []
     otherFileList.value.forEach(item => {
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index 1d10b04..588f6d6 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -89,11 +89,12 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let files = []
     otherFileList.value.forEach(item => {
@@ -139,11 +140,12 @@ const handleResubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let otherFiles = []
     if (name.value === 'Implementation/edit') {
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 6a2a087..262e2d1 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -183,11 +183,12 @@ const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let params = {
       fileList: fileList.value,
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 4ab7af2..dff4c25 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -173,11 +173,12 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     instance.clearValidate()
     tableForm.tableData.forEach(item => {
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index 600263c..c39704d 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -138,11 +138,12 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     let files = []
     otherFileList.value.forEach(item => {
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index d287762..b37cd65 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -189,11 +189,12 @@ const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
-      return ElNotification({
+      ElNotification({
         title: '提示',
         message: '请完善数据,再提交!',
         type: 'error'
       })
+      return;
     }
     const {msg, code} = await addFund(submitParam(formData.value))
     ElNotification({

From d2ddf378bfb76e0862982bd96d952023649de9d2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 01:44:28 +0800
Subject: [PATCH 50/60] =?UTF-8?q?feat=20:=20=E4=BC=98=E5=8C=96=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=94=A8=E6=88=B7=E6=97=B6=E8=AF=A5=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E7=9F=A9=E9=98=B5=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/user.js                          |  15 ++-
 src/views/project-demand/summary/add.vue      |  18 +--
 .../workflow/process/common/UserPicker.vue    |  30 ++++-
 .../process/config/ApprovalNodeConfig.vue     | 110 +++++++++---------
 4 files changed, 102 insertions(+), 71 deletions(-)

diff --git a/src/api/user/user.js b/src/api/user/user.js
index 96d078f..e0a84c1 100644
--- a/src/api/user/user.js
+++ b/src/api/user/user.js
@@ -56,8 +56,8 @@ export const getUserDetail = (userId) => {
 // 操作
 export const operate = (data, type) => {
   // console.log(type ,'type');
-  if(data.userId && type !== '0') return editUser(data)
-  else if(type == '0') return editUserOA(data)
+  if (data.userId && type !== '0') return editUser(data)
+  else if (type == '0') return editUserOA(data)
   return addUser(data)
 }
 
@@ -186,16 +186,23 @@ export const unbindAllUserByPost = (postId) => {
   })
 }
 
-export const bindAccount=(data)=>{
+export const bindAccount = (data) => {
   return request({
     url: '/admin/mosr/user/bind/account',
     method: 'post',
     data
   })
 }
-export const getBindAccount=(userId)=>{
+export const getBindAccount = (userId) => {
   return request({
     url: `/admin/mosr/user/bind/account/info/${userId}`,
     method: 'get'
   })
 }
+
+export const checkMatrix = (userId) => {
+  return request({
+    url: `/admin/mosr/user/matrix?userId=` + userId,
+    method: 'get'
+  })
+}
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index a76ba5c..f80fd8b 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -415,14 +415,6 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
-    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
-    let params = {
-      ...formData.value,
-      deploymentId: deploymentId.value,
-      fileList: otherFiles,
-      requirementId: route.query.id ? route.query.id : '-1'
-    }
-    console.log('params', params)
     if (!attachment.value.isSingleFile) {
       attachment.value.validate()
       ElNotification({
@@ -433,7 +425,15 @@ const handleSubmit = debounce(async (instance) => {
       return;
     } else {
       attachment.value.clearValidate()
+      formData.value.resultForm=JSON.stringify(formData.value.resultForm)
     }
+    let params = {
+      ...formData.value,
+      deploymentId: deploymentId.value,
+      fileList: otherFiles,
+      requirementId: route.query.id ? route.query.id : '-1'
+    }
+    console.log('params', params)
     let res = await requirementReported(params)
     ElNotification({
       title: '提示',
@@ -465,11 +465,11 @@ const handleResubmit = debounce(() => {
     return;
   } else {
     attachment.value.clearValidate()
+    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
   }
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
-  formData.value.resultForm=JSON.stringify(formData.value.resultForm)
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index 459236c..d168e91 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -70,8 +70,9 @@
 </template>
 
 <script setup>
-import {ElMessageBox} from "element-plus";
+import {ElMessageBox, ElNotification} from "element-plus";
 import {getMosrUser} from "@/api/workflow/process-user";
+import {checkMatrix} from "../../../../api/user/user";
 
 const props = defineProps({
   value: {
@@ -92,6 +93,10 @@ const props = defineProps({
   setNullToSelectList: {
     default: false,
     type: Boolean
+  },
+  checkMatrix: {
+    default: false,
+    type: Boolean
   }
 });
 const radio = ref(0);
@@ -279,9 +284,26 @@ const clearSelected = () => {
 };
 const selectConfirm = () => {
   //确定按钮
-  emit("ok", selectList.value);
-  dataList.value = []
-  visible.value = false;
+  if (props.checkMatrix){
+    checkMatrix(selectList.value[0].id).then(res=>{
+      console.log(res)
+      if (res.code === 2000){
+        ElNotification({
+          title: '提示',
+          message: res.msg,
+          type: 'error'
+        })
+      }else {
+        emit("ok", selectList.value);
+        dataList.value = []
+        visible.value = false;
+      }
+    })
+  }else {
+    emit("ok", selectList.value);
+    dataList.value = []
+    visible.value = false;
+  }
 };
 defineExpose({
   showUserPicker
diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue
index 2583619..1209fa8 100644
--- a/src/views/workflow/process/config/ApprovalNodeConfig.vue
+++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue
@@ -8,7 +8,7 @@
         <el-button size="mini" icon="Plus" type="primary" @click="showSysRolePicker" round>
           选择人员
         </el-button>
-        <user-picker title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
+        <user-picker :check-matrix="true" title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
 <!--        <ellipsis :row="3" :user-info="assignedUser"/>-->
         <role-items v-model="assignedUser"/>
       </div>
@@ -60,34 +60,34 @@
 <!--        <span class="item-desc">发起人自己作为审批人进行审批</span>-->
 <!--      </div>-->
     </el-form-item>
-    <el-divider></el-divider>
-    <el-form-item label="审批人为空时" prop="text" class="line-mode">
-      <el-radio-group v-model="nodeProps.nobody.handler">
-        <el-radio label="TO_PASS">自动通过</el-radio>
-        <el-radio label="TO_REFUSE">自动驳回</el-radio>
-        <el-radio label="TO_ADMIN">转交审批管理员</el-radio>
-        <el-radio label="TO_USER">转交到指定人员</el-radio>
-      </el-radio-group>
-      <div style="margin-top: 10px" v-if="nodeProps.nobody.handler === 'TO_USER'">
-        <el-button size="mini" icon="Plus" type="primary" @click="showUserPicker()" round>
-          选择人员
-        </el-button>
-        <user-picker title="请指定用户" :multiple="false" ref="toUserPicker" :v-model="nobodyAssignedUser"
-                     @ok="selectNoSetUser"/>
-        <ellipsis :row="3" :user-info="nobodyAssignedUser"/>
-      </div>
-    </el-form-item>
+<!--    <el-divider></el-divider>-->
+<!--    <el-form-item label="审批人为空时" prop="text" class="line-mode">-->
+<!--      <el-radio-group v-model="nodeProps.nobody.handler">-->
+<!--        <el-radio label="TO_PASS">自动通过</el-radio>-->
+<!--        <el-radio label="TO_REFUSE">自动驳回</el-radio>-->
+<!--        <el-radio label="TO_ADMIN">转交审批管理员</el-radio>-->
+<!--        <el-radio label="TO_USER">转交到指定人员</el-radio>-->
+<!--      </el-radio-group>-->
+<!--      <div style="margin-top: 10px" v-if="nodeProps.nobody.handler === 'TO_USER'">-->
+<!--        <el-button size="mini" icon="Plus" type="primary" @click="showUserPicker()" round>-->
+<!--          选择人员-->
+<!--        </el-button>-->
+<!--        <user-picker title="请指定用户" :multiple="false" ref="toUserPicker" :v-model="nobodyAssignedUser"-->
+<!--                     @ok="selectNoSetUser"/>-->
+<!--        <ellipsis :row="3" :user-info="nobodyAssignedUser"/>-->
+<!--      </div>-->
+<!--    </el-form-item>-->
 
-    <div v-if="showMode">
-      <el-divider/>
-      <el-form-item label="多人审批时审批方式" prop="text" class="approve-mode">
-        <el-radio-group v-model="nodeProps.mode">
-          <el-radio label="NEXT">会签 （按选择顺序审批，每个人必须同意）</el-radio>
-          <el-radio label="AND">会签（可同时审批，每个人必须同意）</el-radio>
-          <el-radio label="OR">或签（有一人同意即可）</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </div>
+<!--    <div v-if="showMode">-->
+<!--      <el-divider/>-->
+<!--      <el-form-item label="多人审批时审批方式" prop="text" class="approve-mode">-->
+<!--        <el-radio-group v-model="nodeProps.mode">-->
+<!--          <el-radio label="NEXT">会签 （按选择顺序审批，每个人必须同意）</el-radio>-->
+<!--          <el-radio label="AND">会签（可同时审批，每个人必须同意）</el-radio>-->
+<!--          <el-radio label="OR">或签（有一人同意即可）</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
+<!--    </div>-->
 
     <el-divider>高级设置</el-divider>
 <!--    <el-form-item label="✍ 审批同意时是否需要签字" prop="text">-->
@@ -99,32 +99,32 @@
     <el-form-item label="是否使用矩阵审批" prop="text">
       <el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch>
     </el-form-item>
-    <el-form-item label="审批期限（为 0 则不生效）" prop="timeLimit">
-      <el-input style="width: 180px;" placeholder="时长" type="number"
-                v-model="nodeProps.timeLimit.timeout.value">
-        <el-select style="width: 75px;" v-model="nodeProps.timeLimit.timeout.unit" slot="append" placeholder="请选择" filterable>
-          <el-option label="天" value="D"></el-option>
-          <el-option label="小时" value="H"></el-option>
-        </el-select>
-      </el-input>
-    </el-form-item>
-    <el-form-item label="审批期限超时后执行" prop="level" v-if="nodeProps.timeLimit.timeout.value > 0">
-      <el-radio-group v-model="nodeProps.timeLimit.handler.type">
-        <el-radio label="PASS">自动通过</el-radio>
-        <el-radio label="REFUSE">自动驳回</el-radio>
-        <el-radio label="NOTIFY">发送提醒</el-radio>
-      </el-radio-group>
-      <div v-if="nodeProps.timeLimit.handler.type === 'NOTIFY'">
-        <div style="color:#409EEF; font-size: small">默认提醒当前审批人</div>
-        <el-switch inactive-text="循环" active-text="一次" v-model="nodeProps.timeLimit.handler.notify.once"></el-switch>
-        <span style="margin-left: 20px" v-if="!nodeProps.timeLimit.handler.notify.once">
-							每隔
-							<el-input-number :min="0" :max="10000" :step="1" size="mini"
-                               v-model="nodeProps.timeLimit.handler.notify.hour"/>
-							小时提醒一次
-						</span>
-      </div>
-    </el-form-item>
+<!--    <el-form-item label="审批期限（为 0 则不生效）" prop="timeLimit">-->
+<!--      <el-input style="width: 180px;" placeholder="时长" type="number"-->
+<!--                v-model="nodeProps.timeLimit.timeout.value">-->
+<!--        <el-select style="width: 75px;" v-model="nodeProps.timeLimit.timeout.unit" slot="append" placeholder="请选择" filterable>-->
+<!--          <el-option label="天" value="D"></el-option>-->
+<!--          <el-option label="小时" value="H"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-input>-->
+<!--    </el-form-item>-->
+<!--    <el-form-item label="审批期限超时后执行" prop="level" v-if="nodeProps.timeLimit.timeout.value > 0">-->
+<!--      <el-radio-group v-model="nodeProps.timeLimit.handler.type">-->
+<!--        <el-radio label="PASS">自动通过</el-radio>-->
+<!--        <el-radio label="REFUSE">自动驳回</el-radio>-->
+<!--        <el-radio label="NOTIFY">发送提醒</el-radio>-->
+<!--      </el-radio-group>-->
+<!--      <div v-if="nodeProps.timeLimit.handler.type === 'NOTIFY'">-->
+<!--        <div style="color:#409EEF; font-size: small">默认提醒当前审批人</div>-->
+<!--        <el-switch inactive-text="循环" active-text="一次" v-model="nodeProps.timeLimit.handler.notify.once"></el-switch>-->
+<!--        <span style="margin-left: 20px" v-if="!nodeProps.timeLimit.handler.notify.once">-->
+<!--							每隔-->
+<!--							<el-input-number :min="0" :max="10000" :step="1" size="mini"-->
+<!--                               v-model="nodeProps.timeLimit.handler.notify.hour"/>-->
+<!--							小时提醒一次-->
+<!--						</span>-->
+<!--      </div>-->
+<!--    </el-form-item>-->
 <!--    <el-form-item label="🙅‍ 如果审批被驳回 👇">-->
 <!--      <el-radio-group v-model="nodeProps.refuse.type">-->
 <!--        <el-radio label="TO_INITIAL">重新开始流程</el-radio>-->
@@ -223,6 +223,8 @@ import RolePicker from '../common/RolePicker.vue'
 import Ellipsis from '../common/Ellipsis.vue'
 import RoleItems from "../common/RoleItems.vue";
 import {computed, defineProps} from 'vue'
+import {checkMatrix} from "../../../../api/user/user";
+import {ElNotification} from "element-plus";
 
 const processStore = useProcessStore()
 

From b1ac328d9d09e981012c7d687e7859a350fe027b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 01:45:10 +0800
Subject: [PATCH 51/60] =?UTF-8?q?Revert=20"feat=20:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=94=A8=E6=88=B7=E6=97=B6=E8=AF=A5=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E7=9F=A9=E9=98=B5=E7=8A=B6=E6=80=81=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d2ddf378bfb76e0862982bd96d952023649de9d2.
---
 src/api/user/user.js                          |  15 +--
 src/views/project-demand/summary/add.vue      |  18 +--
 .../workflow/process/common/UserPicker.vue    |  30 +----
 .../process/config/ApprovalNodeConfig.vue     | 110 +++++++++---------
 4 files changed, 71 insertions(+), 102 deletions(-)

diff --git a/src/api/user/user.js b/src/api/user/user.js
index e0a84c1..96d078f 100644
--- a/src/api/user/user.js
+++ b/src/api/user/user.js
@@ -56,8 +56,8 @@ export const getUserDetail = (userId) => {
 // 操作
 export const operate = (data, type) => {
   // console.log(type ,'type');
-  if (data.userId && type !== '0') return editUser(data)
-  else if (type == '0') return editUserOA(data)
+  if(data.userId && type !== '0') return editUser(data)
+  else if(type == '0') return editUserOA(data)
   return addUser(data)
 }
 
@@ -186,23 +186,16 @@ export const unbindAllUserByPost = (postId) => {
   })
 }
 
-export const bindAccount = (data) => {
+export const bindAccount=(data)=>{
   return request({
     url: '/admin/mosr/user/bind/account',
     method: 'post',
     data
   })
 }
-export const getBindAccount = (userId) => {
+export const getBindAccount=(userId)=>{
   return request({
     url: `/admin/mosr/user/bind/account/info/${userId}`,
     method: 'get'
   })
 }
-
-export const checkMatrix = (userId) => {
-  return request({
-    url: `/admin/mosr/user/matrix?userId=` + userId,
-    method: 'get'
-  })
-}
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index f80fd8b..a76ba5c 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -415,6 +415,14 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
+    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
+    let params = {
+      ...formData.value,
+      deploymentId: deploymentId.value,
+      fileList: otherFiles,
+      requirementId: route.query.id ? route.query.id : '-1'
+    }
+    console.log('params', params)
     if (!attachment.value.isSingleFile) {
       attachment.value.validate()
       ElNotification({
@@ -425,15 +433,7 @@ const handleSubmit = debounce(async (instance) => {
       return;
     } else {
       attachment.value.clearValidate()
-      formData.value.resultForm=JSON.stringify(formData.value.resultForm)
     }
-    let params = {
-      ...formData.value,
-      deploymentId: deploymentId.value,
-      fileList: otherFiles,
-      requirementId: route.query.id ? route.query.id : '-1'
-    }
-    console.log('params', params)
     let res = await requirementReported(params)
     ElNotification({
       title: '提示',
@@ -465,11 +465,11 @@ const handleResubmit = debounce(() => {
     return;
   } else {
     attachment.value.clearValidate()
-    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
   }
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
+  formData.value.resultForm=JSON.stringify(formData.value.resultForm)
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index d168e91..459236c 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -70,9 +70,8 @@
 </template>
 
 <script setup>
-import {ElMessageBox, ElNotification} from "element-plus";
+import {ElMessageBox} from "element-plus";
 import {getMosrUser} from "@/api/workflow/process-user";
-import {checkMatrix} from "../../../../api/user/user";
 
 const props = defineProps({
   value: {
@@ -93,10 +92,6 @@ const props = defineProps({
   setNullToSelectList: {
     default: false,
     type: Boolean
-  },
-  checkMatrix: {
-    default: false,
-    type: Boolean
   }
 });
 const radio = ref(0);
@@ -284,26 +279,9 @@ const clearSelected = () => {
 };
 const selectConfirm = () => {
   //确定按钮
-  if (props.checkMatrix){
-    checkMatrix(selectList.value[0].id).then(res=>{
-      console.log(res)
-      if (res.code === 2000){
-        ElNotification({
-          title: '提示',
-          message: res.msg,
-          type: 'error'
-        })
-      }else {
-        emit("ok", selectList.value);
-        dataList.value = []
-        visible.value = false;
-      }
-    })
-  }else {
-    emit("ok", selectList.value);
-    dataList.value = []
-    visible.value = false;
-  }
+  emit("ok", selectList.value);
+  dataList.value = []
+  visible.value = false;
 };
 defineExpose({
   showUserPicker
diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue
index 1209fa8..2583619 100644
--- a/src/views/workflow/process/config/ApprovalNodeConfig.vue
+++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue
@@ -8,7 +8,7 @@
         <el-button size="mini" icon="Plus" type="primary" @click="showSysRolePicker" round>
           选择人员
         </el-button>
-        <user-picker :check-matrix="true" title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
+        <user-picker title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
 <!--        <ellipsis :row="3" :user-info="assignedUser"/>-->
         <role-items v-model="assignedUser"/>
       </div>
@@ -60,34 +60,34 @@
 <!--        <span class="item-desc">发起人自己作为审批人进行审批</span>-->
 <!--      </div>-->
     </el-form-item>
-<!--    <el-divider></el-divider>-->
-<!--    <el-form-item label="审批人为空时" prop="text" class="line-mode">-->
-<!--      <el-radio-group v-model="nodeProps.nobody.handler">-->
-<!--        <el-radio label="TO_PASS">自动通过</el-radio>-->
-<!--        <el-radio label="TO_REFUSE">自动驳回</el-radio>-->
-<!--        <el-radio label="TO_ADMIN">转交审批管理员</el-radio>-->
-<!--        <el-radio label="TO_USER">转交到指定人员</el-radio>-->
-<!--      </el-radio-group>-->
-<!--      <div style="margin-top: 10px" v-if="nodeProps.nobody.handler === 'TO_USER'">-->
-<!--        <el-button size="mini" icon="Plus" type="primary" @click="showUserPicker()" round>-->
-<!--          选择人员-->
-<!--        </el-button>-->
-<!--        <user-picker title="请指定用户" :multiple="false" ref="toUserPicker" :v-model="nobodyAssignedUser"-->
-<!--                     @ok="selectNoSetUser"/>-->
-<!--        <ellipsis :row="3" :user-info="nobodyAssignedUser"/>-->
-<!--      </div>-->
-<!--    </el-form-item>-->
+    <el-divider></el-divider>
+    <el-form-item label="审批人为空时" prop="text" class="line-mode">
+      <el-radio-group v-model="nodeProps.nobody.handler">
+        <el-radio label="TO_PASS">自动通过</el-radio>
+        <el-radio label="TO_REFUSE">自动驳回</el-radio>
+        <el-radio label="TO_ADMIN">转交审批管理员</el-radio>
+        <el-radio label="TO_USER">转交到指定人员</el-radio>
+      </el-radio-group>
+      <div style="margin-top: 10px" v-if="nodeProps.nobody.handler === 'TO_USER'">
+        <el-button size="mini" icon="Plus" type="primary" @click="showUserPicker()" round>
+          选择人员
+        </el-button>
+        <user-picker title="请指定用户" :multiple="false" ref="toUserPicker" :v-model="nobodyAssignedUser"
+                     @ok="selectNoSetUser"/>
+        <ellipsis :row="3" :user-info="nobodyAssignedUser"/>
+      </div>
+    </el-form-item>
 
-<!--    <div v-if="showMode">-->
-<!--      <el-divider/>-->
-<!--      <el-form-item label="多人审批时审批方式" prop="text" class="approve-mode">-->
-<!--        <el-radio-group v-model="nodeProps.mode">-->
-<!--          <el-radio label="NEXT">会签 （按选择顺序审批，每个人必须同意）</el-radio>-->
-<!--          <el-radio label="AND">会签（可同时审批，每个人必须同意）</el-radio>-->
-<!--          <el-radio label="OR">或签（有一人同意即可）</el-radio>-->
-<!--        </el-radio-group>-->
-<!--      </el-form-item>-->
-<!--    </div>-->
+    <div v-if="showMode">
+      <el-divider/>
+      <el-form-item label="多人审批时审批方式" prop="text" class="approve-mode">
+        <el-radio-group v-model="nodeProps.mode">
+          <el-radio label="NEXT">会签 （按选择顺序审批，每个人必须同意）</el-radio>
+          <el-radio label="AND">会签（可同时审批，每个人必须同意）</el-radio>
+          <el-radio label="OR">或签（有一人同意即可）</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </div>
 
     <el-divider>高级设置</el-divider>
 <!--    <el-form-item label="✍ 审批同意时是否需要签字" prop="text">-->
@@ -99,32 +99,32 @@
     <el-form-item label="是否使用矩阵审批" prop="text">
       <el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch>
     </el-form-item>
-<!--    <el-form-item label="审批期限（为 0 则不生效）" prop="timeLimit">-->
-<!--      <el-input style="width: 180px;" placeholder="时长" type="number"-->
-<!--                v-model="nodeProps.timeLimit.timeout.value">-->
-<!--        <el-select style="width: 75px;" v-model="nodeProps.timeLimit.timeout.unit" slot="append" placeholder="请选择" filterable>-->
-<!--          <el-option label="天" value="D"></el-option>-->
-<!--          <el-option label="小时" value="H"></el-option>-->
-<!--        </el-select>-->
-<!--      </el-input>-->
-<!--    </el-form-item>-->
-<!--    <el-form-item label="审批期限超时后执行" prop="level" v-if="nodeProps.timeLimit.timeout.value > 0">-->
-<!--      <el-radio-group v-model="nodeProps.timeLimit.handler.type">-->
-<!--        <el-radio label="PASS">自动通过</el-radio>-->
-<!--        <el-radio label="REFUSE">自动驳回</el-radio>-->
-<!--        <el-radio label="NOTIFY">发送提醒</el-radio>-->
-<!--      </el-radio-group>-->
-<!--      <div v-if="nodeProps.timeLimit.handler.type === 'NOTIFY'">-->
-<!--        <div style="color:#409EEF; font-size: small">默认提醒当前审批人</div>-->
-<!--        <el-switch inactive-text="循环" active-text="一次" v-model="nodeProps.timeLimit.handler.notify.once"></el-switch>-->
-<!--        <span style="margin-left: 20px" v-if="!nodeProps.timeLimit.handler.notify.once">-->
-<!--							每隔-->
-<!--							<el-input-number :min="0" :max="10000" :step="1" size="mini"-->
-<!--                               v-model="nodeProps.timeLimit.handler.notify.hour"/>-->
-<!--							小时提醒一次-->
-<!--						</span>-->
-<!--      </div>-->
-<!--    </el-form-item>-->
+    <el-form-item label="审批期限（为 0 则不生效）" prop="timeLimit">
+      <el-input style="width: 180px;" placeholder="时长" type="number"
+                v-model="nodeProps.timeLimit.timeout.value">
+        <el-select style="width: 75px;" v-model="nodeProps.timeLimit.timeout.unit" slot="append" placeholder="请选择" filterable>
+          <el-option label="天" value="D"></el-option>
+          <el-option label="小时" value="H"></el-option>
+        </el-select>
+      </el-input>
+    </el-form-item>
+    <el-form-item label="审批期限超时后执行" prop="level" v-if="nodeProps.timeLimit.timeout.value > 0">
+      <el-radio-group v-model="nodeProps.timeLimit.handler.type">
+        <el-radio label="PASS">自动通过</el-radio>
+        <el-radio label="REFUSE">自动驳回</el-radio>
+        <el-radio label="NOTIFY">发送提醒</el-radio>
+      </el-radio-group>
+      <div v-if="nodeProps.timeLimit.handler.type === 'NOTIFY'">
+        <div style="color:#409EEF; font-size: small">默认提醒当前审批人</div>
+        <el-switch inactive-text="循环" active-text="一次" v-model="nodeProps.timeLimit.handler.notify.once"></el-switch>
+        <span style="margin-left: 20px" v-if="!nodeProps.timeLimit.handler.notify.once">
+							每隔
+							<el-input-number :min="0" :max="10000" :step="1" size="mini"
+                               v-model="nodeProps.timeLimit.handler.notify.hour"/>
+							小时提醒一次
+						</span>
+      </div>
+    </el-form-item>
 <!--    <el-form-item label="🙅‍ 如果审批被驳回 👇">-->
 <!--      <el-radio-group v-model="nodeProps.refuse.type">-->
 <!--        <el-radio label="TO_INITIAL">重新开始流程</el-radio>-->
@@ -223,8 +223,6 @@ import RolePicker from '../common/RolePicker.vue'
 import Ellipsis from '../common/Ellipsis.vue'
 import RoleItems from "../common/RoleItems.vue";
 import {computed, defineProps} from 'vue'
-import {checkMatrix} from "../../../../api/user/user";
-import {ElNotification} from "element-plus";
 
 const processStore = useProcessStore()
 

From a7fb633b89ab5643335e3080eef247651dd4b72a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 01:46:13 +0800
Subject: [PATCH 52/60] =?UTF-8?q?feat=20:=20=E4=BC=98=E5=8C=96=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=94=A8=E6=88=B7=E6=97=B6=E8=AF=A5=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E7=9F=A9=E9=98=B5=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/user.js                          |  15 ++-
 .../workflow/process/common/UserPicker.vue    |  30 ++++-
 .../process/config/ApprovalNodeConfig.vue     | 110 +++++++++---------
 3 files changed, 93 insertions(+), 62 deletions(-)

diff --git a/src/api/user/user.js b/src/api/user/user.js
index 96d078f..e0a84c1 100644
--- a/src/api/user/user.js
+++ b/src/api/user/user.js
@@ -56,8 +56,8 @@ export const getUserDetail = (userId) => {
 // 操作
 export const operate = (data, type) => {
   // console.log(type ,'type');
-  if(data.userId && type !== '0') return editUser(data)
-  else if(type == '0') return editUserOA(data)
+  if (data.userId && type !== '0') return editUser(data)
+  else if (type == '0') return editUserOA(data)
   return addUser(data)
 }
 
@@ -186,16 +186,23 @@ export const unbindAllUserByPost = (postId) => {
   })
 }
 
-export const bindAccount=(data)=>{
+export const bindAccount = (data) => {
   return request({
     url: '/admin/mosr/user/bind/account',
     method: 'post',
     data
   })
 }
-export const getBindAccount=(userId)=>{
+export const getBindAccount = (userId) => {
   return request({
     url: `/admin/mosr/user/bind/account/info/${userId}`,
     method: 'get'
   })
 }
+
+export const checkMatrix = (userId) => {
+  return request({
+    url: `/admin/mosr/user/matrix?userId=` + userId,
+    method: 'get'
+  })
+}
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index 459236c..d168e91 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -70,8 +70,9 @@
 </template>
 
 <script setup>
-import {ElMessageBox} from "element-plus";
+import {ElMessageBox, ElNotification} from "element-plus";
 import {getMosrUser} from "@/api/workflow/process-user";
+import {checkMatrix} from "../../../../api/user/user";
 
 const props = defineProps({
   value: {
@@ -92,6 +93,10 @@ const props = defineProps({
   setNullToSelectList: {
     default: false,
     type: Boolean
+  },
+  checkMatrix: {
+    default: false,
+    type: Boolean
   }
 });
 const radio = ref(0);
@@ -279,9 +284,26 @@ const clearSelected = () => {
 };
 const selectConfirm = () => {
   //确定按钮
-  emit("ok", selectList.value);
-  dataList.value = []
-  visible.value = false;
+  if (props.checkMatrix){
+    checkMatrix(selectList.value[0].id).then(res=>{
+      console.log(res)
+      if (res.code === 2000){
+        ElNotification({
+          title: '提示',
+          message: res.msg,
+          type: 'error'
+        })
+      }else {
+        emit("ok", selectList.value);
+        dataList.value = []
+        visible.value = false;
+      }
+    })
+  }else {
+    emit("ok", selectList.value);
+    dataList.value = []
+    visible.value = false;
+  }
 };
 defineExpose({
   showUserPicker
diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue
index 2583619..1209fa8 100644
--- a/src/views/workflow/process/config/ApprovalNodeConfig.vue
+++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue
@@ -8,7 +8,7 @@
         <el-button size="mini" icon="Plus" type="primary" @click="showSysRolePicker" round>
           选择人员
         </el-button>
-        <user-picker title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
+        <user-picker :check-matrix="true" title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
 <!--        <ellipsis :row="3" :user-info="assignedUser"/>-->
         <role-items v-model="assignedUser"/>
       </div>
@@ -60,34 +60,34 @@
 <!--        <span class="item-desc">发起人自己作为审批人进行审批</span>-->
 <!--      </div>-->
     </el-form-item>
-    <el-divider></el-divider>
-    <el-form-item label="审批人为空时" prop="text" class="line-mode">
-      <el-radio-group v-model="nodeProps.nobody.handler">
-        <el-radio label="TO_PASS">自动通过</el-radio>
-        <el-radio label="TO_REFUSE">自动驳回</el-radio>
-        <el-radio label="TO_ADMIN">转交审批管理员</el-radio>
-        <el-radio label="TO_USER">转交到指定人员</el-radio>
-      </el-radio-group>
-      <div style="margin-top: 10px" v-if="nodeProps.nobody.handler === 'TO_USER'">
-        <el-button size="mini" icon="Plus" type="primary" @click="showUserPicker()" round>
-          选择人员
-        </el-button>
-        <user-picker title="请指定用户" :multiple="false" ref="toUserPicker" :v-model="nobodyAssignedUser"
-                     @ok="selectNoSetUser"/>
-        <ellipsis :row="3" :user-info="nobodyAssignedUser"/>
-      </div>
-    </el-form-item>
+<!--    <el-divider></el-divider>-->
+<!--    <el-form-item label="审批人为空时" prop="text" class="line-mode">-->
+<!--      <el-radio-group v-model="nodeProps.nobody.handler">-->
+<!--        <el-radio label="TO_PASS">自动通过</el-radio>-->
+<!--        <el-radio label="TO_REFUSE">自动驳回</el-radio>-->
+<!--        <el-radio label="TO_ADMIN">转交审批管理员</el-radio>-->
+<!--        <el-radio label="TO_USER">转交到指定人员</el-radio>-->
+<!--      </el-radio-group>-->
+<!--      <div style="margin-top: 10px" v-if="nodeProps.nobody.handler === 'TO_USER'">-->
+<!--        <el-button size="mini" icon="Plus" type="primary" @click="showUserPicker()" round>-->
+<!--          选择人员-->
+<!--        </el-button>-->
+<!--        <user-picker title="请指定用户" :multiple="false" ref="toUserPicker" :v-model="nobodyAssignedUser"-->
+<!--                     @ok="selectNoSetUser"/>-->
+<!--        <ellipsis :row="3" :user-info="nobodyAssignedUser"/>-->
+<!--      </div>-->
+<!--    </el-form-item>-->
 
-    <div v-if="showMode">
-      <el-divider/>
-      <el-form-item label="多人审批时审批方式" prop="text" class="approve-mode">
-        <el-radio-group v-model="nodeProps.mode">
-          <el-radio label="NEXT">会签 （按选择顺序审批，每个人必须同意）</el-radio>
-          <el-radio label="AND">会签（可同时审批，每个人必须同意）</el-radio>
-          <el-radio label="OR">或签（有一人同意即可）</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </div>
+<!--    <div v-if="showMode">-->
+<!--      <el-divider/>-->
+<!--      <el-form-item label="多人审批时审批方式" prop="text" class="approve-mode">-->
+<!--        <el-radio-group v-model="nodeProps.mode">-->
+<!--          <el-radio label="NEXT">会签 （按选择顺序审批，每个人必须同意）</el-radio>-->
+<!--          <el-radio label="AND">会签（可同时审批，每个人必须同意）</el-radio>-->
+<!--          <el-radio label="OR">或签（有一人同意即可）</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
+<!--    </div>-->
 
     <el-divider>高级设置</el-divider>
 <!--    <el-form-item label="✍ 审批同意时是否需要签字" prop="text">-->
@@ -99,32 +99,32 @@
     <el-form-item label="是否使用矩阵审批" prop="text">
       <el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch>
     </el-form-item>
-    <el-form-item label="审批期限（为 0 则不生效）" prop="timeLimit">
-      <el-input style="width: 180px;" placeholder="时长" type="number"
-                v-model="nodeProps.timeLimit.timeout.value">
-        <el-select style="width: 75px;" v-model="nodeProps.timeLimit.timeout.unit" slot="append" placeholder="请选择" filterable>
-          <el-option label="天" value="D"></el-option>
-          <el-option label="小时" value="H"></el-option>
-        </el-select>
-      </el-input>
-    </el-form-item>
-    <el-form-item label="审批期限超时后执行" prop="level" v-if="nodeProps.timeLimit.timeout.value > 0">
-      <el-radio-group v-model="nodeProps.timeLimit.handler.type">
-        <el-radio label="PASS">自动通过</el-radio>
-        <el-radio label="REFUSE">自动驳回</el-radio>
-        <el-radio label="NOTIFY">发送提醒</el-radio>
-      </el-radio-group>
-      <div v-if="nodeProps.timeLimit.handler.type === 'NOTIFY'">
-        <div style="color:#409EEF; font-size: small">默认提醒当前审批人</div>
-        <el-switch inactive-text="循环" active-text="一次" v-model="nodeProps.timeLimit.handler.notify.once"></el-switch>
-        <span style="margin-left: 20px" v-if="!nodeProps.timeLimit.handler.notify.once">
-							每隔
-							<el-input-number :min="0" :max="10000" :step="1" size="mini"
-                               v-model="nodeProps.timeLimit.handler.notify.hour"/>
-							小时提醒一次
-						</span>
-      </div>
-    </el-form-item>
+<!--    <el-form-item label="审批期限（为 0 则不生效）" prop="timeLimit">-->
+<!--      <el-input style="width: 180px;" placeholder="时长" type="number"-->
+<!--                v-model="nodeProps.timeLimit.timeout.value">-->
+<!--        <el-select style="width: 75px;" v-model="nodeProps.timeLimit.timeout.unit" slot="append" placeholder="请选择" filterable>-->
+<!--          <el-option label="天" value="D"></el-option>-->
+<!--          <el-option label="小时" value="H"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-input>-->
+<!--    </el-form-item>-->
+<!--    <el-form-item label="审批期限超时后执行" prop="level" v-if="nodeProps.timeLimit.timeout.value > 0">-->
+<!--      <el-radio-group v-model="nodeProps.timeLimit.handler.type">-->
+<!--        <el-radio label="PASS">自动通过</el-radio>-->
+<!--        <el-radio label="REFUSE">自动驳回</el-radio>-->
+<!--        <el-radio label="NOTIFY">发送提醒</el-radio>-->
+<!--      </el-radio-group>-->
+<!--      <div v-if="nodeProps.timeLimit.handler.type === 'NOTIFY'">-->
+<!--        <div style="color:#409EEF; font-size: small">默认提醒当前审批人</div>-->
+<!--        <el-switch inactive-text="循环" active-text="一次" v-model="nodeProps.timeLimit.handler.notify.once"></el-switch>-->
+<!--        <span style="margin-left: 20px" v-if="!nodeProps.timeLimit.handler.notify.once">-->
+<!--							每隔-->
+<!--							<el-input-number :min="0" :max="10000" :step="1" size="mini"-->
+<!--                               v-model="nodeProps.timeLimit.handler.notify.hour"/>-->
+<!--							小时提醒一次-->
+<!--						</span>-->
+<!--      </div>-->
+<!--    </el-form-item>-->
 <!--    <el-form-item label="🙅‍ 如果审批被驳回 👇">-->
 <!--      <el-radio-group v-model="nodeProps.refuse.type">-->
 <!--        <el-radio label="TO_INITIAL">重新开始流程</el-radio>-->
@@ -223,6 +223,8 @@ import RolePicker from '../common/RolePicker.vue'
 import Ellipsis from '../common/Ellipsis.vue'
 import RoleItems from "../common/RoleItems.vue";
 import {computed, defineProps} from 'vue'
+import {checkMatrix} from "../../../../api/user/user";
+import {ElNotification} from "element-plus";
 
 const processStore = useProcessStore()
 

From bffa726cbf0dbb116adf94648dd64e2daaff6e41 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 13:30:01 +0800
Subject: [PATCH 53/60] =?UTF-8?q?feat=20:=20=E4=BC=98=E5=8C=96=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=94=A8=E6=88=B7=E6=97=B6=E8=AF=A5=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E7=9F=A9=E9=98=B5=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/ProjectApply.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 7463001..7622c89 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -213,13 +213,13 @@ const getPreProcessList = () => {
         searchArray.push(item)
       }
     })
-    res.data.forEach((item) => {
-      localFormData.value.preProcess.forEach((item1) => {
-        if (item.requestId == item1.requestId) {
-          preProcessTable.value.toggleRowSelection(item)
-        }
-      })
-    })
+    // res.data.forEach((item) => {
+    //   localFormData.value.preProcess.forEach((item1) => {
+    //     if (item.requestId == item1.requestId) {
+    //       preProcessTable.value.toggleRowSelection(item)
+    //     }
+    //   })
+    // })
     total.value = searchArray.length
     currentList.value = searchArray
     preProcessList.value = currentList.value.slice(0, 10)

From f26a29338a741eb016faf45d557427a754a3eb06 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 14:10:10 +0800
Subject: [PATCH 54/60] =?UTF-8?q?feat=20:=20=E4=BC=98=E5=8C=96=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=94=A8=E6=88=B7=E6=97=B6=E8=AF=A5=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E7=9F=A9=E9=98=B5=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue   | 2 +-
 src/views/project-demand/summary/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index a76ba5c..d3d854f 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -474,7 +474,7 @@ const handleResubmit = debounce(() => {
     ...formData.value,
     deploymentId: deploymentId.value,
     fileList: otherFiles,
-    requirementId: route.query.id ? route.query.id : '-1'
+    requirementId: route.query.requirementId ? route.query.requirementId : '-1'
   }
   // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
   resubmitReported(params).then(res => {
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 8df7cab..b3ef500 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -304,7 +304,7 @@ const handleEdit = (row) => {
   router.push({
     name: 'Summary/edit',
     query: {
-      // requirementId: row.requirementId,
+      requirementId: row.requirementId,
       projectId: row.projectId
     }
   })

From 9edf5d484f3a67ea7797a41547f261c5e8cc1964 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 19:39:53 +0800
Subject: [PATCH 55/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E5=85=AC=E5=8F=B8=E5=9B=9E=E6=98=BE,=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E6=94=B9=E4=B8=BA=E5=BE=81=E9=9B=86?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/steps/index.vue                |  2 +-
 src/utils/matterTree.js                       | 12 ++++----
 src/views/project-demand/requirement/add.vue  | 18 +++++-------
 .../project-demand/requirement/index.vue      |  2 +-
 .../project-management/filing/attachment.vue  |  2 +-
 src/views/project-management/filing/index.vue |  2 +-
 .../project-management/filing/upload.vue      |  2 +-
 .../implementation/attachment.vue             |  2 +-
 .../implementation/index.vue                  |  2 +-
 .../implementation/phase.vue                  |  2 +-
 .../implementation/phaseDetail.vue            |  2 +-
 .../implementation/share.vue                  |  2 +-
 .../implementation/upload.vue                 | 29 ++++++++++++++++++-
 .../implementation/uploadFee.vue              |  2 +-
 .../project-management/initiation/index.vue   |  2 +-
 .../mobledetail/CollectionDetailMoblie.vue    |  2 +-
 .../mobledetail/StepsMoblie.vue               |  2 +-
 17 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 24b2a05..5057855 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -118,7 +118,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
diff --git a/src/utils/matterTree.js b/src/utils/matterTree.js
index 6698582..e3fb4ac 100644
--- a/src/utils/matterTree.js
+++ b/src/utils/matterTree.js
@@ -1,13 +1,13 @@
 export const matterTree = (array,data, id) => {
   if (id) {
-    for (let i = 0; i < data.length; i++) {
-      if (data[i].value == id) {
-        array.push(data[i].label);
+    data.forEach(item => {
+      if (item.value == id) {
+        array.push(item.label);
       }
-      if (data[i].children && data[i].children.length > 0) {
-        matterTree(array,data[i].children,id)
+      if (item.children && item.children.length > 0) {
+        matterTree(array,item.children,id)
       }
-    }
+    })
     return array;
   }
 }
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 11ff89f..0c6f586 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -243,6 +243,7 @@ const showCompany = () => {
 }
 
 const selected = (select) => {
+  formData.value.companyIds=[]
   for (let val of select) {
     formData.value.companyIds.push(val.value)
   }
@@ -368,7 +369,6 @@ const submitParam = (item) => {
   }
 }
 const handleSubmit = async (instance) => {
-  console.log('submitParam(formData.value)', submitParam(formData.value))
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) {
@@ -415,16 +415,14 @@ const getCompanyOptionItem = (val) => {
   if (val !== undefined) {
     val.forEach(item => {
       matterTree(companyNameArray.value, companyOption.value, item)
-      companyNameArray.value.forEach(companyItem => {
-        newObj = {
-          label: companyItem,
-          value: item
-        }
-        newArray.push(newObj)
-      })
+    })
+    companyNameArray.value.forEach(companyItem => {
+      newObj = {
+        label: companyItem
+      }
+      newArray.push(newObj)
     })
   }
-
   return newArray;
 }
 const getDetailInfo = async () => {
@@ -460,7 +458,7 @@ const handleDelete = (row) => {
     })
     if (res.code === 1000) {
       formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
-      showTable.value = formData.value.fileList.length !== 0;
+      // showTable.value = formData.value.fileList.length !== 0;
     }
   });
 }
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 4a68881..3ffd676 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -77,7 +77,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'companyName',
-      label: '所属公司',
+      label: '征集公司',
       align: 'center',
       currentRender: ({row, index}) => (
           <div style={{width: '300px', textOverflow: 'ellipsis'}}>{row.companyName}</div>)
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index 8099ef4..73aea25 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -48,7 +48,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index dcae27b..fad0044 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -144,7 +144,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'affiliatedCompany',
-      label: '所属公司',
+      label: '征集公司',
       align: 'center'
     },
     {
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index 80198f4..e9a4163 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -54,7 +54,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 45bb082..b1b62a0 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -64,7 +64,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 170a57d..3798475 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -147,7 +147,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'affiliatedCompany',
-      label: '所属公司',
+      label: '征集公司',
       align: 'center'
     },
     {
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index e38b0e7..f71e6d6 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -83,7 +83,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index 93bf09c..f4469f9 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -47,7 +47,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index f8498e9..1215e8a 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -38,7 +38,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 262e2d1..ba3c132 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -38,6 +38,7 @@ import {useTagsView} from '@/stores/tagsview.js'
 import {uploadFileList} from "@/api/project-manage/attachment";
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
+import {downloadFile,deleteFile} from "@/api/project-demand";
 
 const tagsViewStore = useTagsView()
 const route = useRoute()
@@ -68,7 +69,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
@@ -110,10 +111,14 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         return (
             <div>
               <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+              <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
+                              perm={['mosr:requirement:del']}
+                              onDelete={() => handleDelete(row)}/>
             </div>
         )
       }
@@ -126,6 +131,28 @@ const name = ref(router.currentRoute.value.name)
 const rules = reactive({
   tagName: [{required: true, message: '请输入标签名称', trigger: ['blur', 'change']}],
 })
+const handleDelete = (row) => {
+  deleteFile(row.fileId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      fileList.value.splice(fileList.value.findIndex((item) => item.id === row.fileId), 1);
+    }
+  });
+}
+
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
 const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index dff4c25..65f766c 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -117,7 +117,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 12
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 1593ab8..d238277 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -141,7 +141,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'affiliatedCompany',
-      label: '所属公司',
+      label: '征集公司',
       align: 'center'
     },
     {
diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
index 41a3e89..95cbd3f 100644
--- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
@@ -18,7 +18,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="type==='singleDetail'">
-          <el-form-item label="所属公司">
+          <el-form-item label="征集公司">
             <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
                 getCompanyName(formData.companyIds)
               }}</span>
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index 61f119d..91cbdf3 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -119,7 +119,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '所属公司',
+      label: '征集公司',
       prop: 'affiliatedCompany',
       colProps: {
         span: 24

From 0f0fa0f4e065beef1b47ed668afb9587aa47bbec Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 20:47:47 +0800
Subject: [PATCH 56/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=A0=94?=
 =?UTF-8?q?=E7=A9=B6=E4=BA=BA=E5=91=98=E6=AF=8F=E8=A1=8C=E7=9A=84=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           |  78 +++--
 .../DetailComponent/ProjectApply.vue          |   2 +-
 src/views/expense-management/share/add.vue    |  14 +-
 src/views/project-demand/summary/add.vue      |   2 +-
 .../project-management/filing/conclusion.vue  | 263 -----------------
 .../implementation/check.vue                  | 239 ---------------
 .../implementation/phase.vue                  |   2 +-
 .../project-management/initiation/apply.vue   | 277 ------------------
 .../mobledetail/ProjectApplyMoblie.vue        |   2 +-
 9 files changed, 63 insertions(+), 816 deletions(-)
 delete mode 100644 src/views/project-management/filing/conclusion.vue
 delete mode 100644 src/views/project-management/implementation/check.vue
 delete mode 100644 src/views/project-management/initiation/apply.vue

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 68101c4..3a317b4 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -82,6 +82,10 @@ const props = defineProps({
   labelPosition: {
     type: String,
     default: ''
+  },
+  tag: {
+    type: String,
+    default: ''
   }
 })
 const emit = defineEmits(["getAttachment", "getOtherFile"])
@@ -222,32 +226,34 @@ const singleFileList = ref([])
 if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
   allFileList.value = props.formData.fileList
 }
+
 watch(() => props.showSingleTable, (newVal) => {
   props.showSingleTable = newVal
 }, {deep: true})
-watch(() => props.formData.fileList, (newVal) => {
-  // console.log('newVal-fileList', newVal)
-  if (props.preview) {
-    newVal?.forEach(item => {
-      allFileList.value.push(item)
-    })
-  }
-}, {deep: true})
-watch(() => props.otherFileList, (newVal) => {
-  // console.log('newotherFileList', newVal)
-  if (props.preview) {
-    if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
-      allFileList.value = newVal
-    } else {
-      newVal?.forEach(item => {
-        allFileList.value.push(item)
-      })
-    }
-  } else {
-    allFileList.value = newVal
-  }
-}, {deep: true})
-
+// watch(() => props.formData.fileList, (newVal) => {
+//   console.log('newVal-fileList', newVal)
+//   if (props.preview) {
+//     // newVal?.forEach(item => {
+//     //   allFileList.value.push(item)
+//     // })
+//   }
+// }, {deep: true})
+// watch(() => props.otherFileList, (newVal) => {
+//   props.otherFileList=newVal
+  // if (props.preview) {
+  //   console.log('newotherFileList', newVal,props.preview,props.formData.fileList)
+  //   if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
+  //     allFileList.value = newVal
+  //   } else {
+  //     console.log('props.otherFileList',props.otherFileList)
+  //     // props.otherFileList?.forEach(item => {
+  //     //   allFileList.value.push(item)
+  //     // })
+  //   }
+  // } else {
+  //   allFileList.value = newVal
+  // }
+// }, {deep: true})
 watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
@@ -271,26 +277,44 @@ const handleDelete = (row, type) => {
     })
     if (res.code === 1000) {
       if (type === 'single') {
-        singleFileList.value.splice(singleFileList.value.findIndex((item) => item.id === row.fileId), 1);
+        singleFileList.value.splice(singleFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
         isSingleFile.value = false
       } else {
-        allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
+        console.log('allFileList.value',allFileList.value,row)
+        console.log('allFileList.value.findIndex((item) => item.id === row.fileId)',allFileList.value.findIndex((item) => item.id === row.fileId))
+        allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
       }
     }
   });
 }
 const handleSingleDelete = (row) => {
-  console.log('row',row)
+  // console.log('row',row)
   // fileUploadRef.value.handleRemove(deleteFileVal.value.id)
   handleDelete(row, 'single')
 }
 const getAttachment = (val) => {
-  console.log('getAttachment', val)
+  // console.log('getAttachment', val)
   isSingleFile.value = true
   // deleteFileVal.value=val
   emit('getAttachment', val)
 }
+const compositeParam = (item) => {
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    newFile: true,
+    tag:props.tag
+  }
+}
 const getOtherFile = (val) => {
+  if (props.preview) {
+        allFileList.value.push(compositeParam(val))
+  } else {
+    allFileList.value = props.otherFileList
+  }
   emit('getOtherFile', val)
 }
 const deleteAttachment = (val) => {
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 7622c89..1e912d3 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -16,7 +16,7 @@
       </el-row>
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
-                      :otherFileList="otherFileList"
+                      :otherFileList="otherFileList" :tag="getTitleName(props.title)"
                       @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 2730e08..1e868fe 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -208,6 +208,14 @@ const researchOptions = ref([])
 const showPersonnelPicker = (row, index) => {
   currentRow.value = row
   currentIndex.value = index
+  if(row.companyName){
+    let userObj = {
+      id: row.researchPersonnelId,
+      name: row.researchPersonnel,
+      companyName: row.companyName,
+    }
+    userList.value.push(userObj)
+  }
   userPicker.value.showUserPicker()
 }
 const selected = (select) => {
@@ -413,12 +421,6 @@ const getDetailList = async () => {
   if (code === 1000) {
     data.rows.forEach(item => {
       item.researchPersonnelId = Number(item.researchPersonnelId)
-      let userObj = {
-        id: item.researchPersonnelId,
-        name: item.researchPersonnel,
-        companyName: item.companyName,
-      }
-      userList.value.push(userObj)
     })
     formData.value.tableData = data.rows
     nextTick(() => {
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index d3d854f..57b0d08 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -234,7 +234,7 @@
     </el-form>
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="需求上报"
                       :preview="name === 'Summary/edit'"/>
     <div class="approval-record" style="margin-left: 70px">
       <div style="display: flex;align-items: center;justify-content: flex-start;">
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
deleted file mode 100644
index f67715f..0000000
--- a/src/views/project-management/filing/conclusion.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<template>
-  <div class="apply-block">
-    <baseTitle title="项目结项"></baseTitle>
-    <AttachmentUpload ref="attachment" label="项目结项附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
-                      :preview="name === 'Filing/edit'"/>
-    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
-    </div>
-    <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="name==='Filing/conclusion'" @click="handleSubmit">提交</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
-      <el-button @click="handleBack">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {useTagsView} from '@/stores/tagsview.js'
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {downloadFile} from "@/api/project-demand";
-import {ElNotification} from "element-plus";
-import {useProcessStore} from '@/stores/processStore.js';
-import {
-  getProjectConclusionProcess,
-  projectConclusion,
-  getConclusionDetail,
-  resubmitConclusion
-} from "@/api/project-manage";
-
-const router = useRouter()
-const route = useRoute()
-const tagsViewStore = useTagsView()
-const formData = ref({})
-
-const attachment = ref()
-const name = ref(router.currentRoute.value.name)
-const loading = ref(false)
-const file = ref({})
-const deploymentId = ref()
-const showTable = ref(true)
-const otherFileList = ref([])
-const processInstanceData = ref()
-const processDiagramViewer = ref(true)
-const processStore = useProcessStore()
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-            </div>
-        )
-      }
-    }
-  ]
-})
-const handleDownload = (row) => {
-  downloadFile(row.fileId).then(res => {
-    const blob = new Blob([res])
-    let a = document.createElement('a')
-    a.href = URL.createObjectURL(blob)
-    a.download = row.originalFileName
-    a.click()
-  })
-}
-const handleBack = () => {
-  history.back()
-}
-const compositeParam = (item) => {
-  let tag = ''
-  if (name.value === 'Filing/conclusion' || name.value === 'Filing/edit') {
-    tag = '项目结项'
-  }
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    newFile: false,
-    tag: tag
-  }
-}
-const getAttachment = (val) => {
-  console.log('上传文件getAttachment', val)
-  formData.value.singleFile = compositeParam(val)
-}
-const getOtherFile = (val) => {
-  console.log('上传文件getOtherFile', val)
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  otherFileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId,
-    tag: item.tag
-  }
-}
-const handleSubmit = async () => {
-  let files = []
-  otherFileList.value.forEach(item => {
-    files.push(getFileParam(item))
-  })
-  if (formData.value.singleFile !== undefined) {
-    formData.value.singleFile = getFileParam(formData.value.singleFile)
-  }
-  let params = {
-    deploymentId: deploymentId.value,
-    requirementId: route.query.id,
-    fileList: files,
-    singleFile: formData.value.singleFile,
-    projectId: route.query.projectId,
-  }
-  if (!attachment.value.isSingleFile) {
-    attachment.value.validate()
-    ElNotification({
-      title: '提示',
-      message: '请上传附件',
-      type: 'error'
-    })
-    return;
-  } else {
-    attachment.value.clearValidate()
-  }
-  console.log('params', params)
-  let res = await projectConclusion(params)
-  ElNotification({
-    title: '提示',
-    message: res.msg,
-    type: res.code === 1000 ? 'success' : 'error'
-  })
-  if (res.code === 1000) {
-    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    await router.push({
-      name: 'Filing'
-    })
-  }
-}
-const handleResubmit = () => {
-  let otherFiles = []
-  if (name.value === 'Filing/edit') {
-    attachment.value.allFileList?.forEach(item => {
-      otherFiles.push(getFileParam(item))
-    })
-  }
-  if (attachment.value.singleFile==null) {
-    attachment.value.validate()
-    ElNotification({
-      title: '提示',
-      message: '请上传附件',
-      type: 'error'
-    })
-    return;
-  } else{
-    attachment.value.clearValidate()
-  }
-  let params = {
-    deploymentId: deploymentId.value,
-    requirementId: route.query.id,
-    fileList: otherFiles,
-    singleFile: attachment.value.singleFile,
-    projectId: route.query.projectId,
-  }
-  console.log('重新提交params', params)
-  resubmitConclusion(params).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Filing'
-      })
-    }
-  })
-}
-const getDetailInfo = async () => {
-  getConclusionDetail(route.query.projectId).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      formData.value = res.data.formData
-      loading.value = false
-    }
-  })
-}
-const init = () => {
-  getProjectConclusionProcess().then(res => {
-    processDiagramViewer.value = false
-    if (res.code === 1000) {
-      let data = res.data
-      deploymentId.value = data.deploymentId
-      processInstanceData.value = data
-      processStore.setDesign(data)
-      processStore.runningList.value = data.runningList;
-      processStore.endList.value = data.endList;
-      processStore.noTakeList.value = data.noTakeList;
-      processStore.refuseList.value = data.refuseList;
-      processStore.passList.value = data.passList;
-      nextTick(() => {
-        processDiagramViewer.value = true
-      })
-    } else {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: 'error'
-      })
-    }
-  })
-}
-onMounted(async () => {
-  await init()
-  if (name.value === 'Filing/edit') {
-    loading.value = true
-    await getDetailInfo()
-  }
-})
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
deleted file mode 100644
index 588f6d6..0000000
--- a/src/views/project-management/implementation/check.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <div class="apply-block">
-    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
-      <baseTitle title="项目验收"></baseTitle>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="前置流程">
-            <el-input v-model="formData.requirementName" clearable></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <AttachmentUpload ref="attachment" label="项目验收附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
-                      :preview="name === 'Implementation/edit'"/>
-    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
-    </div>
-    <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="name==='Implementation/check'" @click="handleSubmit(applyForm)">提交</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit(applyForm)">重新提交</el-button>
-      <el-button @click="handleBack">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getProjectCheckProcess, projectCheck, getCheckDetail, resubmitCheck} from "@/api/project-manage";
-import {ElNotification} from "element-plus";
-import {useProcessStore} from '@/stores/processStore.js';
-import {useTagsView} from '@/stores/tagsview.js'
-
-const tagsViewStore = useTagsView()
-const router = useRouter()
-const route = useRoute()
-const attachment = ref()
-const name = ref(router.currentRoute.value.name)
-const loading = ref(false)
-const formData = ref({})
-const applyForm = ref()
-const deploymentId = ref()
-const showTable = ref(true)
-const otherFileList = ref([])
-const processInstanceData = ref()
-const processDiagramViewer = ref(true)
-const processStore = useProcessStore()
-const handleBack = () => {
-  history.back()
-}
-const compositeParam = (item) => {
-  let tag = ''
-  if (name.value === 'Implementation/check' || name.value === 'Implementation/edit') {
-    tag = '项目验收'
-  }
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    newFile: false,
-    tag: tag
-  }
-}
-const getAttachment = (val) => {
-  console.log('上传文件getAttachment', val)
-  formData.value.singleFile = compositeParam(val)
-}
-const getOtherFile = (val) => {
-  console.log('上传文件getOtherFile', val)
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  otherFileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId,
-    tag: item.tag
-  }
-}
-const handleSubmit = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) {
-      ElNotification({
-        title: '提示',
-        message: '请完善数据,再提交!',
-        type: 'error'
-      })
-      return;
-    }
-    let files = []
-    otherFileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-    if (formData.value.singleFile !== undefined) {
-      formData.value.singleFile = getFileParam(formData.value.singleFile)
-    }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: formData.value.singleFile,
-      projectId: route.query.projectId,
-    }
-    if (!attachment.value.isSingleFile) {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    } else {
-      attachment.value.clearValidate()
-    }
-    console.log('params-提交', params)
-    let res = await projectCheck(params)
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Implementation'
-      })
-    }
-  })
-}
-const handleResubmit = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) {
-      ElNotification({
-        title: '提示',
-        message: '请完善数据,再提交!',
-        type: 'error'
-      })
-      return;
-    }
-    let otherFiles = []
-    if (name.value === 'Implementation/edit') {
-      attachment.value.allFileList?.forEach(item => {
-        otherFiles.push(getFileParam(item))
-      })
-    }
-    if (attachment.value.singleFile==null) {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    } else{
-      attachment.value.clearValidate()
-    }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: otherFiles,
-      singleFile: attachment.value.singleFile,
-      projectId: route.query.projectId,
-    }
-    console.log('重新提交params', params)
-    resubmitCheck(params).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Implementation'
-        })
-      }
-    })
-  })
-}
-const getDetailInfo = async () => {
-  getCheckDetail(route.query.projectId).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      formData.value = res.data.formData
-      loading.value = false
-    }
-  })
-}
-const init = () => {
-  getProjectCheckProcess(route.query.projectId).then(res => {
-    processDiagramViewer.value = false
-    if (res.code === 1000) {
-      let data = res.data
-      deploymentId.value = data.deploymentId
-      processInstanceData.value = data
-      processStore.setDesign(data)
-      processStore.runningList.value = data.runningList;
-      processStore.endList.value = data.endList;
-      processStore.noTakeList.value = data.noTakeList;
-      processStore.refuseList.value = data.refuseList;
-      processStore.passList.value = data.passList;
-      nextTick(() => {
-        processDiagramViewer.value = true
-      })
-    } else {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: 'error'
-      })
-    }
-  })
-}
-onMounted(async () => {
-  await init()
-  if (name.value === 'Implementation/edit') {
-    loading.value = true
-    await getDetailInfo()
-  }
-})
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index f71e6d6..4d8e78d 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -10,7 +10,7 @@
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
     <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"  :singleList="singleList" :showSingleTable="showSingleTable"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="阶段变更"
                       :preview="name === 'Phase/edit'"/>
     <div class="approval-record"  style="margin-left: 68px">
       <div style="display: flex;align-items: center;justify-content: flex-start;">
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
deleted file mode 100644
index c39704d..0000000
--- a/src/views/project-management/initiation/apply.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-<template>
-  <div class="apply-block">
-    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
-      <baseTitle title="项目立项"></baseTitle>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="前置流程">
-            <el-input v-model="formData.requirementName" clearable></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <AttachmentUpload ref="attachment" label="项目立项附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
-                      :preview="name === 'Initiation/edit'"/>
-    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
-    </div>
-    <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="name==='Initiation/apply'" @click="handleSubmit(applyForm)">提交</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
-      <el-button @click="handleBack">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {useTagsView} from '@/stores/tagsview.js'
-import {ElNotification} from "element-plus";
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getApplyProcess, projectApply, resubmitApply, getApplyDetail} from "@/api/project-manage";
-import {useProcessStore} from '@/stores/processStore.js';
-import {downloadFile} from "@/api/project-demand";
-
-const tagsViewStore = useTagsView()
-const router = useRouter()
-const route = useRoute()
-const formData = ref({})
-const rules = reactive({
-  attachment: [{required: true, message: '请上传项目立项附件', trigger: 'blur'}],
-})
-const processStore = useProcessStore()
-const deploymentId = ref()
-const attachment = ref()
-const applyForm = ref()
-const showTable = ref(true)
-const otherFileList = ref([])
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-        )
-      }
-    }
-  ]
-})
-const loading = ref(false)
-const processInstanceData = ref()
-const processDiagramViewer = ref(true)
-const name = ref(router.currentRoute.value.name)
-const handleBack = () => {
-  history.back()
-}
-const handleDownload = (row) => {
-  downloadFile(row.fileId).then(res => {
-    const blob = new Blob([res])
-    let a = document.createElement('a')
-    a.href = URL.createObjectURL(blob)
-    a.download = row.originalFileName
-    a.click()
-  })
-}
-const compositeParam = (item) => {
-  let tag = ''
-  if (name.value === 'Initiation/apply' || name.value === 'Initiation/edit') {
-    tag = '项目立项'
-  }
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    newFile: false,
-    tag: tag
-  }
-}
-const getAttachment = (val) => {
-  console.log('上传文件getAttachment', val)
-  formData.value.singleFile = compositeParam(val)
-}
-const getOtherFile = (val) => {
-  console.log('上传文件getOtherFile', val)
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  otherFileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId,
-    tag: item.tag
-  }
-}
-const handleSubmit = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) {
-      ElNotification({
-        title: '提示',
-        message: '请完善数据,再提交!',
-        type: 'error'
-      })
-      return;
-    }
-    let files = []
-    otherFileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-    if (formData.value.singleFile !== undefined) {
-      formData.value.singleFile = getFileParam(formData.value.singleFile)
-    }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: formData.value.singleFile,
-      projectId: route.query.projectId,
-    }
-    if (!attachment.value.isSingleFile) {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    } else {
-      attachment.value.clearValidate()
-    }
-    console.log('params', params)
-    let res = await projectApply(params)
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Initiation'
-      })
-    }
-  })
-}
-const handleResubmit = async () => {
-  let files = []
-  if (name.value === 'Initiation/edit') {
-    attachment.value.allFileList.forEach(item => {
-      files.push(getFileParam(item))
-    })
-  }
-  if (attachment.value.singleFile==null) {
-    attachment.value.validate()
-    ElNotification({
-      title: '提示',
-      message: '请上传附件',
-      type: 'error'
-    })
-    return;
-  } else{
-    attachment.value.clearValidate()
-  }
-  let params = {
-    deploymentId: deploymentId.value,
-    requirementId: route.query.id,
-    fileList: files,
-    singleFile: attachment.value.singleFile,
-    projectId: route.query.projectId,
-  }
-  console.log('params', params, attachment.value.isSingleFile)
-  let res = await resubmitApply(params)
-  ElNotification({
-    title: '提示',
-    message: res.msg,
-    type: res.code === 1000 ? 'success' : 'error'
-  })
-  if (res.code === 1000) {
-    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    await router.push({
-      name: 'Initiation'
-    })
-  }
-}
-const getDetailInfo = async () => {
-  getApplyDetail(route.query.projectId).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      formData.value = res.data.formData
-      loading.value = false
-    }
-  })
-}
-const init = () => {
-  getApplyProcess(route.query.projectId).then(res => {
-    processDiagramViewer.value = false
-    if (res.code === 1000) {
-      let data = res.data
-      deploymentId.value = data.deploymentId
-      processInstanceData.value = data
-      processStore.setDesign(data)
-      processStore.runningList.value = data.runningList;
-      processStore.endList.value = data.endList;
-      processStore.noTakeList.value = data.noTakeList;
-      processStore.refuseList.value = data.refuseList;
-      processStore.passList.value = data.passList;
-      nextTick(() => {
-        processDiagramViewer.value = true
-      })
-    } else {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: 'error'
-      })
-    }
-  })
-}
-init()
-onMounted(async () => {
-  await init()
-  if (name.value === 'Initiation/edit') {
-    loading.value = true
-    await getDetailInfo()
-  }
-})
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
index 5ce838e..993eb5e 100644
--- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
+++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
@@ -16,7 +16,7 @@
       </el-row>
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
-                      :otherFileList="otherFileList"
+                      :otherFileList="otherFileList" :tag="getTitleName(props.title)"
                       @getAttachment="getAttachment" :labelPosition="'top'"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>

From 9a789db8a71c973b36c04af988b0d0965c53aa15 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 21:31:05 +0800
Subject: [PATCH 57/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=86?=
 =?UTF-8?q?=E6=91=8A=E7=BC=96=E8=BE=91=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue        | 25 ++++++++++------------
 src/views/expense-management/share/add.vue | 19 +++++++++++-----
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 3a317b4..70bb806 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -223,21 +223,20 @@ const isSingleFile = ref(false)
 const allFileList = ref([])
 const deleteFileVal = ref({})
 const singleFileList = ref([])
-if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
-  allFileList.value = props.formData.fileList
-}
-
+// if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
+//   allFileList.value = props.formData.fileList
+// }
 watch(() => props.showSingleTable, (newVal) => {
   props.showSingleTable = newVal
 }, {deep: true})
-// watch(() => props.formData.fileList, (newVal) => {
-//   console.log('newVal-fileList', newVal)
-//   if (props.preview) {
-//     // newVal?.forEach(item => {
-//     //   allFileList.value.push(item)
-//     // })
-//   }
-// }, {deep: true})
+watch(() => props.formData.fileList, (newVal) => {
+  console.log('newVal-fileList', newVal)
+  if (props.preview) {
+    newVal?.forEach(item => {
+      allFileList.value.push(item)
+    })
+  }
+}, {immediate: true})
 // watch(() => props.otherFileList, (newVal) => {
 //   props.otherFileList=newVal
   // if (props.preview) {
@@ -280,8 +279,6 @@ const handleDelete = (row, type) => {
         singleFileList.value.splice(singleFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
         isSingleFile.value = false
       } else {
-        console.log('allFileList.value',allFileList.value,row)
-        console.log('allFileList.value.findIndex((item) => item.id === row.fileId)',allFileList.value.findIndex((item) => item.id === row.fileId))
         allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
       }
     }
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 1e868fe..d74d6b5 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -115,7 +115,7 @@
         <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
         <div v-else></div>
         <div style="display: flex;align-items: center;justify-content: flex-start;">
-          <div class="base-title">流程图</div>
+          <div class="base-title" style="margin-left: 10px">流程图</div>
           <el-switch
               v-model="changeDiagram"
               style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
@@ -214,11 +214,14 @@ const showPersonnelPicker = (row, index) => {
       name: row.researchPersonnel,
       companyName: row.companyName,
     }
-    userList.value.push(userObj)
+    userList.value=[userObj]
   }
-  userPicker.value.showUserPicker()
+  nextTick(() => {
+    userPicker.value.showUserPicker()
+  })
 }
 const selected = (select) => {
+  console.log('select',select)
   if (!select || select.length === 0) {
     return
   }
@@ -228,7 +231,7 @@ const selected = (select) => {
       item.researchPersonnel = select[0].name
     }
   })
-  userList.value=select
+  // userList.value=select
 }
 const getResearchOptions = async () => {
   const res = await getResearchUser()
@@ -353,13 +356,18 @@ const handleResubmit = (instance) => {
         item.performance = null
       }
       newUsrAllocationsObj = {
+        allocationId: formData.value.allocationId,
+        id: item.id,
         projectId: item.projectId,
         projectName: item.projectName,
+        researchPersonnel: item.researchPersonnel,
         researchPersonnelId: item.researchPersonnelId,
         wagesPayable: item.wagesPayable,
         performance: item.performance,
         reserveFund: item.reserveFund,
         socialSecurity: item.socialSecurity,
+        time: item.time,
+        subtotal: item.subtotal,
         annuity: item.annuity,
         workday: item.workday,
         researchDuration: item.researchDuration,
@@ -378,9 +386,10 @@ const handleResubmit = (instance) => {
       allocationId: formData.value.allocationId,
       shareName: formData.value.shareName,
       apportionmentMonth: formData.value.apportionmentMonth,
-      usrAllocations: newUsrAllocationsObjArray,
+      usrAllocations:newUsrAllocationsObjArray,
       deploymentId: processInstanceData.value.deploymentId,
     }
+    console.log('params', params, formData.value.tableData)
     const {code, msg} = await editAllocation(params)
     ElNotification({
       title: '提示',

From 361510242cabf5f24b80da53c67dc97e86510da2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 21:38:51 +0800
Subject: [PATCH 58/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E8=A1=A8=E6=A0=BC=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../implementation/account.vue                | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 5c24d7e..3a92081 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -1,12 +1,15 @@
 <template>
-  <baseTitle title="基础信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" @selectionChange="selectionChange">
-    <template #empty>
-      <el-empty description="暂无数据"/>
-    </template>
-  </fvTable>
+  <view style="overflow-y: scroll">
+    <baseTitle title="基础信息"></baseTitle>
+    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
+    <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+    <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" @selectionChange="selectionChange">
+      <template #empty>
+        <el-empty description="暂无数据"/>
+      </template>
+    </fvTable>
+  </view>
+
 </template>
 
 <script setup lang="jsx">
@@ -326,5 +329,7 @@ const search = (val) => {
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit){
+  min-height: 400px!important;
+}
 </style>

From bbc883a116a8237d61bfc89f5cd6e09834136d94 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 21:52:33 +0800
Subject: [PATCH 59/60] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../implementation/updateTable.vue                 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index f0155eb..950611d 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -10,7 +10,7 @@
       <el-col :span="24">
         <el-form-item prop="projectChargePerson" label="项目负责人">
           {{ tableForm.projectChargePersonName }}
-          <el-button @click="showPersonnelPicker">
+          <el-button color="#DED0B2" @click="showPersonnelPicker">
             {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}
           </el-button>
         </el-form-item>
@@ -154,12 +154,14 @@ getBaseInfo()
 const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
   tableForm.value = data
-  let userObj = {
-    id: data.projectChargePerson,
-    name: data.projectChargePersonName,
-    companyName: data.companyName,
+  if(data.projectChargePersonName){
+    let userObj = {
+      id: data.projectChargePerson,
+      name: data.projectChargePersonName,
+      companyName: data.companyName,
+    }
+    userList.value.push(userObj)
   }
-  userList.value.push(userObj)
   if (code !== 1000) {
     ElNotification({
       title: '提示',

From 842fa7b782ea260d365c7ca4a01f39845d4c2fd8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 22:58:01 +0800
Subject: [PATCH 60/60] =?UTF-8?q?fix=20:=20=E4=BA=BA=E5=91=98=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86,=E4=B8=BB=E6=AC=A1=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue                  | 6 ++++--
 src/views/project-management/implementation/phase.vue       | 3 ++-
 src/views/project-management/implementation/updateTable.vue | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index d74d6b5..f0917d6 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -153,8 +153,6 @@ import {
 import {useProcessStore} from '@/stores/processStore.js';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
-import {ref} from "vue";
-
 import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 
 const userList = ref([])
@@ -213,6 +211,7 @@ const showPersonnelPicker = (row, index) => {
       id: row.researchPersonnelId,
       name: row.researchPersonnel,
       companyName: row.companyName,
+      accountType: row.accountType,
     }
     userList.value=[userObj]
   }
@@ -229,6 +228,8 @@ const selected = (select) => {
     if (index === currentIndex.value) {
       item.researchPersonnelId = select[0].id
       item.researchPersonnel = select[0].name
+      item.companyName = select[0].companyName
+      item.accountType = select[0].accountType
     }
   })
   // userList.value=select
@@ -382,6 +383,7 @@ const handleResubmit = (instance) => {
       })
       return;
     }
+    console.log('formData.value.apportionmentMonth',new Date(formData.value.apportionmentMonth))
     let params = {
       allocationId: formData.value.allocationId,
       shareName: formData.value.shareName,
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 4d8e78d..54ab532 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -163,7 +163,8 @@ const selected = (select) => {
     let userInfo = {
       id: val.id,
       name: val.name,
-      avatar: val.avatar,
+      companyName: val.companyName,
+      accountType: val.accountType,
     }
     userInfoList.push(userInfo)
   }
diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index 950611d..8cfdbd6 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -114,6 +114,8 @@ const selected = (select) => {
   for (const selectElement of select) {
     tableForm.value.projectChargePerson = selectElement.id
     tableForm.value.projectChargePersonName = selectElement.name
+    tableForm.value.companyName = selectElement.companyName
+    tableForm.value.accountType = selectElement.accountType
   }
   userList.value = select
 }
@@ -159,6 +161,7 @@ const init = async () => {
       id: data.projectChargePerson,
       name: data.projectChargePersonName,
       companyName: data.companyName,
+      accountType: data.accountType,
     }
     userList.value.push(userObj)
   }