Skip to content

F
founder_vue
Commit 7163fe7c by liyuhang19990520
Options

22

parent e8d29fb5
Showing with 264 additions and 106 deletions
dist.zip
No preview for this file type
package-lock.json
......@@ -3366,7 +3366,7 @@
},
"claygl": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz",
"resolved": "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz",
"integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ=="
},
"clean-css": {
......
public/JsonData/CODE_JSRYGSXL.json
......@@ -4,31 +4,61 @@
"rows":[
{
"ids":"80821",
"label":"教学序列",
"label":"警务技术",
"codeType":"CODE_JSRYGSXL",
"text":"教学序列",
"text":"警务技术",
"pId":null,
"id":"01",
"id":"1",
"isParent":false,
"children":[]
},
{
"ids":"80822",
"label":"行政序列",
"label":"执法勤务",
"codeType":"CODE_JSRYGSXL",
"text":"行政序列",
"text":"执法勤务",
"pId":null,
"id":"02",
"id":"2",
"isParent":false,
"children":[]
},
{
"ids":"80823",
"label":"讲师序列",
"label":"综合管理",
"codeType":"CODE_JSRYGSXL",
"text":"讲师序列",
"text":"综合管理",
"pId":null,
"id":"03",
"id":"3",
"isParent":false,
"children":[]
},
{
"ids":"80853",
"label":"教师序列",
"codeType":"CODE_JSRYGSXL",
"text":"教师序列",
"pId":null,
"id":"4",
"isParent":false,
"children":[]
},
{
"ids":"80854",
"label":"研究序列",
"codeType":"CODE_JSRYGSXL",
"text":"研究序列",
"pId":null,
"id":"5",
"isParent":false,
"children":[]
},
{
"ids":"80855",
"label":"工程师序列",
"codeType":"CODE_JSRYGSXL",
"text":"工程师序列",
"pId":null,
"id":"6",
"isParent":false,
"children":[]
}
......
public/JsonData/CODE_JSRY_RYFL.json 0 → 100644
{
"code":200,
"data":{
"rows":[
{
"ids":"80856",
"label":"民警",
"codeType":"CODE_JSRY_RYFL",
"text":"民警",
"pId":null,
"id":"1",
"isParent":false,
"children":[]
},
{
"ids":"80857",
"label":"警务辅助人员",
"codeType":"CODE_JSRY_RYFL",
"text":"警务辅助人员",
"pId":null,
"id":"2",
"isParent":false,
"children":[]
}
]
},
"success":true,
"message":"成功"
}
\ No newline at end of file
public/JsonData/CODE_SPECIES.json
......@@ -4,31 +4,31 @@
"rows":[
{
"ids":"80802",
"label":"德国牧羊犬",
"label":"昆明犬",
"codeType":"CODE_SPECIES",
"text":"德国牧羊犬",
"text":"昆明犬",
"pId":null,
"id":"01",
"id":"1",
"isParent":false,
"children":[]
},
{
"ids":"80803",
"label":"昆明犬",
"label":"马里努阿犬",
"codeType":"CODE_SPECIES",
"text":"昆明犬",
"text":"马里努阿犬",
"pId":null,
"id":"02 ",
"id":"2",
"isParent":false,
"children":[]
},
{
"ids":"80804",
"label":"罗威纳犬",
"label":"史宾格犬",
"codeType":"CODE_SPECIES",
"text":"罗威纳犬",
"text":"史宾格犬",
"pId":null,
"id":"03 ",
"id":"3",
"isParent":false,
"children":[]
},
......@@ -38,67 +38,97 @@
"codeType":"CODE_SPECIES",
"text":"拉布拉多犬",
"pId":null,
"id":"04",
"id":"4",
"isParent":false,
"children":[]
},
{
"ids":"80806",
"label":"杜伯文犬",
"label":"罗威纳犬",
"codeType":"CODE_SPECIES",
"text":"杜伯文犬",
"text":"罗威纳犬",
"pId":null,
"id":"05",
"id":"5",
"isParent":false,
"children":[]
},
{
"ids":"80807",
"label":"马里努阿犬",
"label":"荷兰牧羊犬",
"codeType":"CODE_SPECIES",
"text":"马里努阿犬",
"text":"荷兰牧羊犬",
"pId":null,
"id":"06",
"id":"6",
"isParent":false,
"children":[]
},
{
"ids":"80808",
"label":"史宾格犬",
"label":"德国牧羊犬",
"codeType":"CODE_SPECIES",
"text":"史宾格犬",
"text":"德国牧羊犬",
"pId":null,
"id":"07",
"id":"7",
"isParent":false,
"children":[]
},
{
"ids":"80809",
"label":"比格犬",
"label":"寻血猎犬",
"codeType":"CODE_SPECIES",
"text":"比格犬",
"text":"寻血猎犬",
"pId":null,
"id":"08",
"id":"8",
"isParent":false,
"children":[]
},
{
"ids":"80810",
"label":"荷兰牧羊犬",
"label":"杜伯文犬",
"codeType":"CODE_SPECIES",
"text":"荷兰牧羊犬",
"text":"杜伯文犬",
"pId":null,
"id":"09",
"id":"9",
"isParent":false,
"children":[]
},
{
"ids":"80811",
"label":"杂种犬",
"label":"比格犬",
"codeType":"CODE_SPECIES",
"text":"比格犬",
"pId":null,
"id":"10",
"isParent":false,
"children":[]
},
{
"ids":"80850",
"label":"杰克罗素㹴",
"codeType":"CODE_SPECIES",
"text":"杰克罗素㹴",
"pId":null,
"id":"11",
"isParent":false,
"children":[]
},
{
"ids":"80851",
"label":"波音达犬",
"codeType":"CODE_SPECIES",
"text":"波音达犬",
"pId":null,
"id":"12",
"isParent":false,
"children":[]
},
{
"ids":"80852",
"label":"其他",
"codeType":"CODE_SPECIES",
"text":"杂种犬",
"text":"其他",
"pId":null,
"id":"99",
"id":"13",
"isParent":false,
"children":[]
}
......
src/utils/params.js
......@@ -53,12 +53,12 @@ var timeStampTurnTime2 = function (timeStamp) {
/*——————————————警犬管理与指挥系统--数据——————————————————————————————————————————*/
let maglHeaderTitle = "警犬管理与指挥系统";
let maglHeaderIcon = "iconjibenxinxi";
let maglPropLeftMenu = [{
let maglPropLeftMenu = [
{
id: "sjfx",
label: "数据分析",
index: "1",
className: "iconfont iconjibenxinxi",
},
{
id: "jqgl",
......
src/views/artisanManage/components/artisanManageEdit2.vue
......@@ -49,6 +49,21 @@
placeholder="请输入毕业院校"
></el-input>
</el-form-item>
<el-form-item label="人员分类" class="elItemClass" prop="ryfl">
<el-select
clearable
placeholder="请选择人员分类"
v-model="detailInfo.ryfl"
>
<el-option
v-for="(item, index) in ryflOptions"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
:label="'人员照片' + `（${fileList.length}）`"
class="elItemClass elDateClass photoBox"
......@@ -227,7 +242,7 @@
</el-form-item>
<el-form-item
:label="'审批或者获奖材料' + `（${fileList2.length}）`"
:label="'其他材料' + `（${fileList2.length}）`"
class="elItemClass2 elDateClass"
prop="file2"
>
......@@ -333,7 +348,9 @@ export default {
fileList2: [],
loading: false,
routeName: "",
ryflOptions: [],
detailInfo: {
ryfl: "",
file1: [],
file2: [],
workYears: "",
......@@ -352,9 +369,7 @@ export default {
djsj: "",
},
rules: {
file1: [
{ required: true, validator: rules.jqzpRules, trigger: "blur" },
],
personName: [
{ required: true, message: "请输入姓名", trigger: "blur" },
{ required: true, validator: rules.nameRules, trigger: "blur" },
......@@ -380,13 +395,7 @@ export default {
trigger: "blur",
},
],
school: [
{
required: true,
message: "请输入毕业院校",
trigger: "blur",
},
],
birthDate: [
{
required: true,
......@@ -461,6 +470,7 @@ export default {
// 新增
}
this.ryflOptions = await getJsonDataApi("CODE_JSRY_RYFL");
this.shifouOptions = await getJsonDataApi("CODE_YN");
this.jwjsxlOptions = await getJsonDataApi("CODE_JSRYGSXL");
},
......@@ -718,6 +728,7 @@ export default {
birthDate: this.detailInfo.birthDate,
isjwzy: this.detailInfo.isjwzy,
school: this.detailInfo.school,
ryfl: this.detailInfo.ryfl,
gsdwGajgjgdm: this.detailInfo.unitCodeName,
jwjsxl: this.detailInfo.jwjsxl,
workYears: this.detailInfo.workYears,
......
src/views/authManage/index.vue
<template>
<div>权限管理</div>
<div>系统管理</div>
</template>
<script>
......
src/views/dataJq/mapBox.vue
......@@ -10,13 +10,22 @@
<div
id="on-back"
class="back"
v-show="showBack"
v-show="this.log.length > 1"
@click="goBack"
title="回退"
>
<img src="@/assets/img/back.png" alt="" width="30px" height="30px" />
</div>
<div
id="on-back"
class="back"
@click="qhdt"
title="切换"
v-show="this.log.length == 1 && userinfo.grade == 'B'"
>
切换
</div>
<div
id="myEacherForMap"
style="width: 66.08333rem; height: 50.3333rem"
></div>
......@@ -57,7 +66,8 @@
class="infoClass"
v-if="
fileName == 'china' &&
(!currentInfo || !Object.keys(currentInfo).length)
(!currentInfo || !Object.keys(currentInfo).length) &&
mapType
"
>
<div class="topClass">
......@@ -81,7 +91,7 @@ import { jsonRequest } from "@/api/dogView.js";
export default {
data() {
return {
showBack: false,
userinfo: {},
loading: false,
mapDogNum: [],
currentInfo: {},
......@@ -177,7 +187,7 @@ export default {
},
series: [],
},
mapType: true,
log: ["china"],
provinces: [],
dataArr: [],
......@@ -187,29 +197,69 @@ export default {
this.provinces = city.provinceCode;
},
mounted() {
this.getDatas();
this.userinfo = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
if (this.userinfo.grade != "B") {
let unitcode = this.userinfo.unitcode.slice(0, 6);
if (this.userinfo.dunitcode) {
unitcode = this.userinfo.dunitcode.slice(0, 6);
}
this.log = [parseInt(unitcode)];
this.fileName = parseInt(unitcode);
this.getDatas(parseInt(unitcode), true);
} else {
this.getDatas();
}
console.log(this.userinfo, 22222222);
},
methods: {
getMapData(e) {
qhdt() {
if (this.mapType) {
this.mapType = false;
} else {
this.mapType = true;
}
this.getDatas();
},
getMapData(e, nofilter) {
// nofilter 有值进行筛选 没值全部返回
// e 判断四大片区、全国、等多种情况代码值
let self = this;
let arr = [];
return new Promise((resolve) => {
let boo = false;
if (e && e.toString().indexOf("P") >= 0) boo = true;
let uncode;
if (e) {
if (boo) {
uncode = e;
} else {
uncode = e + "000000";
}
} else {
if (this.mapType) {
uncode = "PALL";
} else {
uncode = "";
}
}
jsonRequest("/homePage/getQgMapNum", {
unitcode: e ? (boo ? e : e + "000000") : "",
unitcode: uncode,
}).then((res) => {
if (!e) self.mapDogNum = res.data.rows;
if (e == undefined || e == "undefined") {
resolve(res);
} else {
for (let i = 0; i < res.data.rows.length; i++) {
if (res.data.rows[i].dognum != 0) {
arr.push(res.data.rows[i]);
if (nofilter) {
resolve(res);
} else {
for (let i = 0; i < res.data.rows.length; i++) {
if (res.data.rows[i].dognum != 0) {
arr.push(res.data.rows[i]);
}
}
res.data.rows = arr;
resolve(res);
}
res.data.rows = arr;
resolve(res);
}
});
});
......@@ -380,7 +430,9 @@ export default {
],
},
};
this.mergeProvinces(data, params.names, params.properties);
if (this.mapType) {
this.mergeProvinces(data, params.names, params.properties);
}
}
this.loading = false;
this.$echarts.registerMap(this.fileName, data);
......@@ -442,7 +494,6 @@ export default {
} else if (curName === "昆明片区") {
this.fileName = "P04";
} else {
return;
}
}
if (param.componentType !== "geo" || levelFlag === "3") return;
......@@ -459,11 +510,6 @@ export default {
) {
this.currentInfo = {};
let e = this.provinces[i].key;
if (e === "china") {
this.showBack = false;
} else {
this.showBack = true;
}
this.log.push(e);
this.fileName = e;
this.getDataArr(res.data.rows);
......@@ -533,17 +579,11 @@ export default {
) {
let datas = res.data.rows;
this.getDataArr(datas);
if (this.fileName === "china") {
this.showBack = false;
} else {
this.showBack = true;
}
this.drawEcharts();
}
},
async getDatas() {
let res = await this.getMapData();
async getDatas(e, nofilter) {
let res = await this.getMapData(e, nofilter);
if (
res.code === 200 &&
res.success &&
......@@ -552,11 +592,11 @@ export default {
res.data.rows.length
) {
let datas = res.data.rows;
this.getDataArr(datas);
this.getDataArr(datas, nofilter);
this.drawEcharts();
}
},
getDataArr(datas) {
getDataArr(datas, nofilter) {
this.dataArr = [];
if (datas && datas.length) {
datas.forEach((item) => {
......@@ -571,6 +611,17 @@ export default {
dognum4: item.dognum4,
lev: item.lev,
});
} else if (nofilter) {
this.dataArr.push({
name: item.dwName,
value: [null, null],
count: item.dognum,
dognum1: item.dognum1,
dognum2: item.dognum2,
dognum3: item.dognum3,
dognum4: item.dognum4,
lev: item.lev,
});
}
});
}
......
src/views/dogDeploy/index.vue 0 → 100644
<template>
<div>警犬调配</div>
</template>
<script>
export default {
data() {
return {};
},
};
</script>
\ No newline at end of file
src/views/poDogInfoManage/components/poDogInfoManageEdit2.vue
......@@ -72,7 +72,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="犬只来源" class="elItemClass" prop="dogSource">
<el-form-item label="来源" class="elItemClass" prop="dogSource">
<el-select
clearable
placeholder="请选择使用类别"
......@@ -95,12 +95,6 @@
></el-input>
</el-form-item>
<el-form-item label="疫苗接种（针）" class="elItemClass" prop="ymjz">
<el-input
v-model.trim="detailInfo.ymjz"
placeholder="输入疫苗接种"
></el-input>
</el-form-item>
<el-form-item
:label="'警犬照片' + `（${fileList2.length}）`"
......@@ -156,7 +150,7 @@
</el-form-item>
<el-form-item
:label="'审批或者获奖材料' + `（${fileList.length}）`"
:label="'其他材料' + `（${fileList.length}）`"
class="elItemClass2 elDateClass"
prop="file1"
>
......@@ -209,7 +203,7 @@
<div class="hengLine"></div>
<div class="titles" style="width: 160px">警用技术人员信息</div>
<div class="titles" style="width: 160px">带犬人员信息</div>
<div class="divBoxClass">
<el-form-item
label="身份证号码"
......@@ -340,7 +334,6 @@ export default {
speciesId: "",
dogSource: "",
inbreedingCoefficient: "",
ymjz: "",
file1: [],
file2: [],
jsrysfz: "",
......@@ -355,9 +348,6 @@ export default {
},
],
rules: {
file2: [
{ required: true, validator: rules.jqzpRules, trigger: "blur" },
],
chipCode: [
{ required: true, message: "请输入芯片号", trigger: "blur" },
{ required: true, validator: rules.xphRules, trigger: "blur" },
......@@ -379,7 +369,7 @@ export default {
dogSource: [
{
required: true,
message: "请选择犬只来源",
message: "请选择来源",
trigger: "change",
},
],
......@@ -418,10 +408,6 @@ export default {
message: "请输入正确的技术人员身份证号",
},
],
ymjz: [{ required: true, message: "输入疫苗接种", trigger: "blur" }],
inbreedingCoefficient: [
{ required: true, message: "输入近交系数", trigger: "blur" },
],
},
unitInfos: {
name: "所属单位:",
......@@ -753,7 +739,6 @@ export default {
dna: this.detailInfo.dna,
birthDate: this.detailInfo.birthDate,
speciesId: this.detailInfo.speciesId,
ymjz: this.detailInfo.ymjz,
inbreedingCoefficient: this.detailInfo.inbreedingCoefficient,
jsrysfz: this.detailInfo.jsrysfz,
personName: this.detailInfo.personName,
......
src/views/poDogJobManage/components/poDogJobManageEdit2.vue
......@@ -64,7 +64,7 @@
</el-select>
</el-form-item>
<el-form-item label="犬只来源" class="elItemClass" prop="dogSource">
<el-form-item label="来源" class="elItemClass" prop="dogSource">
<el-select
clearable
placeholder="请选择使用类别"
......@@ -294,7 +294,7 @@
<div class="hengLine"></div>
<div class="titles" style="width: 160px">警犬技术人员信息</div>
<div class="titles" style="width: 160px">带犬人员信息</div>
<div class="divBoxClass">
<el-form-item
label="身份证号码"
......@@ -435,9 +435,6 @@ export default {
},
],
rules: {
file2: [
{ required: true, validator: rules.jqzpRules, trigger: "blur" },
],
chipCode: [
{ required: true, message: "请输入芯片号", trigger: "blur" },
{ required: true, validator: rules.xphRules, trigger: "blur" },
......@@ -470,7 +467,7 @@ export default {
dogSource: [
{
required: true,
message: "请选择犬只来源",
message: "请选择来源",
trigger: "change",
},
],
......
src/views/ratingMethods/index.vue 0 → 100644
<template>
<div>工作犬等级评定方法（2023版）</div>
</template>
<script>
export default {
data() {
return {};
},
};
</script>
\ No newline at end of file
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