flat: 默认登陆

.env.development

@@ -1,7 +1,9 @@
 VUE_APP_SITE='default'
-VUE_APP_LOGIN_ERROR = http://10.160.7.216:9920/casserver/login
+VUE_APP_LOGIN_ERROR = http://36.105.163.21:30081/casserver/login
 VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy12333.org.cn/api/jobslink-api/front/file": "http://10.165.0.173:8000/jobslink-api/front/file"}
-VUE_APP_LOGIN_NEXT = http://10.160.7.216:9920/casserver/login?service=http://10.165.0.173/manage/login&stService=http%3A%2F%2F10.165.0.173%2Fmanage%2Flogin
+VUE_APP_LOGIN_NEXT = http://36.105.163.21:30081/casserver/login?service=http://10.165.0.173/manage/login&stService=http%3A%2F%2F10.165.0.173%2Fmanage%2Flogin
 VUE_APP_SUPPER_MAP = http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768
 VUE_APP_TIANDITU_APIKEY = e4266a5e84fe6c10f60c559967f0a03f
-VUE_APP_LARGESCREEN = http://10.165.0.173/largescreen/
+#VUE_APP_LARGESCREEN = http://10.165.0.173/largescreen/
+VUE_APP_LARGESCREEN = http://36.105.163.21:30081/largescreen
+

.env.production

@@ -1,8 +1,11 @@
 VUE_APP_SITE='default'
-VUE_APP_LOGIN_ERROR = http://10.160.7.216:9920/casserver/login
+VUE_APP_LOGIN_ERROR = http://36.105.163.21:30081/casserver/login
 VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy12333.org.cn/api/jobslink-api/front/file": "http://10.165.0.77:8000/jobslink-api/front/file"}
-VUE_APP_LOGIN_NEXT = http://10.160.7.216:9920/casserver/login?service=http://10.165.0.54:8300/manage/login&stService=http%3A%2F%2F10.165.0.54%3A8300%2Fmanage%2Flogin
+VUE_APP_LOGIN_NEXT = http://36.105.163.21:30081/casserver/login?service=http://10.165.0.54:8300/manage/login&stService=http%3A%2F%2F10.165.0.54%3A8300%2Fmanage%2Flogin
 VUE_APP_SUPPER_MAP = http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768
 VUE_APP_TIANDITU_APIKEY = e4266a5e84fe6c10f60c559967f0a03f
 #VUE_APP_LARGESCREEN = http://10.165.0.173/largescreen/
-VUE_APP_LARGESCREEN = http://10.165.0.54:8300/largescreen/
+#VUE_APP_LARGESCREEN = http://10.165.0.54:8300/largescreen/
+VUE_APP_LARGESCREEN = http://36.105.163.21:30081/largescreen
+
+

public/index.html

@@ -17,7 +17,7 @@
   <link rel="stylesheet" href="<%= BASE_URL %>resource/font/font_1066523_6bvkeuqao36.css"></link>
   <link rel="stylesheet" href="<%= BASE_URL %>resource/font/font_1939523_a2ybsew93wu.css"></link>
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-  <title>德阳市智慧就业服务平台</title>
+  <title>石河子智慧就业服务平台</title>
   <style>
     html,
     body,

src/event.js

@@ -12,7 +12,7 @@ const eventTable = {
             [
               c('p', {style: 'font-weight: 600;'}, '尊敬的客户：'), c('br'),
               c('div', {style: 'text-indent:48px'},
-                '您好！欢迎您使用德阳市智慧就业服务平台！系统将根据贵公司的合同约定收到保证金后开通使用，我们郑重承诺：您的保证金将用于更好的保障您在德阳市智慧就业服务平台中的任务管理、商保管理的权益，非常感谢您对我们的信赖！')
+                '您好！欢迎您使用石河子智慧就业服务平台！系统将根据贵公司的合同约定收到保证金后开通使用，我们郑重承诺：您的保证金将用于更好的保障您在石河子智慧就业服务平台中的任务管理、商保管理的权益，非常感谢您对我们的信赖！')
             ])
         MessageBox.alert(vNode, {
           customClass: 'trialCheckBox',

src/lang/zh.js

@@ -1,6 +1,6 @@
 export default {
   tip: '提示',
-  title: '德阳市智慧就业服务平台',
+  title: '石河子智慧就业服务平台',
   logoutTip: '退出系统, 是否继续?',
   submitText: '确定',
   cancelText: '取消',
@@ -89,7 +89,7 @@ export default {
     directLogin:'返回登录'
   },
   navbar: {
-    experienceEntrance: '德阳市智慧就业服务平台账号入口',
+    experienceEntrance: '石河子智慧就业服务平台账号入口',
     logOut: '退出登录',
     userinfo: '个人信息',
     dashboard: '首页',

src/page/index/logo.vue

@@ -6,7 +6,9 @@
     <transition-group name="fade">
       <template v-if="!keyCollapse">
         <span class="avue-logo_title" style=" display: flex !important; align-items: center !important;" key="1">
-          <img height="42px" width="200px" src="/manage/svg/logo_dark2.png" alt />
+          <!-- <img height="42px" width="200px" src="/manage/svg/logo_dark2.png" alt /> -->
+           <span class="aa"></span>
+          <img height="42px" width="200px" src="/manage/svg/shihezi_dark.png" alt />
         </span>
       </template>
     </transition-group>
@@ -37,7 +39,19 @@ export default {
   /*display: flex !important;*/
   /*align-items: center !important;*/
   img {
-    margin-left: 20px;
+   /* margin-left: 20px;*/
+   position: absolute;
+   left: 20px;
+  }
+
+  .aa {
+    display: inline-block;
+    width: 20px;
+    height: 100%;
+    position: absolute;
+    left: 1px;
+    z-index: 9;
+    background: #409EFF;
   }
 }
 .fade-leave-active {

src/page/index/top/top-menu.vue

@@ -30,7 +30,7 @@ export default {
     return {
       itemHome: {
         code: "wel",
-        name: '欢迎进入德阳市智慧就业服务平台',
+        name: '欢迎进入石河子智慧就业服务平台',
         source: 'iconfont iconhome',
       },
       activeIndex: "0",

src/page/login/CmanageFooter.vue

@@ -2,7 +2,7 @@
   <div class="layoutBottomBox">
       <div class="footerPrepare">
         <p>
-          Copyright © 2021 德阳市智慧就业服务平台
+          Copyright © 2021 石河子智慧就业服务平台
           <a href="//beian.miit.gov.cn" target="blank">京ICP备16004663号-10</a>
           经营许可证编号：京B2-20130104
           <a href="/home/img/license/YYZZ.jpg" target="blank"

src/page/login/CmanageTitle.vue

@@ -49,10 +49,10 @@ let config;
 if (process.env.VUE_APP_SITE === "default") {
   config = {
     logo: "/manage/img/cmanage/logo/default.pn",
-    wxTitle: "德阳市智慧就业服务平台小程序",
+    wxTitle: "石河子智慧就业服务平台小程序",
     wxImg: "/manage/img/cmanage/wx/xcx/default.jpeg",
-    zixun: "德阳市智慧就业服务平台资讯",
+    zixun: "石河子智慧就业服务平台资讯",
-    guanyu: "关于德阳市智慧就业服务平台",
+    guanyu: "关于石河子智慧就业服务平台",
   };
 }
 

src/page/login/index.vue

@@ -3,8 +3,8 @@
     <!-- <cmanage-title @change="changeActive"></cmanage-title> -->
     <div class="login-weaper animated bounceInDown">
       <div class="login-page-title">
-        <img src="/img/icon/logo_sczj.png" alt="">
+        <img src="/img/icon/shihezi.png" alt="">
-        四川省人力资源和社会保障</div>
+        石河子人力资源和社会保障</div>
       <div class="login-wrapper-small">
         <div class="login-content">
           <div class="login-left">
@@ -20,7 +20,7 @@
       </div>
 
       <div data-v-3c692830="" style="text-align: center; margin-top: 20px; padding-bottom: 30px;">
-        <div data-v-3c692830="" style="font-size: 12px; color: #40a9ff;">Copyright @ 德阳市人力资源和社会保障局</div>
+        <div data-v-3c692830="" style="font-size: 12px; color: #40a9ff;">Copyright @ 石河子人力资源和社会保障局</div>
       </div>
     </div>
   </div>

src/page/login/userRegister.vue

@@ -68,7 +68,7 @@
       <div>
         <el-checkbox v-model="checked"></el-checkbox>
         <span @click="checked = !checked" class="reg-agreement">
-          同意德阳市智慧就业服务平台用工
+          同意石河子智慧就业服务平台用工
           <a
             @click.stop
             href="/blackboard/account/companyagreement.html"
@@ -261,7 +261,7 @@ export default {
               }
             );
           } else {
-            this.$message.error("请阅读并同意德阳市智慧就业服务平台用工用户协议及隐私政策");
+            this.$message.error("请阅读并同意石河子智慧就业服务平台用工用户协议及隐私政策");
           }
         }
       });

src/page/login/userlogin.vue

@@ -46,11 +46,11 @@ import topLang from "@/page/index/top/top-lang";
 import { getCaptcha } from "@/api/user";
 
 console.log('是否跳转', /(^http)(s?):\/\/([a-z0-9].+)\/manage(\/)?$/i.test(location.href), location.href)
-if (/(^http)(s?):\/\/([a-z0-9].+)\/manage(\/)?$/i.test(location.href)) {
+// if (/(^http)(s?):\/\/([a-z0-9].+)\/manage(\/)?$/i.test(location.href)) {
-  if (process.env.NODE_ENV !== "development") {
+//   if (process.env.NODE_ENV !== "development") {
-    window.location.href = process.env.VUE_APP_LOGIN_NEXT;
+//     window.location.href = process.env.VUE_APP_LOGIN_NEXT;
-  }
+//   }
-}
+// }
 if (/(\/login\?)(.*)/ig.test(location.href)) {
   const obj = {}
   const query = location.href.split('?')[1].replace(/\?/, '').split('&')
@@ -106,7 +106,13 @@ export default {
   watch: {},
   created() {
     // this.getTenant();
+    this.loginForm = {
+      ...this.loginForm,
+      username: 'admin1',
+      password: 'admin'
+    }
     const { ticket } = JSON.parse(window.sessionStorage.getItem('query_session') || "{}")
+    console.log(ticket, 'ticket')
     window.sessionStorage.removeItem('query_session')
     console.log(ticket)
     if (ticket) {
@@ -119,6 +125,7 @@ export default {
     }
   },
   mounted() {
+    this.handleLogin()
   },
   computed: {
     ...mapGetters(["website", "tagWel"])
@@ -151,7 +158,9 @@ export default {
         this.ByUsernameCallback(params)
         return
       }
+      // this.ByUsernameCallback()
       this.$refs.loginForm.validate(valid => {
+        console.log(valid, 'valid');
         if (valid) {
           this.ByUsernameCallback()
         }
@@ -164,6 +173,7 @@ export default {
         spinner: "el-icon-loading"
       });
       let obj = this.loginForm
+      console.log(obj, 'obj');
       if (params) {
         obj = params
       }

src/router/views/index.js

@@ -12,7 +12,8 @@ export default [
       meta: {i18n: 'dashboard', code: "wel"},
       component: () =>
         // import(/* webpackChunkName: "views" */ '@/views/wel/index')
-        import(/* webpackChunkName: "views" */ '@/views/workstation/workbench')
+        import(/* webpackChunkName: "views" */ '@/views/tenant/main/label/index')
+        // import(/* webpackChunkName: "views" */ '@/views/workstation/workbench')
     }]
   },
   {

src/views/manage/station/mainList.vue

@@ -202,23 +202,23 @@ export default {
         dialogType: "drawer",
         dialogFullscreen: true,
         column: [
-          // {
+          {
-          //   label: "所属机构",
+            label: "所属机构",
-          //   prop: "deptId",
+            prop: "deptId",
-          //   type: "tree",
+            type: "tree",
-          //   multiple: false,
+            multiple: false,
-          //   dicData: this.depTree,
+            dicData: this.depTree,
-          //   props: {
+            props: {
-          //     label: "title",
+              label: "title",
-          //     value: 'value'
+              value: 'value'
-          //   },
+            },
-          //   checkStrictly: true,
+            checkStrictly: true,
-          //   search: true,
+            search: true,
-          //   span: 20,
+            span: 20,
-          //   hide: true,
+            hide: true,
-          //   searchLabelWidth: 80,
+            searchLabelWidth: 80,
-          //   searchSpan: 6,
+            searchSpan: 6,
-          // },
+          },
           {
             label: "用工单位",
             prop: "comname",
@@ -284,13 +284,13 @@ export default {
                 display: true,
                 size: "small",
                 prop: "masterName",
-                // rules: [
+                rules: [
-                //   {
+                  {
-                //     required: true,
+                    required: true,
-                //     whitespace: true,
+                    whitespace: true,
-                //     message: "请输入法人姓名",
+                    message: "请输入法人姓名",
-                //   },
+                  },
-                // ],
+                ],
               },
               {
                 type: "input",
@@ -300,10 +300,10 @@ export default {
                 size: "small",
                 prop: "masterIdentity",
                 rules: [
-                  // {
+                  {
-                  //   required: true,
+                    required: true,
-                  //   message: "请输入身份证号",
+                    message: "请输入身份证号",
-                  // },
+                  },
                   {
                     validator: (rule, value, callback) => {
                       if (check18IdCardNo(value)) {

src/views/manage/works/index.vue

@@ -76,7 +76,7 @@
       @success="onLoad(page, query)"
     ></delay-dialog>
     <el-drawer title="详情" :visible.sync="viewDrawer" size="60%">
-      <post-view :model="view" :wage="true"></post-view>
+      <post-view :model="view"></post-view>
     </el-drawer>
     <zp-view ref="zpView"></zp-view>
     <wage-view ref="wageView"></wage-view>

src/views/tenant/mission/Table/WaitingMission.vue

@@ -8,9 +8,9 @@
         <save-button type="warning" plain icon="el-icon-plus" size="small" @click="rowCopy('', 'add')"
                      v-show="vaildData(permission.tenant_mission_add, false)">发布任务
         </save-button>
-        <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"
+        <!-- <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"
                    v-show="vaildData(permission.tenant_mission_add, false)">批量导入
-        </el-button>
+        </el-button> -->
       </template>
       <template slot="wage" slot-scope="{ row }">
         <!-- wageUnitCategoryOtherEnum -->

src/views/tenant/works/Dialog/CopyMission.vue

@@ -84,16 +84,12 @@
         ></jl-cityLabel-cascader>
       </template>
       <template slot-scope="{ row }" slot="wage">
-        <div>
+        <div class="input-with-select">
-          <div class="input-with-select">
+          <el-input v-model="obj.wage" placeholder="请输入工资" type="number"></el-input>
-            <el-input v-model="obj.wage" placeholder="请输入工资" type="number"></el-input>
+         ~ <el-input placeholder="请输入工资" type="number" v-model="obj.wageUpper" ></el-input>
-           ~ <el-input placeholder="请输入工资" type="number" v-model="obj.wageUpper" ></el-input>
+         <span>元/人·月</span>
-           <span>元/人·月</span>
-          </div>
-          <div class="info">
-            <p>不低于德阳市最低工资</p>
-          </div>
         </div>
+
       </template>
       <template slot-scope="{ disabled }" slot="skillIds">
         <skill-select
@@ -126,14 +122,14 @@
         ></super-map-view>
       </template>
       <!-- 行业类型 -->
-      <template slot="tradeId">
+      <!-- <template slot="tradeId">
         <div class="tradeId">
             <el-autocomplete
               popper-class="my-autocomplete"
-              v-model="obj.tradeNames"
+              v-model.trim="tradeState"
+              :fetch-suggestions="querySearchAsync"
               placeholder="请选择行业类型"
               @select="handleSelect"
-              disabled="true"
               show-word-limit
               ref="selectTradeId"
               >
@@ -142,7 +138,7 @@
               </template>
             </el-autocomplete>
         </div>
-      </template>
+      </template> -->
       <!-- 工种 -->
       <template slot="worktypeIds">
         <div class="tradeId">
@@ -524,9 +520,7 @@ export default {
               {
                 label: "行业类型",
                 prop: "tradeId",
-                type: "cascader",
+                type: "select",
-                // type: "select",
-                formslot: true,
                 dicData: this.tradeData,
                 props: {
                   label: "name",
@@ -569,22 +563,22 @@ export default {
                 prop: "jobDescription",
                 type: "textarea",
                 rules: [
-                  // {
-                  //   required: true,
-                  //   whitespace: true,
-                  //   message: "请输入岗位描述",
-                  //   trigger: "blur",
-                  // },
                   {
-                    min: 0,
+                    required: true,
-                    max: 500,
+                    whitespace: true,
-                    message: "长度在 0 到 500 个字",
+                    message: "请输入岗位描述",
+                    trigger: "blur",
+                  },
+                  {
+                    min: 30,
+                    max: 200,
+                    message: "长度在 30 到 200 个字",
                     trigger: "blur",
                   },
                 ],
-                placeholder: "请输入岗位描述，字数0-500字以内",
+                placeholder: "请输入岗位描述，字数30-200字以内",
                 span: 24,
-                maxlength: 500,
+                maxlength: 200,
                 showWordLimit: true,
               },
             ],
@@ -1127,8 +1121,6 @@ export default {
             education: 7,
             experienceDesc: "不限经验",
             userNature: "灵活用工",
-            tradeId: row.tradeId,
-            tradeNames: row.jobCompanyIndustry,
           };
           this.selectedSkills = [];
           this.drawer = true;
@@ -1213,10 +1205,4 @@ export default {
 .el-drawer .avue-form {
   padding: 0;
 }
-
-.info {
-  font-size: 12px;
-  color: red;
-  margin-top: -16px;
-}
 </style>

src/views/tenant/works/Table/WaitingMission.vue

@@ -5,14 +5,14 @@
                @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
     >
       <!--自定义按钮-->
-      <template slot="menuLeft">
+      <!-- <template slot="menuLeft">
-        <!-- <save-button type="warning" plain icon="el-icon-plus" size="small" @click="rowCopy('', 'add')"
+        <save-button type="warning" plain icon="el-icon-plus" size="small" @click="rowCopy('', 'add')"
                      v-show="vaildData(permission.tenant_works_add, false)">发布岗位
-        </save-button> -->
+        </save-button>
         <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"
                    v-show="vaildData(permission.tenant_works_add, false)">批量导入
         </el-button>
-      </template>
+      </template> -->
       <template slot="wage" slot-scope="{ row }">
         <div>{{ row.wage }}~{{row.wageUpper}}{{ wageUnitCategoryStateEnum[row.wageUnitCategory] }}</div>
       </template>

src/views/util/post-view.vue

@@ -34,16 +34,6 @@
                 {{ format(model.etime) }}
               </el-form-item>
             </el-col>
-            <el-col span="12">
-              <el-form-item label="参考工资：" v-if="wage">{{
-                  model.wage
-                }}~{{model.wageUpper}}{{ wageUnitCategory[model.wageUnitCategory] }}
-              </el-form-item>
-              <el-form-item label="参考工资：" v-else>{{
-                model.wage
-              }}{{ wageUnitCategory[model.wageUnitCategory] }}
-            </el-form-item>
-            </el-col>
           </el-row>
         </el-collapse-item>
 
@@ -58,14 +48,10 @@
               <el-form-item label="招聘人数：">{{ model.peopleNum }}人</el-form-item>
             </el-col>
             <el-col span="12">
-              <el-form-item label="参考工资：" v-if="wage">{{
+              <el-form-item label="参考工资：">{{
                   model.wage
-                }}~{{model.wageUpper}}{{ wageUnitCategory[model.wageUnitCategory] }}
+                }}{{ wageUnitCategory[model.wageUnitCategory] }}
               </el-form-item>
-              <el-form-item label="参考工资：" v-else>{{
-                model.wage
-              }}{{ wageUnitCategory[model.wageUnitCategory] }}
-            </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -264,7 +250,7 @@ function getDic(arr) {
 }
 
 export default {
-  props: {model: Object, wage:Boolean},
+  props: {model: Object},
   data() {
     return {
       activeNames: ["1", "2", "3", "4", "5"],

vue.config.js

@@ -27,12 +27,13 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://39.98.44.136:6013',
+        target: 'http://36.105.163.21:30081',
+        // target: 'http://39.98.44.136:6013',
         // target: 'http://10.165.0.173:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {
-          '^/api': '/'
+          '^/api': '/api'
         }
       },
       "/qq/map": {