educode_sales 1.10.49 → 1.10.58

data/app/views/educode_sales/subjects/edit.html.erb

@@ -3,8 +3,8 @@
   <input style="display: none" value="<%=@id %>" name="id">
   <input style="display: none" value="<%=@school_id %>" name="school_id">
   <div class="layui-form-item">
-    <label class="layui-form-label" style="width: 98px;">实践课程名称:<span style="color: red"> *</span></label>
-    <div class="layui-input-block">
+    <label class="layui-form-label"  style="width: 112px">实践课程名称:<span style="color: red"> *</span></label>
+    <div class="layui-input-block" style="margin-left: 25px;width: 92%">
       <input type="text" name="name"
              lay-verify="required" disabled
              value="<%= @item.name %>" class="layui-input"
@@ -12,9 +12,9 @@
     </div>
   </div>
   <div class="layui-form-item" >
-    <label class="layui-form-label"  style="width: 98px">实践项目名称:</label>
+    <label class="layui-form-label"   style="width: 112px">实践项目名称:</label>
     <div class="layui-input-block"  >
-      <div id="shixun_ids" style="width: 50%;margin-left: 19px"></div>
+      <div id="shixun_ids" style="width: 50%;margin-left: 25px"></div>
     </div>
   </div>
 

data/app/views/educode_sales/subjects/index.html.erb

@@ -10,15 +10,15 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label" style="width: 120px">实践课程名称</label>
+        <label class="layui-form-label" style="width: 130px">实践课程名称</label>
         <div class="layui-input-inline">
           <input type="text" class="layui-input" name="subjects_name">
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label" style="width: 120px">实践项目名称</label>
+        <label class="layui-form-label" style="width: 120px">商机名称</label>
         <div class="layui-input-inline">
-          <input type="text" class="layui-input" name="shixun">
+          <input type="text" class="layui-input" name="business_name">
         </div>
       </div>
       <div class="layui-inline" style="margin-left: 20px">
@@ -54,7 +54,7 @@
 <script type="text/html" id="statusBar">
   {{# if(d.public === 2){ }}
   <span>已公开</span>
-  {{# } else if(d.public === 0){ }}
+  {{# } else if(d.status === 0){ }}
   <span>编辑中</span>
   {{# } else if(d.status === 1){ }}
   <span>审核中</span>
@@ -67,6 +67,10 @@
     <a lay-event="link_shixuns" style="color: deepskyblue">{{= d.shixun_progress }}</a>
 </script>
 
+<script type="text/html" id="link_subject">
+  <a target='_blank' style='color: #1E9FFF' href='<%=@url %>/paths/{{=d.identifier}}'>{{=d.s_name}}</a>
+</script>
+
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown'], function () {
         var laydate = layui.laydate,
@@ -94,7 +98,8 @@
                     field: 's_name',
                     title: '实践课程名称',
                     align: 'center',
-                    minWidth: 200
+                    minWidth: 200,
+                    templet: '#link_subject'
                 },
                 {
                     field: 'shixun_progress',
@@ -115,7 +120,7 @@
                     title: '状态',
                     minWidth: 50,
                     align: 'center',
-                    templet: '#statusBar'
+                    // templet: '#statusBar'
                 },
                 {
                     field: 'b_name',
@@ -150,18 +155,22 @@
                 }
             ]
         ]
-
+        var tableDataCount = 0
         table.render({
             elem: '#table',
             where: {q: form.val()},
             url: '/missions/subjects',
             cellMinWidth: 80,
+            title: '实践课程列表',
             toolbar: '#bussinessBar',
             defaultToolbar: [],
             cols: cols_table,
             limit: 10,
             limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
-            page: true
+            page: true,
+            done:function (res, curr, count){
+                tableDataCount = count;
+            }
         })
         var sort = {}, search = {};
         // 监听搜索操作
@@ -191,7 +200,7 @@
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
-                    shadeClose: true,
+                    shadeClose: false,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content
@@ -209,7 +218,7 @@
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
-                    shadeClose: true,
+                    shadeClose: false,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content
@@ -219,7 +228,18 @@
                 return false;
             }
         });
-
+        // 重置
+        form.on('submit(reset_business_search)', function (data) {
+            table.reload('table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: {}}
+            }, 'data');
+            $(".layui-form")[0].reset();
+            form.render()
+            return false;
+        });
 
         table.on('toolbar(table)', function (obj) {
             // 新增按钮监听
@@ -233,7 +253,7 @@
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
-                    shadeClose: true,
+                    shadeClose: false,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content
@@ -241,6 +261,24 @@
                 $(window).on("resize", function () {
                 });
                 return false;
+            }else if(obj.event === 'list'){
+                table.reload('table',{
+                    page: 1,
+                    limit:tableDataCount, //加载所有数据
+                    done:function (){
+                        //导出所有数据
+                        table.exportFile("table",false,"xls");
+                        //恢复数据分页显示
+                        table.reload('table',{
+                            page: 1,
+                            limit:20,
+                            done:function (res, curr, count){
+                                tableDataCount = count;
+                            }
+                        })
+
+                    }
+                })
             }
         });
     });

data/app/views/educode_sales/subjects/index.json.jbuilder

@@ -3,13 +3,13 @@ json.data do
     json.s_name handled_data d.s_name
     json.deliver_date  handled_time_data d.deliver_date
     json.b_name handled_data d.b_name
-    json.status d.status
-    json.public d.public
+    json.status status d
     json.school_name handled_data @business_subject_schools["#{d.id}"]
     json.id d.id
+    json.identifier d.s_identifier
     json.staff_name handled_data @business_subject_staffs["#{d.id}"]
     json.mange_name handled_data  @business_subject_manges["#{d.id}"]
-    # json.shixun_progress d.shixun_compeled_count
+    json.shixun_progress d.shixun_compeled_count
   end
 end
 json.code 0

data/app/views/educode_sales/subjects/list_shixuns.html.erb

@@ -1,3 +1,14 @@
+<style>
+    .markdown_list img {
+        max-width: 700px;
+    }
+    .layui-table-cell{
+        height: auto !important;
+        width: auto;
+        white-space: normal;
+        /*line-height: 28px;*/
+    }
+</style>
 <div class="min-height-table" style="margin: 20px">
   <div>
     <form class="layui-form layui-form-pane" lay-filter="search_form">
@@ -23,20 +34,21 @@
         <div class="layui-input-inline">
           <%= select_tag "status", options_for_select(
             [["全部", 0], ["待建设", 1], ["已签协议", 2], ["建设中", 3],
-             ["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7]], selected: 0
+             ["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7],
+             ["已付费用",8],["审核通过",9]], selected: 0
           ), { include_blank: true } %>
         </div>
       </div>
 
       <br>
       <div class="layui-inline borders">
-        <label class="layui-form-label" style="width: 120px">实践项目名称</label>
+        <label class="layui-form-label" style="width: 130px">实践项目名称</label>
         <div class="layui-input-inline">
           <input type="text" name="shixun_name" class="layui-input">
         </div>
       </div>
       <div class="layui-inline borders">
-        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+        <button type="reset" class="layui-btn layui-btn-primary" id="list_shixuns_search_reset" lay-submit lay-filter="reset_business_search">重置
         </button>
         <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_shixun_contract">搜索
         </button>
@@ -50,7 +62,9 @@
 
 </div>
 
-
+<script type="text/html" id="shixun_name_link">
+  <a target='_blank' style='color: #1E9FFF'  href='<%=@url %>/shixuns/{{=d.identifier}}/challenges'>{{=d.name}}</a>
+</script>
 <script type="text/html" id="show_state">
   {{# if(d.shixun_status === 1){ }}
   <span>待建设</span>
@@ -66,6 +80,10 @@
   <span>已内部发布</span>
   {{# } else if(d.shixun_status === 7){ }}
   <span>已公开发布</span>
+  {{# } else if(d.shixun_status === 8){ }}
+  <span>已付费用</span>
+  {{# } else if(d.shixun_status === 9){ }}
+  <span>审核通过</span>
   {{# } }}
 </script>
 <script type="text/html" id="show_level">
@@ -84,24 +102,52 @@
 
 
 <script type="text/html" id="show_type">
-  {{# if(d.shixun_type === 1){ }}
+  {{# if(d.category === 1){ }}
   <span>管培</span>
-  {{# } else if(d.shixun_type === 2){ }}
+  {{# } else if(d.category === 2){ }}
   <span>全职</span>
-  {{# } else if(d.shixun_type === 3){ }}
+  {{# } else if(d.category === 3){ }}
   <span>专职</span>
   {{# } }}
 </script>
 <script type="text/html" id="shixun_table_bar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  {{# if(d.shixun_status === 3 || d.shixun_status === 5){ }}
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="examine">提交审核</a>
+  {{# } else { }}
+  <a class="layui-btn layui-btn-disabled layui-btn-xs data-count-edit">提交审核</a>
+  {{# } }}
 </script>
-
+<script type="text/html" id="link_shixun">
+  <a target='_blank' style='color: #1E9FFF' href='<%=@url %>/shixuns/{{=d.identifier}}'>{{=d.name}}</a>
+</script>
+<script src="/markdown/marked.min.js" type="text/javascript" charset="utf-8"></script>
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown'], function () {
+    function extractFirstTenCharsAndImage(markdownText) {
+        let firstTenChars = '';
+        let imageTag = '';
+        // 行内图片的正则表达式
+        const inlineImageRegex = /!\[.*?\]\((.*?)\)/g;
+        // 处理行内图片
+        markdownText = markdownText.replace(inlineImageRegex, (_, imagePath) => {
+            // 如果匹配到行内图片，则生成图片标签，并将匹配的图片部分替换为空字符串
+            imageTag = `<img style="max-height: 100px" src="${imagePath}" />`;
+            return '';
+        });
+        // 去除Markdown格式，只保留纯文本内容
+        const pureText = markdownText.replace(/(^|\n)(\d+\.|)\s*/g, '$1').trim();
+        // 获取前十个字符
+        firstTenChars = pureText.substring(0, 10);
+        // 输出结果
+        return `<div lay-event="show_markdown"><p>${firstTenChars}</p> ${imageTag}</div>`
+    }
+    layui.config({
+        base: '/markdown/mods/' //存放layui拓展模块的目录位置
+    }).use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown','easyeditor'], function () {
         var laydate = layui.laydate,
             form = layui.form,
             table = layui.table,
+            easyeditor= layui.easyeditor,
             miniPage = layui.miniPage
 
 
@@ -116,12 +162,11 @@
                 {
                     field: 'id',
                     width: 60,
-                    fixed: 'left',
                     title: '序号', type: 'numbers',
                     align: 'center'
                 },
                 {
-                    field: 'type',
+                    field: 'category',
                     title: '任务类型',
                     width: 150,
                     align: 'center',
@@ -131,7 +176,9 @@
                     field: 'name',
                     title: '实践项目名称',
                     width: 150,
-                    align: 'center'
+                    align: 'center',
+                    templet: '#shixun_name_link'
+
                 },
                 {
                     field: 'level',
@@ -154,16 +201,21 @@
                     align: 'center'
                 },
                 {
-                    field: 'time2',
+                    field: 'commit_dectect_time',
                     title: '提交审核时间',
                     width: 150,
                     align: 'center'
                 },
                 {
-                    field: 'feedback',
                     title: '审核反馈',
                     width: 150,
-                    align: 'center'
+                    align: 'center',
+                    templet: (d)=>{
+                        if(d.dectect_feedback){
+                            return extractFirstTenCharsAndImage(d.dectect_feedback)
+                        }
+                        return ''
+                    },
                 },
                 {
                     field: 'shixun_producer',
@@ -178,7 +230,7 @@
                     align: 'center'
                 },
                 {
-                    field: 'shixun_manages',
+                    field: 'max_manage',
                     title: '课程组主管',
                     width: 150,
                     align: 'center'
@@ -187,7 +239,6 @@
                     title: '操作',
                     width: 150,
                     align: 'center',
-                    fixed: 'right',
                     templet: "#shixun_table_bar"
                 }
             ]
@@ -206,6 +257,81 @@
             page: true,
             skin: 'line'
         });
+        // 重置
+        form.on('submit(reset_business_search)', function (data) {
+            table.reload('shixun_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: {}}
+            }, 'data');
+            document.getElementById('list_shixuns_search_reset').reset();
+            form.render()
+            return false;
+        });
+
+        table.on('tool(shixun_table)', function (obj) {
+            var data = obj.data;
+            console.log(data)
+            // 编辑按钮监听
+            if (obj.event === 'edit') {
+                var content = miniPage.getHrefContent('/missions/shixuns/' + data.id + '/edit');
+                var openWH = miniPage.getOpenWidthHeight();
+
+                var edit = layer.open({
+                    title: '编辑实践项目',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: false,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                });
+                return false;
+            } else if (obj.event === 'examine') {
+                var status = data.shixun_status
+                console.log(status)
+                if (status != 3 && status != 5) {
+                    layer.confirm("当前状态无法提交审核")
+                    return false
+                }
+
+                $.ajax('/missions/shixun_dectects/submit', {
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        console.log(res)
+                        if (res.success) {
+                            layer.msg("提交成功")
+                        }
+                    },
+                    error: (res) => {
+                        layer.msg("已经提交过了")
+                    }
+                })
+                return false
+            }else if(obj.event === 'show_markdown'){
+                if(data.content !== '--'){
+                    var text = `<div class="markdown_list" style="margin: 50px" >` + data.dectect_feedback + `</div>`
+                    layer.open({
+                        type: 1,
+                        title: '审核反馈',
+                        area: ['900px', '700px'], // 宽高
+                        content: text,
+                        move: '#ID-test-layer-move'
+                    });
+                    easyeditor.render({
+                        elem: ".markdown_list"
+                    });
+                }
+            }
+        });
+
 
         var sort = {}, search = {};
         form.on('submit(search_shixun_contract)', function (data) {

data/app/views/educode_sales/subjects/list_shixuns.json.jbuilder

@@ -1,16 +1,21 @@
 json.data do
   json.array! @shixuns do |d|
-    json.shixun_manages d.shixun_manages
-    json.shixun_producer d.shixun_producer
-    json.shixun_staff d.shixun_staff
+    json.shixun_manages handled_data d.shixun_manages
+    json.shixun_producer handled_data d.shixun_producer
+    json.shixun_staff handled_data d.shixun_staff
     json.shixun_status d.shixun_status
     json.shixun_type d.shixun_type
-    json.deliver_date  d.deliver_date
+    json.category d.category
+    json.deliver_date handled_time_data d.deliver_date
     json.school_id d.school_id
     json.shixun_id d.shixun_id
     json.name d.shixun_name
     json.level d.level
+    json.identifier d.identifier
     json.id d.id
+    json.max_manage "喻银凤"
+    json.dectect_feedback handled_data d.dectects_content
+    json.commit_dectect_time handled_time_data_accurate d.shixun_dectects_time
   end
 end
 json.code 0

data/app/views/educode_sales/subjects/new.html.erb

@@ -2,15 +2,15 @@
 <form class="layui-form" action="" style="width: 90%;margin-top: 20px">
 
   <div class="layui-form-item">
-    <label class="layui-form-label" style="width: 100px">实践课程名称:<span style="color: red"> *</span></label>
+    <label class="layui-form-label" style="width: 112px">实践课程名称:<span style="color: red"> *</span></label>
     <div class="layui-input-block">
-      <div id="subject_id" style="width: 50%;margin-left: 10px"></div>
+      <div id="subject_id" style="width: 48%;margin-left: 25px"></div>
     </div>
   </div>
   <div class="layui-form-item">
-    <label class="layui-form-label" style="width: 100px">实践项目名称:<span style="color: red"> *</span></label>
+    <label class="layui-form-label" style="width: 112px">实践项目名称:<span style="color: red"> *</span></label>
     <div class="layui-input-block">
-      <div id="shixun_ids" style="width: 50%;margin-left: 10px"></div>
+      <div id="shixun_ids" style="width: 48%;margin-left: 25px"></div>
     </div>
   </div>
   <div class="layui-form-item">

data/app/views/layouts/educode_sales/application.html.erb

@@ -233,7 +233,7 @@
                 <dl class="layui-nav-child">
                   <% if can?(:status, EducodeSales::BusinessDeliverSubject) %>
                   <dd>
-                      <a href="/missions/subject_trends/trends" class=""><i style="padding-right: 35px"></i><%= image_tag "educode_sales/7.运营活动.png", size: "15" %>
+                      <a href="/missions/subject_trends/trends" class="<%= current?('layui-this', trends_subject_trends_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/7.运营活动.png", size: "15" %>
                       <i style="font-size: 25px;  padding-right: 15px"></i>课程态势</a></dd>
                     <%end %>
                   <% if can?(:business, EducodeSales::BusinessDeliverSubject) %>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.49'
+  VERSION = '1.10.58'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.49
+  version: 1.10.58
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -798,7 +797,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -813,8 +812,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []