Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/api/system/public.js

@@ -1,10 +1,11 @@
 import request from '@/utils/request'
 
 // 查询部门下拉树结构
-export function deptTreeSelect() {
+export function deptTreeSelect(removeId) {
   return request({
     url: '/system/dept/deptTree',
-    method: 'get'
+    method: 'get',
+    params:removeId
   })
 }
 

src/components/ImageListPreview/index.vue

@@ -39,6 +39,7 @@ export default {
   data() {
     return {
       fileList: [],
+      previewSrcList:[]
     }
   },
   watch: {
@@ -48,10 +49,12 @@ export default {
         if(newVal){
         const list = Array.isArray(newVal) ? newVal : this.value.split(",");
         this.fileList = list.map((url) => ({ name: url, url }));
+        this.previewSrcList=list.map((url) => url);
         console.log("this.fileList",this.fileList);
       }        
         else{
           this.fileList =[];
+          this.previewSrcList=[];
         }
       },
     },

src/components/K-FileUpload/index.vue

@@ -22,9 +22,8 @@
       <!-- <el-button size="mini" type="primary">{{ btnName }}</el-button> -->
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
-        请上传
-        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
-        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b></template>
+        文件<template v-if="fileSize">大小不超过<b style="color: #f56c6c">{{ fileSize }}MB</b></template>
+        <template v-if="fileType"> 格式为<b style="color: #f56c6c">{{ fileType.join("/") }}</b></template>
         的文件
       </div>
     </el-upload>
@@ -101,6 +100,11 @@ export default {
           // 首先将值转为数组
           const list = Array.isArray(val) ? val : this.value.split(',');
           console.log("watch fileList", list)
+          if(list.length>this.limit)
+          {
+            this.handleExceed();
+            return;
+          }
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
@@ -118,6 +122,7 @@ export default {
             return item;
           });
           this.fileValueList=[...this.fileList];
+          this.$emit("input", this.listToTagObj(this.fileValueList));
         } else {
           this.fileList = [];
           this.fileValueList=[];

src/components/layoutContainer/index.vue

@@ -66,7 +66,7 @@ export default {
 
   display: flex;
   .leftBar {
-    min-width: 250px;
+    min-width: 300px;
     // overflow: scroll;
   }
   .rightBar {

src/components/orgTreeSelect/index.vue

@@ -139,6 +139,7 @@ export default {
     defaultNode: {
       immediate: true,
       handler(n) {
+        if(!n || n.length === 0)return;
         this.nodes = this.defaultNode;
         this.$nextTick(() => {
           let arr = [];
@@ -147,8 +148,6 @@ export default {
             arr.push(node.data)
           })
           this.sNodeList = arr;
-          this.$refs.tree.e
-          console.log(arr,'arr')
         });
       },
     },
@@ -161,12 +160,6 @@ export default {
         }
       },
     },
-    sNodeList:{
-      deep: true,
-      handler(){
-        this.$emit("selectNode", JSON.stringify(this.sNodeList));
-      },
-    },
     queryData: {
       handler(n) {
         if (n) {
@@ -191,17 +184,15 @@ export default {
     //   defaultNode:
     //   //pv: sync("value"),
     // },
-    model: {
-      prop: "defaultNode",
-      event: "change",
-    },
+
   },
-    methods: {
+  methods: {
       clear() {
         this.sNodeList = [];
         this.$refs.tree.setCheckedKeys([]);
         this.$refs.tree.setCurrentKey(null);
-        //this.$emit("selectNode", JSON.stringify(this.sNodeList));
+        this.nodes = [];
+        this.$emit("selectNode", JSON.stringify(this.sNodeList));
       },
       //筛选条件变化
       serchTreeHandler() {
@@ -247,7 +238,7 @@ export default {
         }
         // debugger;
         this.sNodeList = this.$refs.tree.getCheckedNodes();
-        //this.$emit("selectNode", JSON.stringify(this.sNodeList));
+        this.$emit("selectNode", JSON.stringify(this.sNodeList));
       },
       recursionTreeHandler(type, tree) {
         tree.forEach((item) => {
@@ -274,7 +265,10 @@ export default {
         }
       },
     },
-
+  model: {
+    prop: "defaultNode",
+    event: "selectNode",
+  },
 };
 </script>
 

src/components/table/gx.search.table.vue

@@ -198,7 +198,9 @@ export default {
   },
   created() {},
   mounted() {
-    if (this.list && !this.manual) {
+    //console.log("gx mounted",this.list,this.manual)
+    // this.list &&
+    if ( !this.manual) {
       this.load(this.searchData)
     }
   },

src/views/core/accessPlan/index.vue

@@ -45,7 +45,7 @@
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" v-hasPermi="['core:accessPlan:list']">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
@@ -88,7 +88,7 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['core:accessPlan:edit']">修改</el-button>
+                v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">修改</el-button>
               <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0" icon="el-icon-add"
                 @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -98,7 +98,7 @@
         </el-table>
 
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+             @pagination="getList" />
       </el-col>
 
     </el-row>
@@ -250,7 +250,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
     // listRole().then(response => {
     //   this.roleList = response.rows;
     // });
@@ -346,6 +346,8 @@ export default {
     getDeptTree() {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
+
+        this.handleQuery();
       });
     },
     /** 重置按钮操作 */

src/views/core/edu/plan/dialog.select.file.vue

@@ -13,8 +13,7 @@
         ref="st"
         url="/core/materials/fileList"
         method="post"
-        :search-data="search"
-        :manual="true"
+        :search-data="search"        
         :pageable="true"
         :select="true"
         :select-default="selectList"
@@ -45,7 +44,7 @@
           >
           <template slot-scope="scope">
             <template v-if="scope.row.fileList">
-              <el-tag size="mini" type="success" v-for="(item, index) in scope.row.fileList"
+              <el-tag style="cursor: pointer;margin-right: 5px;" size="mini" type="success" effect="plain" @click="downLoadFile(JSON.parse(item).url)" v-for="(item, index) in scope.row.fileList"
                       :key="index">
                 {{ JSON.parse(item).name }}
               </el-tag>
@@ -118,9 +117,21 @@ export default {
         title: null,
         fileName: null,
         orgId:this.$store.getters.orgId,
-        t:new Date(),
+        // t:new Date(),
       };
     },
+    downLoadFile(url)
+    {
+        if(process.env.VUE_APP_BASE_API!=='/')
+        {
+          url=process.env.VUE_APP_BASE_API+url;
+        }        
+        const a = document.createElement("a");
+        a.setAttribute("download", name);
+        a.setAttribute("target", "_blank");
+        a.setAttribute("href", url);
+        a.click();
+    }
   },
   mounted() {
 

src/views/core/edu/plan/index.vue

@@ -219,8 +219,12 @@
                                        placeholder="请选择培训机构"/>
                         </el-form-item>-->
             <el-form-item v-show="form.execOrgType" label="培训机构" prop="planExecOrgIdList">
-              <org-tree-select v-model="form.planExecOrgIdList" :queryData="form.execOrgType" ref="orgTreeSelect"
-                               @selectNode="queryNode" :disable="true">
+              <org-tree-select
+                v-model="form.planExecOrgIdList"
+                :queryData="form.execOrgType"
+                ref="orgTreeSelect"
+                @selectNode="queryNode"
+                :disable="true">
               </org-tree-select>
             </el-form-item>
           </el-col>
@@ -527,6 +531,12 @@ export default {
       const id = row.id || this.ids
       getPlan(id).then(response => {
         this.form = response.data;
+
+       //将 this.form.planExecOrgIdList中的元素转为字符串
+        if(this.form.planExecOrgIdList == null){
+          this.form.planExecOrgIdList = [];
+        }
+        this.form.planExecOrgIdList = this.form.planExecOrgIdList.map(element => element.toString());
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
         this.title = "修改教育培训计划";
@@ -594,10 +604,13 @@ export default {
     },
     fileSelected(list) {
       if (!list) return;
+      let tempArry=[];
       list.forEach(x => {
-        this.form.fileList = this.form.fileList.concat(x.fileList);
+        tempArry=tempArry.concat(x.fileList);
       })
-
+      console.log("fileSelected",tempArry);
+      //this.form.fileList=this.form.fileList.concat(tempArry);
+      this.formFileListDefualtValue =this.form.fileList.concat(tempArry);
     },
   }
 };

src/views/core/edu/task/dialog.info.vue

@@ -218,24 +218,25 @@ export default {
             xhr.send();
         },
        saveAs(blob, filename) {
-            // if (window.navigator.msSaveOrOpenBlob) {
-            //     navigator.msSaveBlob(blob, filename);
-            // } else {
-               // var link = document.createElement("a");
-                //var body = document.querySelector("body");
+             console.log("saveAs",blob,filename)
+            if (window.navigator.msSaveOrOpenBlob) {
+                navigator.msSaveBlob(blob, filename);
+            } else {
+               var link = document.createElement("a");
+                var body = document.querySelector("body");
 
-                // link.href = window.URL.createObjectURL(blob);
-                // link.download = filename;
-                //
-                // // fix Firefox
-                // link.style.display = "none";
-                // body.appendChild(link);
-                //
-                // link.click();
-                // body.removeChild(link);
+                link.href = window.URL.createObjectURL(blob);
+                link.download = filename;
+                
+                // fix Firefox
+                link.style.display = "none";
+                body.appendChild(link);
+                
+                link.click();
+                body.removeChild(link);
 
-               // window.URL.revokeObjectURL(link.href);
-         //   }
+               window.URL.revokeObjectURL(link.href);
+           }
         },
         // 事件
         //apimark//

src/views/core/edu/task/index.vue

@@ -291,7 +291,7 @@ export default {
       if(row.status>0) return false;
       if(!row.taskRoleList)   return false;
       let isOver =this.isNotOverOrUnStart(row);
-      console.log("isNotOverOrUnStart",isOver);
+      // console.log("isNotOverOrUnStart",isOver);
       row.taskRoleList.forEach((taskRole) => {
         this.$store.getters.roleList.forEach((role) => {
           if (taskRole.roleId == role.roleId) {
@@ -308,7 +308,7 @@ export default {
       const endDate = dayjs(row.endDate).startOf('day'); // 转换结束时间为 Moment.js 对象，并将时分秒部分设置为00时00分00秒
       // 判断开始时间和结束时间是否是同一天
       const isSameDay = startDate.isSame(endDate, 'day');
-      console.log("isOverOrUnStart",currentTime,startDate,endDate);
+      // console.log("isOverOrUnStart",currentTime,startDate,endDate);
       // 如果是同一天，则判断当前时间是否在开始时间和结束时间之间（包括开始和结束时间）
       // if (isSameDay) {
       //   return dayjs(currentTime).isBetween(startDate, endDate, null, '[]');

src/views/information/configuration/index.vue

@@ -11,7 +11,7 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业前提醒：" prop="front">
 
-              <el-input-number size="mini" style="width: 70%;" v-model="day.font" @change="handleChange" :min="1"
+              <el-input-number size="mini" style="width: 70%;" v-model="day.front" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
               分钟
 
@@ -20,30 +20,32 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业中提醒：" prop="centre">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+              <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业后提醒：" prop="after">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+              <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="全天提醒：" prop="allDay">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+              <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
         </el-row>
+
       </div>
     </el-form>
-    <el-form :model="week" :rules="rules" ref="week" label-width="130px">
+
+    <el-form :model="week" :rules="rules" ref="week" label-width="200px">
       <div class="form-item">
         <el-row>
           <el-col :xs="24" :sm="12" :md="8" :lg="4">
@@ -51,16 +53,17 @@
               每周履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" style="width: 70%" v-model="num" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
-              天
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="week.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
+  
     <el-form :model="month" :rules="rules" ref="month" label-width="130px">
       <div class="form-item">
         <el-row>
@@ -69,13 +72,13 @@
               每月履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
-              天
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="month.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -87,12 +90,13 @@
               每季履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="season.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -104,12 +108,13 @@
               半年履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="halfYear.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -121,18 +126,19 @@
               每年履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="year.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
     <div style="margin-top: 50px; margin-left: 42%">
       <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
-  <!--    <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button> -->
+      <!--    <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button> -->
     </div>
   </div>
 </template>
@@ -144,20 +150,41 @@ export default {
   components: {},
   data() {
     return {
-    
+
       num: 1,
       day: {
         resumptionCycle: 1,
         allDay: null,
+        front: null,
         centre: null,
         after: null,
-        timeUnit: null,
+        timeUnit: 1,
+      },
+      week: {
+        resumptionCycle: 2,
+        allDay: null,
+        timeUnit: 2
+      },
+      month: {
+        resumptionCycle: 3,
+        allDay: null,
+        timeUnit: 2
+      },
+      season: {
+        resumptionCycle: 4,
+        allDay: null,
+        timeUnit: 2
+      },
+      halfYear: {
+        resumptionCycle: 5,
+        allDay: null,
+        timeUnit: 2
+      },
+      year: {
+        resumptionCycle: 6,
+        allDay: null,
+        timeUnit: 2
       },
-      week: {},
-      month: {},
-      season: {},
-      halfYear: {},
-      year: {},
 
       rules: {
         name: [
@@ -221,7 +248,7 @@ export default {
       },
     }
   },
-  
+
   watch: {},
   computed: {},
   beforeCreate() { },
@@ -231,60 +258,44 @@ export default {
   beforeUpdate() { },
   updated() { },
   destroyed() { },
-  
+
   methods: {
     request() { },
     handleChange(value) { },
     hello() {
       alert("来自预设逻辑代码的问候")
     },
-    
-    // saveExtend() {
-    //   // this.formData.userId = this.$route.params.userId;
-
-    //   this.$refs['form'].validate((valid) => {
-    //     if (valid) {
-    //       extendUserInformation(this.formData).then(res => {
-    //         this.$message.success('保存成功！')
-    //         this.$router.go(-1)
-    //       })
-    //     }
-    //   });
 
-    // },
-    checkForm(form){
+    checkForm(form) {
       let val
       this.$refs[form].validate(valid => {
-        console.log(valid,'valid')
+        console.log(valid, 'valid')
         val = valid
       });
       return val;
     },
     saveExtend() {
-    
-      let arr = ['day','week','month','season','halfYear','year'];
+
+      let arr = ['day', 'week', 'month', 'season', 'halfYear', 'year'];
       let flags = [];
-      arr.forEach(v=>{
+      arr.forEach(v => {
         flags.push(this.checkForm(v));
       });
-      console.log(flags,'flags')
-      let flag = flags.every(v=>{
-        console.log(v,'valid')
+      console.log(flags, 'flags')
+      let flag = flags.every(v => {
+        console.log(v, 'valid')
         return v == true;
       })
-      console.log(flag,'flag')
-      if(!flag) return;
-      let coreResumptionConfiguration = {
-        0:this.day,
-     1: this.week,
-     2: this.month
+      console.log(flag, 'flag')
+      if (!flag) return;
+      let data = {
+
+        coreResumptionConfiguration: [this.day, this.week, this.month,this.season,this.halfYear,this.year]
       };
-      
-      insertConfiguration(coreResumptionConfiguration).then(response=>{
-        debugger
-            this.$modal.msgSuccess("新增成功");
-          this.open = false;
-        
+      insertConfiguration(data).then(response => {
+        this.$modal.msgSuccess("新增成功");
+        this.open = false;
+
       })
     }
   },
@@ -309,4 +320,5 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-}</style>
+}
+</style>

src/views/system/bind/index.vue

@@ -23,7 +23,7 @@
           </el-form-item>
 
           <el-form-item label="标签编号" prop="code">
-            <el-input v-model="queryParams.code" placeholder="请输入标签编号" clearable @keyup.enter.native="handleQuery" />
+            <el-input maxlength="50" v-model="queryParams.code" placeholder="请输入标签编号" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
 
 

src/views/system/dept/index.vue

@@ -596,17 +596,18 @@ export default {
       });
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    async handleUpdate(row) {
       this.reset();
       getDept(row.id).then((response) => {
         this.form = response.data;
         this.pId = response.data.parentId;
-        this.open = true;
-        this.title = "编辑";
       });
       if (this.pId != -1) {
-        listDeptExcludeChild(row.id).then((response) => {
-          this.deptOptions2 = this.handleTree(response.data, "id");
+        await deptTreeSelect({removeId:row.parentId,id:row.id}).then((response) => {
+          this.deptOptions2 = response.data;
+          // this.defaultKeys.push(response.data[0].id);
+          this.open = true;
+          this.title = "编辑";
         });
       }
     },

src/views/system/device/index.vue

@@ -75,7 +75,7 @@
               <dict-tag :options="dict.type.sys_device_type" :value="scope.row.deviceType" />
             </template>
           </el-table-column>
-          <el-table-column label="设备品牌" align="center" prop="deviceName" />
+          <el-table-column label="设备名称" align="center" prop="deviceName" />
           <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
           <el-table-column label="有效期至" align="center" prop="checkTime" width="160">
           </el-table-column>
@@ -349,7 +349,6 @@ export default {
         this.deviceList = response.rows;
         this.total = response.total;
         this.loading = false;
-        console.log(this.form, '66666')
       });
     },
 

src/views/system/workTimeSet/workTime.vue

@@ -59,8 +59,7 @@
                 v-model="queryParams.isEnable"
                 placeholder="请选择"
                 clearable
-                style="width: 240px"
-              >
+                style="width: 240px">
                 <el-option
                   v-for="dict in dict.type.sys_business_type"
                   :key="dict.value"
@@ -246,6 +245,7 @@ export default {
     },
     /** 下穿状态改变*/
     changeCheckBox(){
+      this.queryParams.checkSub=!this.queryParams.checkSub;
       this.getList();
     },
     /** 查询列表 */