chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/v2' into v2 

# Conflicts:
#	src/views/enforce/sign.vue
v2
chenrui 2 years ago
parent
020481f2dd 2206200f5c
commit
15728cda36
5 changed files with 184 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/common/globalRouter.js
  2. 44
      src/views/enforce/enforcementPlanAdd.vue
  3. 80
      src/views/enforce/sign.vue
  4. 2
      src/views/enforce/zqyjjdmFilter.vue
  5. 179
      src/views/login.vue

3
src/common/globalRouter.js
View File

@ -4,7 +4,8 @@ let routes = [
{
path: "/",
// redirect: "/home",
redirect: "/enforceHome",
// redirect: "/enforceHome",
redirect: "/login",
name: "App",
},
{

44
src/views/enforce/enforcementPlanAdd.vue
View File

@ -33,26 +33,26 @@
@cancel="cancelSelectDate"
/>
</van-popup>
<div style="display: flex; justify-content: space-between; width: 100%">
<div style="width: 50%">
<van-field
v-model="submitData.planName"
label="计划名称"
placeholder="请输入"
required
:rules="[{ required: true, message: '请输入计划名称' }]"
/>
</div>
<div style="width: 30%;">
<van-field
v-model="submitData.planName"
label="计划名称"
placeholder="请输入"
required
:rules="[{ required: true, message: '请输入计划名称' }]"
/>
<div class="plan-attach">
<div class="plan-time">
<van-field
v-model="data.fieldValue"
is-link
readonly
placeholder="选择日期"
placeholder="选择时段"
@click="data.dateShowPicker = true"
/>
</div>
<div style="width: 30%;"><label style="font-size: 0.4rem;">行政检查计划</label></div>
<div class="plan-text">行政检查计划</div>
</div>
<van-popup v-model:show="data.dateShowPicker" round position="bottom">
<van-picker
@ -443,4 +443,22 @@
:root {
--van-dialog-width: 16rem;
}
.plan-attach {
display: flex;
align-items: center;
width: 100%;
white-space: nowrap;
}
.plan-time {
margin-left: 2.67rem;
width: 2.25rem;
}
.plan-text {
min-width: 30%;
font-size: 0.37rem;
line-height: 3.25;
}
</style>

80
src/views/enforce/sign.vue
View File

@ -106,18 +106,28 @@
<!-- autosize-->
<!-- />-->
<van-field v-model="submitData.lawEnforcementItem" v-show="false" />
<!-- <van-field
v-model="data.lawEnforcementBasisText"
required
readonly
:rules="[{ required: true, message: '必填项' }]"
label="检查依据"
placeholder="检查依据"
@click="showPopupqz"
type="textarea"
rows="1"
autosize
/> -->
<!-- <van-field-->
<!-- v-model="data.lawEnforcementBasisText"-->
<!-- required-->
<!-- readonly-->
<!-- :rules="[{ required: true, message: '必填项' }]"-->
<!-- label="检查依据"-->
<!-- placeholder="检查依据"-->
<!-- @click="showPopupqz"-->
<!-- type="textarea"-->
<!-- rows="1"-->
<!-- autosize-->
<!-- />-->
<van-field v-for="(item, index) in data.lawList" :key="index"
v-model="item.text"
readonly
label="检查依据"
placeholder="检查依据"
@click="showPopupqz(index)"
rows="1"
autosize
/>
<van-button icon="add-o" block="true" square="true" type="default" @click.stop="addField" />
<van-field v-model="submitData.lawEnforcementBasis" v-show="false" />
<!-- <van-field-->
<!-- v-model="submitData.reslut"-->
@ -306,9 +316,6 @@ const submitData = reactive({
enforce: "",
checkCss: "",
enforceReason: "",
/**局级部门 */
bureauDeptName:"",
bureauDeptId:"",
})
const tapGood = () => {
@ -387,9 +394,6 @@ onMounted(() =>{
submitData.lawEnforcerId = success.data.userId
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;
//局级部门
submitData.bureauDeptName = success.data.bureauDept.deptName;
submitData.bureauDeptId = success.data.bureauDept.deptId;
}
},error=>{
@ -463,6 +467,7 @@ const gaCancel = () => {
const dataFillIn = () => {
// getRegByUserIdAndZero(useCommon.userId,success =>{
getByUserIdAndEnterpriseNumber(useCommon.userId, submitData.enterpriseNumber,success =>{
console.log("========> : ", success);
//跳转企业二维码地址
if(success.success){
Object.keys(submitData).forEach((item) => {
@ -475,6 +480,16 @@ const dataFillIn = () => {
// submitData.lawCertificateNumText =success.data['lawEnforcer'];
submitData.lawCertificateNumTwoText =success.data['lawEnforcerTwo'];
submitData.subsidiaryerText =success.data['subsidiaryer'];
submitData.lawEnforcementBasis = success.data['lawEnforcementBasis'];
submitData.lawEnforcementBasisText = success.data['lawEnforcementBasisText'];
var tmpBasis = submitData.lawEnforcementBasis.split(',');
var tmpBasisText = submitData.lawEnforcementBasisText.split(',');
data.lawList = [];
for (var i=0; i<tmpBasis.length; i++) {
data.lawList.push({
index: i, text:tmpBasisText[i], id:tmpBasis[i]
});
}
if(success.data['reslut']==0) {
tapGood();
} else {
@ -492,6 +507,14 @@ const dataFillIn = () => {
const tmpSave = () => {
showSuccessToast('临时保存');
submitData.userId = useCommon.userId;
submitData.lawEnforcementBasis = "";
submitData.lawEnforcementBasisText = "";
for (var i=0; i<data.lawList.length; i++) {
submitData.lawEnforcementBasis += data.lawList[i].id +",";
submitData.lawEnforcementBasisText += data.lawList[i].text +",";
}
submitData.lawEnforcementBasis = submitData.lawEnforcementBasis.substring(0, submitData.lawEnforcementBasis.length - 1);
submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1);
addEnforcementRegistration(submitData,success =>{
//跳转企业二维码地址
if(success.success){
@ -506,6 +529,14 @@ const tmpSave = () => {
const submit = (type) =>{
submitData.isSubmit = type;
submitData.userId = useCommon.userId;
submitData.lawEnforcementBasis = "";
submitData.lawEnforcementBasisText = "";
for (var i=0; i<data.lawList.length; i++) {
submitData.lawEnforcementBasis += data.lawList[i].id +",";
submitData.lawEnforcementBasisText += data.lawList[i].text +",";
}
submitData.lawEnforcementBasis = submitData.lawEnforcementBasis.substring(0, submitData.lawEnforcementBasis.length - 1);
submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1);
form.value.validate().then(() => {
editEnforcementRegistration(submitData, success => {
//跳转首页
@ -525,9 +556,13 @@ const showPopup = () =>{
const showPopup2 = () =>{
data.popupVisible2 = true;
}
const showPopupqz = () =>{
const showPopupqz = (flag) =>{
data.lawCliekFlag = flag;
data.popupVisibleqz = true;
}
const addField = () =>{
data.lawList.push({ text:"", id:"" });
}
const closePopup = () =>{
data.popupVisible = false;
data.popupVisible2 = false;
@ -547,10 +582,11 @@ const reciveData2 = (item) =>{
submitData.subsidiaryerText = item.userName;
}
const reciveDataqz = (item) =>{
console.log(item);
submitData.lawEnforcementBasis = item.id;
data.lawList[data.lawCliekFlag].id = item.id;
data.lawList[data.lawCliekFlag].text = item.lawName;
// submitData.lawEnforcementBasis = item.id;
// submitData.subsidiaryerText = item.userName + " " + item.lawCertificateNum;
data.lawEnforcementBasisText = item.lawName;
// data.lawEnforcementBasisText = item.lawName;
}
const reciveLaw = (item) => {
submitData.lawId = item.id;

2
src/views/enforce/zqyjjdmFilter.vue
View File

@ -18,7 +18,7 @@
<div class="search-result">
<div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
<div class="case-title">法律名称：{{ item.lawName }}</div>
<div class="case-time">内容：{{ item.content }}</div>
<!-- <div class="case-time">内容：{{ item.content }}</div>-->
</div>
</div>
</div>

179
src/views/login.vue
View File

@ -1,67 +1,70 @@
<template>
<div class="login-page">
<div class="login-content">
<van-nav-bar >
<template #title>
<div class="title">
登录
</div>
</template>
</van-nav-bar>
<van-form @submit="onSubmit">
<van-field v-model="loginParam.secretName" name="secretName" label="用户名" placeholder="用户名"
:rules="[{ required: true, message: '请填写用户名' }]" />
<van-field v-model="loginParam.secretKey" type="password" name="secretKey" label="密码" placeholder="密码"
:rules="[{ required: true, message: '请填写密码' }]" />
<div style="margin: 0.42rem">
<van-button block type="primary" native-type="submit">登录</van-button>
</div>
</van-form>
<router-link to="/register" class="link">还没有账号,去注册</router-link>
</div>
</div>
<div class="login-page">
<div class="login-content">
<van-nav-bar>
<template #title>
<div class="title">
登录
</div>
</template>
</van-nav-bar>
<van-form @submit="onSubmit">
<van-field v-model="loginParam.secretName" name="secretName" label="用户名" placeholder="用户名"
:rules="[{ required: true, message: '请填写用户名' }]"/>
<van-field v-model="loginParam.secretKey" type="password" name="secretKey" label="密码" placeholder="密码"
:rules="[{ required: true, message: '请填写密码' }]"/>
<div style="margin: 0.42rem">
<van-button block type="primary" native-type="submit">登录</van-button>
</div>
</van-form>
<router-link to="/register" class="link">还没有账号,去注册</router-link>
</div>
</div>
</template>
<script setup>
import { reactive } from 'vue';
import {userLogin, testLogin} from '../api/Home';
import CryptoJS from "crypto-js";
const { useCommon } = $globalStore;
const router = useRouter();
const loginParam = reactive({
secretName:"",
secretKey:""
})
const userLoginParam = {};
userLoginParam.username = loginParam.username;
userLoginParam.password = loginParam.password;
const onSubmit = async (values) => {
console.log(values);
// await getGoodsnum();
// await getLang();
// values.secretName = values.name;
values.secretKey = Encrypt(values.secretKey);
// return;
// userLogin(values,success=>{
testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey},success=>{
console.log(success);
// router.push({ name: "Home" });
router.push({ name: "enforceHome" });
//设置全局变量
useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_TOKEN(success.data.token);
// 监听uni-app发送的消息
window.addEventListener('message', (event) => {
console.log('Received message from uni-app:', event.data);
// 向uni-app返回消息
window.parent.postMessage('Hello, uni-app!', '*');
});
},error=>{
console.log("登录失败")
})
};
import {reactive} from 'vue';
import {userLogin, testLogin} from '../api/Home';
import CryptoJS from "crypto-js";
const {useCommon} = $globalStore;
const router = useRouter();
const loginParam = reactive({
secretName: "",
secretKey: ""
})
const userLoginParam = {};
userLoginParam.username = loginParam.username;
userLoginParam.password = loginParam.password;
const onSubmit = async (values) => {
// await getGoodsnum();
// await getLang();
// values.secretName = values.name;
values.secretKey = Encrypt(values.secretKey);
// return;
// userLogin(values,success=>{
testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, success => {
if (success.success) {
// router.push({ name: "Home" });
router.push({name: "enforceHome"});
//设置全局变量
useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_TOKEN(success.data.token);
// 监听uni-app发送的消息
window.addEventListener('message', (event) => {
console.log('Received message from uni-app:', event.data);
// 向uni-app返回消息
window.parent.postMessage('Hello, uni-app!', '*');
});
} else {
console.log("登录失败")
}
}, error => {
console.log("登录失败")
})
};
const Encrypt = (passWord) =>{
const Encrypt = (passWord) => {
var keyStr = '1234567898745621';
var ivStr = keyStr;
var key = CryptoJS.enc.Utf8.parse(keyStr);
@ -77,33 +80,35 @@ const Encrypt = (passWord) =>{
</script>
<style lang="less" scoped>
.login-page {
width: 100%;
height: 100%;
display: flex;
overflow: hidden;
background-image: url("~@/assets/images/login.jpg");
background-repeat: no-repeat;
background-size: cover;
opacity: 0.9;
.login-content {
margin: auto;
padding: 0.27rem 0.27rem 0.52rem 0.27rem;
background-color: #fff;
border-radius: 0.27rem;
box-shadow: 0 0 0.27rem rgba(0, 0, 0, 0.2);
opacity: 0.9;
.title{
font-size: 0.52rem;
font-weight: 600;
.login-page {
width: 100%;
height: 100%;
display: flex;
overflow: hidden;
background-image: url("~@/assets/images/login.jpg");
background-repeat: no-repeat;
background-size: cover;
opacity: 0.9;
.login-content {
margin: auto;
padding: 0.27rem 0.27rem 0.52rem 0.27rem;
background-color: #fff;
border-radius: 0.27rem;
box-shadow: 0 0 0.27rem rgba(0, 0, 0, 0.2);
opacity: 0.9;
.title {
font-size: 0.52rem;
font-weight: 600;
}
}
}
.link {
font-size: 0.32rem;
color: #069;
float: right;
margin-right: 0.4rem;
}
}
.link {
font-size: 0.32rem;
color: #069;
float: right;
margin-right: 0.4rem;
}
}
</style>

Write Preview
Loading…
Cancel
Save