Merge branch '新疆体育高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 新疆体育高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml

@@ -400,16 +400,16 @@
         <iframe id="TeacherCertificate" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
     </div>
     <div class="lr-form-wrap tab-pane tabClass" id="tab8">
-        <iframe id="TeacherTrain" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+        <iframe id="TeacherTrain" width="100%" scrolling="no" height="506px" frameborder="0"></iframe>
     </div>
     <div class="lr-form-wrap tab-pane" id="tab9">
-        <iframe id="PM_PositionChange" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+        <iframe id="PM_PositionChange" width="100%" scrolling="no" height="506px" frameborder="0"></iframe>
     </div>
     <div class="lr-form-wrap tab-pane" id="tab10">
-        <iframe id="PM_YearAssess" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+        <iframe id="PM_YearAssess" width="100%" scrolling="no" height="506px" frameborder="0"></iframe>
     </div>
     <div class="lr-form-wrap tab-pane" id="tab11">
-        <iframe id="PM_Certificate" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+        <iframe id="PM_Certificate" width="100%" scrolling="no" height="506px" frameborder="0"></iframe>
     </div>
 </div>
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js

@@ -0,0 +1,21 @@
+let filePath = ''
+let Timestamp = ''
+//编译环境判断，可以根据不同环境来做相应的配置
+if (process.env.UNI_PLATFORM === 'h5') {
+  filePath = 'static/js/'
+  Timestamp = '.' + new Date().getTime();
+
+}
+module.exports = {
+	lintOnSave: true,
+	// 配置路径别名
+	configureWebpack: {
+		devServer: {
+			disableHostCheck: true
+		},
+		output: { // 输出重构  打包编译后的 文件目录 文件名称 【模块名称.时间戳】
+		  filename: `${filePath}[name]${Timestamp}.js`,
+		  chunkFilename: `${filePath}[name]${Timestamp}.js`
+		},
+	}
+}