Skip to content

F
founder_vue
Commit ff3809cd by 张超军
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 31ad3757 983b4dd1
Showing with 372 additions and 122 deletions
package-lock.json
......@@ -1875,6 +1875,37 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
......@@ -1884,11 +1915,35 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
"integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -11110,6 +11165,11 @@
}
}
},
"simple-uploader.js": {
"version": "0.5.6",
"resolved": "https://registry.npmjs.org/simple-uploader.js/-/simple-uploader.js-0.5.6.tgz",
"integrity": "sha512-ukjL0wZhK1dNMaQa6sd+UpCSmnUjblaUGbAd/B8f5IFrChMzDsC/7eFSK4bs4BS5NPJFSZVLI+l6Ri7THTkQtw=="
},
"slash": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/slash/download/slash-2.0.0.tgz",
......@@ -13016,68 +13076,19 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.1",
"resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz?cache=0&sync_timestamp=1632349895587&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.1.tgz",
"integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
"integrity": "sha1-972iyaQ9OYN2IcmgK6d4n12qJLI="
},
"vue-simple-uploader": {
"version": "0.7.6",
"resolved": "https://registry.npmjs.org/vue-simple-uploader/-/vue-simple-uploader-0.7.6.tgz",
"integrity": "sha512-DYddedNi+ZZzqxmKgW2t4lBN3aiB66oKOxgAfS9Hz9J1FHv7Xt+u1Pq8F48BFS4vG0+MFHCNzjzS2xaEUOIcHQ==",
"requires": {
"simple-uploader.js": "^0.5.6"
}
},
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz",
......
package.json
......@@ -27,6 +27,7 @@
"vue-bus": "^1.2.1",
"vue-clipboard2": "^0.3.1",
"vue-router": "^3.2.0",
"vue-simple-uploader": "^0.7.6",
"vue-wechat-title": "^2.0.7",
"vuex": "^3.4.0",
"vuex-persistedstate": "^4.0.0-beta.1"
......
src/main.js
......@@ -27,6 +27,10 @@ import IconSvg from './utils/IconSvg.vue'
//全局注册svg-icon
Vue.component('svg-icon', IconSvg)
// 引入上传组件
import uploader from 'vue-simple-uploader'
Vue.use(uploader)
Vue.prototype.$driver = new Driver({
className: "scoped-class", // className to wrap driver.js popover
animate: true, // Animate while changing highlighted element
......@@ -52,7 +56,7 @@ Vue.use(VueClipboard);
Vue.use(VueBus);
Vue.directive("nsLoading", {
bind(el, binding) {
bind (el, binding) {
const instance = new LoadingCons({
el: document.createElement("div"),
data: {}
......@@ -71,7 +75,7 @@ Vue.directive("nsLoading", {
* @param {*} el
* @param {*} binding
*/
update(el, binding) {
update (el, binding) {
// 通过对比值的变化判断loading是否显示
if (binding.oldValue !== binding.value) {
el.instance.isShow = binding.value;
......@@ -83,7 +87,7 @@ Vue.directive("nsLoading", {
* 只调用一次，在 指令与元素解绑时调用
* @param {*} el
*/
unbind(el) {
unbind (el) {
const mask = el.instance.$el;
if (mask.parentNode) {
mask.parentNode.removeChild(mask);
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -662,7 +662,7 @@ export default {
qxgz (val) {
// alert(val)
this.$axios
.delete("/api/mypsn/cancel", { params: { ids: val } })
.delete("/api/mypsn/cancel", { params: { pids: val } })
.then(response => {
if (response.data.code === 0) {
this.$message.success("取消关注成功");
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -620,6 +620,39 @@ export default {
}
},
methods: {
// // 发查询指位信息
// getHpseqno () {
// let reqParam = {
// barcodes: '', // 条码号
// };
// let barcodeArr = []
// for (let i = 0; i < this.rowData.length; i++) {
// barcodeArr.push(this.rowData[i].barcode)
// }
// reqParam.barcodes = barcodeArr
// this.$axios
// .post("/api/casestore/getHpseqno", reqParam)
// .then(response => {
// if (response.data.code === 0) {
// let arr = response.data.ret
// if (this.rowData.length == 1) {
// for (var item in arr) {
// this.cities = arr[item]
// console.log("指位返回列表===>", item, arr);
// }
// } else {
// console.log("多条案件")
// for (var item in arr) {
// this.cities = arr[item]
// console.log("指位返回列表===>", item, arr);
// }
// }
// } else {
// this.$message.error(response.data.message);
// }
// });
// },
// 发查询指位信息
getHpseqno () {
let reqParam = {
......@@ -635,19 +668,10 @@ export default {
.then(response => {
if (response.data.code === 0) {
let arr = response.data.ret
if (this.rowData.length == 1) {
for (var item in arr) {
this.cities = arr[item]
console.log("指位返回列表===>", item, arr);
}
} else {
console.log("多条案件")
for (var item in arr) {
this.cities = arr[item]
console.log("指位返回列表===>", item, arr);
}
for (let i = 0; i < arr.length; i++) {
cityOptions.push(arr[i].hpseqno)
}
console.info("指位返回列表===>", arr);
} else {
this.$message.error(response.data.message);
}
......@@ -792,14 +816,14 @@ export default {
if (this.dxcx.domains.length > 0) {
queryRequest.excludeBarcode.push(this.pccx.domains[0].value)
}
// 源数据
let SrcQueryData = {
id: '', // 人员pid
barcode: '', // 条码号
selectedSeqnos: null // 指位(选择)(页面获取)
}; //发查询源数据
let selectedSeqnos = [];// 指位
for (let i = 0; i < this.rowData.length; i++) {
// 源数据
let SrcQueryData = {
id: '', // 人员pid
barcode: '', // 条码号
selectedSeqnos: null // 指位(选择)(页面获取)
}; //发查询源数据
SrcQueryData.id = this.rowData[i].pid
SrcQueryData.barcode = this.rowData[i].barcode
SrcQueryData.selectedSeqnos = selectedSeqnos;
......@@ -902,7 +926,7 @@ export default {
if (response.data.code === 0) {
this.byzsArr = response.data.ret
this.byzs = this.byzsArr[0].level1
// console.info("发查询条数返回列表===>", this.byzsArr);
console.info("111发查询总条数返回列表===>", this.byzsArr);
// this.colorDiv()
} else {
this.$message.error(response.data.message);
......@@ -918,7 +942,7 @@ export default {
if (response.data.code === 0) {
this.sytsArr = response.data.ret
this.syts = this.sytsArr[0].level1
console.info("发查询剩余条数返回列表===>", this.sytsArr);
console.info("222发查询剩余条数返回列表===>", this.sytsArr);
} else {
// this.$message.error(response.data.message);
this.$message.error('获取发查询剩余条数失败');
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -604,7 +604,7 @@ export default {
qxgz (val) {
// alert(val)
this.$axios
.delete("/api/mycase/cancel", { params: { ids: val } })
.delete("/api/mycase/cancel", { params: { cids: val } })
.then(response => {
if (response.data.code === 0) {
this.$message.success("取消关注成功");
......
src/views/drFPTX/Index.vue
<template>
<div>
<el-radio-group v-model="drlx">
<div class='drFPTX'>
<el-radio-group
class='drlx'
v-model="drlx"
>
<el-radio :label="3">人员</el-radio>
<el-radio :label="6">案件</el-radio>
<el-radio :label="9">比中关系</el-radio>
</el-radio-group>
<div></div>
<el-radio-group v-model="wjlx">
<el-radio :label="3">FPTX文件</el-radio>
<el-radio :label="6">FPTX文件夹</el-radio>
</el-radio-group>
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.128.108:8099/api/upload/person"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:auto-upload="false"
>
<el-button
slot="trigger"
size="small"
type="primary"
>选取文件</el-button>
<el-button
style="margin-left: 10px;"
size="small"
type="success"
@click="submitUpload"
>上传到服务器</el-button>
</el-upload>
<div class='choose'>
<div class="wjlx">
<div class="left">
<el-radio-group v-model="wjlx">
<el-radio :label="3">单个文件</el-radio>
<el-radio :label="6">文件夹</el-radio>
</el-radio-group>
</div>
<div class="right">
<div class='center'>
<el-input
placeholder="请选择文件路径"
v-model="input"
></el-input>
<div class="line"></div>
<div class="text">选择</div>
</div>
</div>
</div>
<el-button type="primary">导入</el-button>
</div>
<div class="divider"></div>
<!-- <globalUploader></globalUploader> -->
<div class='bottom'>
<div class="left">
<el-transfer
v-model="value"
:data="data"
></el-transfer>
</div>
<div class="right">
<div class='target'>
<div class="targetHead">
人员逻辑分库
</div>
<el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox>
<el-checkbox-group
v-model="checkedCities"
@change="handleCheckedCitiesChange"
>
<el-checkbox
v-for="city in cities"
:label="city"
:key="city"
>{{city}}</el-checkbox>
</el-checkbox-group>
</div>
</div>
</div>
</div>
</template>
<script>
import globalUploader from '../../components/globalUploader.vue'
const targetOptions_ry = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
const targetOptions_aj = ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库'];
export default {
name: 'drFTPX',
components: {
globalUploader
},
data () {
const generateData = _ => {
const data = [];
for (let i = 1; i <= 15; i++) {
data.push({
key: i,
label: `备选项 ${i}`,
disabled: i % 4 === 0
});
}
return data;
};
return {
drlx: 3,
wjlx: 3,
fileList: []
input: '',
data: generateData(),
value: [1, 4],
checkAll: false,
checkedCities: [],
cities: targetOptions_ry,
isIndeterminate: true
};
},
methods: {
submitUpload () {
this.$refs.upload.submit();
handleCheckAllChange (val) {
this.checkedCities = val ? targetOptions_ry : [];
this.isIndeterminate = false;
},
handleRemove (file, fileList) {
console.log(file, fileList);
},
handlePreview (file) {
console.log(file);
handleCheckedCitiesChange (value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.cities.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
}
}
}
</script>
<style lang="scss" scoped>
div#globalUploader {
height: 100px;
.drFPTX {
padding: 25px;
}
.drlx .el-radio {
width: 86px;
height: 32px;
line-height: 32px;
background: #f6f8fa;
border-radius: 2px;
text-align: center;
font-size: 14px;
font-family: MicrosoftYaHei;
margin-right: 25px;
color: #282f3c;
/deep/.el-radio__label {
padding: 0;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #055fe7;
}
}
/deep/.drlx .is-checked {
background: #ddebff;
}
.drlx /deep/.el-radio__input {
display: none;
}
.choose {
width: 100%;
display: flex;
justify-content: space-between;
align-items: flex-end;
.wjlx {
display: flex;
width: 609px;
height: 72px;
background: #f6f8fa;
border-radius: 6px;
margin-top: 24px;
}
.left {
width: 242px;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
/deep/.el-radio__input.is-checked .el-radio__inner {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333;
}
}
.right {
display: flex;
justify-content: center;
align-items: center;
.center {
display: flex;
align-items: center;
width: 343px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
/deep/.el-input {
width: 282px;
height: 40px;
.el-input__inner {
border: none;
outline: none;
}
}
.line {
width: 1px;
height: 14px;
background-color: #e6e6e8;
margin-right: 14px;
}
.text {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #006aff;
}
}
}
.el-button {
width: 72px;
height: 32px;
background: #055fe7;
border-color: #055fe7;
border-radius: 4px;
padding: 0;
}
}
.divider {
width: 100%;
height: 1px;
background: #eeeeee;
margin: 20px 0;
}
.bottom {
display: flex;
.left {
display: flex;
height: 610px;
width: 1392px;
/deep/.el-transfer-panel {
width: 645px;
height: 100%;
}
/deep/.el-transfer__buttons {
width: 90px;
padding: 15px;
box-sizing: border-box;
button {
width: 56px;
height: 56px;
background: #006aff;
border-radius: 10px;
}
}
/deep/.el-button + .el-button {
margin-left: 0;
}
}
.right {
height: 610px;
width: 161px;
.target {
margin: 0 auto;
width: 137px;
height: 610px;
border-radius: 6px;
border: 1px solid #d1d1d1;
.targetHead {
width: 137px;
height: 56px;
background: #f0f3f6;
border-radius: 6px 6px 0px 0px;
line-height: 56px;
text-align: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
}
}
}
</style>
\ No newline at end of file
yarn.lock
......@@ -8364,6 +8364,11 @@ simple-swizzle@^0.2.2:
dependencies:
is-arrayish "^0.3.1"
simple-uploader.js@^0.5.6:
version "0.5.6"
resolved "https://registry.yarnpkg.com/simple-uploader.js/-/simple-uploader.js-0.5.6.tgz#d37b8c0238348b3993541c7293ae9de5658b23a0"
integrity sha512-ukjL0wZhK1dNMaQa6sd+UpCSmnUjblaUGbAd/B8f5IFrChMzDsC/7eFSK4bs4BS5NPJFSZVLI+l6Ri7THTkQtw==
slash@^1.0.0:
version "1.0.0"
resolved "https://registry.npm.taobao.org/slash/download/slash-1.0.0.tgz"
......@@ -9569,6 +9574,13 @@ vue-router@^3.2.0:
resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz"
integrity sha1-972iyaQ9OYN2IcmgK6d4n12qJLI=
vue-simple-uploader@^0.7.6:
version "0.7.6"
resolved "https://registry.yarnpkg.com/vue-simple-uploader/-/vue-simple-uploader-0.7.6.tgz#2da8ce6995c0701c9b16acb7171b351835091d0e"
integrity sha512-DYddedNi+ZZzqxmKgW2t4lBN3aiB66oKOxgAfS9Hz9J1FHv7Xt+u1Pq8F48BFS4vG0+MFHCNzjzS2xaEUOIcHQ==
dependencies:
simple-uploader.js "^0.5.6"
vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
version "4.1.2"
resolved "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment