Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/business/deviceManagement/components/CarouselTabl.vue

@@ -1,7 +1,7 @@
 <template>
     <div style="width: 98%;height: 98%;overflow: hidden;padding: 1%;">
         <div class="title" style="vertical-align: top; height: 10%;font-size: 24px;color: white;font-weight:600;">{{ title }}</div>
-        <div v-show="showChart" style="width:100%;height: 89%;display: flex;justify-content: center;">
+        <div v-show="showChart" style="width:100%;height: 88%;display: flex;justify-content: center;">
             <dv-scroll-board :config="configData" style="width:100%;height:100%" />
         </div>
         <div v-if="!showChart" style="width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;">

src/views/business/deviceManagement/index.vue

@@ -15,39 +15,39 @@
             <dv-border-box-1>
                 <div class="vessel">
                     <div class="area">
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <middleCard v-if="mergeData[0].numData.length>0" v-model="mergeData[0].numData" :title="mergeData[0].title" :width="'98%'" :height="'98%'" />
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line1`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <pie-chart v-if="mergeData[1].numData.length>0" :title="mergeData[1].title" v-model="mergeData[1].numData" :width="'98%'" :height="'98%'" :id="1"/>
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line2`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.33%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <bar-chart v-if="mergeData[2].numData.length>0" :title="mergeData[2].title" v-model="mergeData[2].numData" :width="'98%'" :height="'98%'" :id="1" />
                         </dv-border-box-7>
                     </div>
                     <dv-decoration-2 :key="`line3`" :reverse="true" :dur="6" style="width:1%;height:100%;" />
                     <div class="area midArea">
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:41.5%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:41.5%;">
                             <entirety :title="mergeData[7].title" v-model="mergeData[7].numData" :width="'98%'" :height="'98%'"/>
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line5`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:55.9%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:56.18%;">
                             <bar-chart v-if="mergeData[3].numData.length>0" :title="mergeData[3].title" v-model="mergeData[3].numData" :width="'98%'" :height="'98%'" :id="2" />
                         </dv-border-box-7>
                     </div>
                     <dv-decoration-2 :key="`line4`" :reverse="true" :dur="6" style="width:1%;height:100%;" />
                     <div class="area">
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <bar-chart v-if="mergeData[4].numData.length>0" :title="mergeData[4].title" v-model="mergeData[4].numData" :width="'98%'" :height="'98%'" :id="3" />
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line1`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <bar-chart v-if="mergeData[5].numData.length>0" :title="mergeData[5].title" v-model="mergeData[5].numData" :width="'98%'" :height="'98%'" :id="4" />
                         </dv-border-box-7>
                         <dv-decoration-2 :key="`line1`" :dur="6" style="width:100%;height:2.5%;" />
-                        <dv-border-box-7 :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)" style="width:100%;height:31.66%;">
+                        <dv-border-box-7 :color="dvColor" :backgroundColor="dvBackColor" style="width:100%;height:31.66%;">
                             <CarouselTabl v-if="mergeData[6].numData.data.length>0" :title="mergeData[6].title" v-model="mergeData[6].numData"/> 
                         </dv-border-box-7>
                     </div>
@@ -80,6 +80,8 @@ export default {
             fontSize: 18,
             show: true,
             hoverClassAdd:'w',
+            dvColor: ['rgb(22,47,98)', 'rgba(116, 142, 194, 1)'],
+            dvBackColor: 'rgba(6, 30, 93, 0)',
             mergeData:[
                 {
                     title: '检验科各型设备分布情况',

src/views/business/testMethod/review.vue

@@ -298,7 +298,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.hand-btn{
+.main{
+    .hand-btn{
     width: 100%;
     text-align: right;
 }
@@ -331,19 +332,7 @@ export default {
     padding:10px;
     border-radius: 8px;
 }
-// .custom-input{
-//     display: inline-block;
-//     border: none; /* 移除所有边框 */
-//     outline: none; /* 移除点击时的轮廓 */
-//     border-bottom: 1px solid #ccc; /* 添加下边框 */
-// }
-/* 选中时的效果，可以根据需要调整 */
-// .custom-input:focus {
-//   border-bottom-color: #409EFF; /* 更改下边框颜色 */
-// }
-// ::v-deep .el-dialog {
-// width: 60% !important;
-// margin-top: 2vh !important;
-// height: 90% !important;
-// }
+
+}
+
 </style>

src/views/business/testMethod/reviewDialog.vue

@@ -405,7 +405,6 @@ export default {
         breakData (newValeu) {
             const sql = `select * from neng_li_fan_wei_ where id_='${newValeu}'`
             this.$common.request('sql', sql).then(res => {
-                // console.log('re121s', res)
                 this.ruleForm.xiangMuMingCheng = res.variables.data[0].jian_yan_xiang_mu
                 this.ruleForm.sheBeiMingCheng = res.variables.data[0].she_bei_
                 this.ruleForm.sheBeiBianHao = res.variables.data[0].she_bei_bian_hao_
@@ -438,6 +437,7 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+.paper-detail-dialog{
 .dialog-footer{
     text-align: center;
 }
@@ -452,10 +452,14 @@ export default {
 .review-form{
  padding: 10px;
 }
-::v-deep .el-dialog {
-width: 60% !important;
-margin-top: 2vh !important;
-height: 90% !important;
+::v-deep{
+    .el-dialog{
+        width: 60% !important;
+        margin-top: 2vh !important;
+        height: 90% !important;
+    }
+}
 }
+
 </style>
 

src/views/business/trainManagement/components/jobPlanChart.vue

@@ -2,15 +2,15 @@
   <div class="statisticsPage" :style="{width:width,height:height}">
     <div style="height:8%;font-size:24px;font-weight: 600;"> {{ title }} </div>
     <div v-show="show" style="height:92%;display:flex">
-      <div style="width:30%;display: flex;margin-top: 5%;">
+      <div style="width:30%;margin: 4% 5% 0 0;">
         <div class="leftSty">
-          <div style="width: 100%;height:20%;font-size: 20px;">自动创建培训计划</div>
-          <div style="display:flex;height: 90%;display: flex;align-items: center;width:100%">
-            <div style="width: 46%;display:flex;flex-flow: column;height: 100%;font-size: 20px;">
+          <div style="width: 100%;font-size: 2vh;">自动创建培训计划</div>
+          <div style="display:flex;display: flex;align-items: center;width:100%">
+            <div style="width: 46%;display:flex;flex-flow: column;height: 100%;font-size: 2vh;">
               <div style="line-height: 250%;color: rgb(250, 200, 88);">{{data.autoNum}}</div>
               <div style="color: rgb(250, 200, 88);">占比{{data.rate}}%</div>
             </div>
-            <div :id="'jobPie'+id" :style="{height:'100%',width:'64%'}"/>
+            <div :id="'jobPie'+id" :style="{height:'8vh',width:'64%'}"/>
           </div>
         </div>
       </div>
@@ -106,13 +106,14 @@
           title: {
             text: '近一周计划发布',
             left: 'left',
-            textStyle:{ fontSize:20,color: this.colorw }
+            textStyle:{ fontSize:18,color: this.colorw },
+            itemGap: 20
           },
           grid: {
             left: '5%',
             right: '3%',
             bottom: '15%',
-            top: '15%'
+            top: '20%'
           },
           tooltip: {
             trigger: 'axis',
@@ -137,7 +138,7 @@
               show:true,
               lineStyle:{
                   type: [15,8],
-                  color: ['#fff'],
+                  color: ['rgba(255,255,255,0.5)'],
               }
             }
           },
@@ -218,7 +219,7 @@
     background-color: rgba(84, 112, 198, 0.3);
     border-radius: 10px;
     padding: 5%;
-    height: 50%;
+    /* height: 50%; */
     display: flex;
     align-items: center;
     flex-flow: column;

src/views/business/trainManagement/components/preWorkChart.vue

@@ -125,7 +125,7 @@
               show:true,
               lineStyle:{
                   type: [15,8],
-                  color: ['#fff'],
+                  color: ['rgba(255,255,255,0.5)'],
               }
             }
           },

src/views/business/trainManagement/components/staffList.vue

@@ -90,7 +90,7 @@ export default {
 }
 .fontS{
   padding-left: 25px;
-  font-size: 20px;
+  font-size: 18px;
   font-weight: 600;
 }
 //修改的是下拉框选项内容上方的尖角

src/views/business/trainManagement/components/trainingStaffChart.vue

@@ -165,7 +165,7 @@
               show:true,
               lineStyle:{
                   type: [15,8],
-                  color: ['#fff'],
+                  color: ['rgba(255,255,255,0.5)'],
               }
             }
           },

src/views/business/trainManagement/index.vue

@@ -100,24 +100,24 @@
                     <pie-chart class="tabular" :title="mergeData[4].title" v-model="mergeData[4].numData" :width="'32%'" :height="'29%'" :id="3"/>
                 </div> -->
                 <div class="vessel">
-                    <dv-border-box-12 class="areaTop" :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)">
+                    <dv-border-box-12 class="areaTop" :color="dvColor" :backgroundColor="dvBackColor">
                         <div class="area">
                             <job-plan-chart class="merge" :title="mergeData[1].title" v-model="nowWeekData" :data="mergeData[1].numData" :width="'63%'" :height="'85%'" :id="1" />
-                            <dv-decoration-2  :color="['rgba(255, 255, 255, 0.5)']" :key="`line1`" :reverse="true" :dur="6" style="width:1%;height:85%;margin: auto;" />
+                            <dv-decoration-2  :color="dvLineColor" :key="`line1`" :reverse="true" :dur="6" style="width:1%;height:85%;margin: auto;" />
                             <pie-chart class="tabular" :title="mergeData[0].title" v-model="mergeData[0].numData" :total="mergeData[0].total" :width="'32%'" :height="'85%'" :id="1"/>
                         </div>
-                        <dv-decoration-2 :color="['rgba(255, 255, 255, 0.5)']" :key="`line4`" :dur="6" style="width:98%;height:4%;margin: auto;" />
+                        <dv-decoration-2 :color="dvLineColor" :key="`line4`" :dur="6" style="width:98%;height:4%;margin: auto;" />
                         <div class="area">
                             <training-staff-chart class="merge"  :title="mergeData[2].title" v-model="mergeData[2].numData" :data="mergeData[2].perList" :width="'63%'" :height="'85%'" :id="1" />
-                            <dv-decoration-2  :color="['rgba(255, 255, 255, 0.5)']" :key="`line2`" :reverse="true" :dur="6" style="width:1%;height:85%;margin: auto;" />
+                            <dv-decoration-2  :color="dvLineColor" :key="`line2`" :reverse="true" :dur="6" style="width:1%;height:85%;margin: auto;" />
                             <pie-chart class="tabular" :title="mergeData[3].title" v-model="mergeData[3].numData" :total="mergeData[3].total" :width="'32%'" :height="'85%'" :id="2"/>
                         </div>
                     </dv-border-box-12>
                     <div style="width:100%;height:2.64%" />
-                    <dv-border-box-12 class="areaBottom" :color="['rgb(22,47,98)', 'rgba(116, 142, 194, 1)']" backgroundColor="rgba(6, 30, 93, 0)">
+                    <dv-border-box-12 class="areaBottom" :color="dvColor" :backgroundColor="dvBackColor">
                         <div class="area" style="height:100%">
                             <pre-work-chart class="merge" :title="mergeData[5].title" v-model="mergeData[5].numData" :width="'63%'" :height="'87%'" :id="1" />
-                            <dv-decoration-2 :color="['rgba(255, 255, 255, 0.5)']" :key="`line3`" :reverse="true" :dur="6" style="width:1%;height:87%;margin: auto;" />
+                            <dv-decoration-2 :color="dvLineColor" :key="`line3`" :reverse="true" :dur="6" style="width:1%;height:87%;margin: auto;" />
                             <pie-chart class="tabular" :title="mergeData[4].title" v-model="mergeData[4].numData" :total="mergeData[4].total" :width="'32%'" :height="'87%'" :id="3"/>
                         </div>
                     </dv-border-box-12>
@@ -162,6 +162,9 @@ export default {
             dateValM:'',
             dateValY:'',
             nowWeekData: [],
+            dvColor: ['rgb(22,47,98)', 'rgba(116, 142, 194, 1)'],
+            dvLineColor: ['rgba(255, 255, 255, 0.5)'],
+            dvBackColor: 'rgba(6, 30, 93, 0)',
             dateVal: ["week","nowWeek"],
             show: true,
             options: data.options,

src/views/component/device/deviceDialog.vue

@@ -684,7 +684,8 @@ export default {
                 wenJianXiLei: '', // 附件细类
                 xiLeiId: '',
                 quanXianLeiXing: '',
-                diDian: ''
+                diDian: '',
+                buMen: '' // 图片id
                 // ceLiangGongZuo: '', // 测量/工作范围
                 // jianDingXiao: '', // 检定/校准参数
 
@@ -749,6 +750,11 @@ export default {
         }
     },
     watch: {
+        photos: {
+            handler (val) {
+                this.form.buMen = val.map(item => item.id).join(',')
+            }
+        },
         'form.xiaoZhunWuCha': {
             handler (val, old) {
                 if (!old) return
@@ -936,15 +942,6 @@ export default {
             try {
                 this.loading = true
                 await saveEquipmentCard(this.form)
-                // const paramsRecord = await this.formatForm()
-                // console.log(paramsRecord)
-                // const { variables: { cont }} = await this.$common.request('add', paramsRecord)
-                // if (cont.length > 0) {
-                //     this.$message.success('添加成功')
-                //     this.closeDialog(true)
-                // } else {
-                //     this.$message.warning('添加失败')
-                // }
                 this.$message.success('添加成功')
                 this.closeDialog(true)
                 this.loading = false
@@ -954,78 +951,6 @@ export default {
                 this.loading = false
             }
         },
-        async formatForm () {
-            const resultForm = {
-                chang_shang_: this.form.changShang,
-                gui_ge_xing_hao_: this.form.guiGeXingHao,
-                jie_shou_ri_qi_: this.form.jieShouRiQi,
-                qi_yong_ri_qi_: this.form.qiYongRiQi,
-                cun_fang_di_dian_: this.form.cunFangDiDian, // 中文
-                cun_fang_wei_zhi_: this.form.cunFangWeiZhi, // id
-                jie_shou_zhuang_tai: this.form.jieShouZhuangTai,
-                guan_li_ren_: this.form.guanLiRen,
-                wei_hu_fang_shi_: this.form.weiHuFangShi,
-                bian_zhi_ren_: this.form.bianZhiRen,
-                bian_zhi_bu_men_: this.form.bianZhiBuMen,
-                bian_zhi_shi_jian: this.form.bianZhiShiJian,
-                shi_fou_guo_shen_: '已完成',
-                she_bei_lei_xing_: this.form.sheBeiLeiXing,
-                she_bei_zhuang_ta: this.form.sheBeiZhuangTa,
-                she_bei_shi_bie_h: this.form.sheBeiShiBieH,
-                shi_fou_xiao_zhun: this.form.shiFouXiaoZhun,
-                gong_ying_shang_: this.form.gongYingShang, // 中文
-                shi_fou_qi_jian_h: this.form.shiFouQiJianH, // id
-                lian_xi_fang_shi_: this.form.lianXiFangShi,
-                xiao_zhun_you_xia: this.form.xiaoZhunYouXia,
-                chu_chang_ri_qi_: this.form.chuChangRiQi,
-                she_bei_ming_cheng_: this.form.sheBeiMingCheng, // 中文
-                she_bei_ming_chen: this.form.sheBeiMingChen, // id
-                yi_xiao_ri_qi_: this.form.yiXiaoRiQi,
-                he_cha_xiao_zhun_: this.form.heChaXiaoZhun,
-                shi_ji_shi_yong_f: this.form.shiJiShiYongF,
-                kai_shi_shi_yong_: this.form.kaiShiShiYong,
-                zheng_shu_bian_ha: this.form.zhengShuBianHa,
-                xiao_zhun_wu_cha_: this.form.xiaoZhunWuCha,
-                xiao_zhun_z_q_: this.form.xiaoZhunZQ,
-                yuan_she_bei_bian: this.form.yuanSheBeiBian,
-                jian_kong_yi_ju_: this.form.jianKongYiJu,
-                bi_xu_de_huan_jin: this.form.biXuDeHuanJin,
-                bi_xu_she_shi_: this.form.biXuSheShi,
-                zi_chan_yuan_zhi_: this.form.ziChanYuanZhi,
-                zi_chan_bian_hao_: this.form.ziChanBianHao,
-                shi_fou_wei_hu_: this.form.shiFouWeiHu,
-                ji_shen_xu_hao_: this.form.jiShenXuHao,
-                yan_shou_ri_qi_: this.form.yanShouRiQi,
-                huan_jing_yao_qiu: this.form.huanJingYaoQiu,
-                dian_yuan_yao_qiu: this.form.dianYuanYaoQiu,
-                zhu_ce_zheng_hao_: this.form.zhuCeZhengHao,
-                yqzp: this.form.yqzp,
-                fa_piao_: this.form.faPiao,
-                fu_jian_shang: this.form.fuJianShang,
-                bei_zhu_: this.form.beiZhu,
-                cai_gou_he_tong_: this.form.caiGouHeTong,
-
-                zhuan_ye_bu_men_: this.form.zhuanYeBuMen,
-                wen_jian_xi_lei_: this.form.wenJianXiLei,
-                xi_lei_id_: this.form.xiLeiId,
-                quan_xian_lei_xin: this.form.quanXianLeiXing
-            }
-            const paramsRecord = { tableName: 't_sbdj' }
-            if (this.isEdit) {
-                paramsRecord.updList = [{
-                    where: {
-                        id_: this.params.id
-                    },
-                    param: resultForm
-                }]
-            } else {
-                paramsRecord.paramWhere = [{
-                    ...resultForm,
-                    di_dian_: this.level
-                }]
-            }
-            return paramsRecord
-        },
         async subForm (id, table, parentData) {
             const sql1 = `select id_ from ${table} where parent_id_='${id}'`
             const { variables: { data }} = await this.$common.request('sql', sql1)
@@ -1050,41 +975,9 @@ export default {
             try {
                 this.loading = true
                 await saveEquipmentCard(this.form)
-                // const paramsRecord = await this.formatForm()
-                // console.log(paramsRecord)
-                // const list1 = await this.subForm(this.params.id, 't_whzqjxm', this.$refs.MaintenanceRef.listDataCopy)
-                // const list2 = await this.subForm(this.params.id, 't_fssbjpjb', this.$refs.MoreDevicesRef.listDataCopy)
-                // console.log('维护项目', list1)
-                // console.log('附属设备', list2)
-                // 1.更新主表
-
-                // await this.$common.request('update', paramsRecord)
                 this.$message.success('修改成功')
                 this.closeDialog(true)
                 this.loading = false
-                // 2.更改维护项目表
-                // if (list1.add_list.length > 0) {
-                //     const addParams = {
-                //         tableName: 't_whzqjxm',
-                //         paramWhere: list1.add_list.map(item => {
-                //             return {
-                //                 parent_id_: this.params.id,
-                //                 wei_hu_xiang_mu_c: item.weiHuXiangMuC,
-                //                 wei_hu_ri_qi_: item.weiHuRiQi,
-                //                 wei_hu_lei_xing_: item.weiHuLeiXing,
-                //                 ri_qi_shu_zi_: item.riQiShuZi
-                //             }
-                //         })
-                //     }
-                //     await this.$common.request('add', addParams)
-                //     console.log('维护项目新增成功')
-                // }
-                // if (list1.update_list.length > 0) {
-                //     const updateParamsRecord = {
-                //         tableName: 't_whzqjxm',
-                //
-                //     }
-                // }
             } catch (error) {
                 this.$message.warning(error.message)
                 this.loading = false

src/views/component/fileTraining/fileDialog.vue

@@ -26,24 +26,26 @@
         <el-row class="row">
             <el-col :span="12">
                 <el-row>
-                    <el-col :span="5" class="nameClass">修订人：</el-col>
+                    <el-col v-if="digData.cao_zuo_lei_xing_=='新增'" :span="5" class="nameClass">创建人：</el-col>
+                    <el-col v-else :span="5" class="nameClass">修订人：</el-col>
                     <el-col :span="19" class="contentClass">{{ digData?(digData.fileInfos.CREATOR_NAME_?digData.fileInfos.CREATOR_NAME_:'/'):'/' }}</el-col>
                 </el-row>
             </el-col>
             <el-col :span="12">
                 <el-row>
-                    <el-col :span="5" class="nameClass">修订日期：</el-col>
+                    <el-col v-if="digData.cao_zuo_lei_xing_=='新增'" :span="5" class="nameClass">创建日期：</el-col>
+                    <el-col v-else :span="5" class="nameClass">修订日期：</el-col>
                     <el-col :span="19" class="contentClass">{{ digData?(digData.fileInfos.CREATE_TIME_?formattedTimestamp(digData.fileInfos.CREATE_TIME_):'/'):'/' }}</el-col>
                 </el-row>
             </el-col>
         </el-row>
-        <el-row v-if="fileIndex>0" class="row">
-            <el-col :span="12" class="nameClass">修订内容：</el-col>
-            <el-col :span="12" class="contentClass">{{ digData.xiu_ding_nei_rong?digData.xiu_ding_nei_rong:'/' }}</el-col>
+        <el-row v-if="digData.cao_zuo_lei_xing_=='修订'" class="row">
+            <el-col :span="3" class="nameClass">修订内容：</el-col>
+            <el-col :span="21" class="contentClass">{{ digData.xiu_ding_nei_rong?digData.xiu_ding_nei_rong:'/' }}</el-col>
         </el-row>
-        <el-row v-if="fileIndex>0" class="row">
-            <el-col :span="12" class="nameClass">修订原因：</el-col>
-            <el-col :span="12" class="contentClass">{{ digData.yuan_yin_?digData.yuan_yin_:'/' }}</el-col>
+        <el-row v-if="digData.cao_zuo_lei_xing_=='修订'" class="row">
+            <el-col :span="3" class="nameClass">修订原因：</el-col>
+            <el-col :span="21" class="contentClass">{{ digData.yuan_yin_?digData.yuan_yin_:'/' }}</el-col>
         </el-row>
         <el-table
             :data="listData"
@@ -54,7 +56,7 @@
             style="width: 100%;padding:10px;"
         >
             <el-table-column
-                label="姓名"
+                label="用户"
                 width="300"
             >
                 <template slot-scope="scope">
@@ -62,7 +64,7 @@
                 </template>
             </el-table-column>
             <el-table-column
-                label="阅读时间"
+                label="最近阅读时间"
                 width="300"
             >
                 <template slot-scope="scope">
@@ -70,7 +72,7 @@
                 </template>
             </el-table-column>
             <el-table-column
-                label="阅读时长"
+                label="累计阅读时长"
             >
                 <template slot-scope="scope">
                     <span style="margin-left: 10px">{{ formatDuration(scope.row.shi_chang_) }}</span>
@@ -114,7 +116,8 @@ export default {
             listData: [],
             currentPage: 1,
             pageSize: 10,
-            timer: null
+            timer: null,
+            controlShow: false
         }
     },
     watch: {
@@ -148,7 +151,7 @@ export default {
         setInterfaceTime () {
             this.timer = setTimeout(() => {
                 this.$emit('pause')
-            }, 5000)
+            }, 30000)
         },
         formattedTimestamp (timestamp) {
             const date = new Date(timestamp)
@@ -163,6 +166,7 @@ export default {
             // 格式化日期
             return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
         },
+
         // id转name
         changUserName (id) {
             const user = this.userList.find(item => item.userId === id)

src/views/component/fileTraining/index.vue

@@ -59,9 +59,14 @@
                             :timestamp="activity.fa_fang_shi_jian_"
                             @click.stop.native="toggleActive(activity, index)"
                         >
+                            <!-- <div>
+                                <el-tooltip class="item" effect="dark" placement="right-end" :content="showContent(activity,index)">
+                                    <div>版本号:{{ activity.ban_ben_ }}/修订人：{{ activity.fileInfos.CREATOR_NAME_ }}==={{ activity.bian_zhi_ren_ }}</div>
+                                </el-tooltip>
+                            </div> -->
                             <div>
                                 <el-tooltip class="item" effect="dark" placement="right-end" :content="showContent(activity,index)">
-                                    <div>版本号:{{ activity.ban_ben_ }}/修订人：{{ activity.fileInfos.CREATOR_NAME_ }}</div>
+                                    <div>版本号:{{ activity.ban_ben_ }}/修订人：{{ getUserName(activity.bian_zhi_ren_) }}</div>
                                 </el-tooltip>
                             </div>
                         </el-timeline-item>
@@ -196,11 +201,11 @@ export default {
         //         this.tmpId = val.id
         //         this.upFunc = val.func
         //         const data = {
-        //             ext: val.fileInfos.EXT_,
-        //             fileName: val.fileInfos.FILE_NAME_,
-        //             id: val.fileInfos.ID_,
-        //             index: 0,
-        //             totalBytes: val.fileInfos.TOTAL_BYTES_
+        //             ext: val.fileInfos.EXT_,// 文件类型
+        //             fileName: val.fileInfos.FILE_NAME_,// 文件名称
+        //             id: val.fileInfos.ID_,// 文件id
+        //             index: 0,// 当前文件索引
+        //             totalBytes: val.fileInfos.TOTAL_BYTES_// 文件大小
         //         }
         //         // 1、获取文件数据 及下载流接口
         //         this.optionFile.url = BASE_API() + SYSTEM_URL() + '/file/download?attachmentId=' + data.id
@@ -284,10 +289,18 @@ export default {
         this.checkDialogBody()
     },
     methods: {
+
+        getUserName (data) {
+            const user = this.userList.find(item => item.userId === data)
+            return user ? user.userName : '未知用户'
+        },
         showContent (activity, index) {
-            if (index <= 0) {
-                return '第一版'
+            if (activity.cao_zuo_lei_xing_ === '新增') {
+                return '第一版本'
             }
+            // if (index <= 0) {
+            //     return '第一版'
+            // }
             return activity.xiu_ding_nei_rong ? activity.xiu_ding_nei_rong : '无修订原因'
         },
 
@@ -298,6 +311,7 @@ export default {
                 this.startTimer()
             }
         },
+
         closeDialog () {
             const fvView = this.$refs.fvView
             // 销毁子组件方法
@@ -347,11 +361,24 @@ export default {
             }
         },
         // 本人修改
+        // id转换
+        async idChange (id) {
+            const sql = `select id_ FROM t_wjxxb WHERE shu_ju_lai_yuan_ = '${id}'`
+            return new Promise((resolve, reject) => {
+                this.$common.request('sql', sql).then((res) => {
+                    const { data = [] } = res.variables || {}
+                    const firstId = data[0]?.id_
+                    resolve(firstId) // 解析 Promise 时返回 firstId
+                }).catch(error => {
+                    reject(error) // 捕获错误并拒绝 Promise
+                })
+            })
+        },
+
         toggleActive (activity, index) {
             this.digData = activity
             clearInterval(this.clearTimeSet)
             this.browseTime = 0
-            // console.log('activity', activity)
             this.curFileName = activity.FILE_NAME_
             this.fileShow(activity)// 展示内容改变
             this.checkNum(activity)// 阅读量
@@ -360,12 +387,14 @@ export default {
         },
         // 阅读量函数
         checkNum (activity) {
-            const sql1 = `select * from t_wjcyjl where parent_id_= '${activity.id}' order by create_time_ desc`
-            this.$common.request('sql', sql1).then((res) => {
+            const sql = `select t_wjcyjl.* from t_wjcyjl
+                INNER JOIN t_wjxxb ON t_wjcyjl.parent_id_ = t_wjxxb.id_
+                WHERE t_wjxxb.shu_ju_lai_yuan_ = '${activity.id}' order by create_time_ desc`
+            // const sql1 = `select * from t_wjcyjl where parent_id_= '${activity.id}' order by create_time_ desc`
+            this.$common.request('sql', sql).then((res) => {
                 const { data = [] } = res.variables || {}
                 this.lookNum = data.length
                 this.showList = data
-                // console.log('showList', this.showList)
             })
         },
         handleUpdate (fileId, time) {
@@ -391,8 +420,6 @@ export default {
         lookFile () {
             // console.log(document.querySelector('iframe').contentWindow.document)
             // console.log(document.querySelector('iframe').contentWindow.document.body.innerHTML);
-            // console.log('查看文件', this.digData)
-            // console.log('leftData', this.leftData)
             if (this.digData) {
                 this.checkNum(this.digData)
             } else {
@@ -407,10 +434,9 @@ export default {
             const curRole = this.role.map(i => i.alias)
             const isPower = curRole.some(item => roleKey.includes(item))
             if (this.isSuper || isPower) {
-                console.log('this.leftData[0]', this.leftData[0])
                 const deleteParams = {
                     tableName: 't_wjxxb',
-                    paramWhere: { id_: this.leftData[0].id }
+                    paramWhere: { id_: this.leftData[0].zId }
                 }
                 curdPost('delete', deleteParams).then(() => {
                     this.$message({
@@ -439,9 +465,12 @@ export default {
             a.remove()
         },
         fileShow (val) {
+            // console.log('qwqwqw', this.idChange('1166703356459089920'))
             this.dialogVisible = this.visible
             this.title = `文件：《${val.FILE_NAME_}》`
-            this.tmpId = val.id
+            this.idChange(val.id).then(res => {
+                this.tmpId = res
+            })
             this.upFunc = val.func
             const data = {
                 ext: val.fileInfos.EXT_,
@@ -463,6 +492,14 @@ export default {
                 this.refresh = true
             })
         },
+        // 排序函数
+        sortByFabushijianDesc (data) {
+            return data.sort((a, b) => {
+                const dateA = new Date(a.fa_fang_shi_jian_)
+                const dateB = new Date(b.fa_fang_shi_jian_)
+                return dateB - dateA // 降序排序
+            })
+        },
         formattedTimestamp (timestamp) {
             const date = new Date(timestamp)
             // 获取年月日时分秒

src/views/component/formTemplate/index.vue

@@ -328,13 +328,13 @@ export default {
                 ...this.form,
                 liu_cheng_shu_ju_: JSON.stringify({
                     hasProcess: this.form.shen_pi_liu_cheng === '需要审批' ? 'Y' : 'N',
-                    nodeList: this.subForm.map((item, index) => ({
+                    nodeList: this.form.shen_pi_liu_cheng === '需要审批' ? this.subForm.map((item, index) => ({
                         sn: index + 1,
                         nodeName: item.jie_dian_ming_cheng_,
                         conditionType: item.fang_shi_,
                         executeType: item.yong_hu_lei_xing_,
                         executor: item.chu_li_ren_
-                    }))
+                    })) : []
                 })
 
             }

src/views/infosManage/fileIE.vue

@@ -232,7 +232,7 @@ import noColectPng from '@/assets/images/icons/noColect.png'
 import wordPng from '@/assets/images/icons/word.png'
 import fileTraining from '@/views/component/fileTraining'
 import column from '@/components/ibps-crud/mixin/column'
-// import updateFille from './updateFile.vue'
+import UpdateFile from './updateFile.vue'
 
 export default {
     components: {
@@ -442,7 +442,6 @@ export default {
         // 外部文件更新
         updateDate (data) {
             this.sonData = data
-            console.log('data', data)
             this.dialogVisible1 = true
             this.dialogForm.wen_jian_lei_xing = data.row.wen_jian_xi_lei_
             this.dialogForm.wen_jian_bian_hao = data.row.wen_jian_bian_hao
@@ -480,7 +479,6 @@ export default {
             let wheres3 = '' // 受限
 
             let start = ''
-            //   console.log('this.$store.getters',this.$store.getters)
             const positionsDatas = this.$store.getters.userInfo.positions
             const needSelType = []
             if (this.$store.getters.userInfo.positions === 0) {
@@ -564,7 +562,6 @@ export default {
         WHERE wj.shi_fou_guo_shen_ ='有效' and ((sq.cha_yue_jie_zhi_s >DATE_FORMAT(NOW(), '%Y-%m-%d')) OR (sq.cha_yue_jie_zhi_s =DATE_FORMAT(NOW(), '%Y-%m-%d')))
         and wj.quan_xian_xin_xi_ like '%${this.userId}%'  ${wheres3} `
             const sqlArr = [comSql, buMenSql, authoritySql]
-            // console.log('sqlArr', sqlArr)
             let oldRecordSql = ''
             const buMenWhere = []
             if (this.pageKey !== 'nbwj') {
@@ -590,13 +587,9 @@ export default {
                     needSelType.push(`(${sqlArr[i]})`)
                 }
             }
-            // console.log('this.fileTypesDatas', this.fileTypesDatas)
-            //   console.log('needSelType',needSelType)
             const fileSearchSql = needSelType.join('union all')
-            // console.log('fileSearchSql', fileSearchSql)
             const sql = this.pageKey === 'nbwj' ? `select sq.* from (${fileSearchSql}) sq ORDER BY sq.wen_jian_bian_hao DESC,sq.wen_jian_ming_che DESC` : oldRecordSql
             // console.log('sql------------：', sql)
-            // console.log('sql121', sql)
             curdPost('sql', sql).then(res => {
                 const tableDatas = res.variables.data
                 this.selectListData = JSON.parse(JSON.stringify(tableDatas))
@@ -619,6 +612,7 @@ export default {
                 this.listData = []
             })
         },
+
         refreshData () {
             this.listData = []
             this.getSearcFormData()
@@ -631,14 +625,21 @@ export default {
             return columns.filter(column => column.prop !== prop)
         },
         handleNodeClick (nodeId, nodeData, treeDatas) {
-            if ((nodeData.id === '1174299180374425600' || nodeData.parentId === '1174299180374425600') && this.$store.getters.isSuper) {
-                this.showCaoZuoColumn = true
-                if (!this.hasColumnByProp(this.listConfig.columns, 'cao_zuo')) {
-                    this.listConfig.columns.push({ prop: 'cao_zuo', label: '操作', slotName: 'caozuo', width: 100 })
-                }
-            } else {
-                this.showCaoZuoColumn = false
-                this.listConfig.columns = this.removeColumnByProp(this.listConfig.columns, 'cao_zuo')
+            if (nodeData.name !== '文件分类') {
+                const pathId = nodeData.path.split('.')
+                const sql = `select ID_ from ibps_cat_type where type_key_= 'skwbwj'`
+                this.$common.request('sql', sql).then(res => {
+                    const { data = [] } = res.variables || {}
+                    if (pathId.includes(data[0].ID_) && this.$store.getters.isSuper) {
+                        this.showCaoZuoColumn = true
+                        if (!this.hasColumnByProp(this.listConfig.columns, 'cao_zuo')) {
+                            this.listConfig.columns.push({ prop: 'cao_zuo', label: '操作', slotName: 'caozuo', width: 100 })
+                        }
+                    } else {
+                        this.showCaoZuoColumn = false
+                        this.listConfig.columns = this.removeColumnByProp(this.listConfig.columns, 'cao_zuo')
+                    }
+                })
             }
             this.show = 'detail'
             this.addDataCont = { fenLei: nodeData.name, fenLeiId: nodeId }
@@ -671,7 +672,6 @@ export default {
             if (nodeData.children === undefined) {
                 const authorityName = JSON.parse(nodeData.authorityName)
                 fileTypes.push(nodeId)
-                // console.log('fileTypes', fileTypes)
                 if (authorityName.chaYue === '公用查阅') {
                     this.fileTypesDatas.comAuthority.push(nodeId)
                 }
@@ -836,7 +836,6 @@ export default {
             this.refreshData()
         },
         handleClickTag (val) {
-            console.log('val', val)
             // const sql = `select * from ibps_file_attachment where id_= '${val.fu_jian_}'`
             // this.$common.request('sql', sql).then(res => {
             //     console.log('res', res)
@@ -849,35 +848,70 @@ export default {
             //     this.fileInfos = { id: val.id, FILE_NAME_: val.wen_jian_ming_che, fileInfos: data[0], func: this.handleUpdate, ban_ben_: val.ban_ben_ }
             //     this.dialogVisible = true
             // 本人修改
+            // console.log('文件修订', val)
             this.fileArray = []
-            this.handleFileInfo(val)
+            // this.handleFileInfo(val)
             const sql1 = `select t_wjxxb.*, t_wjxzxdjlb.xiu_ding_ban_ben_, t_wjxzxdjlb.xiu_ding_nei_rong,t_wjxzxdjlb.yuan_yin_
             from  t_wjxxb
             INNER JOIN t_wjxzxdjlb ON  t_wjxxb.shu_ju_lai_yuan_ = t_wjxzxdjlb.id_ WHERE  tou_ban_wen_jian_='${val.id}' AND t_wjxxb.shi_fou_guo_shen_='有效'`
-            // const sql1 = `select * from t_wjxxb WHERE tou_ban_wen_jian_='${val.id}'`
-            this.$common.request('sql', sql1).then(res => {
-                console.log('res测试', res)
+            // 1
+            const sql = `select wjxzxdjlb.* FROM t_wjxxb wjxxb 
+            LEFT JOIN t_wjxzxdjlb wjxzxdjlb ON 
+            wjxxb.wen_jian_fu_jian_ = wjxzxdjlb.wen_jian_fu_jian_
+            WHERE wjxxb.id_ = '${val.id}' ORDER BY wjxzxdjlb.create_time_ DESC`
+            this.$common.request('sql', sql).then(res => {
                 const list = res.variables.data
                 list.forEach(el => {
-                    const obj = { id: el.id_, wen_jian_ming_che: el.wen_jian_ming_che, fu_jian_: el.wen_jian_fu_jian_, xiu_ding_nei_rong: el.xiu_ding_nei_rong, yuan_yin_: el.yuan_yin_, xiu_ding_ban_ben_: el.xiu_ding_ban_ben_, ban_ben_: el.ban_ben_, wen_jian_bian_hao: el.wen_jian_bian_hao, fa_fang_shi_jian_: el.fa_fang_shi_jian_
+                    const obj = {
+                        zId: val.id,
+                        id: el.id_,
+                        wen_jian_ming_che: el.wen_jian_ming_che,
+                        ban_ben_: el.ban_ben_,
+                        fu_jian_: el.wen_jian_fu_jian_,
+                        xiu_ding_nei_rong: el.xiu_ding_nei_rong,
+                        yuan_yin_: el.yuan_yin_,
+                        fa_fang_shi_jian_: el.bian_zhi_shi_jian,
+                        xiu_ding_ban_ben_: el.xiu_ding_ban_ben_, xiu_ding_wen_jian_: el.xiu_ding_wen_jian_,
+                        wen_jian_bian_hao: el.wen_jian_bian_hao,
+                        bian_zhi_ren_: el.bian_zhi_ren_,
+                        cao_zuo_lei_xing_: el.cao_zuo_lei_xing_
                     }
                     this.handleFileInfo(obj)
                 })
                 this.dialogVisible = true
             })
+            /**
+             * ban_ben_(版本)
+             * xiu_ding_bian_hao(修订编号)
+             * xiu_ding_wen_jian_ (修订文件)
+             * xiu_ding_ban_ben_(修订版本)
+             * xiu_ding_nei_rong(修订内容)
+             * yuan_yin_(原因)
+             * fa_fang_shi_jian_(发放时间，共用)
+             * {id_:el.id_,wen_jian_ming_che:el.xiu_ding_wen_jian_ ban_ben_:el.ban_ben_,wen_jian_ming_che:el.xiu_ding_nei_rong:el.xiu_ding_nei_rong,yuan_yin_:el.yuan_yin_,xiu_ding_ban_ben_:el.xiu_ding_ban_ben_,xiu_ding_wen_jian_:el.xiu_ding_wen_jian_,fu_j}
+             */
+            // 1
+            // this.$common.request('sql', sql1).then(res => {
+            //     console.log('res测试', res)
+            //     const list = res.variables.data
+            //     list.forEach(el => {
+            //         const obj = { id: el.id_, wen_jian_ming_che: el.wen_jian_ming_che, fu_jian_: el.wen_jian_fu_jian_, xiu_ding_nei_rong: el.xiu_ding_nei_rong, yuan_yin_: el.yuan_yin_, xiu_ding_ban_ben_: el.xiu_ding_ban_ben_, ban_ben_: el.ban_ben_, wen_jian_bian_hao: el.wen_jian_bian_hao, fa_fang_shi_jian_: el.fa_fang_shi_jian_
+            //         }
+            //         this.handleFileInfo(obj)
+            //     })
+            //     this.dialogVisible = true
+            // })
         },
         handleFileInfo (val) {
-            console.log('val121212', val)
             const sql = `select * from ibps_file_attachment where id_= '${val.fu_jian_}'`
             this.$common.request('sql', sql).then(res => {
-                console.log('res', res)
                 this.fileInfos = {}// 本人添加
                 const { data = [] } = res.variables || {}
                 if (!data.length) {
                     this.$message.warning('没有可查阅的文件，请查明原因！')
                     return
                 }
-                this.fileInfos = { id: val.id, FILE_NAME_: val.wen_jian_ming_che, fileInfos: data[0], func: this.handleUpdate, ban_ben_: val.ban_ben_, xiu_ding_nei_rong: val.xiu_ding_nei_rong ? val.xiu_ding_nei_rong : '', yuan_yin_: val.yuan_yin_ ? val.yuan_yin_ : '', xiu_ding_ban_ben_: val.xiu_ding_ban_ben_ ? val.xiu_ding_ban_ben_ : '', wen_jian_bian_hao: val.wen_jian_bian_hao, fa_fang_shi_jian_: val.fa_fang_shi_jian_ }
+                this.fileInfos = { id: val.id, FILE_NAME_: val.wen_jian_ming_che, fileInfos: data[0], func: this.handleUpdate, ban_ben_: val.ban_ben_, xiu_ding_nei_rong: val.xiu_ding_nei_rong ? val.xiu_ding_nei_rong : '', yuan_yin_: val.yuan_yin_ ? val.yuan_yin_ : '', xiu_ding_ban_ben_: val.xiu_ding_ban_ben_ ? val.xiu_ding_ban_ben_ : '', wen_jian_bian_hao: val.wen_jian_bian_hao, fa_fang_shi_jian_: val.fa_fang_shi_jian_, bian_zhi_ren_: val.bian_zhi_ren_, cao_zuo_lei_xing_: val.cao_zuo_lei_xing_, zId: val.zId }
                 this.fileArray.push(this.fileInfos)
             })
         },

src/views/platform/examination/exam/edit.vue

@@ -611,12 +611,12 @@ export default {
             const params = type === 'add' ? addParams : updateParams
             this.$common.request(type, params).then(() => {
                 this.$message.success(this.id ? '修改考试成功' : '新建考试成功')
-                this.closeDialog()
+                this.closeDialog(true)
             })
         },
         // 关闭当前窗口
-        closeDialog () {
-            this.$emit('close', false)
+        closeDialog (refresh) {
+            this.$emit('close', false, refresh)
         }
     }
 }

src/views/platform/examination/exam/list.vue

@@ -44,7 +44,7 @@
             :visible.sync="showEditDialog"
             :is-disabled="examInfo.state !== '未发布'"
             @callback="search"
-            @close="visible => showEditDialog = visible"
+            @close="dialogClose"
         />
         <exam-detail
             v-if="showDetailDialog"
@@ -213,6 +213,13 @@ export default {
         this.loadData()
     },
     methods: {
+        // 组件关闭事件
+        dialogClose (visible, refresh) {
+            this.showEditDialog = visible
+            if (refresh) {
+                this.loadData()
+            }
+        },
         // 加载数据
         loadData () {
             this.loading = true
@@ -627,7 +634,7 @@ export default {
                         id_: examId
                     },
                     param: {
-                        examState: '已取消'
+                        zhuang_tai_: '已取消'
                     }
                 }]
             }