Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -344,6 +344,7 @@ export default {
       let newData = { page: 1 };
       Object.keys(data).forEach((item) => {
         let val = data[item];
+        console.log(item,this.search)
         this.search.forEach((obj) => {
           if (
             obj.name === item &&
@@ -363,6 +364,7 @@ export default {
         });
         newData[item] = this.decodeVal(val);
       });
+     
       return newData;
     },
     decodeVal(val) {

attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue

 <template>
   <div class="page">
-    <div style="margin:10px 0">
+    <div >
       <tab-pane
         :thirdList="thirdList"
         :activeName="activeName"
@@ -66,14 +66,14 @@
         @click="lookexportHis"
         >导出记录</el-button
       >
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="setdialog"
         >表格设置</el-button
-      >
+      > -->
     </LayoutTable>
     <drawer-show ref="drawerform" @ok="getData" />
     <!-- 导出记录查看 -->

attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue

@@ -18,13 +18,13 @@
                 type="success"
                 @click="lookexportHis"
             >导出记录</el-button>
-            <el-button
+            <!-- <el-button
                 slot="table-head-left2"
                 style="margin-left: 10px"
                 icon="el-icon-tickets"
                 size="mini"
                 @click="setdialog"
-            >表格设置</el-button>
+            >表格设置</el-button> -->
         </LayoutTable>
         <dialog-show ref="dialogform" @ok="getData" />
         <!-- 表格设置 -->

attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue

@@ -56,7 +56,7 @@
                         <el-form-item label="问卷封面：" label-width="125px">
                             <div style="display: flex;align-items: center;">
                                 <img style="width:80px; height: 80px; margin-right: 10px;cursor: pointer;"
-                                    v-for="(i, j) in coverImg" :key="j" :src="ImgUrl + '/' + i.url" alt=""
+                                    v-for="(i, j) in coverImg" :key="j" :src="showImgUrl + '/' + i.url" alt=""
                                     :class="selImg == j ? 'selImg' : ''" @click="selImg = j">
                                 <el-upload v-show="coverImg.length < 4" :action="ImgUrl + '/attendance/file/commonupload'"
                                     accept="image/jpeg,image/png,image/jpg" list-type="picture-card" class="upload"
@@ -185,6 +185,7 @@ export default {
             editStyle: false,
             loadingstate: false,
             ImgUrl: process.env.VUE_APP_API_BASE_URL,
+            showImgUrl:'',
             coverImg: [],
 
             weblink: 0,
@@ -198,6 +199,13 @@ export default {
             }
         }
     },
+    created(){
+        if(process.env.NODE_ENV == "development"){
+            this.showImgUrl= process.env.VUE_APP_API_BASE_URL
+        }else{
+            this.showImgUrl=''
+        }
+    },
     mounted() {
         console.log(process.env.VUE_APP_API_BASE_URL)
         this.getDeptData()

attendance-performance-manager-ui/admin/src/views/job/drawershow.vue

@@ -4,36 +4,83 @@
     :title="title"
     :visible.sync="open"
     :direction="direction"
-            size="50%">
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="padding:20px">
+    size="50%"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="120px"
+      style="padding:20px"
+    >
       <el-row>
-                <Field v-if="from == 'job'" label="分组" prop="groupId" v-model="form.groupId" 
-                :enumData="dict.group" type="select" placeholder="请选择分组"/>
+        <Field
+          v-if="from == 'job'"
+          label="分组"
+          prop="groupId"
+          v-model="form.groupId"
+          :enumData="dict.group"
+          type="select"
+          placeholder="请选择分组"
+        />
 
-                <Field label="分组名称" prop="groupName" v-model="form.groupName" placeholder="请输入分组名称" :maxLength="10" v-if="from == 'group'"/>
+        <Field
+          label="分组名称"
+          prop="groupName"
+          v-model="form.groupName"
+          placeholder="请输入分组名称"
+          :maxLength="10"
+          v-if="from == 'group'"
+        />
 
-                <Field label="职位编码" prop="jobCode" :maxLength="10" v-model="form.jobCode" placeholder="请输入职位编码" v-if="from == 'job'"/>
-                <Field label="职位名称" prop="jobName" :maxLength="10" v-model="form.jobName" placeholder="请输入职位名称" v-if="from == 'job'" />
+        <Field
+          label="职位编码"
+          prop="jobCode"
+          :maxLength="10"
+          v-model="form.jobCode"
+          placeholder="请输入职位编码"
+          v-if="from == 'job'"
+        />
+        <Field
+          label="职位名称"
+          prop="jobName"
+          :maxLength="10"
+          v-model="form.jobName"
+          placeholder="请输入职位名称"
+          v-if="from == 'job'"
+        />
 
-                <Field label="类型" disabled prop="type" v-model="form.type" type="select" :enumData="dict.type" placeholder="请选择类型"/>
-                <Field label="备注" prop="remark" :maxLength="50" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
+        <Field
+          label="类型"
+          disabled
+          prop="type"
+          v-model="form.type"
+          type="select"
+          :enumData="dict.type"
+          placeholder="请选择类型"
+        />
+        <Field
+          label="备注"
+          prop="remark"
+          :maxLength="50"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="请输入备注"
+        />
       </el-row>
-            <form-buttons @submit='submitForm' noCancelBtn />
+      <form-buttons @submit="submitForm" noCancelBtn />
     </el-form>
-
   </el-drawer>
 </template>
 
 <script>
-    import form from "@/assets/mixins/formdialog";
-    export default {
+import form from "@/assets/mixins/formdialog";
+export default {
   name: "JobDetail",
   mixins: [form],
-        components: {
-
-        },
+  components: {},
   created() {
-            this.changePath("job")
+    this.changePath("job");
   },
   data() {
     return {
@@ -43,48 +90,46 @@
       title: "职位信息",
       // 是否显示弹出层
       open: false,
-                direction:"rtl",
-                toString:[
-                ],
-                toDate:[
-                ],
+      direction: "rtl",
+      toString: [],
+      toDate: [],
       // 表单校验
       rules: {
+        groupId: [{ required: true, message: "请选择分组", trigger: "change" }],
       },
-                from:''
+      from: "",
     };
   },
 
   methods: {
     /** 编辑 */
-            edit(from,row) {
-                this.reset()
+    edit(from, row) {
+      this.reset();
       this.query = { id: row.id };
-                this.urls.currUrl ="job/edit";
+      this.urls.currUrl = "job/edit";
       this.getData();
-                this.pageInfo.type="edit"
-                this.from = from
+      this.pageInfo.type = "edit";
+      this.from = from;
 
-                this.title = from === 'group'?"修改分组信息":'修改职位信息';
+      this.title = from === "group" ? "修改分组信息" : "修改职位信息";
     },
     /** 新增 */
     add(row) {
-                console.log(row,'添加')
-                this.from = row
-                this.title = row === 'group'?"新增分组信息":'新增职位信息';
-                this.reset()
+      console.log(row, "添加");
+      this.from = row;
+      this.title = row === "group" ? "新增分组信息" : "新增职位信息";
+      this.reset();
       this.urls.currUrl = "job/add";
       this.getData();
-                this.pageInfo.type="add"
-                
+      this.pageInfo.type = "add";
     },
     /** 查看*/
     view(row) {
-                this.reset()
+      this.reset();
       this.query = { id: row.id };
-                this.urls.currUrl ="job/view";
+      this.urls.currUrl = "job/view";
       this.getData();
-                this.pageInfo.type="view"
+      this.pageInfo.type = "view";
       this.title = "职位信息详细";
     },
     /**取消按钮 */
@@ -93,12 +138,11 @@
     },
     /**获取数据后弹框 */
     afterRender(data) {
-
       // 固定新增类型
-                if(this.from == 'group'){
-                    this.form.type = '1'
-                }else{
-                    this.form.type = '2'
+      if (this.from == "group") {
+        this.form.type = "1";
+      } else {
+        this.form.type = "2";
       }
       this.open = true;
     },
@@ -110,11 +154,11 @@
     // 表单重置
     reset() {
       this.form = {
-                    groupId : null,
-                    groupName : "",
-                    jobCode : "",
-                    jobName : "",
-                    remark : "",
+        groupId: null,
+        groupName: "",
+        jobCode: "",
+        jobName: "",
+        remark: "",
       };
       this.resetForm("form");
     },
@@ -124,5 +168,5 @@
       }
     },
   },
-    };
+};
 </script>

attendance-performance-manager-ui/admin/src/views/staff/perform/stat/components/BarCharts.vue

@@ -80,7 +80,7 @@ export default {
                     name: '目标线',
                     yAxis: this.markLine,
                     label: {
-                      formatter: '{b}：'+this.legendName+'不高于20.0%,',
+                      formatter: '{b}：' + this.legendName + '不高于20.0%,',
                       position: 'insideStartTop'
                     },
                     lineStyle: {
@@ -188,6 +188,10 @@ export default {
           ]
         })
       }
+      myChart.on('click',  (params)=>{
+        this.$emit("click",params)
+      })
+
     },
   },
 };

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
-      <el-button
-        slot="table-head-left2"
-        style="margin-left: 10px"
-        icon="el-icon-tickets"
-        size="mini"
-        @click="doExport"
-        :disabled="isExport"
-        >导出</el-button
-      >
+      <el-button slot="table-head-left2" style="margin-left: 10px" icon="el-icon-tickets" size="mini" @click="doExport"
+        :disabled="isExport">导出</el-button>
     </LayoutTable>
 
     <dialog-show ref="dialogform" @ok="getData" />
@@ -26,7 +19,7 @@ export default {
     dialogShow,
   },
   mixins: [table],
-  created() {},
+  created() { },
   methods: {
     /** 导出Excel */
     doExport() {