Преглед на файлове

首页加入演示视频

wuxw преди 6 години
родител
ревизия
aaacbbd102

+ 5 - 0
WebService/src/main/resources/components/pageFramePackage/nav/nav.html

@@ -8,6 +8,11 @@
         </form>
         </form>
     </div>
     </div>
     <ul class="nav navbar-top-links navbar-right">
     <ul class="nav navbar-top-links navbar-right">
+        <li style="padding: 20px">
+            <span class="m-r-sm text-muted welcome-message">
+                <a target="_blank" href="https://www.bilibili.com/video/av78427253">演示视频</a>
+            </span>
+        </li>
         <li class="nav-item dropdown">
         <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle"
             <a class="nav-link dropdown-toggle"
                data-toggle="dropdown"
                data-toggle="dropdown"

+ 73 - 74
WebService/src/main/resources/components/staffPackage/addStaffStep/addStaffStep.js

@@ -1,56 +1,55 @@
 /**
 /**
-    入驻小区
-**/
-(function(vc){
+ 入驻小区
+ **/
+(function (vc) {
     vc.extends({
     vc.extends({
-        data:{
-            addStaffStepInfo:{
-                $step:{},
-                index:0,
-                infos:[],
-                branchOrgInfo:{
-                        orgId:'',
-                         componentName:'分公司信息',
-                         buttonName:'选择分公司',
-                         orgName:'',
-                         orgLevel:'2',
-                         parentOrgId:'',
-                         description:'',
+        data: {
+            addStaffStepInfo: {
+                $step: {},
+                index: 0,
+                infos: [],
+                branchOrgInfo: {
+                    orgId: '',
+                    componentName: '分公司信息',
+                    buttonName: '选择分公司',
+                    orgName: '',
+                    orgLevel: '2',
+                    parentOrgId: '',
+                    description: '',
                 },
                 },
-                departmemtOrgInfo:{
-                         orgId:'',
-                         componentName:'部门信息',
-                         buttonName:'选择部门',
-                         orgName:'',
-                         orgLevel:'3',
-                         parentOrgId:'',
-                         description:'',
+                departmemtOrgInfo: {
+                    orgId: '',
+                    componentName: '部门信息',
+                    buttonName: '选择部门',
+                    orgName: '',
+                    orgLevel: '3',
+                    parentOrgId: '',
+                    description: '',
                 },
                 },
-                staffInfo:{
-                    orgId:'',
-                    username:'',
-                    sex:'',
-                    email:'',
-                    tel:'',
-                    address:'',
-                    relCd:'',
+                staffInfo: {
+                    orgId: '',
+                    username: '',
+                    sex: '',
+                    email: '',
+                    tel: '',
+                    address: '',
+                    relCd: '',
                 }
                 }
             }
             }
         },
         },
-        _initMethod:function(){
+        _initMethod: function () {
             vc.component._initStep();
             vc.component._initStep();
         },
         },
-        _initEvent:function(){
-            vc.on("addStaffStep", "notify", function(_info){
-                if(vc.component.addStaffStepInfo.index == 0){
-                    vc.copyObject(_info,vc.component.addStaffStepInfo.branchOrgInfo);
+        _initEvent: function () {
+            vc.on("addStaffStep", "notify", function (_info) {
+                if (vc.component.addStaffStepInfo.index == 0) {
+                    vc.copyObject(_info, vc.component.addStaffStepInfo.branchOrgInfo);
                     vc.component.addStaffStepInfo.infos[0] = vc.component.addStaffStepInfo.branchOrgInfo;
                     vc.component.addStaffStepInfo.infos[0] = vc.component.addStaffStepInfo.branchOrgInfo;
-                }else if(vc.component.addStaffStepInfo.index == 1){
-                    vc.copyObject(_info,vc.component.addStaffStepInfo.departmemtOrgInfo);
+                } else if (vc.component.addStaffStepInfo.index == 1) {
+                    vc.copyObject(_info, vc.component.addStaffStepInfo.departmemtOrgInfo);
                     vc.component.addStaffStepInfo.staffInfo.orgId = _info.orgId
                     vc.component.addStaffStepInfo.staffInfo.orgId = _info.orgId
                     vc.component.addStaffStepInfo.infos[1] = vc.component.addStaffStepInfo.departmemtOrgInfo;
                     vc.component.addStaffStepInfo.infos[1] = vc.component.addStaffStepInfo.departmemtOrgInfo;
-
-                }else{
+                } else {
                     vc.copyObject(_info, vc.component.addStaffStepInfo.staffInfo);
                     vc.copyObject(_info, vc.component.addStaffStepInfo.staffInfo);
                     vc.component.addStaffStepInfo.infos[2] = vc.component.addStaffStepInfo.staffInfo;
                     vc.component.addStaffStepInfo.infos[2] = vc.component.addStaffStepInfo.staffInfo;
                 }
                 }
@@ -58,18 +57,18 @@
             });
             });
 
 
         },
         },
-        methods:{
-            _initStep:function(){
+        methods: {
+            _initStep: function () {
                 vc.component.addStaffStepInfo.$step = $("#step");
                 vc.component.addStaffStepInfo.$step = $("#step");
                 vc.component.addStaffStepInfo.$step.step({
                 vc.component.addStaffStepInfo.$step.step({
                     index: 0,
                     index: 0,
                     time: 500,
                     time: 500,
-                    title: ["选择分公司","选择部门","员工信息"]
+                    title: ["选择分公司", "选择部门", "员工信息"]
                 });
                 });
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
                 vc.component._notifyViewOrgInfoComponentData();
                 vc.component._notifyViewOrgInfoComponentData();
             },
             },
-            _prevStep:function(){
+            _prevStep: function () {
                 vc.component.addStaffStepInfo.$step.prevStep();
                 vc.component.addStaffStepInfo.$step.prevStep();
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
 
 
@@ -79,59 +78,59 @@
                 vc.component._notifyViewOrgInfoComponentData();
                 vc.component._notifyViewOrgInfoComponentData();
 
 
             },
             },
-            _nextStep:function(){
+            _nextStep: function () {
                 var _currentData = vc.component.addStaffStepInfo.infos[vc.component.addStaffStepInfo.index];
                 var _currentData = vc.component.addStaffStepInfo.infos[vc.component.addStaffStepInfo.index];
-                if( _currentData == null || _currentData == undefined){
+                if (_currentData == null || _currentData == undefined) {
                     vc.message("请选择或填写必选信息");
                     vc.message("请选择或填写必选信息");
-                    return ;
+                    return;
                 }
                 }
                 vc.component.addStaffStepInfo.$step.nextStep();
                 vc.component.addStaffStepInfo.$step.nextStep();
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
 
 
-                 vc.emit('viewOrgInfo', 'onIndex', vc.component.addStaffStepInfo.index);
+                vc.emit('viewOrgInfo', 'onIndex', vc.component.addStaffStepInfo.index);
                 vc.emit('addStaffView', 'onIndex', vc.component.addStaffStepInfo.index);
                 vc.emit('addStaffView', 'onIndex', vc.component.addStaffStepInfo.index);
                 vc.component._notifyViewOrgInfoComponentData();
                 vc.component._notifyViewOrgInfoComponentData();
 
 
 
 
             },
             },
-            _finishStep:function(){
+            _finishStep: function () {
 
 
                 //vc.component.addStaffStepInfo.staffInfo.departmentOrgId = vc.component.addStaffStepInfo.infos[1].orgId;
                 //vc.component.addStaffStepInfo.staffInfo.departmentOrgId = vc.component.addStaffStepInfo.infos[1].orgId;
                 var _currentData = vc.component.addStaffStepInfo.infos[vc.component.addStaffStepInfo.index];
                 var _currentData = vc.component.addStaffStepInfo.infos[vc.component.addStaffStepInfo.index];
-                if( _currentData == null || _currentData == undefined){
+                if (_currentData == null || _currentData == undefined) {
                     vc.message("请选择或填写必选信息");
                     vc.message("请选择或填写必选信息");
-                    return ;
+                    return;
                 }
                 }
-               vc.http.post(
-                   'addStaffStepBinding',
-                   'binding',
-                   JSON.stringify(vc.component.addStaffStepInfo.staffInfo),
-                   {
-                       emulateJSON:true
+                vc.http.post(
+                    'addStaffStepBinding',
+                    'binding',
+                    JSON.stringify(vc.component.addStaffStepInfo.staffInfo),
+                    {
+                        emulateJSON: true
                     },
                     },
-                    function(json,res){
-                       if(res.status == 200){
+                    function (json, res) {
+                        if (res.status == 200) {
 
 
-                           vc.message('处理成功',true);
-                           //关闭model
-                           vc.jumpToPage("/flow/staff");
-                           return ;
-                       }
-                       vc.message(json);
+                            vc.message('处理成功', true);
+                            //关闭model
+                            vc.jumpToPage("/flow/staff");
+                            return;
+                        }
+                        vc.message(json);
                     },
                     },
-                    function(errInfo,error){
-                       console.log('请求失败处理');
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
 
 
-                       vc.message(errInfo);
+                        vc.message(errInfo);
                     });
                     });
             },
             },
-            _notifyViewOrgInfoComponentData:function(){
+            _notifyViewOrgInfoComponentData: function () {
 
 
-                if(vc.component.addStaffStepInfo.index == 0){
-                    vc.emit('viewOrgInfo', '_initInfo',vc.component.addStaffStepInfo.branchOrgInfo);
-                }else if(vc.component.addStaffStepInfo.index == 1){
+                if (vc.component.addStaffStepInfo.index == 0) {
+                    vc.emit('viewOrgInfo', '_initInfo', vc.component.addStaffStepInfo.branchOrgInfo);
+                } else if (vc.component.addStaffStepInfo.index == 1) {
                     vc.component.addStaffStepInfo.departmemtOrgInfo.parentOrgId = vc.component.addStaffStepInfo.branchOrgInfo.orgId;
                     vc.component.addStaffStepInfo.departmemtOrgInfo.parentOrgId = vc.component.addStaffStepInfo.branchOrgInfo.orgId;
-                    vc.emit('viewOrgInfo', '_initInfo',vc.component.addStaffStepInfo.departmemtOrgInfo);
+                    vc.emit('viewOrgInfo', '_initInfo', vc.component.addStaffStepInfo.departmemtOrgInfo);
                 }
                 }
             }
             }
         }
         }

+ 76 - 76
WebService/src/main/resources/components/staffPackage/addStaffView/addStaffView.js

@@ -1,113 +1,113 @@
-(function(vc){
+(function (vc) {
 
 
     vc.extends({
     vc.extends({
         propTypes: {
         propTypes: {
-           callBackListener:vc.propTypes.string, //父组件名称
-           callBackFunction:vc.propTypes.string //父组件监听方法
+            callBackListener: vc.propTypes.string, //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
         },
         },
-        data:{
-            addStaffViewInfo:{
-                flowComponent:'addStaffView',
-                username:'',
-                sex:'',
-                email:'',
-                tel:'',
-                address:'',
-                relCd:'',
+        data: {
+            addStaffViewInfo: {
+                flowComponent: 'addStaffView',
+                username: '',
+                sex: '',
+                email: '',
+                tel: '',
+                address: '',
+                relCd: '',
             }
             }
         },
         },
-        watch:{
-            addStaffViewInfo:{
+        watch: {
+            addStaffViewInfo: {
                 deep: true,
                 deep: true,
-                handler:function(){
+                handler: function () {
                     vc.component.saveAddStaffInfo();
                     vc.component.saveAddStaffInfo();
                 }
                 }
-             }
+            }
         },
         },
-         _initMethod:function(){
+        _initMethod: function () {
 
 
-         },
-         _initEvent:function(){
+        },
+        _initEvent: function () {
 
 
-            vc.on('addStaffViewInfo', 'onIndex', function(_index){
+            vc.on('addStaffViewInfo', 'onIndex', function (_index) {
                 vc.component.addStaffViewInfo.index = _index;
                 vc.component.addStaffViewInfo.index = _index;
             });
             });
         },
         },
-        methods:{
-            addStaffValidate(){
+        methods: {
+            addStaffValidate() {
                 return vc.validate.validate({
                 return vc.validate.validate({
-                    addStaffViewInfo:vc.component.addStaffViewInfo
-                },{
-                    'addStaffViewInfo.username':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"员工名称不能为空"
+                    addStaffViewInfo: vc.component.addStaffViewInfo
+                }, {
+                    'addStaffViewInfo.username': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "员工名称不能为空"
                         },
                         },
- {
-                            limit:"maxin",
-                            param:"2,10",
-                            errInfo:"员工名称长度必须在2位至10位"
+                        {
+                            limit: "maxin",
+                            param: "2,10",
+                            errInfo: "员工名称长度必须在2位至10位"
                         },
                         },
                     ],
                     ],
-'addStaffViewInfo.sex':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"员工性别不能为空"
+                    'addStaffViewInfo.sex': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "员工性别不能为空"
                         },
                         },
                     ],
                     ],
-                    'addStaffViewInfo.relCd':[
-                    {
-                        limit:"required",
-                        param:"",
-                        errInfo:"员工岗位不能为空"
-                    },
-                     {
-                        limit:"num",
-                        param:"",
-                        errInfo:"员工岗位错误"
-                    },
+                    'addStaffViewInfo.relCd': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "员工岗位不能为空"
+                        },
+                        {
+                            limit: "num",
+                            param: "",
+                            errInfo: "员工岗位错误"
+                        },
                     ],
                     ],
-'addStaffViewInfo.email':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"员工邮箱不能为空"
+                    'addStaffViewInfo.email': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "员工邮箱不能为空"
                         },
                         },
- {
-                            limit:"email",
-                            param:"",
-                            errInfo:"员工邮箱不是有效邮箱"
+                        {
+                            limit: "email",
+                            param: "",
+                            errInfo: "员工邮箱不是有效邮箱"
                         },
                         },
                     ],
                     ],
-'addStaffViewInfo.tel':[
- {
-                            limit:"photo",
-                            param:"",
-                            errInfo:"联系方式不是有效手机"
+                    'addStaffViewInfo.tel': [
+                        {
+                            limit: "photo",
+                            param: "",
+                            errInfo: "联系方式不是有效手机"
                         },
                         },
                     ],
                     ],
-'addStaffViewInfo.address':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"家庭住址不能为空"
+                    'addStaffViewInfo.address': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "家庭住址不能为空"
                         },
                         },
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"家庭住址不能超过200位"
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "家庭住址不能超过200位"
                         },
                         },
                     ],
                     ],
 
 
                 });
                 });
             },
             },
-            saveAddStaffInfo:function(){
-                if(vc.component.addStaffValidate()){
+            saveAddStaffInfo: function () {
+                if (vc.component.addStaffValidate()) {
                     //侦听回传
                     //侦听回传
-                    vc.emit($props.callBackListener,$props.callBackFunction, vc.component.addStaffViewInfo);
-                    return ;
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addStaffViewInfo);
+                    return;
                 }
                 }
             }
             }
         }
         }

+ 4 - 1
docs/index.html

@@ -82,7 +82,10 @@ var _hmt = _hmt || [];
 			</div>
 			</div>
 			<div class="col-md-6 col-sm-8 col-xs-12">
 			<div class="col-md-6 col-sm-8 col-xs-12">
 				<!--<div><img src="images/intro-image.png" class="img-responsive" alt="intro-image"></div>-->
 				<!--<div><img src="images/intro-image.png" class="img-responsive" alt="intro-image"></div>-->
-				<div><img src="images/0003.png" class="img-responsive" alt="intro-image"></div>
+				<div>
+					<!--<img src="images/0003.png" class="img-responsive" alt="intro-image">-->
+					<iframe src="//player.bilibili.com/player.html?aid=78427253&cid=134191715&page=1" class="img-responsive" scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true"> </iframe>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
 	</div>
 	</div>

+ 1 - 1
reBuildAll.sh

@@ -9,7 +9,7 @@ mvn package -Dmaven.test.skip=true
 docker-compose -f ./Api/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./Api/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./OrderService/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./OrderService/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./CommunityService/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./CommunityService/docker/docker-compose.yml       up -d --build --force-recreate;
-docker-compose -f ./StoreService/docker/docker-compose.yml       up -d --build --force-recreate;
+docker-compose -f ./StoreService/dockeaddStaffViewr/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./UserService/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./UserService/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./WebService/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./WebService/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./FeeService/docker/docker-compose.yml       up -d --build --force-recreate;
 docker-compose -f ./FeeService/docker/docker-compose.yml       up -d --build --force-recreate;