Merge branch 'dev-coop-phase2.3-1031' into 'release'

Dev coop phase2.3 1031



See merge request !119

debug.log

+[1112/102746.726:ERROR:process_info.cc(329)] VirtualQueryEx: 拒绝访问。 (0x5)
+[1112/102746.728:ERROR:process_info.cc(556)] ReadMemoryInfo failed
+[1112/102746.728:ERROR:scoped_process_suspend.cc(40)] NtResumeProcess: 已尝试访问正在退出的过程。 (0xc000010a)

package.json

@@ -22,10 +22,12 @@
     "echarts": "^4.2.0-rc.2",
     "element-ui": "^2.10.0",
     "fastclick": "^1.0.6",
+    "html2canvas": "^1.0.0-rc.5",
     "iscroll": "^5.2.0",
     "js-cookie": "^2.2.0",
     "js-md5": "^0.7.3",
     "jsencrypt": "^3.0.0-rc.1",
+    "jspdf": "^1.5.3",
     "node-sass": "^4.9.2",
     "qrcode": "^1.3.3",
     "showdown": "^1.6.4",

src/App.vue

 <template>
 	<div v-if="$route.name!='loginPage'">
 		<v-header :userName="userName" :portrait="portrait" :idType="idType"></v-header>
-    <v-slidebar :authList="authList" :tokenValue="token" :storageIdType="storageIdType" :notCompleteCount="redNum"></v-slidebar>
+    <v-slidebar :authList="authList" :tokenValue="token" :storageIdType="storageIdType" :notCompleteCount="redNum" :masterFlag="masterFlag"></v-slidebar>
 		<el-container>
 			<div class="content" id="body-content">
 				<transition name="router-fade" mode="out-in">
@@ -46,7 +46,8 @@ export default {
 			userName: '',
 			portrait: '',
 			authList: {},
-      redNum: 0,
+			redNum: 0,
+			masterFlag: false,
 		}
 	},
 	computed:{
@@ -141,7 +142,8 @@ export default {
 					localStorage.setItem('storageIdType', res.data.idType)
 					localStorage.setItem('storageMaster', res.data.masterAdministratorFlag)
 					vm.idType = res.data.idType
-          vm.storageIdType = res.data.idType
+					vm.storageIdType = res.data.idType
+					vm.masterFlag = res.data.masterAdministratorFlag
 					vm.userName = res.data.name
 					vm.portrait = res.data.imageUrl
 					vm.authList = res.data.auth

src/utils/fetch.js

@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
       // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      config.headers['token'] = '2E46B77D801C479DBA1C550CE70D348F';
+      config.headers['token'] = '006EAC5D201B4547A27C842505F0E368';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/filter.js

@@ -270,5 +270,16 @@ const vueFilter = {
     list = list.substring(0, list.length - 1);
     return list
   },
+  entryStatusType: (value) => {
+    if(value == 1) {
+        return '草稿';
+    } else if(value == 2) {
+        return '未上架';
+    } else if(value == 3) {
+        return '已上架';
+    } else if(value == 4) {
+        return '已下架';
+    }
+  }
 }
 export default vueFilter
\ No newline at end of file

src/views/education/create-component.vue

@@ -32,7 +32,7 @@
                         <el-input type="textarea" rows="4" cols="10" v-model="portalComponent.introduce" size="small" placeholder="请输入组件简介" style="width:37%;"></el-input>
                         <span class="word-num">{{(portalComponent.introduce).replace(/\s+/g,"").length}}/150</span>
                     </el-form-item>
-                    <div class="basic-item-icon">
+                    <!-- <div class="basic-item-icon">
                         <span class="require">*</span>
                         <el-form-item label="组件图片" prop="imageUrl">
                             <el-upload
@@ -52,7 +52,7 @@
                             </el-upload>
                         </el-form-item>
                         <p class="upload-message" v-if="uploadImgMessage">请上传组件图片</p>
-                    </div>
+                    </div> -->
                     <el-row>
                         <el-col :span="6">
                             <div class="basic-item-icon">
@@ -565,7 +565,7 @@ export default {
                 }
                 if(!vm.portalComponent.imageUrl) {
                     vm.uploadImgMessage = true
-                    return
+                    // return
                 } else {
                     vm.uploadImgMessage = false
                 }

src/views/education/item-manager.vue

@@ -78,6 +78,7 @@
         <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
         <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
         <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" width="100" align="center"></el-table-column>
         <el-table-column
           prop="projectIntro"
           label="项目简介"

src/views/layout/slidebar.vue

@@ -56,7 +56,11 @@
       },
       notCompleteCount: {
         type: Number,
-      }
+      },
+      masterFlag: {
+        type: Boolean,
+        default: false
+      },
     },
     data() {
       return {
@@ -173,6 +177,13 @@
         // if(val==2){    // 调试时已经去掉了
           vm.setFollowSide()
         // }              // 调试时已经去掉了
+      },
+      masterFlag(newVal, oldVal) {
+        // console.log('新老:',newVal,oldVal)
+        // 入口管理暂时判断
+        if(newVal === true) {
+          vm.setEntrySide();
+        }
       }
     },
     methods: {
@@ -201,6 +212,14 @@
         }
         vm.items.push(followSider);
       },
+      setEntrySide() {
+        const followSider =  {
+          title: '入口管理',
+          icon: 'el-icon-setting',
+          index: 'entry-manager'
+        }
+        vm.items[1].subs.push(followSider);
+      },
       goToMessageSendPage(checkAuth) {
         if(checkAuth){
           utils.checkAuthFunc().then(res=>{

src/views/learning/item-learning-effect.vue

 <template>
   <div class="learning-effect">
-    <div class="learning" ref="learning"></div>
+    <el-button type="default" size="small" @click="exportPDF">导出明细</el-button>
     <div class="education" ref="education"></div>
+    <div class="learning" ref="learning"></div>
   </div>
 </template>
 
 <script>
 import { openLoading, closeLoading } from "../../utils/utils";
 import * as commonUtil from "../../utils/utils";
-const echarts = require("echarts");
+import echarts from "echarts";
+import html2Canvas from 'html2canvas'
+import JsPDF from 'jspdf'
+let vm = null;
 export default {
   data() {
-    return {};
+    return {
+      echartsData: {
+        chart1: {},
+        chart2: {}
+      }
+    };
+  },
+  created() {
+    vm = this;
+    vm.$nextTick(() => {
+      vm.setEducation();
+      vm.setLearning();
+    });
   },
   mounted() {
     commonUtil.resizeHeight();
-    this.initEcharts();
   },
   methods: {
-    // 初始化图表
-    initEcharts() {
-      openLoading(this);
-      let trainChart = echarts.init(this.$refs["learning"]);
-      let educationChart = echarts.init(this.$refs["education"]);
-      let trainPara = {
-        color: ["#FF9999", "#66CCFF"],
-        text: '培训前后知识点掌握情况变化',
-        xAxisData:  [
-              "转诊与履约",
-              "转诊与履约",
-              "周三",
-              "治疗原则及降压目标",
-              "周五",
-              "治疗原则及降压目标",
-              "周日"
-        ],
-        seriesBeforeDate: [20, 32, 31, 34, 39, 33, 32],
-        seriesAfterDate: [86, 10, 96, 10, 16, 16, 15]
+    exportPDF() {
+      let element = '';
+      element = document.querySelector('.data-all-wrap');
+      console.log(element);
+      if(element == null) {
+        return
       }
-      let educationPara = {
-        color: ["#33FFFF", "#FF9999"],
-        text: '不同学历培训前后正确率对比',
-        xAxisData:  [
-              "转诊与履约",
-              "转诊与履约",
-              "周三",
-              "治疗原则及降压目标",
-              "周五",
-              "治疗原则及降压目标",
-              "周日"
-        ],
-        seriesBeforeDate: [20, 32, 31, 34, 39, 33, 32],
-        seriesAfterDate: [86, 10, 96, 10, 16, 16, 15]
-      };
-      // 显示图表。
-      trainChart.setOption(this.echartOptions(trainPara));
-      educationChart.setOption(this.echartOptions(educationPara));
-      closeLoading(this)
+      setTimeout(() => {
+        html2Canvas(element).then(function(canvas) {
+          let contentWidth = canvas.width;
+          let contentHeight = canvas.height;
+
+          //一页pdf显示html页面生成的canvas高度;
+          let pageHeight = contentWidth / 592.28 * 841.89;
+          //未生成pdf的html页面高度
+          let leftHeight = contentHeight;
+          //页面偏移
+          let position = 0;
+          //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
+          let imgWidth = 595.28;
+          let imgHeight = 592.28 / contentWidth * contentHeight;
+
+          let pageData = canvas.toDataURL('image/jpeg', 1.0);
+
+          let pdf = new JsPDF('', 'pt', 'a4');
+
+          //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
+          //当内容未超过pdf一页显示的范围，无需分页
+          if (leftHeight < pageHeight) {
+            pdf.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight);
+          } else {
+            while (leftHeight > 0) {
+              pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
+              leftHeight -= pageHeight;
+              position -= 841.89;
+              //避免添加空白页
+              if (leftHeight > 0) {
+                pdf.addPage();
+              }
+            }
+          }
+          let title = "导出学情报告";
+          pdf.save(title + '.pdf');
+        });
+      }, 0);
+    },
+    updateResize() {
+      this.$nextTick(function() {
+        window.onresize = function() {
+          vm.echartsData.chart1.resize();
+          vm.echartsData.chart2.resize();
+        };
+      });
     },
-    // 图表的参数
-    echartOptions(parameter) {
+    setEducation() {
+      let myChart = echarts.init(this.$refs.education);
       let option = {
-        color: parameter.color,
         title: {
-          text: parameter.text,
-          x: "center",
-          textStyle: {
-            //主标题文本样式
-            fontSize: 16,
-            fontWeight: "bolder",
-            color: "#333"
-          }
+          text: ""
         },
         tooltip: {
           trigger: "axis",
@@ -78,10 +99,9 @@ export default {
             type: "shadow"
           }
         },
+        color: ['#5D7092','#FFB01B'],
         legend: {
-          data: ["培训前正确率", "培训后正确率"],
-          right: 0,
-          top: 20
+          data: ["项目前总正确率", "项目后总正确率"]
         },
         grid: {
           left: "3%",
@@ -89,70 +109,94 @@ export default {
           bottom: "3%",
           containLabel: true
         },
-        xAxis: [
-          {
-            type: "category",
-            data: parameter.xAxisData,
-            axisLabel: {
-              //坐标轴刻度标签的相关设置。
-              interval: 0,
-              rotate: "45"
-            }
+        xAxis: {
+          type: "category",
+          data: ["本科", "大专", "中专及以下", "硕士", "博士", "其他"]
+        },
+        yAxis: {
+          min: 0,
+          max: 100,
+          type: "value",
+          axisLabel: {
+            formatter: "{value} %"
           }
-        ],
-        yAxis: [
+        },
+        series: [
           {
-            name: "比率(%)",
-            type: "value",
-            axisLabel: {
-              show: true,
-              interval: "auto",
-              formatter: "{value} %"
-            },
-            show: true,
-            axisLine: {
-              // 轴线
-              show: false
-            }
+            name: "项目前总正确率",
+            type: "bar",
+            barWidth: 10,
+            data: [45, 45, 34, 34, 4, 8]
+          },
+          {
+            name: "项目后总正确率",
+            type: "bar",
+            barWidth: 10,
+            data: [70, 66, 67, 67, 24, 24]
           }
-        ],
+        ]
+      };
+      myChart.setOption(option);
+      vm.echartsData.chart1 = myChart;
+      vm.updateResize();
+    },
+    setLearning() {
+      let myChart = echarts.init(this.$refs.learning);
+      let option = {
+        title: {
+          text: ""
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "shadow"
+          }
+        },
+        color: ['#5D7092','#FFB01B'],
+        legend: {
+          data: ["培训前正确率", "培训后正确率"]
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true
+        },
+        xAxis: {
+          axisLabel: {
+            interval: 0,
+            rotate: 45
+          },
+          type: "category",
+          data: ["推荐联合用药方案"]
+        },
+        yAxis: {
+          min: 0,
+          max: 100,
+          type: "value",
+          axisLabel: {
+            formatter: "{value} %"
+          }
+        },
         series: [
           {
             name: "培训前正确率",
             type: "bar",
-            barGap: "20%",
-            barMaxWidth: "50",
-            itemStyle: {
-              normal: {
-                label: {
-                  show: true,
-                  position: "top",
-                  formatter: "{c}%"
-                }
-              }
-            },
-            data: parameter.seriesBeforeDate
+            barWidth: 10,
+            data: [45]
           },
           {
             name: "培训后正确率",
             type: "bar",
-            barGap: "20%",
-            barMaxWidth: "50",
-            itemStyle: {
-              normal: {
-                label: {
-                  show: true,
-                  position: "top",
-                  formatter: "{c}%" //这是关键，在需要的地方加上就行了
-                }
-              }
-            },
-            data: parameter.seriesAfterDate
+            barWidth: 10,
+            data: [81]
           }
         ]
       };
-      return option;
-    }
+      myChart.setOption(option);
+      vm.echartsData.chart2 = myChart;
+      vm.updateResize();
+    },
   }
 };
 </script>

src/views/learning/item-list.vue

@@ -61,7 +61,7 @@
         <el-button type="default" size="small" :disabled="exportStatus" @click="exportExcel">导出明细</el-button>
       </div>
       <!-- <div class="item-tab"></div> -->
-      <el-tabs v-model="activeName" @tab-click="handleClick" :before-leave="beforeLeave">
+      <el-tabs id="item-list-tabs" v-model="activeName" @tab-click="handleClick" :before-leave="beforeLeave">
         <el-tab-pane label="参与情况" name="first">
           <part-in
             ref="childPart"
@@ -97,9 +97,18 @@
             :organizationList="organizationList"
           ></examination-analysisfrom>
         </el-tab-pane>
-        <!-- <el-tab-pane label="学习效果分析" name="fifth" lazy>
+        <!-- <el-tab-pane label="数据总览" name="zero" >
+          <data-all
+            ref="childDataAll"
+            :formInline="formInline"
+            :activeName="activeName"
+            :organizationNum="organizationNum"
+            :organizationList="organizationList"
+          ></data-all>
+        </el-tab-pane>
+        <el-tab-pane label="学习效果分析" name="fifth" :lazy=true>
           <learning-effect></learning-effect>
-        </el-tab-pane>-->
+        </el-tab-pane> -->
       </el-tabs>
       <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" center>
         <p style="text-align:center">文件正在生成，你可以去“我的导出下载”页，下载文件</p>
@@ -130,6 +139,7 @@ import PartIn from "./item-part-in.vue";
 import ExaminationAnalysisfrom from "./item-examination-analysis.vue";
 import LearningEffect from "./item-learning-effect.vue";
 import DataAlignment from "./data-alignment.vue";
+import DataAll from "./item-data-all.vue";
 import { create } from "domain";
 import { mapGetters } from "vuex";
 import { openLoading, closeLoading } from "../../utils/utils";
@@ -146,7 +156,8 @@ export default {
     PartIn,
     ExaminationAnalysisfrom,
     LearningEffect,
-    DataAlignment
+    DataAlignment,
+    DataAll,
   },
   data() {
     return {
@@ -387,6 +398,11 @@ export default {
         openLoading(vm);
         vm.GET("basic-data/position/provinces", req).then(res => {
           closeLoading(vm);
+          // let list = [];
+          // for(let i =0;i<res.data.provinceList.length;i++) {
+          //   list[i] = res.data.provinceList[i].provinceName;
+          // }
+          // console.log(list);
           if (res.code == "000000") {
             this.optionsRegion = operationData.setRegionOption(
               res.data.provinceList

src/views/system/role.vue

@@ -45,6 +45,7 @@
         <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
         <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
         <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" width="100" align="center"></el-table-column>
         <el-table-column prop="projectIntro" label="项目简介" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="projectBegintime" label="项目开始时间" align="center"></el-table-column>
         <el-table-column prop="projectEndtime" label="项目结束时间" align="center"></el-table-column>