diff --git a/colorui/components/cu-custom.vue b/colorui/components/cu-custom.vue
index d77fb06..d5ef126 100644
--- a/colorui/components/cu-custom.vue
+++ b/colorui/components/cu-custom.vue
@@ -68,7 +68,24 @@
return uni.redirectTo({url})
}
if(this.backUrl) {
- return uni.redirectTo({url: this.backUrl})
+ if (this.backUrl === 'returnLogin') {
+ uni.showModal({
+ title: '操作提示',
+ content: '返回登录将会清空当前注册信息,确认是否继续?',
+ cancelColor:"#000000",
+ cancelText: '取消',
+ confirmText: '确定',
+ success: res => {
+ if (res.confirm) {
+ uni.navigateBack({
+ delta: 1
+ });
+ }
+ }
+ })
+ } else {
+ return uni.redirectTo({url: this.backUrl})
+ }
} else {
uni.navigateBack({
delta: 1
diff --git a/common/tool.js b/common/tool.js
index ee1c0d6..3a6f338 100644
--- a/common/tool.js
+++ b/common/tool.js
@@ -1,5 +1,5 @@
// export var basePath = "http://192.168.0.42:8099/";
-export var basePath = "http://192.168.0.49:8093/";
+export var basePath = "http://192.168.0.69:7072/";
// export var basePath = "https://gateway.qhdsafety.com/";
export const baseImgPath = "https://file.zcloudchina.com/YTHFile";
export const adminPath = "http://192.168.0.18:8085";
@@ -12,7 +12,7 @@ export var corpinfoId = ''; //
export var loginUserId = '';
export var loginUser = '';
export function loginSession() {
- if ('' == corpinfoId || undefined == corpinfoId || '' == loginUserId || undefined == loginUserId ||
+ if ('' == loginUserId || undefined == loginUserId ||
'' == loginUser || undefined == loginUser) {
uni.navigateTo({
url: '/pages/login/home',
@@ -110,6 +110,76 @@ function noMultipleClicks(methods, e) {
console.log("请稍后点击")
}
}
+
+/**
+ * 验证身份证号码
+ */
+export function validateIdCard(value) {
+ return /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/.test(
+ value
+ )
+}
+
+/**
+ * 验证手机格式
+ */
+export function validateMobile(value) {
+ return /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/.test(value)
+}
+
+
+//获取数据字典数据
+export async function getLevel(dataParams) {
+ const list = await sendPost(dataParams, '/dictionaries/getDictList')
+ return list
+}
+//获取数据字典数据(3级字典)
+export async function getLevelCustom(dataParams) {
+ const list = await sendPost(dataParams, '/dictionaries/getLevelCustom')
+ return list
+}
+
+export async function listCorpAll(dataParams) {
+ const list = await sendPost(dataParams, '/app/corpinfo/listAll')
+ return list
+}
+
+/**
+ * 获取字典
+ */
+async function sendPost(dataParams, url) {
+ let resData = await uni.request({
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ url: basePath + url,
+ data: dataParams
+ })
+ return resData[1].data.list
+}
+
+export async function checkIdCard(dataParams) {
+ const data = await getData(dataParams, '/app/user/hasUserIdCard')
+ return data
+}
+
+/**
+ * 获取字典
+ */
+async function getData(dataParams, url) {
+ let resData = await uni.request({
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ url: basePath + url,
+ data: dataParams
+ })
+ return resData[1].data
+}
//导出
export default {
noMultipleClicks, //禁止多次点击
diff --git a/components/zqs-select/right_icon.png b/components/zqs-select/right_icon.png
new file mode 100644
index 0000000..7a5f4eb
Binary files /dev/null and b/components/zqs-select/right_icon.png differ
diff --git a/components/zqs-select/zqs-select.vue b/components/zqs-select/zqs-select.vue
new file mode 100644
index 0000000..9fb132c
--- /dev/null
+++ b/components/zqs-select/zqs-select.vue
@@ -0,0 +1,529 @@
+
+
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+ 搜索
+
+
+
+
+ {{ getLabelKeyValue(item) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/package-lock.json b/package-lock.json
index 4263587..78d8b2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,117 +1,162 @@
{
+ "name": "integrated_traffic_uniapp",
+ "lockfileVersion": 3,
"requires": true,
- "lockfileVersion": 1,
- "dependencies": {
- "@babel/parser": {
- "version": "7.24.0",
- "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.0.tgz",
- "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
- "dev": true
+ "packages": {
+ "": {
+ "dependencies": {
+ "@dcloudio/uni-ui": "^1.5.0",
+ "moment": "^2.29.4",
+ "vue-aliplayer": "^1.0.0"
+ },
+ "devDependencies": {
+ "@types/html5plus": "^1.0.2",
+ "@types/uni-app": "^1.4.4"
+ }
},
- "@dcloudio/uni-ui": {
- "version": "1.5.2",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-ui/-/uni-ui-1.5.2.tgz",
- "integrity": "sha512-/MO31TELyHcKt3nS5bo1t8lQmLSnP9EKlHcShjqM27gL0QeYtoc9UekOITRbA9zi8rnlII3Aw91DHtny3IodFg=="
+ "node_modules/@babel/parser": {
+ "version": "7.23.6",
+ "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.6.tgz",
+ "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+ "dev": true,
+ "bin": {
+ "parser": "bin/babel-parser.js"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
},
- "@types/html5plus": {
+ "node_modules/@dcloudio/uni-ui": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-ui/-/uni-ui-1.5.0.tgz",
+ "integrity": "sha512-E7D37VbRZeh1E2yzrIie8psBckIrErdkUbUA751rlG8zdioGovW3zOuUsKgY+Gh7csMvi6XMEoSacvboe8o4Gw=="
+ },
+ "node_modules/@types/html5plus": {
"version": "1.0.5",
"resolved": "https://registry.npmmirror.com/@types/html5plus/-/html5plus-1.0.5.tgz",
"integrity": "sha512-qt5z+3WYkARL/rWnJRcB2fCDOZLKa/hEOkse9sjA6FFkXZtKb+OPxKqo8bDgix4+ufahOff0adarVfaUaK1mfw==",
"dev": true
},
- "@types/uni-app": {
+ "node_modules/@types/uni-app": {
"version": "1.4.8",
"resolved": "https://registry.npmmirror.com/@types/uni-app/-/uni-app-1.4.8.tgz",
"integrity": "sha512-plxwi9MvGDrekCsDKuNlCN3ZXIv9zkqHsKZJOsc8FQqLSHveDBOm11qOaswe4QyNWVHpvwZMViii/Ni1/d40LA==",
"dev": true,
- "requires": {
+ "dependencies": {
"vue": "^2.6.8"
}
},
- "@vue/compiler-sfc": {
+ "node_modules/@vue/compiler-sfc": {
"version": "2.7.16",
"resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
"integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
"dev": true,
- "requires": {
+ "dependencies": {
"@babel/parser": "^7.23.5",
"postcss": "^8.4.14",
- "prettier": "^1.18.2 || ^2.0.0",
"source-map": "^0.6.1"
+ },
+ "optionalDependencies": {
+ "prettier": "^1.18.2 || ^2.0.0"
}
},
- "csstype": {
+ "node_modules/csstype": {
"version": "3.1.3",
"resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
"dev": true
},
- "moment": {
+ "node_modules/moment": {
"version": "2.30.1",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
- "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+ "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+ "engines": {
+ "node": "*"
+ }
},
- "nanoid": {
+ "node_modules/nanoid": {
"version": "3.3.7",
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
- "dev": true
+ "dev": true,
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
},
- "picocolors": {
+ "node_modules/picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true
},
- "postcss": {
- "version": "8.4.35",
- "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.35.tgz",
- "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+ "node_modules/postcss": {
+ "version": "8.4.33",
+ "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.33.tgz",
+ "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
"dev": true,
- "requires": {
+ "dependencies": {
"nanoid": "^3.3.7",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
}
},
- "prettier": {
+ "node_modules/prettier": {
"version": "2.8.8",
"resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz",
"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
"dev": true,
- "optional": true
+ "optional": true,
+ "bin": {
+ "prettier": "bin-prettier.js"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
},
- "source-map": {
+ "node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
},
- "source-map-js": {
+ "node_modules/source-map-js": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
- "dev": true
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
},
- "vue": {
+ "node_modules/vue": {
"version": "2.7.16",
"resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz",
"integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+ "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
"dev": true,
- "requires": {
+ "dependencies": {
"@vue/compiler-sfc": "2.7.16",
"csstype": "^3.1.0"
}
},
- "vue-aliplayer": {
+ "node_modules/vue-aliplayer": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/vue-aliplayer/-/vue-aliplayer-1.0.0.tgz",
"integrity": "sha512-z29s38hlNJDckGSPtuTsYwMdjj70SsvJ5VzbEoBoV2BTrg3ucvodM2CW7BWstrG9WaQqz4F8nVGLSON05RrmJw==",
- "requires": {
+ "dependencies": {
"vue-github-badge": "^1.0.0"
}
},
- "vue-github-badge": {
+ "node_modules/vue-github-badge": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/vue-github-badge/-/vue-github-badge-1.0.1.tgz",
"integrity": "sha512-8X+FUWapnnDfs6cRUg3mCfHUf2r5arUfCSRdvbIn860oj9us3Rz3VOtioUgmfzh6EhaaYTs0Oh78EzJ+Z6uqAA=="
diff --git a/pages.json b/pages.json
index 5455a61..af431f9 100644
--- a/pages.json
+++ b/pages.json
@@ -27,10 +27,66 @@
"path": "pages/login/forget/forget-reset",
"style": {}
},
+ {
+ "path": "pages/login/register/index",
+ "style": {}
+ },
+ {
+ "path": "pages/login/register/account",
+ "style": {}
+ },
+ {
+ "path": "pages/login/register/baseInfo",
+ "style": {}
+ },
+ {
+ "path": "pages/login/register/certificate",
+ "style": {}
+ },
+ {
+ "path": "pages/login/register/apply",
+ "style": {}
+ },
{
"path": "pages/basics/basic-info/basic-info",
"style": {}
},
+ {
+ "path": "pages/basics/basic-info/home",
+ "style": {}
+ },
+ {
+ "path": "pages/basics/basic-info/user-info",
+ "style": {}
+ },
+ {
+ "path": "pages/basics/basic-info/components/account",
+ "style": {}
+ },
+ {
+ "path": "pages/basics/basic-info/components/baseInfo",
+ "style": {}
+ },
+ {
+ "path": "pages/basics/basic-info/components/certificate",
+ "style": {}
+ },
+ {
+ "path": "pages/basics/basic-info/components/apply",
+ "style": {}
+ },
+ {
+ "path": "pages/basics/basic-info/resignation",
+ "style": {}
+ },
+ {
+ "path": "pages/basics/basic-info/entry",
+ "style": {}
+ },
+ {
+ "path": "pages/basics/basic-info/confirm",
+ "style": {}
+ },
{
"path": "pages/basics/home",
"style": {
diff --git a/pages/application/blindboard/blindboard-confess/blindboard-confess-detail.vue b/pages/application/blindboard/blindboard-confess/blindboard-confess-detail.vue
index 3934354..aa3c646 100644
--- a/pages/application/blindboard/blindboard-confess/blindboard-confess-detail.vue
+++ b/pages/application/blindboard/blindboard-confess/blindboard-confess-detail.vue
@@ -165,7 +165,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail.vue b/pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail.vue
index 14dd437..15a8c72 100644
--- a/pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail.vue
+++ b/pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail.vue
@@ -117,7 +117,7 @@
delImgs(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
@@ -233,7 +233,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/blindboard/blindboard-workuser/blindboard-workuser-detail.vue b/pages/application/blindboard/blindboard-workuser/blindboard-workuser-detail.vue
index 9b1ab32..58398e9 100644
--- a/pages/application/blindboard/blindboard-workuser/blindboard-workuser-detail.vue
+++ b/pages/application/blindboard/blindboard-workuser/blindboard-workuser-detail.vue
@@ -102,7 +102,7 @@
delImgs(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/breakground/breakground-confess/breakground-confess-detail.vue b/pages/application/breakground/breakground-confess/breakground-confess-detail.vue
index aa50c56..c3d9f37 100644
--- a/pages/application/breakground/breakground-confess/breakground-confess-detail.vue
+++ b/pages/application/breakground/breakground-confess/breakground-confess-detail.vue
@@ -165,7 +165,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue b/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue
index 2c027c6..5ba0a0d 100644
--- a/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue
+++ b/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue
@@ -127,7 +127,7 @@
delImgs(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/check-record/imgs_details.vue b/pages/application/check-record/imgs_details.vue
index 0eb32c1..8098f89 100644
--- a/pages/application/check-record/imgs_details.vue
+++ b/pages/application/check-record/imgs_details.vue
@@ -115,7 +115,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/confinedspace/confinedspace-confess/confinedspace-confess-detail.vue b/pages/application/confinedspace/confinedspace-confess/confinedspace-confess-detail.vue
index 22375f9..206031a 100644
--- a/pages/application/confinedspace/confinedspace-confess/confinedspace-confess-detail.vue
+++ b/pages/application/confinedspace/confinedspace-confess/confinedspace-confess-detail.vue
@@ -165,7 +165,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/cutroad/cutroad-confess/cutroad-confess-detail.vue b/pages/application/cutroad/cutroad-confess/cutroad-confess-detail.vue
index 5065639..465cfc1 100644
--- a/pages/application/cutroad/cutroad-confess/cutroad-confess-detail.vue
+++ b/pages/application/cutroad/cutroad-confess/cutroad-confess-detail.vue
@@ -161,7 +161,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/cutroad/cutroad-projectmanager/cutroad-projectmanager-detail.vue b/pages/application/cutroad/cutroad-projectmanager/cutroad-projectmanager-detail.vue
index e8dd847..52a0687 100644
--- a/pages/application/cutroad/cutroad-projectmanager/cutroad-projectmanager-detail.vue
+++ b/pages/application/cutroad/cutroad-projectmanager/cutroad-projectmanager-detail.vue
@@ -127,7 +127,7 @@
delImgs(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/dangerous_options/index.vue b/pages/application/dangerous_options/index.vue
index 60ccb32..79d89cb 100644
--- a/pages/application/dangerous_options/index.vue
+++ b/pages/application/dangerous_options/index.vue
@@ -129,7 +129,7 @@ export default {
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/electricity/electricity-confess/electricity-confess-detail.vue b/pages/application/electricity/electricity-confess/electricity-confess-detail.vue
index 14a4171..01e0716 100644
--- a/pages/application/electricity/electricity-confess/electricity-confess-detail.vue
+++ b/pages/application/electricity/electricity-confess/electricity-confess-detail.vue
@@ -165,7 +165,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/gas-detection/gas-detection-record.vue b/pages/application/gas-detection/gas-detection-record.vue
index dc36385..968791f 100644
--- a/pages/application/gas-detection/gas-detection-record.vue
+++ b/pages/application/gas-detection/gas-detection-record.vue
@@ -562,7 +562,7 @@
return;
}
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '请确定是否正确填写气体检测单,点击确认后将归档?',
cancelColor:"#000000",
cancelText: '取消',
@@ -765,7 +765,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
index 3cd7857..27d816a 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
@@ -652,7 +652,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-imgs.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-imgs.vue
index 232571d..5ebc4a0 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-imgs.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-imgs.vue
@@ -152,7 +152,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
index 62db3fa..47d46df 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
@@ -647,7 +647,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue b/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue
index c955a1c..77ef37d 100644
--- a/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue
+++ b/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue
@@ -601,7 +601,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
index ef19eea..602478c 100644
--- a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
@@ -601,7 +601,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue
index 74baaa2..f7d830f 100644
--- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue
@@ -556,7 +556,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
index 62855f8..561f432 100644
--- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
@@ -565,7 +565,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue
index a9ec123..5559fe4 100644
--- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue
@@ -551,7 +551,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue
index 76ade6a..913dfde 100644
--- a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue
@@ -543,7 +543,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue
index 4fbea0f..c14a67b 100644
--- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue
@@ -648,7 +648,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
@@ -684,7 +684,7 @@
},
DelImg_fa(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
@@ -721,7 +721,7 @@
},
DelImg_plan(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue
index 4edf365..5f76a7d 100644
--- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue
@@ -653,7 +653,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
@@ -689,7 +689,7 @@
},
DelImg_fa(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
@@ -726,7 +726,7 @@
},
DelImg_plan(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue
index 2b0788d..caf95da 100644
--- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue
@@ -645,7 +645,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
@@ -681,7 +681,7 @@
},
DelImg_fa(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
@@ -718,7 +718,7 @@
},
DelImg_plan(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue
index ae92f34..1e1faaa 100644
--- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue
@@ -404,7 +404,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue
index ae92f34..1e1faaa 100644
--- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue
@@ -404,7 +404,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue
index a2faad2..01febe4 100644
--- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue
@@ -405,7 +405,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue
index 04929dd..40af467 100644
--- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue
@@ -625,7 +625,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue
index 49ce3bc..460ff91 100644
--- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue
@@ -559,7 +559,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue
index c49a3b1..8bcda01 100644
--- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue
@@ -556,7 +556,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-danger-management/hidden-danger-review/hidden-danger-review-detail.vue b/pages/application/hidden-danger-management/hidden-danger-review/hidden-danger-review-detail.vue
index 24295f8..b933e47 100644
--- a/pages/application/hidden-danger-management/hidden-danger-review/hidden-danger-review-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-review/hidden-danger-review-detail.vue
@@ -524,7 +524,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-imgs.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-imgs.vue
index 232571d..5ebc4a0 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-imgs.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-imgs.vue
@@ -152,7 +152,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
index e598aa3..40bf160 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
@@ -647,7 +647,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
index c58c497..bfc60c4 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
@@ -639,7 +639,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
index 37b73e9..8458a04 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
@@ -601,7 +601,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/highwork/highwork-confess/highwork-confess-detail.vue b/pages/application/highwork/highwork-confess/highwork-confess-detail.vue
index ec0c59b..764ac91 100644
--- a/pages/application/highwork/highwork-confess/highwork-confess-detail.vue
+++ b/pages/application/highwork/highwork-confess/highwork-confess-detail.vue
@@ -165,7 +165,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hoisting/hoisting-confess/hoisting-confess-detail.vue b/pages/application/hoisting/hoisting-confess/hoisting-confess-detail.vue
index 221e154..e60b0c6 100644
--- a/pages/application/hoisting/hoisting-confess/hoisting-confess-detail.vue
+++ b/pages/application/hoisting/hoisting-confess/hoisting-confess-detail.vue
@@ -165,7 +165,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue
index a1a4d74..02a142f 100644
--- a/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue
+++ b/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue
@@ -165,7 +165,7 @@
delImg(e) {
var _this = this;
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/limit-space-affirm/limit-space-affirm-detail.vue b/pages/application/limit-space-affirm/limit-space-affirm-detail.vue
index 27c425b..4d88928 100644
--- a/pages/application/limit-space-affirm/limit-space-affirm-detail.vue
+++ b/pages/application/limit-space-affirm/limit-space-affirm-detail.vue
@@ -758,7 +758,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/limit-space-check/limit-space-check-detail.vue b/pages/application/limit-space-check/limit-space-check-detail.vue
index 4065c1e..4f777e2 100644
--- a/pages/application/limit-space-check/limit-space-check-detail.vue
+++ b/pages/application/limit-space-check/limit-space-check-detail.vue
@@ -811,7 +811,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/safety-environmental-inspection/apply/detail-plead.vue b/pages/application/safety-environmental-inspection/apply/detail-plead.vue
index 1564792..6867107 100644
--- a/pages/application/safety-environmental-inspection/apply/detail-plead.vue
+++ b/pages/application/safety-environmental-inspection/apply/detail-plead.vue
@@ -263,7 +263,7 @@
},
delImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/safety-environmental-inspection/archive/detail-check.vue b/pages/application/safety-environmental-inspection/archive/detail-check.vue
index 295c06c..87d8e43 100644
--- a/pages/application/safety-environmental-inspection/archive/detail-check.vue
+++ b/pages/application/safety-environmental-inspection/archive/detail-check.vue
@@ -618,7 +618,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/safety-environmental-inspection/rectification/detail.vue b/pages/application/safety-environmental-inspection/rectification/detail.vue
index de420d8..3750726 100644
--- a/pages/application/safety-environmental-inspection/rectification/detail.vue
+++ b/pages/application/safety-environmental-inspection/rectification/detail.vue
@@ -478,7 +478,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
@@ -514,7 +514,7 @@
},
DelImg_fa(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/application/speEquip/add.vue b/pages/application/speEquip/add.vue
index 352b44b..cf87c74 100644
--- a/pages/application/speEquip/add.vue
+++ b/pages/application/speEquip/add.vue
@@ -201,7 +201,7 @@
var _this = this;
let i=e.currentTarget.dataset.index
uni.showModal({
- title: '秦安双控',
+ title: '操作提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/application/video/VideoManager/VideoManager-detail.vue b/pages/application/video/VideoManager/VideoManager-detail.vue
index bcac459..bcb52ca 100644
--- a/pages/application/video/VideoManager/VideoManager-detail.vue
+++ b/pages/application/video/VideoManager/VideoManager-detail.vue
@@ -113,7 +113,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/basics/basic-info/components/account.vue b/pages/basics/basic-info/components/account.vue
new file mode 100644
index 0000000..60bfbd2
--- /dev/null
+++ b/pages/basics/basic-info/components/account.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+ 身份证号
+
+
+
+ 姓名
+
+
+
+ 手机
+
+
+
+ 服务单位
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/basic-info/components/apply.vue b/pages/basics/basic-info/components/apply.vue
new file mode 100644
index 0000000..f58fe09
--- /dev/null
+++ b/pages/basics/basic-info/components/apply.vue
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+ 姓名
+
+
+
+ 身份证号
+
+
+
+ 手机
+
+
+
+ 人员类型
+ {{formData.PERSONNEL_TYPE_NAME}}
+
+
+ {{formData.PERSONNEL_TYPE_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}}
+
+
+
+
+
+
+
+ 入职企业
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/basic-info/components/baseInfo.vue b/pages/basics/basic-info/components/baseInfo.vue
new file mode 100644
index 0000000..907c0b8
--- /dev/null
+++ b/pages/basics/basic-info/components/baseInfo.vue
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+ 姓名
+
+
+
+ 身份证号
+
+
+
+ 手机
+
+
+
+ 人员类型
+ {{formData.PERSONNEL_TYPE_NAME}}
+
+
+ {{formData.PERSONNEL_TYPE_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}}
+
+
+
+
+ 文化程度
+ {{formData.DEGREE_OF_EDUCATION_NAME}}
+
+
+ {{formData.DEGREE_OF_EDUCATION_NAME?formData.DEGREE_OF_EDUCATION_NAME:'请选择'}}
+
+
+
+
+ 政治面貌
+ {{formData.POLITICAL_OUTLOOK_NAME}}
+
+
+ {{formData.POLITICAL_OUTLOOK_NAME?formData.POLITICAL_OUTLOOK_NAME:'请选择'}}
+
+
+
+
+ 参加工作日期
+ {{formData.WORKING_DATE}}
+
+
+ {{formData.WORKING_DATE?formData.WORKING_DATE:'请选择'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/basic-info/components/certificate.vue b/pages/basics/basic-info/components/certificate.vue
new file mode 100644
index 0000000..e1faf2c
--- /dev/null
+++ b/pages/basics/basic-info/components/certificate.vue
@@ -0,0 +1,899 @@
+
+
+
+
+
+
+ 姓名
+
+
+
+ 身份证号
+
+
+
+ 手机
+
+
+
+ 人员类型
+ {{formData.PERSONNEL_TYPE_NAME}}
+
+
+ {{formData.PERSONNEL_TYPE_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}}
+
+
+
+
+
+
+
+
+ 身份证(正面)
+
+
+
+
+
+
+
+
+
+
+
+ 身份证(正面)
+
+
+ {{fileData.idCardFront.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 身份证(背面)
+
+
+
+
+
+
+
+
+
+
+
+ 身份证(背面)
+
+
+ {{fileData.idCardBack.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 生日
+ {{formData.DATE_OF_BIRTH}}
+
+
+ {{formData.DATE_OF_BIRTH?formData.DATE_OF_BIRTH:'请选择'}}
+
+
+
+
+ 民族
+ {{formData.NATION_NAME}}
+
+
+ {{formData.NATION_NAME?formData.NATION_NAME:'请选择'}}
+
+
+
+
+ 性别
+ {{formData.SEX_NAME}}
+
+
+ {{formData.SEX_NAME?formData.SEX_NAME:'请选择'}}
+
+
+
+
+ 有效期(起始)
+ {{formData.ID_CARD_VALIDITY_START}}
+
+
+ {{formData.ID_CARD_VALIDITY_START?formData.ID_CARD_VALIDITY_START:'请选择'}}
+
+
+
+
+ 有效期(截止)
+ {{formData.ID_CARD_VALIDITY_END}}
+
+
+ {{formData.ID_CARD_VALIDITY_END?formData.ID_CARD_VALIDITY_END:'请选择'}}
+
+
+
+
+ 住址
+
+
+
+ 签发机关
+
+
+
+
+
+
+
+
+ 驾驶证
+
+
+
+
+
+
+
+
+
+
+
+ 驾驶证
+
+
+ {{fileData.driverLicense.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 驾驶证号
+
+
+
+ 准驾车型
+
+
+
+ 国籍
+
+
+
+ 初次领证日期
+ {{formData.DRIVER_LICENSE_ISSUE_DATE}}
+
+
+ {{formData.DRIVER_LICENSE_ISSUE_DATE?formData.DRIVER_LICENSE_ISSUE_DATE:'请选择'}}
+
+
+
+
+ 有效期(起始)
+ {{formData.DRIVER_LICENSE_VALIDITY_START}}
+
+
+ {{formData.DRIVER_LICENSE_VALIDITY_START?formData.DRIVER_LICENSE_VALIDITY_START:'请选择'}}
+
+
+
+
+ 有效期(截止)
+ {{formData.DRIVER_LICENSE_VALIDITY_END}}
+
+
+ {{formData.DRIVER_LICENSE_VALIDITY_END?formData.DRIVER_LICENSE_VALIDITY_END:'请选择'}}
+
+
+
+
+ 签发机关
+
+
+
+
+
+
+
+
+ 从业资格证
+
+
+
+
+
+
+
+
+
+
+
+ 从业资格证
+
+
+ {{fileData.qualificationCertificate.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 从业资格证号
+
+
+
+ 从业资格类别
+
+
+
+ 国籍
+
+
+
+ 初次领证日期
+ {{formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE}}
+
+
+ {{formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE?formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE:'请选择'}}
+
+
+
+
+ 有效期(起始)
+ {{formData.QUALIFICATION_CERTIFICATE_VALIDITY_START}}
+
+
+ {{formData.QUALIFICATION_CERTIFICATE_VALIDITY_START?formData.QUALIFICATION_CERTIFICATE_VALIDITY_START:'请选择'}}
+
+
+
+
+ 有效期(截止)
+ {{formData.QUALIFICATION_CERTIFICATE_VALIDITY_END}}
+
+
+ {{formData.QUALIFICATION_CERTIFICATE_VALIDITY_END?formData.QUALIFICATION_CERTIFICATE_VALIDITY_END:'请选择'}}
+
+
+
+
+ 签发机关
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/basic-info/confirm.vue b/pages/basics/basic-info/confirm.vue
new file mode 100644
index 0000000..7734c78
--- /dev/null
+++ b/pages/basics/basic-info/confirm.vue
@@ -0,0 +1,230 @@
+
+
+
+ 返回
+ {{ form.APPLY_TYPE ==='2' ? '入职确认' : '解聘确认' }}
+
+
+
+
+ 服务公司
+
+
+
+ 所在部门
+
+
+
+ 任职岗位
+
+
+
+ 确认结果
+
+
+
+
+
+
+ 申请描述
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/basic-info/entry.vue b/pages/basics/basic-info/entry.vue
new file mode 100644
index 0000000..a14dbfe
--- /dev/null
+++ b/pages/basics/basic-info/entry.vue
@@ -0,0 +1,206 @@
+
+
+
+ 返回
+ 入职申请
+
+
+
+
+
+
+ 入职企业
+
+
+
+
+ 申请描述
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/basic-info/home.vue b/pages/basics/basic-info/home.vue
new file mode 100644
index 0000000..3092b6d
--- /dev/null
+++ b/pages/basics/basic-info/home.vue
@@ -0,0 +1,121 @@
+
+
+
+ 返回
+ 个人信息
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/basic-info/resignation.vue b/pages/basics/basic-info/resignation.vue
new file mode 100644
index 0000000..5ebb270
--- /dev/null
+++ b/pages/basics/basic-info/resignation.vue
@@ -0,0 +1,186 @@
+
+
+
+ 返回
+ 离职申请
+
+
+
+
+ 服务公司
+
+
+
+ 所在部门
+
+
+
+ 任职岗位
+
+
+
+ 申请描述
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/basic-info/user-info.vue b/pages/basics/basic-info/user-info.vue
new file mode 100644
index 0000000..d0cf677
--- /dev/null
+++ b/pages/basics/basic-info/user-info.vue
@@ -0,0 +1,593 @@
+
+
+
+ 返回
+ 人员信息
+
+
+
+
+
+
+ {{tabNav[index]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/basics/home.vue b/pages/basics/home.vue
index 2ef6a3f..8bc268c 100644
--- a/pages/basics/home.vue
+++ b/pages/basics/home.vue
@@ -64,7 +64,7 @@
-->
-
+
@@ -580,163 +580,178 @@ import {
updateInfo
} from '@/common/tool.js';
-import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
-import maoScroll from '@/components/mao-scroll/mao-scroll.vue';
-import ykAuthpup from "@/components/yk-authpup/yk-authpup";
-export default {
- components: {
- maoScroll,ykAuthpup
- },
- mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
- data() {
- return {
- safetyEnvironmentalInspection:0,//安全环保总数
- permissionID:'',
- premission: {},
- noClick: true,
- StatusBar: this.StatusBar,
- StatusBarb: this.StatusBar + 50,
- hidCount: [],
- hdCount: {},
- userCount: {},
- deptCount: {},
- superviseDeptCount: {},
- today: '',
- triggered: false,
- count: {},
- totalList: [],
- SURVEY_ID: '',
- IS_PUBLISH: '',
- isGoodsEdit: false, // 是否加载编辑后的数据
- downOption: {
- mustToTop: true,
- },
- upOption: {
- use: false, // 禁止上拉
- toTop: {
- src: '' // 不显示回到顶部按钮
- }
- },
- isRest: '',
- showNum: 4,
- lineHeight: 60,
- animationScroll: 180,
- animation: 3000,
- rollData: [],
- eight_work_count: 0,
- updataPd: {},
- modalName:''
- };
- },
- mounted() {
- loginSession()
- this.getSafetyEnvironmentalInspectionCount();
- this.getUpdateInfo()
- this.premission = Object.assign({}, premission)
- let now = new Date();
- var today = formatDate(now, 'yyyy-MM-dd');
- if (!this.premission || JSON.stringify(this.premission) === '{}') {
- this.getMenu();
- }
- this.getIsRest();
- this.getData();
- this.getSurveyData();
- // this.getUserId();
- this.getListData();
- // 获取隐患播报滚动
- this.getHiddenRoll();
- // this._freshing = false;
- // setTimeout(() => {
- // this.triggered = true;
- // }, 1000)
+ import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
+ import maoScroll from '@/components/mao-scroll/mao-scroll.vue';
+ import ykAuthpup from "@/components/yk-authpup/yk-authpup";
+ export default {
+ components: {
+ maoScroll,
+ ykAuthpup
+ },
+ mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+ data() {
+ return {
+ keyProjectManagement: '',
+ safetyEnvironmentalInspection: 0, //安全环保总数
+ permissionID: '',
+ premission: {},
+ noClick: true,
+ StatusBar: this.StatusBar,
+ StatusBarb: this.StatusBar + 50,
+ hidCount: [],
+ hdCount: {},
+ userCount: {
+ check_count: 0,
+ hidden_count: 0,
+ rectify_count: 0
+ },
+ deptCount: {
+ check_count: 0,
+ hidden_count: 0,
+ rectify_count: 0
+ },
+ superviseDeptCount: {
+ check_count: 0,
+ hidden_count: 0,
+ rectify_count: 0
+ },
+ today: '',
+ triggered: false,
+ count: {},
+ totalList: [],
+ SURVEY_ID: '',
+ IS_PUBLISH: '',
+ isGoodsEdit: false, // 是否加载编辑后的数据
+ downOption: {
+ mustToTop: true,
+ },
+ upOption: {
+ use: false, // 禁止上拉
+ toTop: {
+ src: '' // 不显示回到顶部按钮
+ }
+ },
+ isRest: '',
+ showNum: 4,
+ lineHeight: 60,
+ animationScroll: 180,
+ animation: 3000,
+ rollData: [],
+ eight_work_count: 0,
+ updataPd: {},
+ modalName: ''
+ };
+ },
+ mounted() {
+ loginSession()
+ this.getUpdateInfo()
+ let now = new Date();
+ var today = formatDate(now, 'yyyy-MM-dd');
+
+ if (loginUser.CORPINFO_ID) {
+ this.getSafetyEnvironmentalInspectionCount();
+ this.getIsRest();
+ this.getData();
+ this.getSurveyData();
+ this.getListData();
+ // 获取隐患播报滚动
+ this.getHiddenRoll();
+ }
+ // this.getUserId();
+ // this._freshing = false;
+ // setTimeout(() => {
+ // this.triggered = true;
+ // }, 1000)
this.eight_work_count = 0
this.getRedPoint()
- },
- // onPullDownRefresh() {
- // console.log('refresh');
- // setTimeout(function () {
- // uni.stopPullDownRefresh();
- // }, 1000);
- // },
- methods: {
- getSafetyEnvironmentalInspectionCount(){
- var _this = this;
- return new Promise((resolve, reject) => {
- uni.request({
- url: basePath +'/app/safetyenvironmental/countCheck',
- method: 'POST',
- dataType: 'json',
- header:{
- 'Content-type':'application/x-www-form-urlencoded'
- },
- data: {
- CORPINFO_ID:corpinfoId,
- INSPECTION_USER_ID:loginUser.USER_ID,
- INSPECTED_SITEUSER_ID: loginUser.USER_ID,
- INSPECTION_ORIGINATOR_ID: loginUser.USER_ID,
- tm:new Date().getTime()
- },
- success: (res) => {
- if ("success" == res.data.result) {
- _this.safetyEnvironmentalInspection = res.data.confirmCount.confirmCount
- + res.data.checkedCount.checkedCount+ res.data.repulseCount.repulseCount
- +res.data.repulseAndCheckCount.repulseAndCheckCount
- resolve();
- }
- }
- });
- })
- },
- getUpdateInfo() {
- // console.info(updateInfo)
- if (!updateInfo) {
- var _this = this;
- uni.request({
- url: projectManagerUrl + 'projectDetails/findUpdate?code=cloud&type=APP',
- method: 'POST',
- dataType: 'json',
- header: {
- 'Content-type': 'application/x-www-form-urlencoded'
- },
- data: {},
- success: (res) => {
- // console.info(res)
- if (res.data.pd) {
- // console.info(res.data.pd)
- _this.modalName = 'Modal'
- _this.updataPd = res.data.pd
- }
- }
- });
- }
- },
- IKnow(){
- this.modalName = ''
- setUpdateInfo(true)
- // console.info(updateInfo)
- },
- getRedPoint() {
- uni.request({
- url: basePath + '/app/eightwork/checkWork',
- method: 'POST',
- dataType: 'json',
- header: {
- 'Content-type': 'application/x-www-form-urlencoded'
- },
- data: {
- USER_ID: loginUser.USER_ID,
- },
- success: (res) => {
- if ("success" == res.data.result) {
- Object.values(res.data.count).forEach(item => {
- this.eight_work_count += (item || 0)
- })
- }
- }
- })
- },
+ },
+ // onPullDownRefresh() {
+ // console.log('refresh');
+ // setTimeout(function () {
+ // uni.stopPullDownRefresh();
+ // }, 1000);
+ // },
+ methods: {
+ getSafetyEnvironmentalInspectionCount() {
+ var _this = this;
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: basePath + '/app/safetyenvironmental/countCheck',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {
+ CORPINFO_ID: corpinfoId,
+ INSPECTION_USER_ID: loginUser.USER_ID,
+ INSPECTED_SITEUSER_ID: loginUser.USER_ID,
+ INSPECTION_ORIGINATOR_ID: loginUser.USER_ID,
+ tm: new Date().getTime()
+ },
+ success: (res) => {
+ if ("success" == res.data.result) {
+ _this.safetyEnvironmentalInspection = res.data.confirmCount
+ .confirmCount +
+ res.data.checkedCount.checkedCount + res.data.repulseCount
+ .repulseCount +
+ res.data.repulseAndCheckCount.repulseAndCheckCount
+ resolve();
+ }
+ }
+ });
+ })
+ },
+ getUpdateInfo() {
+ // console.info(updateInfo)
+ if (!updateInfo) {
+ var _this = this;
+ uni.request({
+ url: projectManagerUrl + 'projectDetails/findUpdate?code=cloud&type=APP',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {},
+ success: (res) => {
+ // console.info(res)
+ if (res.data.pd) {
+ // console.info(res.data.pd)
+ _this.modalName = 'Modal'
+ _this.updataPd = res.data.pd
+ }
+ }
+ });
+ }
+ },
+ IKnow() {
+ this.modalName = ''
+ setUpdateInfo(true)
+ // console.info(updateInfo)
+ },
+ getRedPoint() {
+ uni.request({
+ url: basePath + '/app/eightwork/checkWork',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {
+ USER_ID: loginUser.USER_ID,
+ },
+ success: (res) => {
+ if ("success" == res.data.result) {
+ Object.values(res.data.count).forEach(item => {
+ this.eight_work_count += (item)
+ })
+ }
+ }
+ })
+ },
getMenu() {
var _this = this;
@@ -846,10 +861,12 @@ export default {
});
},
async downCallback(page) {
- await this.getWork();
- await this.getUserData();
- await this.getDeptData();
- await this.getSuperviseDeptData();
+ if (loginUser.CORPINFO_ID) {
+ await this.getWork();
+ await this.getUserData();
+ await this.getDeptData();
+ await this.getSuperviseDeptData();
+ }
// await this.getMonth();
// await this.getYear();
await this.mescroll.endSuccess();
@@ -1009,124 +1026,126 @@ export default {
this.$forceUpdate();
resolve();
+ }
+ }
+ });
+ })
+ },
+ getYear() {
+ return new Promise((resolve, reject) => {
+ var _this = this;
+ //年隐患数
+ uni.request({
+ url: basePath + '/app/hidden/getIndexCount',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {
+ userId: loginUserId,
+ IS_YEAR: '1',
+ CORPINFO_ID: loginUser.CORPINFO_ID,
+ USER_ID: loginUser.USER_ID,
+ },
+ success: (res) => {
+ if (res.data != null) {
+ _this.hdCount.yearTotal = res.data.total;
+ _this.hdCount.yearChecked = res.data.checked;
+ _this.hdCount.yearUncheck = res.data.uncheck;
+ this.$forceUpdate();
+ resolve();
+ }
+ }
+ });
+ })
+ },
+ getSurveyData() {
+ if (loginUser.CORPINFO_ID) {
+ var _this = this;
+ uni.showLoading({
+ title: '请稍候'
+ })
+ uni.request({
+ url: basePath + '/app/survey/goEdit',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {
+ CORPINFO_ID: loginUser.CORPINFO_ID,
+ USER_ID: loginUser.USER_ID,
+ },
+ success: (res) => {
+ if ("success" == res.data.result) {
+ uni.hideLoading();
+ _this.SURVEY_ID = res.data.pd.SURVEY_ID
+ _this.IS_PUBLISH = res.data.pd.IS_PUBLISH
+ console.log(res.data)
+ // console.log(_this.SURVEY_ID)
+ console.log(_this.IS_PUBLISH)
+ } else if ("exception" == data.result) {
+ uni.showToast({
+ title: '错误',
+ duration: 2000
+ });
+ }
}
- }
- });
- })
- },
- getYear() {
- return new Promise((resolve, reject) => {
- var _this = this;
- //年隐患数
- uni.request({
- url: basePath + '/app/hidden/getIndexCount',
- method: 'POST',
- dataType: 'json',
- header: {
- 'Content-type': 'application/x-www-form-urlencoded'
- },
- data: {
- userId: loginUserId,
- IS_YEAR: '1',
- CORPINFO_ID: loginUser.CORPINFO_ID,
- USER_ID: loginUser.USER_ID,
- },
- success: (res) => {
- if (res.data != null) {
- _this.hdCount.yearTotal = res.data.total;
- _this.hdCount.yearChecked = res.data.checked;
- _this.hdCount.yearUncheck = res.data.uncheck;
- this.$forceUpdate();
- resolve();
- }
- }
- });
- })
- },
- getSurveyData() {
- var _this = this;
- uni.showLoading({
- title: '请稍候'
- })
- uni.request({
- url: basePath + '/app/survey/goEdit',
- method: 'POST',
- dataType: 'json',
- header: {
- 'Content-type': 'application/x-www-form-urlencoded'
- },
- data: {
- CORPINFO_ID:loginUser.CORPINFO_ID,
- USER_ID:loginUser.USER_ID,
- },
- success: (res) => {
- if ("success" == res.data.result) {
- uni.hideLoading();
- _this.SURVEY_ID = res.data.pd.SURVEY_ID
- _this.IS_PUBLISH = res.data.pd.IS_PUBLISH
- console.log(res.data)
- // console.log(_this.SURVEY_ID)
- console.log(_this.IS_PUBLISH)
- } else if ("exception" == data.result) {
- uni.showToast({
- title: '错误',
- duration: 2000
- });
- }
+ });
}
- });
- },
- getUserId() {
- var _this = this;
- uni.showLoading({
- title: '请稍候'
- })
- uni.request({
- url: basePath + '/app/surveyanswer/getUserId',
- method: 'POST',
- dataType: 'json',
- header: {
- 'Content-type': 'application/x-www-form-urlencoded'
- },
- data: {
- CORPINFO_ID:loginUser.CORPINFO_ID,
- USER_ID:loginUser.USER_ID
- },
- success: (res) => {
- if ("success" == res.data.result) {
- uni.hideLoading();
- _this.count = res.data.count.count
- // console.log(_this.count)
- // console.log(res.data.count.count)
- } else if ("exception" == data.result) {
- uni.showToast({
- title: '错误',
- duration: 2000
- });
- }
- }
- });
- },
- getData() {
- var _this = this;
- let now = new Date();
- _this.today = formatDate(now, 'yyyy-MM-dd');
- uni.request({
- url: basePath + '/app/hidden/getCountByUserId',
- method: 'POST',
- dataType: 'json',
- header: {
- 'Content-type': 'application/x-www-form-urlencoded'
- },
- data: {
- userId: loginUserId,
- USER_NAME: loginUser.NAME,
- CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID,
- IS_MAIN: loginUser.ISMAIN,
- CORPINFO_ID: loginUser.CORPINFO_ID,
- USER_ID: loginUser.USER_ID,
- },
- success: (res) => {
+ },
+ getUserId() {
+ var _this = this;
+ uni.showLoading({
+ title: '请稍候'
+ })
+ uni.request({
+ url: basePath + '/app/surveyanswer/getUserId',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {
+ CORPINFO_ID: loginUser.CORPINFO_ID,
+ USER_ID: loginUser.USER_ID
+ },
+ success: (res) => {
+ if ("success" == res.data.result) {
+ uni.hideLoading();
+ _this.count = res.data.count.count
+ // console.log(_this.count)
+ // console.log(res.data.count.count)
+ } else if ("exception" == data.result) {
+ uni.showToast({
+ title: '错误',
+ duration: 2000
+ });
+ }
+ }
+ });
+ },
+ getData() {
+ var _this = this;
+ let now = new Date();
+ _this.today = formatDate(now, 'yyyy-MM-dd');
+ uni.request({
+ url: basePath + '/app/hidden/getCountByUserId',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {
+ userId: loginUserId,
+ USER_NAME: loginUser.NAME,
+ CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID,
+ IS_MAIN: loginUser.ISMAIN,
+ CORPINFO_ID: loginUser.CORPINFO_ID,
+ USER_ID: loginUser.USER_ID,
+ },
+ success: (res) => {
if (res.data != null) {
_this.hidCount = res.data.hidCount;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 25434c6..21438d3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -160,75 +160,78 @@
methods: {
getRedPoint() {
- var _this = this;
- uni.showLoading({
- title: '请稍候'
- })
- uni.request({
- url: basePath + '/app/trafficNotice/getRedPoint',
- method: 'POST',
- dataType: 'json',
- header: {
- 'Content-type':'application/x-www-form-urlencoded'
- },
- data: {
- CORPINFO_ID:loginUser.CORPINFO_ID,
- USER_ID:loginUser.USER_ID,
- },
- success: (res) => {
- if("success" == res.data.result){
- uni.hideLoading();
- _this.mesCount = res.data.count;
- if(_this.mesCount > 0){
- uni.setTabBarBadge({ //显示数字
- index: 2,//tabbar下标
- text: _this.mesCount//数字
- })
- }else{
- uni.hideTabBarRedDot({ //隐藏红点
- index:2
- })
- }
- } else {
- uni.showToast({
- title: res.data.message,
- duration: 2000
- });
- }
- },
- fail: (res) => {
- uni.showToast({
- icon: 'none',
- title: "服务器正在升级,请稍后再试。",
- duration: 2000
- });
- }
- });
+ if (loginUser.CORPINFO_ID) {
- uni.request({
- url: basePath + '/app/hidden/getCountByUserId',
- method: 'POST',
- dataType: 'json',
- header:{
- 'Content-type':'application/x-www-form-urlencoded'
- },
- data: {
- userId: loginUserId,
- USER_NAME: loginUser.NAME,
- CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID,
- IS_MAIN:loginUser.ISMAIN,
- CORPINFO_ID:loginUser.CORPINFO_ID,
- USER_ID:loginUser.USER_ID,
- },
- success: (res) => {
- if (res.data != null) {
- _this.hidCount += res.data.hidCount.dys || 0
- _this.hidCount += res.data.hidCount.dzg || 0
- _this.dys += res.data.hidCount.dys || 0
- _this.dzg += res.data.hidCount.dzg || 0
+ var _this = this;
+ uni.showLoading({
+ title: '请稍候'
+ })
+ uni.request({
+ url: basePath + '/app/trafficNotice/getRedPoint',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type':'application/x-www-form-urlencoded'
+ },
+ data: {
+ CORPINFO_ID:loginUser.CORPINFO_ID,
+ USER_ID:loginUser.USER_ID,
+ },
+ success: (res) => {
+ if("success" == res.data.result){
+ uni.hideLoading();
+ _this.mesCount = res.data.count;
+ if(_this.mesCount > 0){
+ uni.setTabBarBadge({ //显示数字
+ index: 2,//tabbar下标
+ text: _this.mesCount//数字
+ })
+ }else{
+ uni.hideTabBarRedDot({ //隐藏红点
+ index:2
+ })
+ }
+ } else {
+ uni.showToast({
+ title: res.data.message,
+ duration: 2000
+ });
+ }
+ },
+ fail: (res) => {
+ uni.showToast({
+ icon: 'none',
+ title: "服务器正在升级,请稍后再试。",
+ duration: 2000
+ });
}
- }
- });
+ });
+
+ uni.request({
+ url: basePath + '/app/hidden/getCountByUserId',
+ method: 'POST',
+ dataType: 'json',
+ header:{
+ 'Content-type':'application/x-www-form-urlencoded'
+ },
+ data: {
+ userId: loginUserId,
+ USER_NAME: loginUser.NAME,
+ CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID,
+ IS_MAIN:loginUser.ISMAIN,
+ CORPINFO_ID:loginUser.CORPINFO_ID,
+ USER_ID:loginUser.USER_ID,
+ },
+ success: (res) => {
+ if (res.data != null) {
+ _this.hidCount += res.data.hidCount.dys || 0
+ _this.hidCount += res.data.hidCount.dzg || 0
+ _this.dys += res.data.hidCount.dys || 0
+ _this.dzg += res.data.hidCount.dzg || 0
+ }
+ }
+ });
+ }
},
NavChange: function (e) {
this.PageCur = e.currentTarget.dataset.cur
diff --git a/pages/login/home.vue b/pages/login/home.vue
index 15514f1..c88b7a9 100644
--- a/pages/login/home.vue
+++ b/pages/login/home.vue
@@ -11,17 +11,17 @@
欢迎使用,
- 秦安安全云平台!
+ 交通运输安全生产综合管理平台!
- 手机号码
+ 登录帐号
+ placeholder="请输入身份证号..." />
@@ -41,9 +41,9 @@
-
+
+ 从业人员注册
+
{
- uni.navigateTo({
- url: '/pages/index/index',
- });
- })
+ if (loginUser.CORPINFO_ID) {
+ // 查看是否离岗
+ this.handleLoginCheck(res.data.USER_ID).then(() => {
+ uni.navigateTo({
+ url: '/pages/index/index',
+ });
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pages/index/index',
+ });
+ }
}
}
});
@@ -209,7 +215,7 @@
// var keydataVal = 'zcloudchina' + userName + ',zy,' + userPwd;
- var myreg = /^(((13[0-9]{1})|159)+\d{8})$/;
+ var myreg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/;
if (userName == '') {
uni.showToast({
@@ -221,7 +227,7 @@
} else if (userName.length != 11 && !myreg.test(userName)) {
uni.showToast({
icon: 'none',
- title: '手机号格式不正确',
+ title: '身份证号格式不正确',
duration: 2000
});
return;
@@ -241,7 +247,7 @@
title: '请稍候'
})
uni.request({
- url: basePath + '/admin/check',
+ url: basePath + '/admin/checkPractitioner',
method: 'POST',
dataType: 'json',
header: {
@@ -444,7 +450,8 @@
.input-row .title {
color: #8ee6ff;
- margin-bottom: 10upx;
+ margin-top: 10upx;
+ right: 0;
}
.bar-forget {
diff --git a/pages/login/register/account.vue b/pages/login/register/account.vue
new file mode 100644
index 0000000..d47b264
--- /dev/null
+++ b/pages/login/register/account.vue
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+ 身份证号
+
+
+
+ 姓名
+
+
+
+ 手机
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/login/register/apply.vue b/pages/login/register/apply.vue
new file mode 100644
index 0000000..1366031
--- /dev/null
+++ b/pages/login/register/apply.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+ 姓名
+
+
+
+ 身份证号
+
+
+
+ 手机
+
+
+
+ 人员类型
+
+
+ {{formData.PERSONNEL_TYPENAME?formData.PERSONNEL_TYPENAME:'请选择'}}
+
+
+
+
+
+
+
+ 入职企业
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/login/register/baseInfo.vue b/pages/login/register/baseInfo.vue
new file mode 100644
index 0000000..5ab30ef
--- /dev/null
+++ b/pages/login/register/baseInfo.vue
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+ 姓名
+
+
+
+ 身份证号
+
+
+
+ 手机
+
+
+
+ 人员类型
+
+
+ {{formData.PERSONNEL_TYPENAME?formData.PERSONNEL_TYPENAME:'请选择'}}
+
+
+
+
+ 文化程度
+
+
+ {{formData.DEGREE_OF_EDUCATIONNAME?formData.DEGREE_OF_EDUCATIONNAME:'请选择'}}
+
+
+
+
+ 政治面貌
+
+
+ {{formData.POLITICAL_OUTLOOKNAME?formData.POLITICAL_OUTLOOKNAME:'请选择'}}
+
+
+
+
+ 参加工作日期
+
+
+ {{formData.WORKING_DATE?formData.WORKING_DATE:'请选择'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/login/register/certificate.vue b/pages/login/register/certificate.vue
new file mode 100644
index 0000000..5d9cf79
--- /dev/null
+++ b/pages/login/register/certificate.vue
@@ -0,0 +1,799 @@
+
+
+
+
+
+
+ 姓名
+
+
+
+ 身份证号
+
+
+
+ 手机
+
+
+
+ 人员类型
+
+
+ {{formData.PERSONNEL_TYPENAME?formData.PERSONNEL_TYPENAME:'请选择'}}
+
+
+
+
+
+
+
+
+ 身份证(正面)
+
+
+ {{fileData.idCardFront.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 身份证(背面)
+
+
+ {{fileData.idCardBack.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 生日
+
+
+ {{formData.DATE_OF_BIRTH?formData.DATE_OF_BIRTH:'请选择'}}
+
+
+
+
+ 民族
+
+
+ {{formData.NATIONNAME?formData.NATIONNAME:'请选择'}}
+
+
+
+
+ 性别
+
+
+ {{formData.SEXNAME?formData.SEXNAME:'请选择'}}
+
+
+
+
+ 有效期(起始)
+
+
+ {{formData.ID_CARD_VALIDITY_START?formData.ID_CARD_VALIDITY_START:'请选择'}}
+
+
+
+
+ 有效期(截止)
+
+
+ {{formData.ID_CARD_VALIDITY_END?formData.ID_CARD_VALIDITY_END:'请选择'}}
+
+
+
+
+ 住址
+
+
+
+ 签发机关
+
+
+
+
+
+
+
+
+ 驾驶证
+
+
+ {{fileData.driverLicense.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 驾驶证号
+
+
+
+ 准驾车型
+
+
+
+ 国籍
+
+
+
+ 初次领证日期
+
+
+ {{formData.DRIVER_LICENSE_ISSUE_DATE?formData.DRIVER_LICENSE_ISSUE_DATE:'请选择'}}
+
+
+
+
+ 有效期(起始)
+
+
+ {{formData.DRIVER_LICENSE_VALIDITY_START?formData.DRIVER_LICENSE_VALIDITY_START:'请选择'}}
+
+
+
+
+ 有效期(截止)
+
+
+ {{formData.DRIVER_LICENSE_VALIDITY_END?formData.DRIVER_LICENSE_VALIDITY_END:'请选择'}}
+
+
+
+
+ 签发机关
+
+
+
+
+
+
+
+
+ 从业资格证
+
+
+ {{fileData.qualificationCertificate.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 从业资格证号
+
+
+
+ 从业资格类别
+
+
+
+ 国籍
+
+
+
+ 初次领证日期
+
+
+ {{formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE?formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE:'请选择'}}
+
+
+
+
+ 有效期(起始)
+
+
+ {{formData.QUALIFICATION_CERTIFICATE_VALIDITY_START?formData.QUALIFICATION_CERTIFICATE_VALIDITY_START:'请选择'}}
+
+
+
+
+ 有效期(截止)
+
+
+ {{formData.QUALIFICATION_CERTIFICATE_VALIDITY_END?formData.QUALIFICATION_CERTIFICATE_VALIDITY_END:'请选择'}}
+
+
+
+
+ 签发机关
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/login/register/index.vue b/pages/login/register/index.vue
new file mode 100644
index 0000000..e32e6bd
--- /dev/null
+++ b/pages/login/register/index.vue
@@ -0,0 +1,562 @@
+
+
+
+ 返回
+ 从业人员注册
+
+
+
+
+
+ {{tabNav[index]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/my/feedback/feedback.vue b/pages/my/feedback/feedback.vue
index 9cded43..c5a92d6 100644
--- a/pages/my/feedback/feedback.vue
+++ b/pages/my/feedback/feedback.vue
@@ -259,7 +259,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor:"#000000",
cancelText: '取消',
diff --git a/pages/my/home.vue b/pages/my/home.vue
index e4a2b05..8422e2a 100644
--- a/pages/my/home.vue
+++ b/pages/my/home.vue
@@ -8,7 +8,7 @@
{{loginUser.NAME}}
- 手机号:
+ 帐号:
{{loginUser.USERNAME}}
diff --git a/pages/my/offduty/offduty-detail.vue b/pages/my/offduty/offduty-detail.vue
index fbfc687..7cb1e61 100644
--- a/pages/my/offduty/offduty-detail.vue
+++ b/pages/my/offduty/offduty-detail.vue
@@ -289,7 +289,7 @@
title: '请稍候'
})
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要提交申请么?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/my/offduty/offduty-list.vue b/pages/my/offduty/offduty-list.vue
index 3285262..c75bb22 100644
--- a/pages/my/offduty/offduty-list.vue
+++ b/pages/my/offduty/offduty-list.vue
@@ -314,7 +314,7 @@
title: '请稍候'
})
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要提交么?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/my/offduty/offduty-record.vue b/pages/my/offduty/offduty-record.vue
index c48f118..15803ae 100644
--- a/pages/my/offduty/offduty-record.vue
+++ b/pages/my/offduty/offduty-record.vue
@@ -268,7 +268,7 @@ export default {
}
var _this = this;
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要提交么?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/works/hidden-danger/hidden-danger-check.vue b/pages/works/hidden-danger/hidden-danger-check.vue
index e8c0508..47fe527 100644
--- a/pages/works/hidden-danger/hidden-danger-check.vue
+++ b/pages/works/hidden-danger/hidden-danger-check.vue
@@ -369,7 +369,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/works/hidden-danger/hidden-danger-details.vue b/pages/works/hidden-danger/hidden-danger-details.vue
index 3c8c9ee..c058982 100644
--- a/pages/works/hidden-danger/hidden-danger-details.vue
+++ b/pages/works/hidden-danger/hidden-danger-details.vue
@@ -400,7 +400,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/works/hidden-danger/hidden-danger-rectify.vue b/pages/works/hidden-danger/hidden-danger-rectify.vue
index 19cccc2..db4b264 100644
--- a/pages/works/hidden-danger/hidden-danger-rectify.vue
+++ b/pages/works/hidden-danger/hidden-danger-rectify.vue
@@ -326,7 +326,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
diff --git a/pages/works/hidden-danger/hidden-danger-review.vue b/pages/works/hidden-danger/hidden-danger-review.vue
index 8262847..48e58e9 100644
--- a/pages/works/hidden-danger/hidden-danger-review.vue
+++ b/pages/works/hidden-danger/hidden-danger-review.vue
@@ -350,7 +350,7 @@
},
DelImg(e) {
uni.showModal({
- title: '双控平台',
+ title: '温馨提示',
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',