Hua 1 lună în urmă
părinte
comite
5c5f22d1eb

+ 2 - 1
rsbuild.config.ts

@@ -70,6 +70,7 @@ export default defineConfig((env: any) => {
     resolve: {
       alias: {
         '@': './src',
+        '@widget': './src/widgets',
         'vue-video-player': './src/compat/VideoPlayer.vue',
         'vue-video-player/src/custom-theme.css':
           './src/compat/custom-theme.css',
@@ -79,7 +80,7 @@ export default defineConfig((env: any) => {
       port: 3000,
       proxy: {
         '/pdcApi': {
-          target: 'http://fa2c8ad6.natappfree.cc',
+          target: 'http://z6e64c54.natappfree.cc',
           changeOrigin: true,
           pathRewrite: {
             '^/pdcApi': '',

+ 1 - 1
src/router/moduleRoutes.js

@@ -1,4 +1,4 @@
-import { h } from 'vue';
+import { h } from 'vue';
 import { RouterView } from 'vue-router';
 import { name } from '../../package.json';
 

+ 4 - 9
src/views/PblmRectify/ywcc_index.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { h } from 'vue';
+import { Modal } from 'ant-design-vue';
 import request from '../../utils/gw_ajax_request';
 import { distinct, requestUserRole } from './Common/rectify_api';
 import { tabsForYwcc } from './Common/tabsForRectify';
@@ -70,15 +70,10 @@ export default {
   },
   methods: {
     showConfirm() {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
-        content: () =>
-          h(
-            'div',
-            { style: { color: 'red' } },
-            '问题超出5个工作日未审核,将推送公权力大数据平台预警,请知悉!',
-          ),
-        keyboard: false,
+        content: '问题超出5个工作日未审核,将推送公权力大数据平台预警,请知悉!',
+        okText: '确定',
         cancelButtonProps: { style: { display: 'none' } },
         onOk() {
           console.log('OK');

+ 1 - 1
src/views/duChaGuanLi/duChaQuYuList.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div
     style="height:100%;max-height:100%;overflow-y:auto;display:flex;flex-direction:column;justify-content:space-between;"
   >

+ 1 - 1
src/views/duChaJiHua/editDcdxInfo_common.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-modal
     title="添加督查对象"
     :open="dialogFormVisible"

+ 1 - 1
src/views/duChaJiHua/editDcdxInfo_county.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-modal title="添加督查对象" :open="dialogFormVisible" @ok="saveChange" @cancel="() => { dialogFormVisible = false, type = undefined }" width="80%">
     <a-layout>
       <a-layout-sider width="200px" style="border:1px solid #d5d5ff; background: #fff;">

+ 1 - 1
src/views/duChaJiHua/editDcdxInfo_sjzhdcjh.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-modal
     title="添加督查对象123"
     v-model:open="dialogFormVisible"

+ 1 - 1
src/views/duChaJiHua/editDczInfo.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-modal
     title="添加人员"
     :open="dialogFormVisible"

+ 2 - 0
src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangList.vue

@@ -256,6 +256,7 @@ export default {
         okType: 'warning',
         onOk: () => {
           if (type == '111') {
+            sessionStorage.setItem('Authorization', '1');
             deleteDcdxByObjid(item.objId, type, '1').then((res) => {
               if (res.success) {
                 this.getDcdxList1();
@@ -269,6 +270,7 @@ export default {
               }
             });
           } else {
+            sessionStorage.setItem('Authorization', '1');
             deleteDcdxByObjid(item.objId, type).then((res) => {
               if (res.success) {
                 this.getDcdxList1();

+ 1 - 1
src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/common.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-table
     :row-selection="{
       selectedRowKeys: selectedRowKeys,

+ 1 - 1
src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/sjzhdcjh.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-table
     :row-selection="{
       selectedRowKeys: selectedRowKeys,

+ 1 - 1
src/views/duChaJiHua/planManageProvinceNew/treeGroup.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="grid-content bg-purple tree_group" :style="{'height': treeHeight + 'px'}">
     <a-card title="分工节点" style="height: 100%">
       <!-- 左侧树 -->

+ 4 - 9
src/views/duChaTianBao/duChaTianBaoIndex_sxqfgdc.vue

@@ -261,7 +261,7 @@
 </template>
 
 <script>
-import { h } from 'vue';
+import { Modal } from 'ant-design-vue';
 import request from '../../utils/gw_ajax_request.js';
 import { dateFormat } from '../../utils/gw_date.js';
 import { exportModel } from '../../utils/gw_exportModel';
@@ -436,15 +436,10 @@ export default {
   },
   methods: {
     showConfirm() {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
-        content: () =>
-          h(
-            'div',
-            { style: { color: 'red' } },
-            '请先选择页面左侧最新年份的全覆盖督查,否则容易造成无效填报!',
-          ),
-        keyboard: false,
+        content: '请先选择页面左侧最新年份的全覆盖督查,否则容易造成无效填报!',
+        okText: '确定',
         cancelButtonProps: { style: { display: 'none' } },
         onOk() {
           console.log('OK');

+ 1 - 1
src/views/duChaTianBao/duChaTianBaoIndex_tydc.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div style="height:100%;width:100%;">
     <a-layout style="height:100%;width:100%;">
       <a-layout-sider width="320px" theme="light" style="border-right:2px solid #d5d5ff;float:left" :style="{ 'max-height': testHeight + 'px', 'height': testHeight + 'px' }">

+ 1 - 1
src/views/duChaWenTi/dcwt_ywgfzrwtcz_1.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="mainCss">
     <div class="pageRight_none">
       <a-tabs v-model="hasStat" type="card" ref="topContainer" @tabClick="handleClick">

+ 35 - 51
src/views/duChaWenTi/zgwzWenTi_all_1.vue

@@ -378,7 +378,7 @@
             </template>
             <template #nm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.nm }}</span>
                 </template>
                 <span class="ellipsis180">{{ text.nm }}</span>
@@ -386,7 +386,7 @@
             </template>
             <template #adName="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.adName }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.adName }}</span>
@@ -394,7 +394,7 @@
             </template>
             <template #objType="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.objType }}</span>
                 </template>
                 <span class="ellipsis100">{{ text.objType }}</span>
@@ -402,7 +402,7 @@
             </template>
             <template #zgDate="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.zgDate }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.zgDate }}</span>
@@ -410,7 +410,7 @@
             </template>
             <template #fileNoNumber="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.fileNoNumber }}</span>
                 </template>
                 <span class="ellipsis100">{{ text.fileNoNumber }}</span>
@@ -418,7 +418,7 @@
             </template>
             <template #inspPblmDesc="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.inspPblmDesc }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.inspPblmDesc }}</span>
@@ -426,7 +426,7 @@
             </template>
             <template #pblmSource="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.pblmSource }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.pblmSource }}</span>
@@ -434,7 +434,7 @@
             </template>
             <template #upAdName="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.upAdName }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.upAdName }}</span>
@@ -442,7 +442,7 @@
             </template>
             <template #zgMemo="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.zgMemo }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.zgMemo }}</span>
@@ -450,7 +450,7 @@
             </template>
             <template #pblmSourceTm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.pblmSourceTm }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.pblmSourceTm }}</span>
@@ -458,7 +458,7 @@
             </template>
             <template #zgWjName="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.zgWjName }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.zgWjName }}</span>
@@ -466,7 +466,7 @@
             </template>
             <template #issuedTm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.issuedTm }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.issuedTm }}</span>
@@ -474,7 +474,7 @@
             </template>
             <template #isPblmDel="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.property == '0' ? '是' : '否' }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.property == '0' ? '是' : '否' }}</span>
@@ -482,7 +482,7 @@
             </template>
             <template #pblmSggtn="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.pblmSggtn }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.pblmSggtn }}</span>
@@ -490,7 +490,7 @@
             </template>
             <template #isPdTm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.isPdTm }}</span>
                 </template>
                 <span class="ellipsis100">{{ text.isPdTm }}</span>
@@ -498,7 +498,7 @@
             </template>
             <template #firstZgTm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.firstZgTm }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.firstZgTm }}</span>
@@ -506,7 +506,7 @@
             </template>
             <template #isPdSche="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.isPdSche }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.isPdSche }}</span>
@@ -514,7 +514,7 @@
             </template>
             <template #psDlyTm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.psDlyTm }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.psDlyTm }}</span>
@@ -522,7 +522,7 @@
             </template>
             <template #applyPdTm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.applyPdTm }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.applyPdTm }}</span>
@@ -530,7 +530,7 @@
             </template>
             <template #applyFfcTm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.applyFfcTm }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.applyFfcTm }}</span>
@@ -538,7 +538,7 @@
             </template>
             <template #zgDevelopment="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.zgDevelopment }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.zgDevelopment }}</span>
@@ -546,23 +546,15 @@
             </template>
             <template #isApplyPd="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.isApplyPd }}</span>
                 </template>
                 <span class="ellipsis120">{{ text.isApplyPd }}</span>
               </a-tooltip>
             </template>
-            <template #dutyDept="text">
-              <a-tooltip placement="top">
-                <template slot="title">
-                  <span>{{ text.dutyDept }}</span>
-                </template>
-                <span class="ellipsis180">{{ text.dutyDept }}</span>
-              </a-tooltip>
-            </template>
             <template #isDeptagePd="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.isDeptagePd }}</span>
                 </template>
                 <span class="ellipsis220">{{ text.isDeptagePd }}</span>
@@ -570,7 +562,7 @@
             </template>
             <template #deptagePdEln="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.deptagePdEln }}</span>
                 </template>
                 <span class="ellipsis250">{{ text.deptagePdEln }}</span>
@@ -578,7 +570,7 @@
             </template>
             <template #zgRedefineReq="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.zgRedefineReq }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.zgRedefineReq }}</span>
@@ -586,7 +578,7 @@
             </template>
             <template #zgZgxx="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.zgZgxx }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.zgZgxx }}</span>
@@ -594,7 +586,7 @@
             </template>
             <template #zgDelayEln="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.zgDelayEln }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.zgDelayEln }}</span>
@@ -602,7 +594,7 @@
             </template>
             <template #informedNum="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.informedNum }}</span>
                 </template>
                 <span class="ellipsis200">{{ text.informedNum }}</span>
@@ -611,7 +603,7 @@
 
             <template #pblmName="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.pblmName }}</span>
                 </template>
                 <span class="ellipsis180">{{ text.pblmName }}</span>
@@ -619,7 +611,7 @@
             </template>
             <template #checkPoint="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.checkPoint }}</span>
                 </template>
                 <span class="ellipsis180">{{ text.checkPoint }}</span>
@@ -627,7 +619,7 @@
             </template>
             <template #pblmDesc="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.pblmDesc }}</span>
                 </template>
                 <span class="ellipsis180">{{ text.pblmDesc }}</span>
@@ -639,17 +631,9 @@
               <span v-if="text.inspPblmCate=='2'" style="color:#ff9599">严重</span>
               <span v-if="text.inspPblmCate=='3'" style="color:#f94c01">特别严重</span>
             </template>
-            <template #inspPblmDesc="text">
-              <a-tooltip placement="top">
-                <template slot="title">
-                  <span>{{ text.inspPblmDesc }}</span>
-                </template>
-                <span class="ellipsis200">{{ text.inspPblmDesc }}</span>
-              </a-tooltip>
-            </template>
             <template #intm="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.intm ? text.intm.substring(0, 10) : '' }}</span>
                 </template>
                 <span class="ellipsis160">{{ text.intm ? text.intm.substring(0, 10) : '' }}</span>
@@ -657,7 +641,7 @@
             </template>
             <template #zgOrgId="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ zgOrgId(text.zgOrgId) }}</span>
                 </template>
                 <span class="ellipsis160">{{ zgOrgId(text.zgOrgId) }}</span>
@@ -665,7 +649,7 @@
             </template>
             <template #dutyDept="text">
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>{{ text.dutyDept }}</span>
                 </template>
                 <span class="ellipsis180">{{ text.dutyDept }}</span>
@@ -982,7 +966,7 @@
   </div>
 </template>
 
-<script>
+<script lang="jsx">
 import { formatD, dateFormat } from '../../utils/gw_date'
 import { hostUrl } from '../../utils/global_variable.js'
 import { showDetailsXq, deleteFileById } from '../../api/duChaAPI.js'

+ 1 - 1
src/views/jicha/dialogCom/ProblemModifyCom.vue

@@ -76,7 +76,7 @@
                     </el-form-item>
                     <el-form-item label="问题分类">
                         <!-- pblmQlttvCd -->
-                        <el-select style="width:180px;" v-model="changeSupervision.pblmTypeDesc" filterable popper-class="problem_select" style="width: 88%" placeholder="请选择">
+                        <el-select v-model="changeSupervision.pblmTypeDesc" filterable popper-class="problem_select" style="width: 88%" placeholder="请选择">
                             <el-option
                             v-for="(item,index) in problemDxList"
                             :key="index"

+ 2 - 2
src/views/jicha/dialogCom/addProblemCom.vue

@@ -3,7 +3,7 @@
         :close-on-click-modal="false" class="add_problem_dialog">
         <el-form :model="form" :rules="rules" ref="form" label-width="140px" class="problem_form">
             <el-form-item label="选择问题">
-                <el-select style="width:180px;" v-model="keyword" filterable  popper-class="problem_select"
+                <el-select v-model="keyword" filterable popper-class="problem_select"
                     style="width: 88%" placeholder="请选择" @change="changeSelect">
                     <el-option v-for="item in problemList" :key="item.id" :label="item.pblmsDesc" :value="item.id">
                     </el-option>
@@ -103,7 +103,7 @@
                     </el-form-item>
                     <el-form-item label="问题分类" prop="pblmTypeDesc">
                         <!-- pblmQlttvCd -->
-                        <el-select style="width:180px;" v-model="form.pblmTypeDesc" filterable popper-class="problem_select"
+                        <el-select v-model="form.pblmTypeDesc" filterable popper-class="problem_select"
                             style="width: 88%" placeholder="请选择">
                             <el-option v-for="(item,index) in problemDxList" :key="index" :label="item" :value="item">
                             </el-option>

+ 20 - 7
src/views/jicha/inspectionIndex.vue

@@ -38,14 +38,17 @@
                             <el-tree :highlight-current="true" class="filter_tree" :data="treeDataLists"
                                 :props="defaultProps" :default-expanded-keys="defaultExpanded"
                                 :filter-node-method="filterNode" node-key="id" @node-click='treeNodeClickHandler'
+                                style="margin-left:2%"
                                 ref="tree2">
-                                <span class="custom-tree-node" #default="{ node }">
-                                    <el-tooltip v-if="node.isLeaf" class="item" effect="dark" :content="node.label"
-                                        placement="top-start">
-                                        <span>{{ node.label }}</span>
-                                    </el-tooltip>
-                                    <span v-else>{{ node.label }}</span>
-                                </span>
+                                <template #default="{ node }">
+                                    <span class="custom-tree-node">
+                                        <el-tooltip v-if="node.isLeaf" class="item" effect="dark" :content="node.label"
+                                            placement="top-start">
+                                            <span>{{ node.label }}</span>
+                                        </el-tooltip>
+                                        <span v-else>{{ node.label }}</span>
+                                    </span>
+                                </template>
                             </el-tree>
                         </el-row>
                     </el-main>
@@ -1204,6 +1207,16 @@
             color: #666;
             font-size: large;
         }
+        .el-tree-node__content {
+            overflow: hidden;
+        }
+        .custom-tree-node {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            display: block;
+            max-width: 100%;
+        }
     }
 
     .filter_tree.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {

+ 2 - 2
src/views/slzj/page_cqzgss_handclose.vue

@@ -47,7 +47,7 @@
               <template v-else-if="column.slots?.customRender === 'adjustRcordTooltip'">
                 <a-tooltip placement="topLeft" :title="text">{{ text }}</a-tooltip>
               </template>
-              <template v-else-if="column.slots?.customRender === 'action'">
+              <template v-else-if="column.dataIndex === 'action'">
                 <a-button type="primary" size="small" @click="close(record)">关闭</a-button>
               </template>
               <template v-else>
@@ -228,8 +228,8 @@ export default {
         },
         {
           title: '操作',
+          dataIndex: 'action',
           width: 100,
-          slots: { customRender: 'action' },
           align: 'center',
         },
       ],

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
src/views/xiTongGuanLi/dcdxjcxx_1.vue


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff