神东6.0审批，报表bug修改-提交

src/views/vent/home/billboard/components/ContentD.vue

@@ -1,19 +1,19 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <CommonTitle class="mb-10px" label="测试" value="是我啊" />
-  <CommonTable :columns="COLUMN_A" :data="[{ a: 1, b: 2, c: 3 }]" />
+  <!-- <CommonTitle class="mb-10px" label="测试" value="是我啊" />
+  <CommonTable :columns="COLUMN_A" :data="[{ a: 1, b: 2, c: 3 }]" /> -->
 </template>
 <script lang="ts" setup>
-  import { computed, ref } from 'vue';
-  import BaseCard from './components/BaseCard.vue';
-  import ArrowButton from './components/ArrowButton.vue';
-  import CommonTable from './components/CommonTable.vue';
-  import CommonTitle from './components/CommonTitle.vue';
-  import { BILLBOARDS, COLUMN_A } from './billboard.data';
-  import ListItemA from './components/ListItemA.vue';
-  import ListItemB from './components/ListItemB.vue';
-  import ListItemC from './components/ListItemC.vue';
-  import FileOverview from './components/FileOverview.vue';
+  // import { computed, ref } from 'vue';
+  // import BaseCard from './components/BaseCard.vue';
+  // import ArrowButton from './components/ArrowButton.vue';
+  // import CommonTable from './components/CommonTable.vue';
+  // import CommonTitle from './components/CommonTitle.vue';
+  // import { BILLBOARDS, COLUMN_A } from './billboard.data';
+  // import ListItemA from './components/ListItemA.vue';
+  // import ListItemB from './components/ListItemB.vue';
+  // import ListItemC from './components/ListItemC.vue';
+  // import FileOverview from './components/FileOverview.vue';
   // import mapComponent from './components/3Dmap/index.vue';
 </script>
 <style lang="less" scoped></style>

src/views/vent/monitorManager/deviceMonitor/index.vue

@@ -13,7 +13,7 @@
   import { ref, onMounted, watch } from 'vue';
   import DeviceVue from './components/device/index.vue';
   import Network from './components/network/index.vue';
-  import Emergency from './components/emergency/index.vue';
+  // import Emergency from './components/emergency/index.vue';
   import { getActions } from '/@/qiankun/state';
   import { useRoute } from 'vue-router';
   import { onBeforeUnmount } from 'vue';

src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -498,7 +498,7 @@
   import { message } from 'ant-design-vue';
   import { useCamera } from '/@/hooks/system/useCamera';
   import { CaretRightOutlined } from '@ant-design/icons-vue';
-  import ConditionAssistance from './components/conditionAssistance.vue';
+  // import ConditionAssistance from './components/conditionAssistance.vue';
   import { DownloadOutlined } from '@ant-design/icons-vue';
   import reportInfo from '../comment/components/reportInfo.vue';
   import { save, reportList } from '../../reportManager/reportManager.api';

src/views/vent/performance/approvalPend/approvalPend.data.ts

@@ -8,54 +8,51 @@ export const  columns:BasicColumn[]=[
   },
   {
     title: '文件名称',
-    dataIndex: 'areaName',
-    key: 'areaName',
+    dataIndex: 'fileName',
+    key: 'fileName',
     align: 'center',
     ellipsis: true,
   },
   {
     title: '文件类型',
-    dataIndex: 'warnLevel_dictText',
-    key: 'warnLevel_dictText',
+    dataIndex: 'fileSuffix',
+    key: 'fileSuffix',
     align: 'center',
     ellipsis: true,
-    width: 110,
   },
   {
     title: '文件来源',
-    dataIndex: 'zhType',
-    key: 'zhType',
+    dataIndex: 'fileType_dictText',
+    key: 'fileType_dictText',
     align: 'center',
     ellipsis: true,
   },
   {
     title: '上传时间',
-    dataIndex: 'isLk',
-    key: 'isLk',
+    dataIndex: 'createTime',
+    key: 'createTime',
     align: 'center',
     ellipsis: true,
   },
   {
     title: '审批状态',
-    dataIndex: 'remarks',
-    key: 'remarks',
+    dataIndex: 'bpmStatus_dictText',
+    key: 'bpmStatus_dictText',
     align: 'center',
     ellipsis: true,
-    width:110
   },
   {
     title: '当前审批人',
-    dataIndex: 'suggestMsg',
-    key: 'suggestMsg',
+    dataIndex: 'createBy',
+    key: 'createBy',
     align: 'center',
     ellipsis: true,
-    width: 110,
-  },
-  {
-    title: '操作',
-    key: 'action',
-    width: 400,
-    slots: { customRender: 'action' },
-    align: 'center',
   },
+  // {
+  //   title: '操作',
+  //   key: 'action',
+  //   width: 200,
+  //   slots: { customRender: 'action' },
+  //   align: 'center',
+  // },
 ]

src/views/vent/performance/approvalPend/index.vue

@@ -52,7 +52,9 @@ function pageChange(val){
     getNowUserAgencyDataList()
 }
 //查看
-function getViews(){}
+function getViews(){
+    
+}
 watch(()=>props.selected,(newV,oldV)=>{
     console.log(newV,'newV---=======')
     selectedParam=newV

src/views/vent/performance/comment/HistorySp.vue

@@ -14,7 +14,7 @@
         <div class="bottom-box">
             <div class="box-title">实时流程图</div>
             <div class="box-content">
-                <img :src="imgSrc" alt="">
+                <img :src="imgSrcs" alt="" @error="showerrimg">
             </div>
         </div>
         <!-- 审批通过弹窗 -->
@@ -37,6 +37,7 @@ import { ref, reactive, defineProps, watch } from 'vue'
 import { columns } from './comment.data'
 import { pass, back } from './comment.api'
 import { message } from 'ant-design-vue';
+import errorImg from '../../../../assets/images/errorImg.png'
 let props = defineProps({
     historySpList: {
         type: Array,
@@ -80,9 +81,15 @@ let passDes = ref('')
 let visibleBh = ref(false)
 let rejectDes = ref('')
 
+let imgSrcs = ref('')
+
 
 let emit = defineEmits(['spClose',])
 
+function showerrimg() {
+    imgSrcs.value = errorImg;
+}
+
 //审批通过
 function getPass() {
     visibleTg.value = true
@@ -133,6 +140,10 @@ watch(() => props.spInfo, (newV, oldV) => {
     spInfos = Object.assign({}, newV)
 }, { immediate: true, deep: true })
 
+watch(() => props.imgSrc, (newV, oldV) => {
+    imgSrcs.value = newV
+}, { immediate: true, deep: true })
+
 </script>
 
 <style lang="less" scoped>
@@ -177,12 +188,12 @@ watch(() => props.spInfo, (newV, oldV) => {
             height: calc(100% - 30px);
 
             img {
-             width: 498px;
-             height: 236px;
-             position: absolute;
-             left: 50%;
-             top: -130px;
-             transform: translate(-72%,0);
+                width: 498px;
+                height: 236px;
+                position: absolute;
+                left: 50%;
+                top: -130px;
+                transform: translate(-72%, 0);
             }
         }
     }

src/views/vent/performance/comment/NormalTable.vue

@@ -4,13 +4,13 @@
       <template #action="{ record }">
         <!-- <TableAction :actions="getActions(record)" :dropDownActions="getDropDownAction(record)" /> -->
         <a class="table-action-link" @click="handleTo(record)">提交</a>
+        <a class="table-action-link" @click="handleSpDetail(record)">审批详情</a>
+        <a class="table-action-link" @click="handleSpRevoke(record)">撤回</a>
         <a class="table-action-link" @click="handleEdit(record)">编辑</a>
+        <a class="table-action-link" @click="handleDownLoad(record)">下载</a>
         <a-popconfirm title="确定删除?" @confirm="handleDelete(record)">
           <a class="table-action-link">删除</a>
         </a-popconfirm>
-        <a class="table-action-link" @click="handleDownLoad(record)">下载</a>
-        <a class="table-action-link" @click="handleSpDetail(record)">审批详情</a>
-        <a class="table-action-link" @click="handleSpRevoke(record)">撤回</a>
       </template>
       <template #bodyCell="{ column, record }">
         <slot name="filterCell" v-bind="{ column, record }"></slot>
@@ -74,8 +74,10 @@ const props = defineProps({
   },
   //查询参数
   searchParam: {
-    type: String,
-    default: '',
+    type: Object,
+    default:()=>{
+      return {}
+    },
   },
   //菜单树传递参数
   nodeParam: {
@@ -187,7 +189,8 @@ const { tableContext, doRequest } = useListPage({
     beforeFetch: (params) => {
       params.parentId = props.nodeParam.id ? props.nodeParam.id : '';
       params.selectFlag = props.nodeParam.id ? false : true;
-      params.likeFileName = props.searchParam ? props.searchParam : '';
+      params.likeFileName = props.searchParam.fileName ? props.searchParam.fileName : '';
+      params.fileSuffix = props.searchParam.fileType ? '.'+ props.searchParam.fileType : '';
       params.bpmStatus = props.selfParam.bpmStatus ? props.selfParam.bpmStatus : '';
       params.sysOrgCode = props.selfParam.sysOrgCode ? props.selfParam.sysOrgCode : '';
     },
@@ -235,6 +238,7 @@ function handleSpDetail(data) {
 //审批详情-审批历史列表
 async function getHistoricFlowNewList(params) {
   let res = await historicFlowNew({ ...params })
+  console.log(res,'res99999999999999')
   if (res.length != 0) {
     historySpList.length = 0
     res.forEach(el => {

src/views/vent/performance/endEd/endEd.data.ts

@@ -8,54 +8,52 @@ export const  columns:BasicColumn[]=[
   },
   {
     title: '文件名称',
-    dataIndex: 'areaName',
-    key: 'areaName',
+    dataIndex: 'fileName',
+    key: 'fileName',
     align: 'center',
     ellipsis: true,
   },
   {
     title: '文件类型',
-    dataIndex: 'warnLevel_dictText',
-    key: 'warnLevel_dictText',
+    dataIndex: 'fileSuffix',
+    key: 'fileSuffix',
     align: 'center',
     ellipsis: true,
-    width: 110,
   },
   {
     title: '文件来源',
-    dataIndex: 'zhType',
-    key: 'zhType',
+    dataIndex: 'fileType_dictText',
+    key: 'fileType_dictText',
     align: 'center',
     ellipsis: true,
   },
   {
-    title: '上传时间',
-    dataIndex: 'isLk',
-    key: 'isLk',
+    title: '创建人',
+    dataIndex: 'createBy',
+    key: 'createBy',
     align: 'center',
     ellipsis: true,
   },
   {
-    title: '审批状态',
-    dataIndex: 'remarks',
-    key: 'remarks',
+    title: '上传时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
     align: 'center',
     ellipsis: true,
-    width:110
   },
   {
-    title: '当前审批人',
-    dataIndex: 'suggestMsg',
-    key: 'suggestMsg',
+    title: '审批状态',
+    dataIndex: 'bpmStatus_dictText',
+    key: 'bpmStatus_dictText',
     align: 'center',
     ellipsis: true,
-    width: 110,
-  },
-  {
-    title: '操作',
-    key: 'action',
-    width: 400,
-    slots: { customRender: 'action' },
-    align: 'center',
   },
+ 
+  // {
+  //   title: '操作',
+  //   key: 'action',
+  //   width: 200,
+  //   slots: { customRender: 'action' },
+  //   align: 'center',
+  // },
 ]

src/views/vent/performance/fileDetail/index.vue

@@ -25,14 +25,19 @@
       </div>
       <div class="right-box">
         <div class="search">
-          <a-input v-model:value="fileName" placeholder="请输入文件名称" />
-          <a-button type="primary" preIcon="ant-design:search-outlined" @click="onSearch">查询</a-button>
+          <span style="color:#fff">文件名称：</span>
+          <a-input v-model:value="searchForm.fileName" placeholder="请输入文件名称" :disabled="activeKey!='1'" />
+          <span style="color:#fff">文件类型：</span>
+          <a-select v-model:value="searchForm.fileType" placeholder="请选择..." style="width:220px;margin-right:20px" :disabled="activeKey!='1'">
+            <a-select-option v-for="item in filetypeList" :value="item.value">{{ item.label }}</a-select-option>
+          </a-select>
+          <a-button type="primary" preIcon="ant-design:search-outlined" @click="onSearch" :disabled="activeKey!='1'">查询</a-button>
           <a-button type="primary" style="float: right; margin-right: 20px" @click="openModal(true)">文件上传</a-button>
         </div>
         <div class="list">
           <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange">
             <a-tab-pane key="1" tab="全部">
-              <NormalTable :key="alive" :submitInfo="submitInfo" :selfParam="selfParam" :searchParam="fileName"
+              <NormalTable :key="alive" :submitInfo="submitInfo" :selfParam="selfParam" :searchParam="searchForm"
                 :nodeParam="nodeParam" :columns="columns" :list="getTree" :deleteById="deleteById" :downLoad="downLoad"
                 designScope="file-detail" title="文件详情" />
             </a-tab-pane>
@@ -92,7 +97,22 @@ let selfParam = reactive({
 });
 let router = useRouter(); //路由
 const { createMessage } = useMessage();
-let fileName = ref('');
+let searchForm = reactive({
+  fileName: '',
+  fileType: ''
+})
+let filetypeList = reactive<any[]>([
+  { label: 'txt', value: 'txt' },
+  { label: 'doc', value: 'doc' },
+  { label: 'docx', value: 'docx' },
+  { label: 'xls', value: 'xls' },
+  { label: 'xlsx', value: 'xlsx' },
+  { label: 'ppt', value: 'ppt' },
+  { label: 'pptx', value: 'pptx' },
+  { label: 'jpg', value: 'jpg' },
+  { label: 'png', value: 'png' },
+  { label: 'pdf', value: 'pdf' },
+])
 let fileList = reactive<any[]>([]); //上传文件列表
 // let uploadParam = reactive({}); //上传文件参数
 let nodeParam = reactive({}); //点击树节点时传递的参数
@@ -201,10 +221,11 @@ let list2trees = (data) => {
 let getTypeTableList = async () => {
   let parentId = nodeParam.id || '';
   let selectFlag = nodeParam.id ? false : true;
-  let likeFileName = fileName.value || '';
+  let likeFileName = searchForm.fileName || '';
+  let fileSuffix=searchForm.fileType || '';
   let bpmStatus = selfParam.bpmStatus || '';
   let sysOrgCode = selfParam.sysOrgCode || '';
-  let res = await getTree({ parentId: parentId, selectFlag: selectFlag, likeFileName: likeFileName, bpmStatus: bpmStatus, sysOrgCode: sysOrgCode });
+  let res = await getTree({ parentId: parentId, selectFlag: selectFlag, likeFileName: likeFileName,fileSuffix:'.'+fileSuffix, bpmStatus: bpmStatus, sysOrgCode: sysOrgCode });
   console.log(res, 'tableList--------------------');
 };
 
@@ -413,14 +434,25 @@ onMounted(() => {
 
 ::v-deep .zxm-input {
   width: 220px;
-  height: 28px;
+  height: 30px;
   background: transparent;
   border: 1px solid #31bccc;
   color: #fff;
-  margin: 0px 20px;
+  margin-right: 20px;
   border-radius: 5px;
 }
 
+::v-deep .zxm-select:not(.zxm-select-customize-input) .zxm-select-selector{
+  height: 30px !important;
+  background: transparent !important;
+  border: 1px solid #31bccc !important;
+  border-radius: 5px !important;
+  color: #fff !important;
+}
+::v-deep .zxm-select-single.zxm-select-show-arrow .zxm-select-selection-item{
+  color: #fff !important;
+}
+
 ::v-deep .zxm-btn-group {
   margin-right: 25px;
 }

src/views/vent/reportManager/comment/NormalTable.vue

@@ -89,7 +89,7 @@ let reportId = ref('')//历史记录列表传参
 const emit = defineEmits(['saveAdd']);
 const record = reactive({});
 const columnList = getTableHeaderColumns('');
-let visibleUp = ref(false)
+let visibleUp = ref(0)
 let resetTable = ref(0)
 let optionLists = reactive<any[]>([])
 //列表查询参数
@@ -109,6 +109,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls, doRequest } = useList
     showTableSetting: false,
     // size: 'small',
     // bordered: false,
+    scroll: { y: 650 },
     formConfig: {
       showAdvancedButton: true,
       // labelWidth: 100,
@@ -138,7 +139,7 @@ const [registerTable, { reload, getForm }, { rowSelection, selectedRowKeys }] =
 
 //报表或模板上传
 function handleUpload() {
-  visibleUp.value = true
+  visibleUp.value = new Date().getTime()
 }
 function resetUpload() {
   resetTable.value = new Date().getTime()
@@ -151,7 +152,9 @@ async function getQueryList() {
   if (res.length != 0) {
     optionLists.length = 0
     res[0].children.forEach(el => {
-      optionLists.push({ label: el.itemText, value: el.id })
+      if(el.itemValue!='needQ' && el.itemValue!='majorpath' ){
+        optionLists.push({ label: el.itemText, value: el.itemValue })
+      }
     })
   }
 }

src/views/vent/reportManager/comment/common/tempUpload.vue

@@ -44,8 +44,8 @@ import { useMessage } from '/@/hooks/web/useMessage';
 
 let props = defineProps({
     visibleUp: {
-        type: Boolean,
-        default: false
+        type: Number,
+        default: 0
     }
 })
 
@@ -114,9 +114,7 @@ let handleRemove = (file) => {
 
 watch(() => props.visibleUp, (newV, oldV) => {
     fileList.length = 0
-    visibleUpload.value = newV
-}, {
-    immediate: true
+    visibleUpload.value = !visibleUpload.value
 })
 </script>
 

src/views/vent/reportManager/index.vue

@@ -167,6 +167,7 @@ onMounted(() => {
       box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
       -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
       -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
+      overflow-y: auto;
 
       // lxh
       .iconfont {