Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

update code
2024-04-11 00:18:53 +08:00 · 2024-04-11 00:18:16 +08:00
5 changed files with 33 additions and 0 deletions
--- a/ruoyi-ui/public/wx/jquery.min.js
+++ b/ruoyi-ui/public/wx/jquery.min.js
--- a/ruoyi-ui/public/wx/jweixin-1.3.2.js
+++ b/ruoyi-ui/public/wx/jweixin-1.3.2.js
--- a/ruoyi-ui/public/wx/vconsole.min.js
+++ b/ruoyi-ui/public/wx/vconsole.min.js
--- a/ruoyi-ui/public/wx/wx.html
+++ b/ruoyi-ui/public/wx/wx.html
@ -0,0 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=1.0, initial-scale=1.0">
    <title>公众号信息网页授权</title>
    <script src="./jquery.min.js"></script>
    <script src="./jweixin-1.3.2.js"></script>
    <script src="./vconsole.min.js"></script>    
    <script>
        var vCon=new VConsole();
       console.log("1000100")
    </script>
 </head>
 <body>    
 </body>
 </html>
--- a/ruoyi-ui/src/views/project/attendanceWorker/index.vue
+++ b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
@ -23,6 +23,9 @@
          <el-option value="103" label="劳务人员"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="姓名" prop="name">
        <el-input v-model="queryParams.name" placeholder="请输入姓名"></el-input>
      </el-form-item>
      <el-form-item label="" prop="state">
        <el-radio-group v-model="queryParams.state" size="mini">
          <el-radio-button label="">全部人员</el-radio-button>
@ -122,6 +125,7 @@ export default {
        pageSize: 10,
        projectId: null,
        subDeptId: null,
        name:null,
        state: '',
      },
      // 表单参数
Author	SHA1	Message	Date
haha	42d9d37e17	Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev	2024-04-11 00:18:53 +08:00
haha	a32336c77d	update code	2024-04-11 00:18:16 +08:00