wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

合并版本v0.8.4.3

This commit is contained in:
wuhongjian 2022-08-08 09:19:39 +08:00
parent 9601541628 cf53e51913
commit 8a58e70fc6
69 changed files with 3709 additions and 2335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/src/views/modules/ability/bsabilityai.vue
View File

@ -154,7 +154,7 @@
>详情</el-button
>
<el-button type="text" size="small" @click="showDocument(scope.row)"
>开发文档</el-button
>技术文档</el-button
>
<el-button
type="text"
@ -762,11 +762,15 @@ export default {
this.notFilled.push('部门联系人电话')
}
if (this.radio === '智能算法' && !this.submitFrom.apiUrl) {
if ((this.submitFrom.infoList.filter(val => val.attrType === '使用方式')[0].attrValue === '调用接口')) {
this.notFilled.push('服务接口')
}
}
if (this.radio === '智能算法' && !this.submitFrom.apiMethodType) {
if ((this.submitFrom.infoList.filter(val => val.attrType === '使用方式')[0].attrValue === '调用接口')) {
this.notFilled.push('接口请求方式')
}
}
if (this.radio === '智能算法' && (!this.submitFrom.infoList.filter(val => val.attrType === '算法类别')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '算法类别')[0].attrValue)) {
this.notFilled.push('算法类别')
}

673
back/src/views/modules/ability/bsabilityservice-add-or-update.vue
View File

@ -271,8 +271,7 @@
v-if="
item.attrType != '应用领域' &&
item.attrType != '应用类型' &&
item.attrType != '发布端' &&
item.attrType != '应用状态'
item.attrType != '发布端'
"
></el-input>
<el-select
@ -368,30 +367,30 @@
</template>
<script>
import debounce from "lodash/debounce";
import dictionaries from "@/utils/dictionaries";
import { mapState } from "vuex";
import { getIconList } from "@/utils";
import Cookies from "js-cookie";
import upload from "./upload.vue";
import bus from "@/views/bus.js";
import qs from "qs";
import Vue from "vue";
import debounce from 'lodash/debounce'
import dictionaries from '@/utils/dictionaries'
import { mapState } from 'vuex'
import { getIconList } from '@/utils'
import Cookies from 'js-cookie'
import upload from './upload.vue'
import bus from '@/views/bus.js'
import qs from 'qs'
import Vue from 'vue'
export default {
components: {
upload,
upload
},
data() {
data () {
return {
checkList: [],
dialogVisibleImg: false,
previewImg: "", // 预览图片
previewImg: '', // 预览图片
dialogVisible: false,
fileUploadUrl: window.SITE_CONFIG.apiURL + "/upload",
fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload',
uploadUrl:
window.SITE_CONFIG.apiURL +
"/sys/oss/upload?token=" +
Cookies.get("ucsToken"),
'/sys/oss/upload?token=' +
Cookies.get('ucsToken'),
companyArr: dictionaries.companyArr,
visible: false,
sceneArr: dictionaries.sceneArr,
@ -403,602 +402,602 @@ export default {
menuListVisible: false,
UpdateState: false,
dataForm: {
id: "",
deptId: "",
deptContacts: "",
deptPhone: "",
dataVolume: "",
shareCondition: "",
shareType: "",
shareMode: "",
id: '',
deptId: '',
deptContacts: '',
deptPhone: '',
dataVolume: '',
shareCondition: '',
shareType: '',
shareMode: '',
delFlag: 0,
description: "",
description: '',
downloads: 0,
image: "",
image: '',
showList: [],
infoList: [],
link: "",
name: "",
note1: "",
note2: "",
note3: "",
note4: "",
note5: "",
score: "",
type: "应用资源",
apiMethodType: "",
apiUrl: "",
visits: 0,
link: '',
name: '',
note1: '',
note2: '',
note3: '',
note4: '',
note5: '',
score: '',
type: '应用资源',
apiMethodType: '',
apiUrl: '',
visits: 0
},
deptId: "",
fangwendizhi: "",
mingzi: "",
deptId: '',
fangwendizhi: '',
mingzi: '',
dataFormUpdate: {},
dataFormShowDetails: {},
infoList2: [],
infoList3: [],
typeOptions: [
{ value: "有条件共享", label: "有条件共享" },
{ value: "无条件共享", label: "无条件共享" },
{ value: '有条件共享', label: '有条件共享' },
{ value: '无条件共享', label: '无条件共享' }
],
conditionOptions: [
{ value: "申请", label: "申请" },
{ value: "免批申请", label: "免批申请" },
{ value: '申请', label: '申请' },
{ value: '免批申请', label: '免批申请' }
],
rules: {
name: [
{
required: true,
message: "请输入应用名称",
trigger: "change",
},
message: '请输入应用名称',
trigger: 'change'
}
],
description: [
{
required: true,
message: "请输入应用描述",
trigger: "change",
},
message: '请输入应用描述',
trigger: 'change'
}
],
deptContacts: [
{
required: true,
message: "请输入部门联系人",
trigger: "change",
},
message: '请输入部门联系人',
trigger: 'change'
}
],
deptPhone: [
{
required: true,
message: "请输入部门联系人电话",
trigger: "change",
},
message: '请输入部门联系人电话',
trigger: 'change'
}
],
shareCondition: [
{
required: true,
message: "请选择共享条件",
trigger: "change",
},
message: '请选择共享条件',
trigger: 'change'
}
],
shareType: [
{
required: true,
message: "请选择请输入共享类型",
trigger: "change",
},
message: '请选择请输入共享类型',
trigger: 'change'
}
],
shareMode: [
{
required: true,
message: "请输入共享方式",
trigger: "change",
},
],
},
};
message: '请输入共享方式',
trigger: 'change'
}
]
}
}
},
props: {
disabled: {
type: Boolean,
default: false,
},
default: false
}
},
computed: {
...mapState(["catalogueTree"]),
...mapState(["departmentSelects"]),
dataRule() {
...mapState(['catalogueTree']),
...mapState(['departmentSelects']),
dataRule () {
return {
name: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
version: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
visitUrl: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
type: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
shareType: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
shareForm: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
field: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
scene: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
deptId: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
content: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
rank: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
useInfo: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
remarks: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
message: this.$t('validate.required'),
trigger: 'blur'
}
],
isUp: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
],
};
},
message: this.$t('validate.required'),
trigger: 'blur'
}
]
}
}
},
methods: {
// 上传图片
handleAvatarSuccess(res, file) {
handleAvatarSuccess (res, file) {
if (res.code !== 0) {
return this.$message.error("上传图片失败");
return this.$message.error('上传图片失败')
}
debugger;
debugger
this.dataForm.infoList.map((item, index) => {
if (item.attrType == "应用图片") {
if (item.attrType == '应用图片') {
if (!this.dataForm.infoList[index].attrValue) {
this.dataForm.infoList[index].attrValue = res.data;
this.dataForm.infoList[index].attrValue = res.data
} else {
this.dataForm.infoList[index].attrValue += ";" + res.data;
this.dataForm.infoList[index].attrValue += ';' + res.data
}
console.log("上传图片", this.dataForm.infoList[index]);
console.log('上传图片', this.dataForm.infoList[index])
}
});
})
// this.imageUrl = URL.createObjectURL(file.raw);
},
handleAvatarSuccessone(res, file) {
handleAvatarSuccessone (res, file) {
if (res.code !== 0) {
return this.$message.error("上传图片失败");
return this.$message.error('上传图片失败')
}
debugger;
debugger
this.dataForm.infoList.map((item, index) => {
if (item.attrType == "子系统一图片") {
if (item.attrType == '子系统一图片') {
if (!this.dataForm.infoList[index].attrValue) {
this.dataForm.infoList[index].attrValue = res.data;
this.dataForm.infoList[index].attrValue = res.data
} else {
this.dataForm.infoList[index].attrValue = "";
this.dataForm.infoList[index].attrValue = res.data;
this.dataForm.infoList[index].attrValue = ''
this.dataForm.infoList[index].attrValue = res.data
}
console.log("上传图片", this.dataForm.infoList[index]);
console.log('上传图片', this.dataForm.infoList[index])
}
});
})
// this.imageUrl = URL.createObjectURL(file.raw);
},
handleAvatarSuccesstwo(res, file) {
handleAvatarSuccesstwo (res, file) {
if (res.code !== 0) {
return this.$message.error("上传图片失败");
return this.$message.error('上传图片失败')
}
debugger;
debugger
this.dataForm.infoList.map((item, index) => {
if (item.attrType == "子系统二图片") {
if (item.attrType == '子系统二图片') {
if (!this.dataForm.infoList[index].attrValue) {
this.dataForm.infoList[index].attrValue = res.data;
this.dataForm.infoList[index].attrValue = res.data
} else {
this.dataForm.infoList[index].attrValue = "";
this.dataForm.infoList[index].attrValue = res.data;
this.dataForm.infoList[index].attrValue = ''
this.dataForm.infoList[index].attrValue = res.data
}
console.log("上传图片", this.dataForm.infoList[index]);
console.log('上传图片', this.dataForm.infoList[index])
}
});
})
// this.imageUrl = URL.createObjectURL(file.raw);
},
handleAvatarSuccessthree(res, file) {
handleAvatarSuccessthree (res, file) {
if (res.code !== 0) {
return this.$message.error("上传图片失败");
return this.$message.error('上传图片失败')
}
debugger;
debugger
this.dataForm.infoList.map((item, index) => {
if (item.attrType == "子系统三图片") {
if (item.attrType == '子系统三图片') {
if (!this.dataForm.infoList[index].attrValue) {
this.dataForm.infoList[index].attrValue = res.data;
this.dataForm.infoList[index].attrValue = res.data
} else {
this.dataForm.infoList[index].attrValue = "";
this.dataForm.infoList[index].attrValue = res.data;
this.dataForm.infoList[index].attrValue = ''
this.dataForm.infoList[index].attrValue = res.data
}
console.log("上传图片", this.dataForm.infoList[index]);
console.log('上传图片', this.dataForm.infoList[index])
}
});
})
// this.imageUrl = URL.createObjectURL(file.raw);
},
beforeAvatarUpload(file) {
beforeAvatarUpload (file) {
const isImage =
file.type === "image/jpeg" ||
file.type === "image/jpg" ||
file.type === "image/png";
const isLt2M = file.size / 1024 / 1024 < 9999;
file.type === 'image/jpeg' ||
file.type === 'image/jpg' ||
file.type === 'image/png'
const isLt2M = file.size / 1024 / 1024 < 9999
if (!isImage) {
this.$message.error("上传头像图片只能是 JPG 格式!");
this.$message.error('上传头像图片只能是 JPG 格式!')
}
if (!isLt2M) {
this.$message.error("上传头像图片大小不能超过 2MB!");
this.$message.error('上传头像图片大小不能超过 2MB!')
}
return isImage && isLt2M;
return isImage && isLt2M
},
addUploadRemoveFile(file, fileList) {
this.$refs.addUpload.clearFiles();
this.addDataFrom.imageUrl = "";
addUploadRemoveFile (file, fileList) {
this.$refs.addUpload.clearFiles()
this.addDataFrom.imageUrl = ''
},
showView(file) {
this.previewImg = file.url;
this.dialogVisibleImg = true;
showView (file) {
this.previewImg = file.url
this.dialogVisibleImg = true
},
// 获取当前管理员信息
getUserInfo() {
this.$http.get("/sys/user/info").then(({ data: res }) => {
this.dataForm.deptId = res.data.deptId;
this.deptId = res.data.deptId;
console.log("depid", this.dataForm);
});
getUserInfo () {
this.$http.get('/sys/user/info').then(({ data: res }) => {
this.dataForm.deptId = res.data.deptId
this.deptId = res.data.deptId
console.log('depid', this.dataForm)
})
},
guanbi() {
guanbi () {
this.dataForm = {
id: "",
deptId: "",
deptContacts: "",
deptPhone: "",
dataVolume: "",
shareCondition: "",
shareType: "",
shareMode: "",
id: '',
deptId: '',
deptContacts: '',
deptPhone: '',
dataVolume: '',
shareCondition: '',
shareType: '',
shareMode: '',
delFlag: 0,
description: "",
description: '',
downloads: 0,
image: "",
image: '',
showList: [],
infoList: [],
link: "",
name: "",
note1: "",
note2: "",
note3: "",
note4: "",
note5: "",
score: "",
type: "应用资源",
apiMethodType: "",
apiUrl: "",
visits: 0,
};
link: '',
name: '',
note1: '',
note2: '',
note3: '',
note4: '',
note5: '',
score: '',
type: '应用资源',
apiMethodType: '',
apiUrl: '',
visits: 0
}
},
handleRemove(file, fileList) {
console.log(file, fileList);
handleRemove (file, fileList) {
console.log(file, fileList)
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
handlePictureCardPreview (file) {
this.dialogImageUrl = file.url
this.dialogVisible = true
},
// 上传图片之前
uploadBeforeUploadHandle(file) {
uploadBeforeUploadHandle (file) {
if (
file.type !== "image/jpg" &&
file.type !== "image/jpeg" &&
file.type !== "image/png" &&
file.type !== "image/gif"
file.type !== 'image/jpg' &&
file.type !== 'image/jpeg' &&
file.type !== 'image/png' &&
file.type !== 'image/gif'
) {
this.$message.error("只支持jpg、png、gif格式的图片！");
return false;
this.$message.error('只支持jpg、png、gif格式的图片！')
return false
}
},
imgUploadSuccess(res, file, fileList) {
console.log("zzzzzzz", res, file, fileList);
imgUploadSuccess (res, file, fileList) {
console.log('zzzzzzz', res, file, fileList)
if (res.code !== 0) {
return this.$message.error(res.msg);
return this.$message.error(res.msg)
}
},
init() {
this.getInfoList();
this.visible = true;
init () {
this.getInfoList()
this.visible = true
this.$nextTick(() => {
this.$refs.dataForm && this.$refs.dataForm.resetFields();
this.iconList = getIconList();
this.$refs.dataForm && this.$refs.dataForm.resetFields()
this.iconList = getIconList()
if (this.dataForm.id) {
this.getInfo();
this.getInfo()
}
});
})
},
// 获取属性信息
getInfoList() {
getInfoList () {
const parms = {
topCategoryName: "应用资源",
};
this.infoList2 = [];
topCategoryName: '应用资源'
}
this.infoList2 = []
this.$http
.get("/category/getAllFiledByTopCategory" + "?" + qs.stringify(parms))
.get('/category/getAllFiledByTopCategory' + '?' + qs.stringify(parms))
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
return this.$message.error(res.msg)
}
res.data.map((item, index) => {
if (
item.name.search("应用名称") == -1 &&
item.name.search("地址") == -1 &&
item.name.search('应用名称') == -1 &&
item.name.search('地址') == -1 &&
// item.name.search("描述") == -1 &&
item.name !== "组件描述" &&
item.name !== "组件名称" &&
item.name !== "服务接口" &&
item.name !== "共享类型" &&
item.name !== "共享条件" &&
item.name !== "共享方式" &&
item.name !== "部门联系人电话" &&
item.name !== "部门统一社会代码" &&
item.name !== "部门联系人" &&
item.name !== "服务商统一社会信用代码" &&
item.name !== "服务接口请求方式" &&
item.name !== "部门名称"
item.name !== '组件描述' &&
item.name !== '组件名称' &&
item.name !== '服务接口' &&
item.name !== '共享类型' &&
item.name !== '共享条件' &&
item.name !== '共享方式' &&
item.name !== '部门联系人电话' &&
item.name !== '部门统一社会代码' &&
item.name !== '部门联系人' &&
item.name !== '服务商统一社会信用代码' &&
item.name !== '服务接口请求方式' &&
item.name !== '部门名称'
) {
const duixiang = {
attrType: item.name,
attrValue: "",
delFlag: 0,
};
this.infoList2.push(item);
if (item.isLinkToDic != "false") {
attrValue: '',
delFlag: 0
}
this.infoList2.push(item)
if (item.isLinkToDic != 'false') {
const xinxi = {
page: 1,
limit: 99,
dictTypeId: item.linkValue,
dictLabel: "",
dictValue: "",
};
dictLabel: '',
dictValue: ''
}
this.$http
.get("/sys/dict/data/page" + "?" + qs.stringify(xinxi))
.get('/sys/dict/data/page' + '?' + qs.stringify(xinxi))
.then(({ data: res2 }) => {
// this.infoList2[index - 1].children = res2.data.list
this.infoList2.map((item3, index3) => {
if (item3.name == item.name) {
Vue.set(
this.infoList2[index3],
"children",
'children',
res2.data.list
);
)
}
});
})
this.dataFormUpdate.infoList.map((item3, index3) => {
if (item3.attrType == item.name) {
Vue.set(
this.dataFormUpdate.infoList[index3],
"children",
'children',
res2.data.list
);
)
}
});
console.log(
"11111111111111111111111111110",
this.dataFormUpdate
);
});
}
this.dataForm.infoList.push(duixiang);
}
});
console.log("this.infoList", this.dataFormUpdate);
})
.catch(() => {});
console.log(
'11111111111111111111111111110',
this.dataFormUpdate
)
})
}
this.dataForm.infoList.push(duixiang)
}
})
console.log('this.infoList', this.dataFormUpdate)
})
.catch(() => {})
this.$http
.get("/sys/dict/data/page" + "?" + qs.stringify(parms))
.get('/sys/dict/data/page' + '?' + qs.stringify(parms))
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
return this.$message.error(res.msg)
}
console.log("this.infoList", this.dataForm);
console.log('this.infoList', this.dataForm)
})
.catch(() => {});
.catch(() => {})
},
// 图标, 选中
iconListCurrentChangeHandle(icon) {
this.dataForm.imgurl = icon;
this.iconListVisible = false;
iconListCurrentChangeHandle (icon) {
this.dataForm.imgurl = icon
this.iconListVisible = false
},
// 上级菜单树, 选中
menuListTreeCurrentChangeHandle(data) {
this.dataForm.pid = data.id;
this.dataForm.type = data.name;
this.menuListVisible = false;
menuListTreeCurrentChangeHandle (data) {
this.dataForm.pid = data.id
this.dataForm.type = data.name
this.menuListVisible = false
},
// 上级菜单树, 设置默认值
deptListTreeSetDefaultHandle() {
this.dataForm.pid = "0";
this.dataForm.type = "目录级别";
deptListTreeSetDefaultHandle () {
this.dataForm.pid = '0'
this.dataForm.type = '目录级别'
},
// 获取信息
getInfo() {
getInfo () {
this.$http
.get("/ability/bsabilityai/" + this.dataForm.id)
.get('/ability/bsabilityai/' + this.dataForm.id)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data,
};
...res.data
}
})
.catch(() => {});
.catch(() => {})
},
// 表单提交
dataFormSubmitHandle: debounce(
function () {
this.$refs.dataForm.validate((valid) => {
this.getUserInfo();
this.dataForm.deptId = this.deptId;
this.getUserInfo()
this.dataForm.deptId = this.deptId
if (!valid) {
this.$message.error("请检查表单是否填写完整");
return false;
this.$message.error('请检查表单是否填写完整')
return false
}
console.log("表单数据=======================》", this.dataForm);
console.log('表单数据=======================》', this.dataForm)
if (!this.UpdateState) {
this.dataForm.infoList = [];
this.dataForm.infoList = []
this.dataForm.showListAll.forEach((val) => {
if (val.name !== "必填信息") {
if (val.name === "服务接口信息") {
if (val.name !== '必填信息') {
if (val.name === '服务接口信息') {
val.children.forEach((item) => {
if (item.name === "服务接口") {
this.dataForm.apiUrl = item.note1;
if (item.name === '服务接口') {
this.dataForm.apiUrl = item.note1
}
if (item.name === "接口请求方式") {
this.dataForm.apiMethodType = item.note1;
if (item.name === '接口请求方式') {
this.dataForm.apiMethodType = item.note1
}
if (item.name === "访问地址") {
this.dataForm.link = item.note1;
if (item.name === '访问地址') {
this.dataForm.link = item.note1
}
});
})
} else {
val.children.forEach((item) => {
this.dataForm.infoList.push({
attrType: item.name,
attrValue: item.note1,
delFlag: 0,
});
});
delFlag: 0
})
})
}
}
});
})
this.$http
.post("/resource/insert?source= b", this.dataForm)
.post('/resource/insert?source= b', this.dataForm)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
return this.$message.error(res.msg)
}
this.$message({
message: this.$t("prompt.success"),
type: "success",
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false;
this.$emit("refreshDataList");
},
});
this.visible = false
this.$emit('refreshDataList')
}
})
.catch(() => {});
})
.catch(() => {})
} else {
this.$http
.put("/resource/update", this.dataFormUpdate)
.put('/resource/update', this.dataFormUpdate)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
return this.$message.error(res.msg)
}
this.$message({
message: this.$t("prompt.success"),
type: "success",
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false;
this.$emit("refreshDataList");
},
});
})
.catch(() => {});
this.visible = false
this.$emit('refreshDataList')
}
});
})
})
.catch(() => {})
}
})
},
1000,
{ leading: true, trailing: false }
),
showListChagne() {
showListChagne () {
this.dataForm.showList = this.dataForm.showListAll.filter(
(item) => this.checkList.indexOf(item.name) > -1
);
)
console.log(
"属性变更===================>",
'属性变更===================>',
this.checkList,
this.dataForm.showList,
this.dataForm.showListAll
);
)
}
},
mounted () {
this.getUserInfo()
},
mounted() {
this.getUserInfo();
},
beforeDestroy() {
console.log("销毁~~~~~~~~~~~~~~~~~~~~");
},
};
beforeDestroy () {
console.log('销毁~~~~~~~~~~~~~~~~~~~~')
}
}
</script>
<style lang="scss" scoped>

10
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -149,7 +149,7 @@
>详情</el-button
>
<el-button type="text" size="small" @click="showDocument(scope.row)"
>开发文档</el-button
>技术文档</el-button
>
<el-button
type="text"
@ -233,7 +233,7 @@ export default {
mixins: [mixinViewModule],
data () {
return {
required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '应用名称', '应用描述', '应用状态', '应用类型'],
required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '应用名称', '应用描述', '应用类型'],
notFilled: [],
mixinViewModuleOptions: {
getDataListURL: '/resource/page',
@ -692,9 +692,9 @@ export default {
if (!this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0].attrValue) {
this.notFilled.push('应用领域')
}
if (!this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0].attrValue) {
this.notFilled.push('应用状态')
}
// if (!this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0].attrValue) {
// this.notFilled.push('应用状态')
// }
if (!this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0].attrValue) {
this.notFilled.push('应用类型')
}

177
back/src/views/modules/activiti/demo/abilitydemandapply.vue
View File

@ -64,25 +64,55 @@
</el-form-item>
</el-form>
<!-- 流程综合组件 -->
<ren-process-multiple
<!-- <ren-process-multiple
v-if="processVisible"
updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
saveFormUrl="/processForm/tabilityapplication"
dataFormName="dataForm"
ref="renProcessMultiple"
></ren-process-multiple>
></ren-process-multiple> -->
<!-- 审批 -->
<div class="agreeOr" v-if="taskId">
<div>
<el-button type="primary" @click="showDialog('同意')">同意</el-button>
<el-button type="danger" plain @click="showDialog('拒绝')"
>驳回</el-button
>
</div>
</div>
<!-- 审批弹窗 -->
<el-dialog
title="审批意见"
:close-on-click-modal="false"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose"
>
<el-input v-model="input" placeholder="请输入审批意见"></el-input>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose2">取 消</el-button>
<el-button
type="primary"
@click.native="agreeOrNot($store.state.contentTabsActiveName)"
>确 定</el-button
>
</span>
</el-dialog>
</el-card>
</template>
<script>
// 引入工作流公共方法
import processModule from '@/mixins/process-module'
import qs from 'qs'
import debounce from 'lodash/debounce'
import bus from '@/views/bus.js'
export default {
// 注入公共方法
mixins: [processModule],
data () {
return {
visible: false,
// visible: false,
// 表单属性是否可编辑
fieldDisabled: false,
dataForm: {
@ -94,7 +124,13 @@ export default {
system: '',
scene: '',
basis: ''
}
},
// 审批
dialogVisible: false,
dialogType: '',
input: '',
visible: true,
taskId: ''
}
},
created () {
@ -113,6 +149,8 @@ export default {
}
// 初始化综合组件
this.initProcessMultiple(callbacks)
this.taskId = this.$route.params.taskId
this.dataForm.taskId = this.$route.params.taskId
},
computed: {
dataRule () {
@ -164,6 +202,128 @@ export default {
})
.catch(() => {})
},
// 审批
showDialog (title) {
this.dialogVisible = true
this.dialogType = title
},
handleClose (done) {
this.$confirm('确认关闭？')
.then((_) => {
this.input = ''
done()
})
.catch((_) => {})
},
handleClose2 () {
this.dialogVisible = false
this.input = ''
},
// 同意与退回
agreeOrNot: debounce(
function (data) {
this.dataForm.taskId = this.$route.params.taskId
if (this.dialogType === '同意') {
if (this.input !== '') {
console.log('this.dataForm', this.dataForm)
const params = qs.stringify({
taskId: this.dataForm.taskId,
comment: this.input
})
console.log(params)
this.$http
.post('/act/task/complete?' + params)
.then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) {
this.callbacks.taskHandleErrorCallback(res)
}
return
}
bus.$emit('AbilityResourcesRemovedInit')
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.dialogVisible = false
if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res)
}
}
})
})
.catch(() => {})
this.tabRemoveHandle(data)
} else {
this.$message.error('请输入审批意见！')
}
} else if (this.dialogType === '拒绝') {
if (this.input !== '') {
const params = qs.stringify({
taskId: this.dataForm.taskId,
comment: this.input
})
this.$http
.post('/act/task/backToFirst?', params)
.then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) {
this.callbacks.taskHandleErrorCallback(res)
}
return
}
bus.$emit('AbilityResourcesRemovedInit')
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res)
}
}
})
})
this.tabRemoveHandle(data)
} else {
this.$message.error('请输入审批意见！')
}
}
},
1000,
{ leading: true, trailing: false }
),
tabRemoveHandle (tabName) {
console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
if (tabName === 'home') {
return false
}
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
(item) => item.name !== tabName
)
if (this.$store.state.contentTabs.length <= 0) {
this.$store.state.sidebarMenuActiveName =
this.$store.state.contentTabsActiveName = 'home'
return false
}
// 当前选中tab被删除
if (tabName === this.$store.state.contentTabsActiveName) {
const tab =
this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1
]
this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
params: { ...tab.params },
query: { ...tab.query }
})
}
},
// 启动流程出错回调
startProcessErrorCallback (data) {
console.log(data)
@ -173,3 +333,12 @@ export default {
}
}
</script>
<style lang="scss">
.agreeOr {
& > div {
// text-align: right;
padding-right: 40px;
margin: 20px 0;
}
}
</style>

195
back/src/views/modules/activiti/demo/comments.vue
View File

@ -7,28 +7,65 @@
@keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
>
<el-tooltip placement="bottom" :content="dataForm.comment">
<template #title>
<span>{{ dataForm.comment }}</span>
</template>
<el-form-item label="评论内容">
<el-input
type="textarea"
v-model="dataForm.comment"
:disabled="fieldDisabled"
placeholder="评论内容"
></el-input>
</el-form-item>
</el-tooltip>
</el-form>
</div>
<!-- 流程综合组件 -->
<ren-process-multiple
<!-- <ren-process-multiple
v-if="processVisible"
updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
saveFormUrl="/processForm/tabilityapplication"
dataFormName="dataForm"
ref="renProcessMultiple"
></ren-process-multiple>
></ren-process-multiple> -->
<!-- 审批 -->
<div class="agreeOr" v-if="taskId">
<div>
<el-button type="primary" @click="showDialog('同意')">同意</el-button>
<el-button type="danger" plain @click="showDialog('拒绝')"
>驳回</el-button
>
</div>
</div>
<!-- 审批弹窗 -->
<el-dialog
title="审批意见"
:close-on-click-modal="false"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose"
>
<el-input v-model="input" placeholder="请输入审批意见"></el-input>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose2">取 消</el-button>
<el-button
type="primary"
@click.native="agreeOrNot($store.state.contentTabsActiveName)"
>确 定</el-button
>
</span>
</el-dialog>
</div>
</template>
<script>
import processModule from '@/mixins/process-module'
import qs from 'qs'
import debounce from 'lodash/debounce'
import bus from '@/views/bus.js'
export default {
// 注入公共方法
mixins: [processModule],
@ -44,12 +81,19 @@ export default {
data () {
return {
// processVisible: true,
visible: false,
// visible: false,
// 表单属性是否可编辑
fieldDisabled: false,
dataForm: [],
id: '',
shifoushizujian: true
shifoushizujian: true,
// 审批
dialogVisible: false,
dialogType: '',
input: '',
visible: true,
taskId: ''
}
},
watch: {},
@ -85,6 +129,128 @@ export default {
// }
console.log('this.dataForm', this.dataForm)
})
},
// 审批
showDialog (title) {
this.dialogVisible = true
this.dialogType = title
},
handleClose (done) {
this.$confirm('确认关闭？')
.then((_) => {
this.input = ''
done()
})
.catch((_) => {})
},
handleClose2 () {
this.dialogVisible = false
this.input = ''
},
// 同意与退回
agreeOrNot: debounce(
function (data) {
this.dataForm.taskId = this.$route.params.taskId
if (this.dialogType === '同意') {
if (this.input !== '') {
console.log('this.dataForm', this.dataForm)
const params = qs.stringify({
taskId: this.dataForm.taskId,
comment: this.input
})
console.log(params)
this.$http
.post('/act/task/complete?' + params)
.then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) {
this.callbacks.taskHandleErrorCallback(res)
}
return
}
bus.$emit('AbilityResourcesRemovedInit')
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.dialogVisible = false
if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res)
}
}
})
})
.catch(() => {})
this.tabRemoveHandle(data)
} else {
this.$message.error('请输入审批意见！')
}
} else if (this.dialogType === '拒绝') {
if (this.input !== '') {
const params = qs.stringify({
taskId: this.dataForm.taskId,
comment: this.input
})
this.$http
.post('/act/task/backToFirst?', params)
.then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) {
this.callbacks.taskHandleErrorCallback(res)
}
return
}
bus.$emit('AbilityResourcesRemovedInit')
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res)
}
}
})
})
this.tabRemoveHandle(data)
} else {
this.$message.error('请输入审批意见！')
}
}
},
1000,
{ leading: true, trailing: false }
),
tabRemoveHandle (tabName) {
console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
if (tabName === 'home') {
return false
}
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
(item) => item.name !== tabName
)
if (this.$store.state.contentTabs.length <= 0) {
this.$store.state.sidebarMenuActiveName =
this.$store.state.contentTabsActiveName = 'home'
return false
}
// 当前选中tab被删除
if (tabName === this.$store.state.contentTabsActiveName) {
const tab =
this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1
]
this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
params: { ...tab.params },
query: { ...tab.query }
})
}
}
},
created () {
@ -102,14 +268,27 @@ export default {
}
// 初始化综合组件
this.initProcessMultiple(callbacks)
this.taskId = this.$route.params.taskId
this.dataForm.taskId = this.$route.params.taskId
},
mounted () {}
}
</script>
<style lang="scss">
.kuandukuandukuandu{
max-width:1500px;
<style lang="scss" >
.kuandukuandukuandu {
max-width: 1500px;
}
.agreeOr {
& > div {
// text-align: right;
padding-right: 40px;
margin: 20px 0;
}
.wrapper {
}
</style>
<style lang="scss" scoped>
::v-deep .el-textarea__inner {
height: 100px;
resize: none;
}
</style>

14
back/src/views/modules/activiti/demo/putaway-process3.vue
View File

@ -106,7 +106,7 @@
</el-radio-group> -->
<el-button type="primary" @click="showDialog('同意')">同意</el-button>
<el-button type="danger" plain @click="showDialog('拒绝')"
>拒绝</el-button
>驳回</el-button
>
<!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
<el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
@ -229,6 +229,7 @@ export default {
function (data) {
this.dataForm.taskId = this.$route.params.taskId
if (this.dialogType === '同意') {
if (this.input !== '') {
console.log('this.dataForm', this.dataForm)
const params = qs.stringify({
taskId: this.dataForm.taskId,
@ -260,7 +261,12 @@ export default {
})
})
.catch(() => {})
this.tabRemoveHandle(data)
} else {
this.$message.error('请输入审批意见！')
}
} else if (this.dialogType === '拒绝') {
if (this.input !== '') {
const params = qs.stringify({
taskId: this.dataForm.taskId,
comment: this.input
@ -288,9 +294,11 @@ export default {
}
})
})
}
this.tabRemoveHandle(data)
// this.getDataList(data)
} else {
this.$message.error('请输入审批意见！')
}
}
},
1000,
{ leading: true, trailing: false }

8
back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
View File

@ -136,15 +136,7 @@ export default {
return this.$message.error(this.$t('task.detailError'))
}
this.getProcDefRouteSet(row, this.forwardDetail)
},
methodsThree () {
this.$http.get('/category/getCategoryTree').then((res) => {
localStorage.setItem('getCategoryTree', JSON.stringify(res.data.data))
})
}
},
mounted () {
this.methodsThree()
}
}
</script>

125
back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="wrapper">
<el-form>
<el-form :model="dataView">
<div v-for="(item, index) in dataView.children" :key="item">
<!-- <div class="dataTitle">{{ item.name }}</div> -->
<div v-for="itemson in item.children" :key="itemson.name">
@ -234,68 +234,8 @@ export default {
if (item) {
this.dataList = item
}
}
},
computed: {},
methods: {
videoAndImg (link) {
if (link) {
window.open(link)
} else {
this.$message({
message: '未上传',
type: 'warning'
})
}
},
deptName () {
console.log(this.dataForm.deptId)
this.$http
.get(`/sys/dept/${this.dataForm.deptId}`)
.then(({ data: res }) => {
console.log(res.data.name, 'res')
this.unit = res.data.name
})
},
queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) {
if (this.dataForm.type === '组件服务') {
this.$http
.get(
'/dataResourceRel/queryApp4PartByKeyId' +
'?keyId=' +
this.dataForm.id
)
.then(({ data: res }) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 = ''
res.data.map((item) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 += item.name + ';'
})
})
} else {
this.$http
.get(
'/dataResourceRel/queryPart4AppByKeyId?keyId=' +
this.dataForm.id +
'&type=' +
'组件服务'
)
.then(({ data: res }) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 = ''
res.data.map((item) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 += item.name + ';'
})
})
}
},
insertListFunction (val) {
insertList (val) {
if (val) {
if (this.dataForm.type === '应用资源') {
this.dataView = val.filter(
@ -483,10 +423,69 @@ export default {
}
}
},
computed: {},
methods: {
videoAndImg (link) {
if (link) {
window.open(link)
} else {
this.$message({
message: '未上传',
type: 'warning'
})
}
},
deptName () {
console.log(this.dataForm.deptId)
this.$http
.get(`/sys/dept/${this.dataForm.deptId}`)
.then(({ data: res }) => {
console.log(res.data.name, 'res')
this.unit = res.data.name
})
},
queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) {
if (this.dataForm.type === '组件服务') {
this.$http
.get(
'/dataResourceRel/queryApp4PartByKeyId' +
'?keyId=' +
this.dataForm.id
)
.then(({ data: res }) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 = ''
res.data.map((item) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 += item.name + ';'
})
})
} else {
this.$http
.get(
'/dataResourceRel/queryPart4AppByKeyId?keyId=' +
this.dataForm.id +
'&type=' +
'组件服务'
)
.then(({ data: res }) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 = ''
res.data.map((item) => {
this.dataView.children[index].children[indexSon].children[
indexSonSon
].note1 += item.name + ';'
})
})
}
}
},
created () {},
mounted () {
this.deptName()
this.insertListFunction(this.insertList)
}
}
</script>

38
back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
View File

@ -135,16 +135,16 @@ export default {
this.init()
console.log('fromList', this.$router.currentRoute.params.businessKey)
// this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
// var callbacks = {
// startProcessSuccessCallback: this.closeCurrentTab,
// startProcessErrorCallback: this.startProcessErrorCallback,
// taskHandleSuccessCallback: this.closeCurrentTab,
// taskHandleErrorCallback: this.taskHandleErrorCallback,
// formSaveSuccessCallback: null,
// formSaveErrorCallback: null
// }
// // 初始化综合组件
// this.initProcessMultiple(callbacks)
var callbacks = {
startProcessSuccessCallback: this.closeCurrentTab,
startProcessErrorCallback: this.startProcessErrorCallback,
taskHandleSuccessCallback: this.closeCurrentTab,
taskHandleErrorCallback: this.taskHandleErrorCallback,
formSaveSuccessCallback: null,
formSaveErrorCallback: null
}
// 初始化综合组件
this.initProcessMultiple(callbacks)
},
mounted () {
const businessKey = this.$router.currentRoute.params.businessKey
@ -180,10 +180,9 @@ export default {
this.input = ''
},
methodsThree () {
// this.$http.get('/category/getCategoryTree').then((res) => {
// this.insertList = res.data.data
// })
this.insertList = JSON.parse(localStorage.getItem('getCategoryTree'))
this.$http.get('/category/getCategoryTree').then((res) => {
this.insertList = res.data.data
})
},
init () {
this.visible = true
@ -201,6 +200,7 @@ export default {
agreeOrNot: debounce(
function (data) {
if (this.dialogType === '同意') {
if (this.input !== '') {
console.log('this.dataForm', this.dataForm)
const params = qs.stringify({
taskId: this.taskId,
@ -233,7 +233,12 @@ export default {
})
})
.catch(() => {})
this.tabRemoveHandle(data)
} else {
this.$message.error('请输入审批意见！')
}
} else if (this.dialogType === '驳回') {
if (this.input !== '') {
const params = qs.stringify({
taskId: this.taskId,
comment: this.input
@ -262,8 +267,11 @@ export default {
}
})
})
}
this.tabRemoveHandle(data)
} else {
this.$message.error('请输入审批意见！')
}
}
},
1000,
{ leading: true, trailing: false }

27
back/src/views/modules/myAgent/demo/competency-application.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-28 17:23:05
* @LastEditTime: 2022-08-04 14:34:45
* @Description: 告诉大家这是什么
-->
<!-- 流程业务表单 -->
@ -55,7 +55,7 @@
></span
>
</p>
<p v-if="dataForm.content.enclosure">
<p v-if="dataForm.content.enclosure" class="lastP">
<span>
申请附件：<span>
{{ dataForm.content.enclosure || '--'
@ -102,8 +102,8 @@
<el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
</el-radio-group> -->
<el-button type="primary" @click="showDialog('同意')">同意</el-button>
<el-button type="danger" plain @click="showDialog('拒绝')"
>拒绝</el-button
<el-button type="danger" plain @click="showDialog('驳回')"
>驳回</el-button
>
<!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
<el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
@ -291,6 +291,7 @@ export default {
if (val.cameraList) {
flag = true
obj.describe += val.system
obj.describe += '；'
} else {
this.$http.get('/resource/' + val.resourceId).then((res1) => {
// console.log(res1.data.data, '1111111111111111111111111111111111')
@ -380,6 +381,7 @@ export default {
agreeOrNot: debounce(
function (data) {
if (this.dialogType === '同意') {
if (this.input !== '') {
console.log('this.dataForm', this.dataForm)
const params = qs.stringify({
taskId: this.dataForm.taskId,
@ -411,13 +413,18 @@ export default {
})
})
.catch(() => {})
} else if (this.dialogType === '拒绝') {
this.tabRemoveHandle(data)
} else {
this.$message.error('请输入审批意见！')
}
} else if (this.dialogType === '驳回') {
if (this.input !== '') {
const params = qs.stringify({
taskId: this.dataForm.taskId,
comment: this.input
})
this.$http
.post('/act/task/endProcess?', params)
.post('/act/task/backToFirst?', params)
.then(({ data: res }) => {
if (res.code !== 0) {
this.$message.error(res.msg)
@ -439,9 +446,11 @@ export default {
}
})
})
}
this.tabRemoveHandle(data)
// this.getDataList(data)
} else {
this.$message.error('请输入审批意见！')
}
}
},
1000,
{ leading: true, trailing: false }
@ -510,7 +519,7 @@ export default {
width: 500px;
}
}
p:last-of-type {
.lastP {
margin-top: 16px;
width: 100%;
span {

216
back/src/views/modules/sys/user-add-or-update.vue
View File

@ -1,40 +1,110 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form-item prop="username" :label="$t('user.username')" auto-complete="new-password">
<el-input v-model="dataForm.username" :placeholder="$t('user.username')" auto-complete="new-password"></el-input>
<el-dialog
:visible.sync="visible"
:title="!dataForm.id ? $t('add') : $t('update')"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form
:model="dataForm"
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
label-width="120px"
>
<el-form-item
prop="username"
:label="$t('user.username')"
auto-complete="new-password"
>
<el-input
v-model="dataForm.username"
:placeholder="$t('user.username')"
auto-complete="new-password"
></el-input>
</el-form-item>
<el-form-item prop="deptName" :label="$t('user.deptName')">
<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>
<ren-dept-tree
v-model="dataForm.deptId"
:placeholder="$t('dept.title')"
:dept-name.sync="dataForm.deptName"
></ren-dept-tree>
</el-form-item>
<el-form-item prop="password" :label="$t('user.password')" :class="{ 'is-required': !dataForm.id }" auto-complete="new-password" v-if="!dataForm.id">
<el-input v-model="dataForm.password" type="password" :placeholder="$t('user.password')" auto-complete="new-password" @input="changeInput"></el-input>
<el-form-item
prop="password"
:label="$t('user.password')"
:class="{ 'is-required': !dataForm.id }"
auto-complete="new-password"
v-if="!dataForm.id"
>
<el-input
v-model="dataForm.password"
type="password"
:placeholder="$t('user.password')"
auto-complete="new-password"
@input="changeInput"
></el-input>
</el-form-item>
<el-form-item prop="confirmPassword" :label="$t('user.confirmPassword')" :class="{ 'is-required': !dataForm.id }" v-if="!dataForm.id">
<el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('user.confirmPassword')"></el-input>
<el-form-item
prop="confirmPassword"
:label="$t('user.confirmPassword')"
:class="{ 'is-required': !dataForm.id }"
v-if="!dataForm.id"
>
<el-input
v-model="dataForm.confirmPassword"
type="password"
:placeholder="$t('user.confirmPassword')"
></el-input>
</el-form-item>
<el-form-item prop="realName" :label="$t('user.realName')">
<el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>
<el-input
v-model="dataForm.realName"
:placeholder="$t('user.realName')"
></el-input>
</el-form-item>
<el-form-item prop="gender" :label="$t('user.gender')">
<ren-radio-group v-model="dataForm.gender" dict-type="gender"></ren-radio-group>
<ren-radio-group
v-model="dataForm.gender"
dict-type="gender"
></ren-radio-group>
</el-form-item>
<el-form-item prop="email" :label="$t('user.email')">
<el-input v-model="dataForm.email" :placeholder="$t('user.email')"></el-input>
<el-input
v-model="dataForm.email"
:placeholder="$t('user.email')"
></el-input>
</el-form-item>
<el-form-item prop="mobile" :label="$t('user.mobile')">
<el-input v-model="dataForm.mobile" :placeholder="$t('user.mobile')"></el-input>
<el-input
v-model="dataForm.mobile"
:placeholder="$t('user.mobile')"
></el-input>
</el-form-item>
<el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list">
<el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')">
<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
<el-form-item
prop="roleIdList"
:label="$t('user.roleIdList')"
class="role-list"
>
<el-select
v-model="dataForm.roleIdList"
multiple
:placeholder="$t('user.roleIdList')"
>
<el-option
v-for="role in roleList"
:key="role.id"
:label="role.name"
:value="role.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="postIdList" :label="$t('user.postIdList')" class="role-list">
<!-- 所在岗位屏蔽掉，bug729 -->
<!-- <el-form-item prop="postIdList" :label="$t('user.postIdList')" class="role-list">
<el-select v-model="dataForm.postIdList" multiple :placeholder="$t('user.postIdList')">
<el-option v-for="post in postList" :key="post.id" :label="post.postName" :value="post.id"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item prop="status" :label="$t('user.status')" size="mini">
<el-radio-group v-model="dataForm.status">
<el-radio :label="0">{{ $t('user.status0') }}</el-radio>
@ -44,7 +114,9 @@
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{
$t('confirm')
}}</el-button>
</template>
</el-dialog>
</template>
@ -93,8 +165,22 @@ export default {
const low = /^.*[a-z]+.*/
const up = /^.*[A-Z]+.*/
const spe = /^.*[^a-zA-Z0-9]+.*/
console.log('包含数字', num.test(value), '包含字母', low.test(value), up.test(value), '包含特殊符号', spe.test(value))
if (!(num.test(value) && (low.test(value) || up.test(value)) && spe.test(value))) {
console.log(
'包含数字',
num.test(value),
'包含字母',
low.test(value),
up.test(value),
'包含特殊符号',
spe.test(value)
)
if (
!(
num.test(value) &&
(low.test(value) || up.test(value)) &&
spe.test(value)
)
) {
return callback(new Error(this.$t('validate.pwdStrength')))
}
// if (!this.dataForm.id && !/\S/.test(value)) {
@ -113,38 +199,52 @@ export default {
}
var validateEmail = (rule, value, callback) => {
if (value && !isEmail(value)) {
return callback(new Error(this.$t('validate.format', { attr: this.$t('user.email') })))
return callback(
new Error(
this.$t('validate.format', { attr: this.$t('user.email') })
)
)
}
callback()
}
var validateMobile = (rule, value, callback) => {
if (value && !isMobile(value)) {
return callback(new Error(this.$t('validate.format', { attr: this.$t('user.mobile') })))
return callback(
new Error(
this.$t('validate.format', { attr: this.$t('user.mobile') })
)
)
}
callback()
}
return {
username: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
{
required: true,
message: this.$t('validate.required'),
trigger: 'blur'
}
],
deptName: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' }
],
password: [
{ validator: validatePassword, trigger: 'blur' }
{
required: true,
message: this.$t('validate.required'),
trigger: 'change'
}
],
password: [{ validator: validatePassword, trigger: 'blur' }],
confirmPassword: [
{ validator: validateConfirmPassword, trigger: 'blur' }
],
realName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
{
required: true,
message: this.$t('validate.required'),
trigger: 'blur'
}
],
email: [
{ validator: validateEmail, trigger: 'blur' }
],
mobile: [
{ validator: validateMobile, trigger: 'blur' }
]
email: [{ validator: validateEmail, trigger: 'blur' }],
mobile: [{ validator: validateMobile, trigger: 'blur' }]
}
}
},
@ -165,10 +265,7 @@ export default {
this.$nextTick(() => {
this.$refs.dataForm.resetFields()
this.roleIdListDefault = []
Promise.all([
this.getRoleList(),
this.getPostList()
]).then(() => {
Promise.all([this.getRoleList(), this.getPostList()]).then(() => {
if (this.dataForm.id) {
this.getInfo()
} else {
@ -193,25 +290,33 @@ export default {
},
// 获取角色列表
getRoleList () {
return this.$http.get('/sys/role/list').then(({ data: res }) => {
return this.$http
.get('/sys/role/list')
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.roleList = res.data
}).catch(() => {})
})
.catch(() => {})
},
// 获取岗位列表
getPostList () {
return this.$http.get('/sys/post/list').then(({ data: res }) => {
return this.$http
.get('/sys/post/list')
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.postList = res.data
}).catch(() => {})
})
.catch(() => {})
},
// 获取信息
getInfo () {
this.$http.get(`/sys/user/${this.dataForm.id}`).then(({ data: res }) => {
this.$http
.get(`/sys/user/${this.dataForm.id}`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -222,16 +327,22 @@ export default {
}
// 角色配置, 区分是否为默认角色
for (var i = 0; i < res.data.roleIdList.length; i++) {
if (this.roleList.filter(item => item.id === res.data.roleIdList[i])[0]) {
if (
this.roleList.filter(
(item) => item.id === res.data.roleIdList[i]
)[0]
) {
this.dataForm.roleIdList.push(res.data.roleIdList[i])
continue
}
this.roleIdListDefault.push(res.data.roleIdList[i])
}
}).catch(() => {})
})
.catch(() => {})
},
// 表单提交
dataFormSubmitHandle: debounce(function () {
dataFormSubmitHandle: debounce(
function () {
this.$refs.dataForm.validate((valid) => {
if (!valid) {
return false
@ -248,7 +359,8 @@ export default {
...this.dataForm.roleIdList,
...this.roleIdListDefault
]
}).then(({ data: res }) => {
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -262,10 +374,14 @@ export default {
}
})
this.submitFlag = true
}).catch(() => {})
})
.catch(() => {})
}
})
}, 1000, { leading: true, trailing: false })
},
1000,
{ leading: true, trailing: false }
)
}
}
</script>

120
back/src/views/modules/sys/user.vue
View File

@ -9,7 +9,14 @@
<el-form-item>
<el-input
v-model="dataForm.username"
:placeholder="$t('user.username')"
placeholder="用户名"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-input
v-model="dataForm.real_name"
placeholder="真实姓名"
clearable
></el-input>
</el-form-item>
@ -44,7 +51,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{
$t("query")
$t('query')
}}</el-button>
</el-form-item>
<el-form-item>
@ -52,7 +59,7 @@
v-if="$hasPermission('sys:user:save')"
type="primary"
@click="addOrUpdateHandle()"
>{{ $t("add") }}</el-button
>{{ $t('add') }}</el-button
>
</el-form-item>
<el-form-item>
@ -60,7 +67,7 @@
v-if="$hasPermission('sys:user:delete')"
type="danger"
@click="deleteHandle()"
>{{ $t("deleteBatch") }}</el-button
>{{ $t('deleteBatch') }}</el-button
>
</el-form-item>
<el-form-item>
@ -68,7 +75,7 @@
v-if="$hasPermission('sys:user:export')"
type="info"
@click="exportHandle()"
>{{ $t("export") }}</el-button
>{{ $t('export') }}</el-button
>
</el-form-item>
<el-form-item>
@ -96,6 +103,12 @@
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="realName"
label="真实姓名"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="deptName"
:label="$t('user.deptName')"
@ -123,7 +136,7 @@
align="center"
>
<template slot-scope="scope">
{{ $getDictLabel("gender", scope.row.gender) }}
{{ $getDictLabel('gender', scope.row.gender) }}
</template>
</el-table-column>
<el-table-column
@ -135,10 +148,10 @@
>
<template slot-scope="scope">
<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
$t("user.status0")
$t('user.status0')
}}</el-tag>
<el-tag v-else size="small" type="success">{{
$t("user.status1")
$t('user.status1')
}}</el-tag>
</template>
</el-table-column>
@ -163,14 +176,14 @@
type="text"
size="small"
@click="addOrUpdateHandle(scope.row.id)"
>{{ $t("update") }}</el-button
>{{ $t('update') }}</el-button
>
<el-button
v-if="$hasPermission('sys:user:delete')"
type="text"
size="small"
@click="deleteHandle(scope.row.id)"
>{{ $t("delete") }}</el-button
>{{ $t('delete') }}</el-button
>
</template>
</el-table-column>
@ -196,86 +209,87 @@
</template>
<script>
import mixinViewModule from "@/mixins/view-module";
import AddOrUpdate from "./user-add-or-update";
import qs from "qs";
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './user-add-or-update'
import qs from 'qs'
export default {
mixins: [mixinViewModule],
data() {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: "/sys/user/page",
getDataListURL: '/sys/user/page',
getDataListIsPage: true,
deleteURL: "/sys/user",
deleteURL: '/sys/user',
deleteIsBatch: true,
exportURL: "/sys/user/export",
exportURL: '/sys/user/export'
},
postList: [],
dataForm: {
username: "",
deptId: "",
postId: "",
gender: "",
},
};
username: '',
deptId: '',
postId: '',
gender: ''
}
}
},
components: {
AddOrUpdate,
AddOrUpdate
},
created() {
this.getPostList();
created () {
this.getPostList()
},
methods: {
reset() {
reset () {
this.$http
.get(
this.mixinViewModuleOptions.getDataListURL +
"?" +
'?' +
qs.stringify({
page: 1,
limit: 10,
username: "",
deptId: "",
postId: "",
gender: "",
username: '',
deptId: '',
postId: '',
gender: ''
})
)
.then(({ data: res }) => {
this.dataForm.username = "";
this.dataForm.deptId = "";
this.dataForm.postId = "";
this.dataForm.gender = "";
this.dataForm.username = ''
this.dataForm.real_name = ''
this.dataForm.deptId = ''
this.dataForm.postId = ''
this.dataForm.gender = ''
if (res.code !== 0) {
this.dataList = [];
this.total = 0;
return this.$message.error(res.msg);
this.dataList = []
this.total = 0
return this.$message.error(res.msg)
}
this.dataList = this.mixinViewModuleOptions.getDataListIsPage
? res.data.list
: res.data;
: res.data
this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total
: 0;
: 0
if (this.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data);
this.mixinViewModuleOptions.requestCallback(res.data)
}
this.dataListLoading = false;
this.dataListLoading = false
})
.catch(() => {
this.dataListLoading = false;
});
this.dataListLoading = false
})
},
getPostList() {
getPostList () {
this.$http
.get("/sys/post/list")
.get('/sys/post/list')
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
return this.$message.error(res.msg)
}
this.postList = res.data;
this.postList = res.data
})
.catch(() => {});
},
},
};
.catch(() => {})
}
}
}
</script>

3
back/src/views/modules/workBench/components/frequency-top5-view.vue
View File

@ -87,7 +87,8 @@ export default {
this.noData = true
return
}
for (let i = 0; i < 3; i++) {
const num = _arr.length < 3 ? _arr.length : 3
for (let i = 0; i < num; i++) {
const k = i + 1
this[`no${k}Obj`].name = _arr[i].name
this[`no${k}Obj`].count = _arr[i].count

3
front/package.json
View File

@ -45,7 +45,7 @@
"three.meshline": "^1.1.0",
"vue": "^3.1.4",
"vue-router": "^4.0.10",
"vue3-video-play": "^1.3.1-beta.6",
"vue3-video-play-emiyagm": "^1.3.1-beta.6.1",
"vuex": "^4.0.2"
},
"devDependencies": {
@ -75,6 +75,7 @@
"svg-sprite-loader": "^6.0.9",
"swiper": "^8.0.0",
"vab-config": "0.0.8",
"vue3-video-play-emiyagm": "^1.3.1-beta.6.1",
"webpackbar": "^5.0.0-3"
},
"gitHooks": {

12
front/public/index.html
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-02 16:06:03
* @LastEditTime: 2022-08-08 09:19:02
* @Description: 告诉大家这是什么
-->
<!DOCTYPE html>
@ -60,10 +60,12 @@
// window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
// window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
// window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
// window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
// window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
// window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
// window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin';
window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 穿透版本
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
// window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';

4
front/public/static/config/location.js
View File

@ -1,8 +1,8 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-02 10:18:58
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-08-01 11:02:21
* @Description: 数据资源参数配置
*/
const newLocation = 'qingdao'

2
front/public/static/config/mapConfig.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-28 16:57:43
* @LastEditTime: 2022-08-02 18:19:32
* @Description: 地图静态参数配置
*/
var _mapConfig = {}

7
front/src/App.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.wuhongjian
* @Date: 2022-05-06 11:12:00
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-26 11:27:50
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-03 10:13:59
* @Description: 告诉大家这是什么
-->
<template>
@ -68,4 +68,7 @@
position: relative;
background-color: #fff;
}
body {
font-size: 0.14rem;
}
</style>

2
front/src/api/capabilityCloud.js
View File

@ -97,7 +97,7 @@ export function callTheTrendPort(start, end, params) {
export function totalCallsSnum(params) {
return request({
url:
`/metrics/api/v1/query?time=${params}&query=sum(apigateway_http_status)`,
`/gateway-monitor/getCallCount`,
method: 'get',
})
}

9
front/src/api/personalCenter.js
View File

@ -275,3 +275,12 @@ export function AbilityToPullDownPages(params) {
params,
})
}
// 终止流程
export function endProcess(params) {
return request({
url: '/act/task/endProcess',
method: 'post',
params,
})
}

BIN
front/src/assets/menu/apply.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 122 KiB

BIN
front/src/assets/menu/apply_back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 119 KiB

BIN
front/src/assets/menu/down.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 119 KiB

BIN
front/src/assets/menu/jcss.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
front/src/assets/menu/new-bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
front/src/assets/menu/sevice-bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
front/src/assets/menu/shelves.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 128 KiB

BIN
front/src/assets/menu/sjzy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
front/src/assets/menu/yyzy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
front/src/assets/menu/zjfw.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

8
front/src/main.js
View File

@ -1,8 +1,8 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 17:48:03
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-22 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-06 15:00:49
* @Description: 告诉大家这是什么
*/
import { createApp } from 'vue'
@ -16,8 +16,8 @@ import 'ant-design-vue/dist/antd.css'
import '@/vab'
import * as echarts from 'echarts'
import * as moment from 'moment'
import vue3videoPlay from 'vue3-video-play' // 引入组件
import 'vue3-video-play/dist/style.css' // 引入css
import vue3videoPlay from 'vue3-video-play-emiyagm' // 引入组件
import 'vue3-video-play-emiyagm/dist/style.css' // 引入css
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import * as ElementPlusIconsVue from '@element-plus/icons-vue'

14
front/src/views/abilityStatistics/components/CapabilityRequirements.vue
View File

@ -13,10 +13,16 @@
backgroundImage: `url(${item.photo}) `,
}"
></div>
<a-tooltip>
<template #title>{{ item.demandSubject }}</template>
<div class="name">{{ item.demandSubject }}</div>
</a-tooltip>
<a-tooltip>
<template #title>{{ item.demandDetails }}</template>
<div class="text">
{{ item.demandDetails }}
</div>
</a-tooltip>
<div class="reply">回复量:{{ item.commentCount }}</div>
<div class="view-details" @click="viewDetails(item.id)">查看详情</div>
</div>
@ -165,6 +171,10 @@
font-size: 16px;
color: #212121;
margin-bottom: 24px;
width: 226px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.text {
width: 100%;
@ -175,6 +185,10 @@
font-size: 14px;
color: #666;
text-align: center;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.view-details {
width: 75px;

13
front/src/views/assignCase/components/queryPage.vue
View File

@ -64,14 +64,14 @@
</div>
<div class="pagination">
<!-- 分页 -->
<span>共{{ resourceTotal }}条</span>
<!-- <span>共{{ resourceTotal }}条</span>
<a-pagination
v-model:current="currentPage"
v-model:pageSize="currentPageSize"
show-quick-jumper
:total="resourceTotal"
@change="pageChange"
/>
/> -->
</div>
</main>
</div>
@ -215,7 +215,7 @@
orderField: 'create_date',
orderType: 'DESC',
pageNum: currentPage.value,
pageSize: 3,
pageSize: 100,
type: '赋能案例',
}
pageWithAttrs(params).then((res) => {
@ -367,14 +367,15 @@
.content {
width: 100%;
display: flex;
justify-content: center;
padding-top: 40px;
justify-content: space-around;
flex-wrap: wrap;
padding: 40px 300px 0;
overflow: hidden;
.contenBox {
// width: 430px;
padding: 30px;
border: 1px solid #e4e6f5;
margin-right: 30px;
margin-bottom: 20px;
background: #ffffff;
border-radius: 6px;
box-shadow: 5px 5px 20px 0 #f2f3fb;

16
front/src/views/capabilityCloud/components/ComponentServices.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-19 10:15:33
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-06-19 18:19:58
* @LastEditTime: 2022-08-06 16:21:24
* @Description: 能力云图-组件服务
-->
<template>
@ -409,11 +409,16 @@
const TotalCallsAPI = () => {
const end = Date.parse(new Date()) / 1000
totalCallsSnum(end).then((res) => {
debugger
snum.value[1].num = res.data.data.result[0].value[1]
snum.value[1].num = Number(res.data.data)
totalCallsSnum2(end).then((resSon) => {
if (snum.value[1].num === 0) {
num.value[2].num = '100%'
} else {
snum.value[2].num =
(resSon.data.data.result[0].value[1] / snum.value[1].num) * 100 + '%'
parseInt(
(resSon.data.data.result[0].value[1] / snum.value[1].num) * 100
) + '%'
}
})
})
}
@ -421,8 +426,11 @@
timeSwitch(timeSwitchindex.value)
NumberOfComponentServices()
ranking(dataclick.value)
// 西海岸版本不调用API总数
if (!xinhaianIsShow) {
TotalCallsAPI()
}
}
onMounted(() => {
init()
callTheTrend(callTheTrendData.value)

64
front/src/views/capacityOnTheShelf/Algorithm.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.liangjunhua
* @Date: 2022-06-13 10:22:27
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-08-02 11:28:00
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-03 10:40:28
* @Description: 算法上架
-->
<template>
@ -841,25 +841,25 @@
<style lang="less" scoped>
.box {
position: relative;
top: 64px;
margin: 15px 400px;
padding: 10px;
top: 0.64rem;
margin: 0.15rem 4rem;
padding: 0.1rem;
background: #fff;
.header {
font-size: 28px;
font-size: 0.28rem;
font-weight: 600;
}
.vue-box {
padding: 0 100px;
padding: 0 1rem;
}
.top {
margin: 10px 20px 0;
padding: 15px 30px;
margin: 0.1rem 0.2rem 0;
padding: 0.15rem 0.3rem;
background: #edf4fc;
display: flex;
justify-content: space-between;
div {
font-size: 18px;
font-size: 0.18rem;
color: #999;
display: flex;
justify-content: center;
@ -868,26 +868,26 @@
display: flex;
justify-content: center;
align-items: center;
width: 45px;
height: 45px;
width: 0.45rem;
height: 0.45rem;
border-radius: 50%;
border: 1px solid rgb(214, 214, 214);
margin-right: 10px;
border: 0.01rem solid rgb(214, 214, 214);
margin-right: 0.1rem;
transition: all 0.3s ease;
span {
display: flex;
justify-content: center;
align-items: center;
width: 30px;
height: 30px;
width: 0.3rem;
height: 0.3rem;
border-radius: 50%;
border: 1px solid #999;
border: 0.01rem solid #999;
}
}
.line {
margin-left: 10px;
width: 130px;
height: 1px;
margin-left: 0.1rem;
width: 1.3rem;
height: 0.01rem;
background: #999;
}
}
@ -896,10 +896,10 @@
.bg-box {
background: #9ccefa;
color: #fff;
border: 1px solid #9ccefa;
border: 0.01rem solid #9ccefa;
span {
background: #0087ff;
border: 1px solid #0087ff;
border: 0.01rem solid #0087ff;
}
}
.line {
@ -909,17 +909,18 @@
.btn {
display: flex;
justify-content: space-around;
padding: 10px 350px 0;
padding: 0.1rem 3.5rem 0;
button {
cursor: pointer;
width: 80px;
height: 35px;
font-size: 0.14rem;
width: 0.8rem;
height: 0.35rem;
text-align: center;
color: #fff;
border: 1px solid #9ccefa;
border: 0.01rem solid #9ccefa;
span {
background: #0087ff;
border: 1px solid #0087ff;
border: 0.01rem solid #0087ff;
}
}
.line {
@ -940,15 +941,16 @@
.btn {
display: flex;
justify-content: space-between;
padding: 10px 350px 0;
padding: 0.1rem 3.5rem 0;
button {
cursor: pointer;
width: 80px;
height: 35px;
font-size: 0.14rem;
width: 0.8rem;
height: 0.35rem;
text-align: center;
color: #fff;
border: none;
border-radius: 6px;
border-radius: 0.06rem;
background: #0087ff;
}
button:nth-of-type(1) {

25
front/src/views/capacityOnTheShelf/Application.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.liangjunhua
* @Date: 2022-06-13 10:22:27
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-08-02 11:40:41
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-04 16:11:50
* @Description: 应用上架
-->
<template>
@ -67,7 +67,7 @@
v-else-if="showView === '部署与应用'"
:refData="refData"
:dataFrom="dataFrom"
:externalField="['共享类型']"
:externalField="['共享类型', '访问地址']"
:configure="bs"
@submit="submit()"
@back="back()"
@ -299,7 +299,6 @@
'共享条件',
'应用名称',
'应用描述',
'应用状态',
'应用类型',
])
const notFilled = ref([])
@ -347,15 +346,15 @@
) {
notFilled.value.push('应用领域')
}
if (
!dataFrom.value.infoList.filter(
(val) => val.attrType === '应用状态'
)[0] ||
!dataFrom.value.infoList.filter((val) => val.attrType === '应用状态')[0]
.attrValue
) {
notFilled.value.push('应用状态')
}
// if (
// !dataFrom.value.infoList.filter(
// (val) => val.attrType === '应用状态'
// )[0] ||
// !dataFrom.value.infoList.filter((val) => val.attrType === '应用状态')[0]
// .attrValue
// ) {
// notFilled.value.push('应用状态')
// }
if (
!dataFrom.value.infoList.filter(
(val) => val.attrType === '应用类型'

11
front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-08-02 11:31:43
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-03 11:47:41
* @Description: 上架
-->
<template>
@ -86,6 +86,7 @@
<template v-if="attr.type == 'input2'">
<a-input
disabled
:maxLength="1000"
v-model:value="val[attr.field]"
:placeholder="'请填写' + attr.name"
/>
@ -144,6 +145,7 @@
/>
<template v-if="val.type == 'input2'">
<a-input
:maxLength="1000"
v-model:value="val.note1"
:placeholder="'请填写' + val.name"
/>
@ -228,6 +230,7 @@
{{ item.name }}
</div>
<a-input
:maxLength="1000"
v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
v-model:value="item.note1"
:placeholder="'请输入' + item.name"
@ -246,9 +249,11 @@
v-else-if="item.type == 'radio'"
v-model:value="item.note1"
:options="item.options"
@change="changeIiem(item.name, item.note1)"
/>
<a-input
v-else-if="item.type == 'AbilityType'"
:maxLength="1000"
v-model:value="item.note1"
:placeholder="'请输入' + item.name"
:disabled="true"
@ -256,6 +261,7 @@
<a-input
v-else-if="item.type == 'ComponentType'"
v-model:value="item.note1"
:maxLength="1000"
:placeholder="'请输入' + item.name"
:disabled="true"
/>
@ -1222,6 +1228,7 @@
.submit {
margin-top: 0.4rem;
font-size: 0.14rem;
display: flex;
justify-content: flex-end;

2
front/src/views/demandCenter/demandDetails.vue
View File

@ -299,7 +299,7 @@
if (res.data.code == '0') {
demandCommentApply({ id: res.data.data.id }).then((res1) => {
if (res1.data.code == '0') {
message.success('提交评价成功！')
message.success('提交评论成功，请注意查看消息通知！')
myComment.value = ''
evaluateList()
}

46
front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue
View File

@ -9,7 +9,7 @@
<div class="algorithm-advantage" v-if="flag">
<detals-title title="算法优势" type="ADVANTGE"></detals-title>
<div class="main">
<div class="top">
<div class="top" v-if="data.length < 3">
<div v-for="val in data" :key="val.id" class="item">
<div class="icon" :class="val.icon"></div>
<a-tooltip>
@ -22,17 +22,44 @@
</a-tooltip>
</div>
</div>
<div class="top" v-else>
<swiper
:slidesPerView="3"
:spaceBetween="30"
:pagination="{ clickable: true }"
:modules="modules"
class="mySwiper2"
@swiper="onSwiper"
@slideChange="onSlideChange"
>
<swiper-slide v-for="val in data" :key="val.id" class="item">
<div class="icon" :class="val.icon"></div>
<a-tooltip>
<template #title>{{ val.title }}</template>
<div class="title">{{ val.title }}</div>
</a-tooltip>
<a-tooltip>
<template #title>{{ val.text }}</template>
<div class="text">{{ val.text }}</div>
</a-tooltip>
</swiper-slide>
</swiper>
</div>
<div class="bottom"></div>
</div>
</div>
</template>
<script setup>
import { ref, defineProps, watch } from 'vue'
import { Navigation, Pagination, Scrollbar, A11y } from 'swiper'
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
import { Swiper, SwiperSlide } from 'swiper/vue/swiper-vue.js'
import 'swiper/swiper-bundle.min.css'
const data = ref([])
const props = defineProps({
dataList: { type: Object, default: null },
})
const modules = ref([Pagination])
const flag = ref(true)
if (props.dataList.infoList) {
let obj = props.dataList.infoList.filter(
@ -43,10 +70,10 @@
} else {
data.value = []
let arr = JSON.parse(obj.attrValue)
if (arr.length > 3) {
// 截取数组前三位
arr = arr.splice(0, 3)
}
// if (arr.length > 3) {
// // 截取数组前三位
// arr = arr.splice(0, 3)
// }
arr.forEach((item, index) => {
data.value.push({
title: item.name,
@ -67,10 +94,10 @@
} else {
data.value = []
let arr = JSON.parse(obj.attrValue)
if (arr.length > 3) {
// 截取数组前三位
arr = arr.splice(0, 3)
}
// if (arr.length > 3) {
// // 截取数组前三位
// arr = arr.splice(0, 3)
// }
arr.forEach((item, index) => {
data.value.push({
title: item.name,
@ -90,6 +117,7 @@
.main {
margin-top: 40px;
.top {
width: 13.14rem;
display: flex;
justify-content: space-around;
align-items: center;

2
front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="application-associated-ability" v-if="flag">
<detals-title title="关联应用" type="ASSOCIATED"></detals-title>
<detals-title title="来源应用" type="ASSOCIATED"></detals-title>
<div
class="application-associated-ability-main"
v-if="dataFrom[0].dataList.length < 4"

12
front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
View File

@ -64,18 +64,18 @@
},
])
const list = ref([])
// 根据能力id查询是否存在关联应用
// 根据能力id查询是否存在来源应用
if (keyId) {
queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
console.log('ressssssss', res)
if (res.data.data.length > 0) {
// 存在关联应用时在导航栏加入关联应用
// 存在来源应用时在导航栏加入来源应用
navList.value.unshift({
name: '关联应用',
name: '来源应用',
key: 'algorithm-associated-ability',
show: true,
})
// list.value.push('关联应用')
// list.value.push('来源应用')
console.log('navList', navList)
}
})
@ -130,7 +130,7 @@
if (list.value.length > 0) {
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
select.value = navList.value.filter(
(item) => (item.name === '关联应用') | (item.name === list.value[0])
(item) => (item.name === '来源应用') | (item.name === list.value[0])
)[0].key
}
}
@ -171,7 +171,7 @@
list.value.push('使用方式')
}
})
list.value.unshift('关联应用')
list.value.unshift('来源应用')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {

4
front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
View File

@ -66,7 +66,7 @@
})
const select = ref('application-associated-ability')
const list = ref([])
// 根据能力id查询是否存在关联应用
// 根据能力id查询是否存在关联组件
if (keyId) {
let params = {
keyId: keyId,
@ -75,7 +75,7 @@
queryPartAppByKeyId(params).then((res) => {
console.log('ressssssss', res)
if (res.data.data.length != 0) {
// 存在关联应用时在导航栏加入关联应用
// 存在关联组件时在导航栏加入关联组件
navList.value.unshift({
name: '关联组件',
key: 'application-associated-ability',

2
front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="application-associated-ability" v-if="flag">
<detals-title title="关联应用" type="ASSOCIATED"></detals-title>
<detals-title title="来源应用" type="ASSOCIATED"></detals-title>
<div
class="application-associated-ability-main"
v-if="dataFrom[0].dataList.length < 4"

24
front/src/views/detailsAll/components/Business/BusinessNavigation.vue
View File

@ -62,18 +62,18 @@
})
const select = ref('business-associated-ability')
const list = ref([])
// 根据能力id查询是否存在关联应用
// 根据能力id查询是否存在来源应用
if (keyId) {
queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
console.log('ressssssss', res)
if (res.data.data.length > 0) {
// 存在关联应用时在导航栏加入关联应用
// 存在来源应用时在导航栏加入来源应用
navList.value.unshift({
name: '关联应用',
name: '来源应用',
key: 'business-associated-ability',
show: true,
})
// list.value.push('关联应用')
// list.value.push('来源应用')
console.log('navList', navList)
}
})
@ -85,7 +85,7 @@
if (props.dataList.infoList) {
list.value = []
let arr = [
'关联应用',
'来源应用',
'组件视频介绍',
'功能介绍',
'应用场景',
@ -110,12 +110,12 @@
list.value.push('组件展示')
}
})
list.value.unshift('关联应用')
list.value.unshift('来源应用')
list.value.push('使用方式')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
if (item.name == '关联应用') {
if (item.name == '来源应用') {
if (props.associatedComponents[0].dataList.length != 0) {
item.show = true
}
@ -127,7 +127,7 @@
if (list.value.length > 0) {
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
select.value = navList.value.filter(
(item) => (item.name === '关联应用') | (item.name === list.value[0])
(item) => (item.name === '来源应用') | (item.name === list.value[0])
)[0].key
}
}
@ -145,7 +145,7 @@
if (val) {
list.value = []
let arr = [
'关联应用',
'来源应用',
'组件视频介绍',
'功能介绍',
'应用场景',
@ -171,12 +171,12 @@
list.value.push('组件展示')
}
})
list.value.unshift('关联应用')
list.value.unshift('来源应用')
list.value.push('使用方式')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
if (item.name == '关联应用') {
if (item.name == '来源应用') {
if (props.associatedComponents[0].dataList.length != 0) {
item.show = true
}
@ -189,7 +189,7 @@
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
select.value = navList.value.filter(
(item) =>
(item.name === '关联应用') | (item.name === list.value[0])
(item.name === '来源应用') | (item.name === list.value[0])
)[0].key
}
}

3
front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
View File

@ -210,7 +210,6 @@
let obj = props.dataList.infoList.filter(
(item) => item.attrType === '使用手册'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
if (obj) {
window.open(
window.SITE_CONFIG.previewUrl +
@ -221,7 +220,7 @@
message.config({
top: '100px', // 距离顶部的位置
})
message.error('暂未上传使用手册')
message.error('暂未开放新手指引')
}
}
</script>

2
front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="application-associated-ability" v-if="flag">
<detals-title title="关联应用" type="ASSOCIATED"></detals-title>
<detals-title title="来源应用" type="ASSOCIATED"></detals-title>
<div
class="application-associated-ability-main"
v-if="dataFrom[0].dataList.length < 4"

20
front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
View File

@ -65,18 +65,18 @@
})
const select = ref('developer-associated-ability')
const list = ref([])
// 根据能力id查询是否存在关联应用
// 根据能力id查询是否存在来源应用
if (keyId) {
queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
console.log('ressssssss', res)
if (res.data.data.length > 0) {
// 存在关联应用时在导航栏加入关联应用
// 存在来源应用时在导航栏加入来源应用
navList.value.unshift({
name: '关联应用',
name: '来源应用',
key: 'developer-associated-ability',
show: true,
})
// list.value.push('关联应用')
// list.value.push('来源应用')
console.log('navList', navList)
}
})
@ -101,12 +101,12 @@
list.value.push('组件试用')
}
})
list.value.unshift('关联应用')
list.value.unshift('来源应用')
list.value.push('使用方式')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
// if (item.name == '关联应用') {
// if (item.name == '来源应用') {
// if (props.associatedComponents[0].dataList.length != 0) {
// item.show = true
// }
@ -117,7 +117,7 @@
})
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
select.value = navList.value.filter(
(item) => (item.name === '关联应用') | (item.name === list.value[0])
(item) => (item.name === '来源应用') | (item.name === list.value[0])
// (item) => item.name === list.value[0]
)[0].key
}
@ -151,13 +151,13 @@
list.value.push('组件试用')
}
})
list.value.unshift('关联应用')
list.value.unshift('来源应用')
// list.value.push('组件试用')
list.value.push('使用方式')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
// if (item.name == '关联应用') {
// if (item.name == '来源应用') {
// if (props.associatedComponents[0].dataList.length != 0) {
// item.show = true
// }
@ -170,7 +170,7 @@
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
select.value = navList.value.filter(
(item) =>
(item.name === '关联应用') | (item.name === list.value[0])
(item.name === '来源应用') | (item.name === list.value[0])
)[0].key
}
}

2
front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
View File

@ -173,7 +173,7 @@
message.config({
top: '100px', // 距离顶部的位置
})
message.error('暂未上传使用手册')
message.error('暂未开放新手指引')
}
}
watch(

18
front/src/views/detailsAll/components/Developer/DeveloperTrial.vue
View File

@ -17,7 +17,12 @@
</div>
<div class="main-center">
<p>{{ dataFrom.numberName }}</p>
<p>{{ dataFrom.number }}</p>
<a-tooltip>
<template #title>{{ dataFrom.number }}</template>
<p class="main-center-number">
{{ dataFrom.number }}
</p>
</a-tooltip>
<div @click="copyFunction(dataFrom.number, '复制账号')">复制账号</div>
</div>
<div class="main-right">
@ -40,9 +45,9 @@
})
const dataFrom = ref({
linkName: '试用地址',
link: 'http://localhost:8080/#/detailsfdddffffffffffffffdfgdfgdfdgdfgdfg',
link: '',
numberName: '试用账号',
number: 'zhangfeihu',
number: '',
passwordName: '试用密码',
password: '**************************',
password2: '',
@ -144,6 +149,13 @@
.main-center {
padding-left: 1rem;
padding-right: 1rem;
.main-center-number {
display: inline-block;
width: 2.4rem;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.main-right {
padding-right: 0.7rem;

2
front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="application-associated-ability" v-if="flag">
<detals-title title="关联应用" type="ASSOCIATED"></detals-title>
<detals-title title="来源应用" type="ASSOCIATED"></detals-title>
<div
class="application-associated-ability-main"
v-if="dataFrom[0].dataList.length < 4"

14
front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
View File

@ -64,18 +64,18 @@
associatedComponents: { type: Array, default: null },
})
const list = ref([])
// 根据能力id查询是否存在关联应用
// 根据能力id查询是否存在来源应用
if (keyId) {
queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
console.log('ressssssss', res)
if (res.data.data.length > 0) {
// 存在关联应用时在导航栏加入关联应用
// 存在来源应用时在导航栏加入来源应用
navList.value.unshift({
name: '关联应用',
name: '来源应用',
key: 'layer-service-associated-ability',
show: true,
})
list.value.unshift('关联应用')
list.value.unshift('来源应用')
}
})
}
@ -137,7 +137,7 @@
list.value.push('使用方式')
}
})
list.value.unshift('关联应用')
list.value.unshift('来源应用')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
@ -146,7 +146,7 @@
})
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
select.value = navList.value.filter(
(item) => (item.name === '关联应用') | (item.name === list.value[0])
(item) => (item.name === '来源应用') | (item.name === list.value[0])
// (item) => item.name === list.value[0]
)[0].key
}
@ -215,7 +215,7 @@
list.value.push('使用方式')
}
})
list.value.unshift('关联应用')
list.value.unshift('来源应用')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {

9
front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
View File

@ -12,14 +12,14 @@
<div class="left">
<a-tooltip>
<template #title>{{ item.linkValue }}</template>
<p>
<p @click="ServiceAddressFunction(item.linkValue)">
服务地址：
{{ item.linkValue }}
</p>
</a-tooltip>
<a-tooltip>
<template #title>{{ item.csslinkValue }}</template>
<p>
<p @click="ServiceAddressFunction(item.csslinkValue)">
样式服务地址：
{{ item.csslinkValue }}
</p>
@ -186,6 +186,10 @@
}
}
)
//服务地址和样式服务地址跳转方法
function ServiceAddressFunction(link) {
window.open(link)
}
function technical() {
// 拼接路径
// const type = pinyin(props.dataList.type, {
@ -280,6 +284,7 @@
color: #212956;
line-height: 26px;
margin-top: 0.3rem;
cursor: pointer;
}
p:first-child {
margin-top: 0.2rem;

54
front/src/views/home/AbilityToApplyFor.vue
View File

@ -2,8 +2,51 @@
<div class="ability-to-apply-for" :class="{ all: falg }">
<div class="title">
<span>申请能力</span>
<span class="btn" @click="falg = !falg" v-show="!falg">展开</span>
<span class="btn" @click="falg = !falg" v-show="falg">收起</span>
<div class="btnBox" v-show="!falg">
<svg
t="1659419933164"
class="btn"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="5926"
width="20"
height="20"
@click="falg = !falg"
>
<path
d="M512 565.12a45.44 45.44 0 0 1-32.64-13.44l-448-451.84a45.44 45.44 0 0 1 64-64L512 454.4 931.84 35.2a46.08 46.08 0 0 1 64 0 45.44 45.44 0 0 1 0 64L545.28 551.68a45.44 45.44 0 0 1-33.28 13.44z"
fill="#13227a"
p-id="5927"
></path>
<path
d="M512 1016.96a45.44 45.44 0 0 1-32.64-13.44l-448-451.84a45.44 45.44 0 0 1 64-64L512 906.24l419.2-419.2a46.08 46.08 0 0 1 64 0 45.44 45.44 0 0 1 0 64l-449.92 452.48a45.44 45.44 0 0 1-33.28 13.44z"
fill="#13227a"
p-id="5928"
></path>
</svg>
<span class="btn" @click="falg = !falg">展开</span>
</div>
<div class="btnBox" v-show="falg">
<svg
t="1659420014519"
class="btn"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="9781"
width="20"
height="20"
@click="falg = !falg"
>
<path
d="M498.095 146.134l403.416 403.415c17.387 17.387 45.576 17.387 62.963 0s17.387-45.576 0-62.963L499.888 22 35.302 486.586c-17.388 17.387-17.388 45.575 0 62.963 17.387 17.387 45.576 17.387 62.964 0L498.095 146.134zM498.817 592.073l402.693 402.693c17.387 17.387 45.576 17.387 62.963 0s17.387-45.576 0-62.963L499.888 467.219 35.302 931.804c-17.388 17.387-17.388 45.576 0 62.963 17.387 17.387 45.576 17.387 62.964 0L498.817 592.073z"
p-id="9782"
fill="#13227a"
></path>
</svg>
<span class="btn" @click="falg = !falg">收起</span>
</div>
</div>
<div
v-for="(item, index) in dataForm"
@ -50,7 +93,7 @@
{{
val.description ||
((val.note1 || '') &&
( JSON.parse(val.note1)[0].channelName || '--') +
(JSON.parse(val.note1)[0].channelName || '--') +
'等' +
JSON.parse(val.note1).length +
'个摄像头') ||
@ -248,6 +291,7 @@
.btn {
cursor: pointer;
margin-left: 10px;
}
.tx {
@ -285,4 +329,8 @@
background: url('~@/assets/home/ywzj_square.png') no-repeat;
background-size: 100%;
}
.btnBox {
display: flex;
align-items: center;
}
</style>

2
front/src/views/home/DetailsPageconetent.vue
View File

@ -772,7 +772,7 @@
type: Cardsname.value,
name: '',
infoList: [],
orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量
orderField: 'visits', // total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量
orderType: 'DESC', // ASC 升序 DESC 降序
}
//西海岸查询参数

24
front/src/views/home/algorithmCompare.vue
View File

@ -37,7 +37,9 @@
{{ `共选取${selectedRowKeys.length}个算法` }}
</div>
<div class="td" v-for="(item, k) in detailArray" :key="k">
<span v-if="item">{{ item.name || '--' }}</span>
<span v-if="item" style="line-height: 14px">
{{ item.name || '--' }}
</span>
<span
v-if="item"
@click="deleteList(k)"
@ -230,10 +232,10 @@
text: '共享条件',
key: 'shareCondition',
},
{
text: '共享类型',
key: 'shareType',
},
// {
// text: '共享类型',
// key: 'shareType',
// },
{
text: '算法描述',
key: 'description',
@ -355,7 +357,6 @@
answer: '回答',
},
}
const showAddModal = ref(false)
const dataList = ref([])
const selectedRowKeys = ref([])
@ -428,7 +429,7 @@
_newObj.list = []
}
let list = []
titleInfoObj[titleKey].map((trName) => {
titleInfoObj[titleKey].map((trName, index) => {
let obj = {
name: trName.text,
}
@ -445,8 +446,15 @@
}
tableData.value.push(_newObj)
})
tableData.value[1].list[4].infoList.map((item, index) => {
if (!item && tableData.value[0].list[0].infoList[index]) {
tableData.value[1].list[3].infoList[index] = '否'
} else if (item && tableData.value[0].list[0].infoList[index]) {
tableData.value[1].list[3].infoList[index] = '是'
}
})
console.log('11111111111111', tableData.value)
console.log('11111111111111', tableData.value[1].list[4])
}
// 基本信息等

201
front/src/views/home/apply.vue
View File

@ -249,7 +249,7 @@
relaunch,
selectOne,
} from '@/api/home'
import { getCategoryTreePage } from '@/api/personalCenter'
import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
import mybus from '@/myplugins/mybus'
import { sgcDel, getApplyForm } from '@/api/personalCenter'
import { pageWithAttrs } from '@/api/home'
@ -327,6 +327,30 @@
enclosureName: '', //附件
})
const dataList = ref([])
const id = router.currentRoute.value.query.id
const taskId = router.currentRoute.value.query.taskId
const businessKey = ref(router.currentRoute.value.query.id)
if (id) {
getApplyForm(id).then((res) => {
console.log('修改==============>', res.data.data)
// formName.id = res.data.data.id || ''
formName.applicationSystem = res.data.data.applicationSystem || ''
formName.applicationScene = res.data.data.applicationScene || []
formName.applicationBackground =
res.data.data.applicationBackground || ''
formName.effectWish = res.data.data.effectWish || ''
formName.phone = res.data.data.phone || ''
// formName.system = res.data.data.system || []
formName.enclosure = res.data.data.enclosure || ''
formName.enclosureName = res.data.data.enclosureName || ''
if (res.data.data.enclosure) {
fileList.value.push({
name: res.data.data.enclosureName,
url: res.data.data.enclosure,
})
}
})
}
getUser().then((res) => {
formName.user = res.data.data.realName
formName.userId = res.data.data.id
@ -338,18 +362,6 @@
})
})
// console.log('本地存储====================》', list.value)
const businessKey = ref(router.currentRoute.value.query.id)
const taskId = ref(router.currentRoute.value.query.taskId)
if (businessKey.value) {
getApplyForm(businessKey.value).then((res) => {
formName.id = res.data.data.id
formName.phone = res.data.data.phone
formName.scene = res.data.data.scene
formName.basis = res.data.data.basis
formName.enclosure = res.data.data.enclosure
// console.log('回填数据================>', res, formName.phone)
})
}
const applicationSceneOpthion = ref([])
getCategoryTreePage({
page: 1,
@ -385,34 +397,6 @@
window.history.go(-1)
}
const processStartHandle = () => {
if (businessKey.value) {
const obj = ref({})
for (const key in formName) {
if (key !== 'formNameSystem') {
obj.value[key] = formName[key]
}
}
obj.value.system = formName.system[0].resourceName
tabilityapplication(obj.value).then((upres) => {
if (upres.data.code == 0) {
relaunch({ data: obj.value, taskId: taskId.value }).then(
(res) => {
// console.log('驳回================>', res)
if (res.data.code == 0) {
message.success('重新发起流程成功！')
window.setTimeout(() => {
window.history.go(-1)
}, 1000)
} else {
message.error('重新发起流程失败！')
}
}
)
} else {
message.error('数据更新失败！')
}
})
} else {
formRef.value.validate().then(() => {
if (!formUrl) {
return message.error('请设置保存表单的URL')
@ -420,6 +404,139 @@
if (!formName) {
return message.error('请设置表单名称')
}
if (id) {
endProcess({ instanceId: taskId }).then((end) => {
if (end.data.code == 0) {
let ids = []
let falgNum = 0
let sxt = true
formName.system = []
console.log('list==================', list.value)
list.value.map((val) => {
val.arr.map((item) => {
if (item.type !== '基础设施') {
falgNum++
}
})
})
list.value.map((val) => {
val.arr.map((item) => {
if (item.type !== '基础设施') {
formName.system.push({
resourceId: item.resourceId,
resourceName: item.resourceName,
})
falgNum++
console.log(item.id)
if (item.id) {
ids.push(item.id)
}
} else {
let obj = {}
Object.assign(obj, formName)
console.log('摄像头===============>', obj, item)
obj.system = []
item.note1 = JSON.parse(item.note1)
item.note1.map((sxt) => {
obj.system.push({
resourceId: sxt.idtCameraChannel + '',
resourceName: sxt.channelName,
cameraId: sxt.channelId, // 改接口后删除
channelCode: sxt.channelCode,
channelId: sxt.channelId,
channelName: sxt.channelName,
checkStatus: sxt.checkStatus + '',
gpsX: sxt.gpsX,
gpsY: sxt.gpsY,
idtCameraChannel: sxt.idtCameraChannel + '',
nodeName: sxt.nodeName,
parentId: sxt.parentId,
status: sxt.status + '',
})
})
submitApply(obj).then((res) => {
// applySuccess.value = false
console.log('摄像头申请================>', res)
if (item.id) {
sgcDel({ ids: [item.id] }).then((res1) => {
if (res1.data.msg === 'success') {
if (falgNum == 0 && sxt) {
message.success(
'申请提交成功，请到消息中心查看！'
)
sxt = false
}
mybus.emit('getSgcNum')
router.push({
path: '/DetailsPageconetent',
query: {
select: '组件服务',
},
})
}
})
} else {
if (
res.data.msg === 'success' &&
falgNum == 0 &&
sxt
) {
message.success('申请提交成功，请到消息中心查看！')
sxt = false
}
router.push({
path: '/DetailsPageconetent',
query: {
select: '组件服务',
},
})
}
})
}
})
})
console.log(
'提交数据==========================>',
formName,
ids
)
if (formName.system.length !== 0) {
if (formName.applicationSystem.length == 0) {
formName.applicationSystem = ''
}
submitApply(formName).then((res) => {
// applySuccess.value = false
message.success('申请提交成功，请到消息中心查看！')
console.log('能力申请================>', res)
if (res.data.code == 0) {
if (ids && ids.length > 0) {
sgcDel({ ids: ids }).then((res) => {
if (res.data.msg === 'success') {
mybus.emit('getSgcNum')
router.push({
path: '/DetailsPageconetent',
query: {
select: '组件服务',
},
})
}
})
} else {
router.push({
path: '/DetailsPageconetent',
query: {
select: '组件服务',
},
})
}
} else {
message.error('申请失败！')
}
})
}
}
})
} else {
if (!applyAll) {
console.log(list.value[0].arr[0])
// 单兵设备为了演示 添加 不做处理
@ -576,8 +693,8 @@
}
})
}
})
}
})
}
// 启动流程
const startProcess = (processDefinitionKey, businessKey, formData) => {

4
front/src/views/home/components/AbilityToRecommend.vue
View File

@ -447,13 +447,15 @@
height: 0.24rem;
width: 0.24rem;
background: url('~@/assets/home/shenqing.png') no-repeat;
background-size: cover;
background-size: contain;
background-position: center;
}
.fixedmount div:nth-child(2) p:nth-child(1) {
height: 0.24rem;
width: 0.24rem;
background: url('~@/assets/home/shangjia.png') no-repeat;
background-size: contain;
background-position: center;
}
.ability-to-recommend-bottom {
width: 100%;

303
front/src/views/home/components/searchResultList.vue
View File

@ -10,43 +10,89 @@
}}
</div>
<div class="condition" :key="showKey">
<ul v-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'">
<li v-for="(item, i) in orderList" :key="item.value" @click="changeOrder(i, item.value, item.orderType)">
<ul
v-if="
selectCardsname === '融合服务' || selectCardsname === '赋能场景'
"
>
<li
v-for="(item, i) in orderList"
:key="item.value"
@click="changeOrder(i, item.value, item.orderType)"
>
{{ item.name }}
<span class="arrow" :class="item.orderType == 'ASC' ? 'down' : ''"></span>
<span
class="arrow"
:class="item.orderType == 'ASC' ? 'down' : ''"
></span>
</li>
</ul>
<ul v-else>
<li v-for="item in selList" :key="item.value" @click="changeCondition(item.value)" v-show="
<li
v-for="item in selList"
:key="item.value"
@click="changeCondition(item.value)"
v-show="
item.show &&
item.name !== '评分' &&
selectCardsname !== '数据资源'
">
"
>
{{ item.name }}
<span class="arrow" :class="item.value == selData ? 'down' : ''"></span>
<span
class="arrow"
:class="item.value == selData ? 'down' : ''"
></span>
</li>
</ul>
</div>
</div>
<div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
<div
class="result-list"
v-for="(item, index) in resourceList.data"
:key="item.index"
>
<div class="item" :key="showKey">
<div class="left" style="display: flex; align-items: center" v-if="
<div
class="left"
style="display: flex; align-items: center"
v-if="
item.type === '应用资源' &&
item.infoList &&
item.infoList.filter((val) => val.attrType == '应用图片')[0]
">
<a-image :width="106" :preview="false" :src="
"
>
<a-image
:width="106"
:preview="false"
:src="
item.infoList.filter((val) => val.attrType == '应用图片')[0]
.attrValue
" />
"
/>
</div>
<div class="left" style="display: flex;
align-items: center"
v-else-if="(selectCardsname === '融合服务' || selectCardsname === '赋能场景') && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
<a-image :width="106" :preview="false"
:src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue" />
<div
class="left"
style="display: flex; align-items: center"
v-else-if="
(selectCardsname === '融合服务' ||
selectCardsname === '赋能场景') &&
item.fuseAttrList &&
item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
"
>
<a-image
:width="106"
:preview="false"
:src="
item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
.attrValue
"
/>
</div>
<div class="left" :class="
<div
class="left"
:class="
item.type == '应用资源'
? 'yyzy'
: !item.type
@ -71,35 +117,76 @@
.attrValue == '业务组件'
? 'ywzj'
: ''
" v-else-if="
selectCardsname !== '基础设施' && selectCardsname !== '融合服务' && selectCardsname !== '赋能场景'
"></div>
"
v-else-if="
selectCardsname !== '基础设施' &&
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景'
"
></div>
<div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
<div class="left rhfw" v-else-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'"></div>
<div
class="left rhfw"
v-else-if="
selectCardsname === '融合服务' || selectCardsname === '赋能场景'
"
></div>
<div class="right">
<div class="header">
<span style="display: flex; align-items: center; width: 680px">
{{ item.name }}
<svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="item.applyState == '通过'"
style="margin-left: 10px">
<svg
t="1652322568870"
class="icon"
viewBox="0 0 3072 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="3062"
width="40"
height="40"
v-if="item.applyState == '通过'"
style="margin-left: 10px; min-width: 40px"
>
<path
d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
fill="#d81e06" p-id="3063"></path>
fill="#d81e06"
p-id="3063"
></path>
<path
d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
fill="#d81e06" p-id="3064"></path>
fill="#d81e06"
p-id="3064"
></path>
<path
d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
fill="#d81e06" p-id="3065"></path>
fill="#d81e06"
p-id="3065"
></path>
</svg>
</span>
<div class="header-right">
<div v-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'" class="label-content">
<template v-if="item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0]">
<span class="label"
v-for="(data, index) in item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0].attrValue.split(';')"
:key="index">
<div
v-if="
selectCardsname === '融合服务' ||
selectCardsname === '赋能场景'
"
class="label-content"
>
<template
v-if="
item.fuseAttrList &&
item.fuseAttrList.filter(
(val) => val.attrType == '应用领域'
)[0]
"
>
<span
class="label"
v-for="(data, index) in item.fuseAttrList
.filter((val) => val.attrType == '应用领域')[0]
.attrValue.split(';')"
:key="index"
>
{{ data }}
</span>
</template>
@ -131,13 +218,21 @@
>
<span>{{ item.shareType || '--' }}</span>
</div> -->
<div v-if="
selectCardsname !== '融合服务' && selectCardsname !== '赋能场景' && selectCardsname !== '基础设施'
">
<div
v-if="
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景' &&
selectCardsname !== '基础设施'
"
>
<span>{{ item.deptName || '--' }}</span>
</div>
</div>
<div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
<div
v-if="selectCardsname !== '基础设施'"
style="margin-top: 0.1rem"
class="description"
>
<a-tooltip>
<template #title>{{ item.description }}</template>
{{ item.description || '--' }}
@ -146,26 +241,32 @@
<div class="btn">
<div class="bottom" v-if="selectCardsname !== '基础设施'">
<div>
<div v-if="
<div
v-if="
selectCardsname !== '数据资源' &&
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景'
">
"
>
浏览量：{{ item.visits || 0 }}次
</div>
<div v-if="
<div
v-if="
selectCardsname !== '数据资源' &&
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景' &&
(selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
">
"
>
申请量：{{ item.applyCount || 0 }}次
</div>
<div v-if="
<div
v-if="
selectCardsname === '数据资源' &&
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景'
">
"
>
数据量：{{ item.sjlCount || 0 }}
</div>
<div v-if="selectCardsname !== '数据资源'">
@ -184,28 +285,59 @@
</div>
<div class="right" v-if="selectCardsname !== '基础设施'">
<div class="shopping" :key="shoppingKey">
<template v-if="
<template
v-if="
selectCardsname == '组件服务' ||
(selectCardsname == '应用资源' && whoShow1.itShowQingDao)
">
<span class="shopping-down" v-if="item.isInShoppingCart"></span>
<span class="shopping-on" v-else @click="addShoppingCart(item, index)"></span>
"
>
<span
class="shopping-down"
v-if="item.isInShoppingCart"
></span>
<span
class="shopping-on"
v-else
@click="addShoppingCart(item, index)"
></span>
</template>
</div>
<div class="sc">
<span class="sc-down" v-if="item.isCollect == 'false'" @click="addCollect(item)"></span>
<span class="sc-on" v-if="item.isCollect == 'true'" @click="addCollect(item)"></span>
<span
class="sc-down"
v-if="item.isCollect == 'false'"
@click="addCollect(item)"
></span>
<span
class="sc-on"
v-if="item.isCollect == 'true'"
@click="addCollect(item)"
></span>
</div>
<div class="shopping pk" :key="pk" v-show="
<div
class="shopping pk"
:key="pk"
v-show="
cardType == '组件服务' && findComponentName(item, '智能算法')
">
"
>
<span class="pk-on" @click="goComparePk(item, index)"></span>
</div>
<a-button type="primary" @click="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
<a-button
type="primary"
@click="toView('details', item)"
v-if="!whoShow1.itShowBaoTou"
>
查看详情
</a-button>
<a-button style="margin-left: 10px" v-show="selectCardsname === '融合服务' || selectCardsname === '赋能场景'"
@click="handleAKeyApplication(item)">
<a-button
style="margin-left: 10px"
v-show="
selectCardsname === '融合服务' ||
selectCardsname === '赋能场景'
"
@click="handleAKeyApplication(item)"
>
一键申请
</a-button>
<!-- <a-button
@ -216,10 +348,14 @@
>
免费试用
</a-button> -->
<a-button type="primary" @click="toView('apply', item)" v-show="
<a-button
type="primary"
@click="toView('apply', item)"
v-show="
cardType == '组件服务' ||
(cardType == '应用资源' && whoShow1.itShowQingDao)
">
"
>
{{
item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
}}
@ -234,7 +370,12 @@
</div>
</div>
</div>
<a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
<a-modal
v-model:visible="visible"
title="视频预览"
:width="750"
destroyOnClose
>
<template #footer></template>
<div style="width: 100%; display: flex; justify-content: center">
<div style="width: 100%; height: 100%">
@ -245,20 +386,20 @@
</div>
</template>
<script>
import { ref, reactive } from 'vue'
import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router'
import { getUser, sgcInsert } from '@/api/home'
import { scInsert, scDel } from '@/api/personalCenter'
import mybus from '@/myplugins/mybus'
import { getHls } from '@/api/home.js'
export default {
import { ref, reactive } from 'vue'
import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router'
import { getUser, sgcInsert } from '@/api/home'
import { scInsert, scDel } from '@/api/personalCenter'
import mybus from '@/myplugins/mybus'
import { getHls } from '@/api/home.js'
export default {
name: '',
// props: ['resourceList', 'resourceTotal', 'selectCardsname'],
props: {
resourceList: {
type: Object,
default: () => { },
default: () => {},
},
resourceTotal: {
type: String,
@ -592,12 +733,12 @@ export default {
// 融合服务--一键申请
// 一键申请
const handleAKeyApplication = (item ) => {
let _applyList = [];
const handleAKeyApplication = (item) => {
let _applyList = []
let fuseResourceList = item.fuseResourceList || []
let jcssArray = fuseResourceList.filter(v => v.type === '基础设施')
let otherArray = fuseResourceList.filter(v => v.type !== '基础设施')
jcssArray = jcssArray.map(v => {
let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
jcssArray = jcssArray.map((v) => {
v = Object.assign(v, v.resource)
return v
})
@ -622,7 +763,7 @@ export default {
}
otherArray.map((v) => {
let resource = v.resource || {}
console.log('resource------------>', resource);
console.log('resource------------>', resource)
let obj = {
arr: [
{
@ -678,7 +819,10 @@ export default {
if (!typeObj) {
selData.value = 'total'
}
if (typeObj && (typeObj.type === '融合服务' || typeObj.type === '赋能场景')) {
if (
typeObj &&
(typeObj.type === '融合服务' || typeObj.type === '赋能场景')
) {
orderList.value = [
{
value: 'collectCount',
@ -777,10 +921,10 @@ export default {
mybus.off('chongzhi')
// mybus.emit('changeSelcted')
},
}
}
</script>
<style scoped lang="less">
#search-result-list-container {
#search-result-list-container {
width: 1088px;
padding: 0 20px;
background: #f3f5f9;
@ -960,6 +1104,7 @@ export default {
margin-right: 0.1rem;
border-radius: 0.13rem;
background: #0087ff;
color: #fff;
}
}
}
@ -1112,11 +1257,11 @@ export default {
margin-top: 10px;
align-items: center;
&>div {
& > div {
display: flex;
align-items: center;
&>div {
& > div {
margin: 0 10px;
}
}
@ -1143,9 +1288,9 @@ export default {
margin-top: 0;
}
}
}
}
.description {
.description {
max-width: 990px;
height: 52px;
font-size: 14px;
@ -1159,5 +1304,5 @@ export default {
/*超出显示为省略号*/
-webkit-box-orient: vertical;
word-break: break-all;
}
}
</style>

3
front/src/views/home/detailsPageconetentTree.vue
View File

@ -48,6 +48,9 @@
</div>
<span v-if="item.title !== '区级'">{{ val.total }}</span>
<span v-else>
<span style="display: inline-block; margin-right: 4px">
{{ val.total }}
</span>
<down-outlined v-show="!val.show" />
<up-outlined v-show="val.show" />
</span>

111
front/src/views/home/infrastructurePage.vue
View File

@ -67,6 +67,10 @@
</a-button>
</div>
<i class="boundary"></i>
<!-- 批量预览 -->
<a-button type="primary" @click="batchPreview" class="buttonAdd">
批量预览
</a-button>
<!-- 添加至申购车 -->
<a-button type="primary" @click="addShoppingCart" class="buttonAdd">
添加至申购车
@ -143,6 +147,7 @@
</template>
</a-table>
</div>
<!-- 单个预览弹窗 -->
<a-modal
v-model:visible="visible"
title="视频预览"
@ -156,6 +161,26 @@
</div>
</div>
</a-modal>
<!-- 批量预览弹窗 -->
<a-modal
wrapClassName="batch-preview-modal"
v-model:visible="batchVisible"
title="视频批量预览"
:width="1250"
destroyOnClose
@cancel="videoClean"
>
<template #footer></template>
<div class="batch-video">
<div
v-for="item in videoList"
:key="item.id"
style="width: 100%; height: 100%"
>
<vue3VideoPlay v-bind="item.options" />
</div>
</div>
</a-modal>
<a-modal
wrapClassName="wrj"
v-model:visible="wrjVisible"
@ -233,7 +258,7 @@
const router = useRouter()
const whoShow1 = ref(whoShow)
const options = reactive({
width: '700px', //播放器宽度
width: '900px', //播放器宽度
height: '400px', //播放器高度
color: '#409eff', //主题色
title: '', //视频名称
@ -259,14 +284,16 @@
'fullScreen',
], //显示所有按钮,
})
const videoList = ref([])
let visible = ref(false)
let batchVisible = ref(false)
const jcssType = ref(router.currentRoute.value.query.type)
const pagination = ref({
total: 0,
current: 1,
pageSize: 10, //每页中显示10条数据
showSizeChanger: true,
pageSizeOptions: ['5', '10', '15', '20'], //每页中显示的数据
pageSizeOptions: ['10', '30', '50', '100', '1000'], //每页中显示的数据
})
const mapSearchParam = ref({
// 地图搜索初始化数据
@ -552,6 +579,56 @@
}
}
}
const batchPreview = async function () {
if (selectedList.value.length > 0) {
const list = selectedList.value.splice(0, 4)
const length = list.length
videoList.value = []
for (let index = 0; index < length; index++) {
const param = {
key: list[index].channelId,
}
let ob = {
options: {
width: '600px', //播放器宽度
height: '350px', //播放器高度
color: '#409eff', //主题色
title: '', //视频名称
src: '', //视频源
type: 'm3u8', // 视频源类型
muted: false, //静音
webFullScreen: false,
speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
autoPlay: false, //自动播放
loop: false, //循环播放
mirror: false, //镜像画面
ligthOff: false, //关灯模式
volume: 0.3, //默认音量大小
control: true, //是否显示控制
controlBtns: [
'audioTrack',
'quality',
'speedRate',
'volume',
'setting',
'pip',
'pageFullScreen',
'fullScreen',
], //显示所有按钮,
},
}
await getStreamByChannelCode(param).then((res) => {
ob.options.src = res.data.data
console.log('监测ob的变化', ob)
videoList.value.push(ob)
})
}
console.log('验证数据的准确性', videoList)
batchVisible.value = true
} else {
message.error('请选择需要预览的数据')
}
}
// 清空
const nullClick = () => {
clickList.value[1].content = []
@ -562,8 +639,19 @@
// 重置
const clean = () => {
mapSearchParam.value.cameraName = ''
selectedList.value = []
selectedRowKeys.value = []
videoList.value = []
pagination.value.current = 1
mapSearchParam.value.pageNum = 1
pagination.value.pageSize = 10
getCamera()
}
const videoClean = () => {
selectedList.value = []
selectedRowKeys.value = []
videoList.value = []
}
// 一键申请
const dept = reactive({})
// eslint-disable-next-line no-undef
@ -709,8 +797,8 @@
const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
console.log('hahhahah', record, selected, selectedRows, nativeEvent)
if (selected) {
if (selectedRowKeys.value.length == 10) {
message.warning('最多只能添加10个摄像头！')
if (selectedRowKeys.value.length == 1000) {
message.warning('最多只能添加1000个摄像头！')
} else {
selectedList.value.push(record)
selectedRowKeys.value.push(record.channelCode || record.channelId)
@ -734,8 +822,8 @@
selectedList.value.push(val)
selectedRowKeys.value.push(val.channelCode || val.channelId)
})
if (selectedRowKeys.value.length > 10) {
message.warning('最多只能添加10个摄像头！')
if (selectedRowKeys.value.length > 1000) {
message.warning('最多只能添加1000个摄像头！')
changeRows.map((val) => {
selectedList.value = selectedList.value.filter(
(item) => item.idtCameraChannel !== val.idtCameraChannel
@ -912,4 +1000,15 @@
overflow-y: scroll !important;
}
}
.batch-preview-modal {
.batch-video {
width: 100%;
display: grid;
grid-template-columns: 50% 50%;
grid-template-rows: 50% 50%;
justify-content: center;
grid-row-gap: 14px;
grid-column-gap: 20px;
}
}
</style>

191
front/src/views/home/mapTest/index.vue
View File

@ -93,7 +93,7 @@
// name: '市南区',
// code: 'shinan',
// className: 'classsn',
// value: 0,
// value: 1,
// },
{
name: '市北区',
@ -117,13 +117,13 @@
name: '李沧区',
code: 'licang',
className: 'classlc',
value: 0,
value: 0.2,
},
{
name: '城阳区',
code: 'chengyang',
className: 'classcy',
value: 0,
value: 0.2,
},
{
name: '即墨区',
@ -175,6 +175,8 @@
]
} else if (val.name === '市北区') {
geoCoordMap[val.name] = [val.coord[0], val.coord[1]]
} else if (val.name === '城阳区') {
geoCoordMap[val.name] = [val.coord[0] - 0.057495, val.coord[1]]
} else if (val.name === '市南区') {
geoCoordMap[val.name] = [120.364482, 36.065671]
}
@ -322,7 +324,12 @@
let res = []
for (let i = 0; i < data.length; i++) {
let dataItem = data[i]
if (dataItem.name === '西海岸' || dataItem.name === '崂山区') {
if (
dataItem.name === '西海岸' ||
dataItem.name === '崂山区' ||
dataItem.name === '李沧区' ||
dataItem.name === '城阳区'
) {
let fromCoord = geoCoordMap[dataItem.name]
let toCoord = [120.364482, 36.065671]
if (fromCoord && toCoord) {
@ -344,7 +351,12 @@
let res = []
for (let i = 0; i < data.length; i++) {
let dataItem = data[i]
if (dataItem.name === '西海岸' || dataItem.name === '崂山区') {
if (
dataItem.name === '西海岸' ||
dataItem.name === '崂山区' ||
dataItem.name === '李沧区' ||
dataItem.name === '城阳区'
) {
let fromCoord = [120.364482, 36.065671]
let toCoord = geoCoordMap[dataItem.name]
if (fromCoord && toCoord) {
@ -366,7 +378,12 @@
let res = []
for (let i = 0; i < data.length; i++) {
let dataItem = data[i]
if (dataItem.name !== '西海岸' && dataItem.name !== '崂山区') {
if (
dataItem.name !== '西海岸' &&
dataItem.name !== '崂山区' &&
dataItem.name !== '李沧区' &&
dataItem.name !== '城阳区'
) {
let fromCoord = [120.364482, 36.065671]
let toCoord = geoCoordMap[dataItem.name]
if (fromCoord && toCoord) {
@ -558,7 +575,7 @@
symbolOffset: [0, -20],
data: [
{
name: '西海岸',
name: '',
value: geoCoordMap['西海岸'].concat([10]),
},
],
@ -595,10 +612,84 @@
symbolOffset: [0, -20],
data: [
{
name: '崂山区',
name: '',
value: geoCoordMap['崂山区'].concat([10]),
},
],
},
{
type: 'scatter',
coordinateSystem: 'geo',
zlevel: 2,
rippleEffect: {
period: 4,
brushType: 'stroke',
scale: 4,
},
label: {
normal: {
show: true,
position: 'bottom',
//offset:[5, 0],
color: '#fbd500',
formatter: '{b}',
textStyle: {
color: '#fbd500',
fontSize: 18,
fontWeight: 600,
},
},
emphasis: {
show: true,
color: '#f60',
},
},
symbol: 'image://' + require('@/assets/home/yb.png'),
symbolSize: 40,
symbolOffset: [0, -20],
data: [
{
name: '',
value: geoCoordMap['城阳区'].concat([10]),
},
],
},
{
type: 'scatter',
coordinateSystem: 'geo',
zlevel: 2,
rippleEffect: {
period: 4,
brushType: 'stroke',
scale: 4,
},
label: {
normal: {
show: true,
position: 'bottom',
//offset:[5, 0],
color: '#fbd500',
formatter: '{b}',
textStyle: {
color: '#fbd500',
fontSize: 18,
fontWeight: 600,
},
},
emphasis: {
show: true,
color: '#f60',
},
},
symbol: 'image://' + require('@/assets/home/yb.png'),
symbolSize: 40,
symbolOffset: [0, -20],
data: [
{
name: '',
value: geoCoordMap['李沧区'].concat([10]),
},
],
}
)
})
@ -612,11 +703,93 @@
}
onMounted(() => {
initMap()
myChart.on('mouseover', function () {
myChart.on('mouseover', function (params) {
console.log(params.value)
myChart.dispatchAction({
type: 'downplay',
})
let flag = true
if (
params.value[0] == '119.825774' &&
params.value[1] == '35.739174000000006'
) {
if (option.series[8].data[0].name == '西海岸') {
flag = false
}
option.series[8].data[0].name = '西海岸'
option.series[9].data[0].name = ''
option.series[10].data[0].name = ''
option.series[11].data[0].name = ''
if (flag) {
myChart.clear()
myChart.setOption(option, true)
}
} else if (
params.value[0] == '120.579994' &&
params.value[1] == '36.189191'
) {
if (option.series[9].data[0].name == '崂山区') {
flag = false
}
option.series[8].data[0].name = ''
option.series[9].data[0].name = '崂山区'
option.series[10].data[0].name = ''
option.series[11].data[0].name = ''
if (flag) {
myChart.clear()
myChart.setOption(option, true)
}
} else if (
params.value[0] == '120.421977' &&
params.value[1] == '36.18555'
) {
if (option.series[11].data[0].name == '李沧区') {
flag = false
}
option.series[8].data[0].name = ''
option.series[9].data[0].name = ''
option.series[10].data[0].name = ''
option.series[11].data[0].name = '李沧区'
if (flag) {
myChart.clear()
myChart.setOption(option, true)
}
} else if (
params.value[0] == '120.272216' &&
params.value[1] == '36.27479'
) {
if (option.series[10].data[0].name == '城阳区') {
flag = false
}
option.series[8].data[0].name = ''
option.series[9].data[0].name = ''
option.series[10].data[0].name = '城阳区'
option.series[11].data[0].name = ''
if (flag) {
myChart.clear()
myChart.setOption(option, true)
}
}
})
// myChart.on('mouseout', function (params) {
// console.log(params)
// switch (params.name) {
// case '西海岸':
// option.series[8].data[0].name = ''
// break
// case '崂山区':
// option.series[9].data[0].name = ''
// break
// case '城阳区':
// option.series[10].data[0].name = ''
// break
// case '李沧区':
// option.series[11].data[0].name = ''
// break
// }
// myChart.clear()
// myChart.setOption(option, true)
// })
myChart.on('click', function (params) {
console.log(params)
params.event.event.stopPropagation()

86
front/src/views/instructionManual/components/abilityDocTree.vue
View File

@ -1,50 +1,38 @@
<template>
<div class="list-box">
<div
class="list-item"
v-for="(item, i) in newDataList"
:key="i"
@click.stop="showChildren(item)"
>
<div class="list-item" v-for="(item, i) in newDataList" :key="i" @click.stop="showChildren(item)">
<a-tooltip placement="top" :title="item.title" arrow-point-at-center>
<div
:class="[
<div :class="[
newClickData.title === item.title ? 'select' : '',
level === 1 ? 'parent' : '',
judgeLeaf(item) ? 'leaf' : '',
]"
class="list-text"
>
]" class="list-text">
{{ item.title }}
<DownOutlined v-show="!item.show && !judgeLeaf(item)" />
<UpOutlined v-show="item.show && !judgeLeaf(item)" />
</div>
</a-tooltip>
<div style="margin-left: 10px" v-if="!judgeLeaf(item) && item.show">
<abilityDocTree
:dataList="item.children"
@tree-click="handleTreeItem"
:clickData="newClickData"
:level="newLevel + 1"
></abilityDocTree>
<abilityDocTree :dataList="item.children" @tree-click="handleTreeItem" :clickData="newClickData"
:level="newLevel + 1"></abilityDocTree>
</div>
</div>
</div>
</template>
<script setup>
import {
import {
defineComponent,
onMounted,
ref,
watch,
defineProps,
nextTick,
} from 'vue'
import { getDevelopDocTree } from '@/api/home'
import { message } from 'ant-design-vue'
import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
} from 'vue'
import { getDevelopDocTree } from '@/api/home'
import { message } from 'ant-design-vue'
import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
const props = defineProps({
const props = defineProps({
dataList: {
type: Array,
default: () => [],
@ -59,25 +47,25 @@
''
},
},
})
})
// 数组
const newDataList = ref(props.dataList)
// 级别
const newLevel = ref(props.level)
// 数组
const newDataList = ref(props.dataList)
// 级别
const newLevel = ref(props.level)
const newClickData = ref(props.clickData)
const newClickData = ref(props.clickData)
// 判断是不是叶子节点
const judgeLeaf = (item) => {
// 判断是不是叶子节点
const judgeLeaf = (item) => {
if (item.children && item.children.length > 0) {
return false
} else {
return true
}
}
}
const showChildren = (item) => {
const showChildren = (item) => {
if (!(item.children && item.children.length > 0)) {
if (newClickData.value.title !== '') {
handleTreeItem(item)
@ -88,33 +76,33 @@
if (item.children && item.children.length > 0) {
item.show = !item.show
}
}
}
watch(
watch(
() => props.dataList,
(val) => {
if (val) {
newDataList.value = val
}
}
)
)
watch(
watch(
() => props.clickData,
(val) => {
if (val) {
newClickData.value = val
}
}
)
)
const emit = defineEmits(['treeClick'])
const handleTreeItem = (item) => {
const emit = defineEmits(['treeClick'])
const handleTreeItem = (item) => {
emit('tree-click', item)
}
}
</script>
<style lang="less" scoped>
.list-text {
.list-text {
font-size: 16px;
color: #333;
padding: 10px 0;
@ -131,9 +119,9 @@
color: #0058e1;
cursor: pointer;
}
}
}
.parent {
.parent {
margin-bottom: 10px;
background: rgba(0, 135, 225, 0.1);
color: #333;
@ -143,17 +131,17 @@
background: #0058e1;
cursor: pointer;
}
}
}
.leaf {
.leaf {
font-size: 14px;
color: #555;
cursor: pointer;
}
}
.select {
.select {
color: #0058e1;
font-weight: 600;
cursor: pointer;
}
}
</style>

40
front/src/views/instructionManual/components/menuBook.vue
View File

@ -48,7 +48,7 @@
</div>
<!-- 联系我们 -->
<div class="img-bg callus-box">
<div class="title" style="margin-bottom: 20px">
<!-- <div class="title" style="margin-bottom: 20px">
<div class="text text-white">联系我们</div>
<div class="line line-white"></div>
</div>
@ -61,7 +61,7 @@
手机号：
<span>0530-0000000</span>
</p>
</div>
</div> -->
</div>
<!-- 能力上架弹窗 -->
<a-modal
@ -95,11 +95,6 @@
>
<div class="title">组件类型选择</div>
<div class="component-type-content">
<!-- <a-checkbox-group
v-model:value="value1"
name="checkboxgroup"
:options="componentType"
/> -->
<a-radio-group v-model:value="componentTypeValue">
<a-radio
@click="componentTypeValueFunction(item)"
@ -123,9 +118,7 @@
import TheOverallProcess from './TheOverallProcess.vue'
import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue'
const router = useRouter()
const seviceList = ref([
{
name: '组件服务',
@ -151,7 +144,6 @@
{
name: '基础设施',
img: require('@/assets/menu/service-infrastructure.png'),
list: ['视频资源', '云资源', '感知资源'],
imgBG: require('../../../assets/menu/imgBG.png'),
width: '124px',
@ -159,13 +151,11 @@
{
name: '数据资源',
img: require('@/assets/menu/service-data.png'),
list: ['政务信息资源'],
imgBG: require('../../../assets/menu/imgBG-long.png'),
width: '200px',
},
])
const imgList = ref([
{
name: '能力上架',
@ -256,18 +246,12 @@
componentTypeValue.value = ''
console.log(e)
}
// 跳转
const toWhere = (data) => {
console.log(data, 'wwwwwww')
if (data === '能力上架') {
visible.value = true
} else if (data === '能力申请') {
const newpage = router.resolve({
path: '/addApplication', // 跳转的页面路由
})
window.open(newpage.href, '_blank')
} else if (data === '需求发布') {
const newpage = router.resolve({
path: '/DetailsPageconetent',
query: {
@ -275,6 +259,11 @@
},
})
window.location.href = newpage.href
} else if (data === '需求发布') {
const newpage = router.resolve({
path: '/addApplication', // 跳转的页面路由
})
window.open(newpage.href, '_blank')
} else if (data === '资源下架') {
window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
const newpage = router.resolve({
@ -301,18 +290,22 @@
height: 0.16rem;
width: 0.16rem;
}
.ant-radio-inner::after {
background-color: unset;
background: url('~@/assets/personalCenter/xuanzhong.png') no-repeat;
background-size: cover;
background-position: center;
}
.ant-modal-content {
border-radius: 0.1rem;
.ability-to-type,
.component-type {
display: flex;
margin-top: 0.2rem;
.title {
white-space: nowrap;
margin-right: 0.2rem;
@ -320,11 +313,13 @@
align-items: center;
height: 0.26rem;
}
.component-type-content {
width: 100%;
height: unset;
border: unset;
background: unset;
.ant-radio-group {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
@ -340,6 +335,7 @@
height: unset;
border: unset;
background: unset;
div {
margin-right: 0.15rem;
cursor: pointer;
@ -373,6 +369,7 @@
border: 0;
text-align: center;
padding-bottom: 0.2rem;
button {
margin-right: 0.2rem;
border-radius: 0.08rem;
@ -454,23 +451,28 @@
margin: 0 auto;
}
}
.callus-box {
width: 1920px;
height: 214px;
background-size: 100% 100%;
background-image: url('../../../assets/menu/callus.png');
.list-box {
width: 1560px;
// height: 350px;
margin: 0 auto;
p {
font-size: 24px;
color: #ffffff;
font-weight: bold;
span {
font-size: 30px;
}
}
p:nth-child(1) {
margin-right: 100px;
}
@ -550,9 +552,11 @@
margin: 0 0 20px;
background-size: 100% 100%;
}
.item-v:nth-child(2n) {
margin-left: 16px;
}
// .item-v:last-child {
// width: 200px;
// }

262
front/src/views/instructionManual/index.vue
View File

@ -1,81 +1,69 @@
<template>
<home-header></home-header>
<div class="menu-container">
<div class="menu-box">
<div id="container" class="content-menu">
<div class="left">
<div
class="first-title-text"
v-for="(data, i) in titleList"
:key="i"
@click="changeName(data)"
:style="{ color: data.name === titleData.name ? '#0058e1' : '' }"
>
<div class="img" :class="data.className"></div>
{{ data.name }}
</div>
<abilityDocTree
:dataList="treeArray"
@treeClick="treeClick"
:clickData="clickData"
></abilityDocTree>
</div>
<!-- 技术文档 -->
<div class="right" v-if="titleData.name !== '新手指引'">
<div style="height: 100%">
<iframe
name="iframeName"
width="1300"
height="100%"
id="iframeId"
:frameborder="0"
:src="doc_base_url + clickData.doc"
></iframe>
</div>
</div>
<!-- 使用手册 -->
<div class="manual"><p>使用手册</p></div>
</div>
<menuBook v-if="titleData.name === '新手指引'"></menuBook>
<div class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
@click="changeName({ name: '技术文档' })">
技术文档
</div>
<abilityDocTree style="max-height:320px;overflow-y:auto" :dataList="treeArray" @treeClick="treeClick"
:clickData="clickData"></abilityDocTree>
</div>
<home-footer></home-footer>
<div class="first-title-text new-guide-box" :style="{ color: '使用手册' === titleData.name ? '#0058e1' : '' }"
@click="changeName({ name: '使用手册' })">
<div class="guide-text">使用手册</div>
</div>
<!-- 技术文档 -->
<div class="right" v-if="titleData.name !== '使用手册'">
<div style="height: 100%">
<iframe name="iframeName" width="1300" height="100%" id="iframeId" :frameborder="0"
:src="doc_base_url + clickData.doc"></iframe>
</div>
</div>
</div>
<menuBook v-if="titleData.name === '使用手册'"></menuBook>
</div>
<home-footer v-if="footShow"></home-footer>
</template>
<script setup>
import HomeHeader from '@/views/home/components/header'
import abilityDocTree from './components/abilityDocTree'
import menuBook from './components/menuBook'
import { ref, onMounted } from 'vue'
import { message } from 'ant-design-vue'
import { getDevelopDocTree } from '@/api/home'
import HomeFooter from '@/views/newHome/components/Footer'
// import flatten from '@turf/flatten'
import HomeHeader from '@/views/home/components/header'
import abilityDocTree from './components/abilityDocTree'
import menuBook from './components/menuBook'
import { ref, onMounted } from 'vue'
import { message } from 'ant-design-vue'
import { getDevelopDocTree } from '@/api/home'
import HomeFooter from '@/views/newHome/components/Footer'
// import flatten from '@turf/flatten'
const titleList = ref([
const titleList = ref([
{
name: '新手指引',
name: '使用手册',
className: 'newGuide',
},
{
name: '技术文档',
className: 'doc',
},
])
const titleData = ref(titleList.value[0])
const clickData = ref({})
const treeArray = ref([])
const treeArrayCopy = ref([])
let typeList = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
let doc_base_url = ref(window.SITE_CONFIG['frontUrl'])
])
const titleData = ref(titleList.value[0])
const clickData = ref({})
const treeArray = ref([])
const treeArrayCopy = ref([])
let typeList = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
let doc_base_url = ref(window.SITE_CONFIG['frontUrl'])
const treeClick = (item) => {
const treeClick = (item) => {
footShow.value = false
clickData.value = item
console.log('clickData------------>', item)
titleData.value = titleList.value[1]
}
}
const getTreeData = () => {
const getTreeData = () => {
getDevelopDocTree({})
.then((res) => {
console.log('res------文档树------>', res)
@ -88,14 +76,17 @@
.catch((err) => {
message.error(err)
})
}
}
const footShow = ref(true)
const changeName = (item) => {
const changeName = (item) => {
titleData.value = item
if (item.name == '新手指引') {
if (item.name == '使用手册') {
footShow.value = true
clickData.value = {}
}
if (item.name == '技术文档') {
footShow.value = false
if (!clickData.value.title) {
clickData.value = {}
treeArray.value = []
@ -115,9 +106,9 @@
getFirstData(treeArrayCopy.value[0] || {})
}
}
}
}
const formData = (children = [], dataItem) => {
const formData = (children = [], dataItem) => {
children.map((item, index) => {
let _obj = Object.assign({}, item, {
title: item.title,
@ -133,28 +124,27 @@
}
dataItem.children.push(_obj)
})
}
}
const getFirstData = (firstObj = {}) => {
const getFirstData = (firstObj = {}) => {
if (firstObj && firstObj.children && firstObj.children.length > 0) {
getFirstData(firstObj.children[0])
} else {
clickData.value = firstObj
}
}
}
onMounted(() => {
onMounted(() => {
getTreeData()
})
})
</script>
<style scoped lang="less">
.menu-box {
// overflow: hidden;
.menu-box {
height: 100%;
}
}
.first-title-text {
.first-title-text {
cursor: pointer;
font-size: 18px;
color: #333;
@ -165,104 +155,134 @@
&:hover {
color: #0058e1;
}
}
}
.menu-container {
.doc {
font-weight: bold;
}
.menu-container {
width: 100%;
padding-top: 0.74rem;
}
min-height: 1000px;
position: relative;
}
.content-menu {
.content-menu {
width: 1800px;
display: flex;
justify-content: flex-start;
margin: 0 auto;
box-sizing: border-box;
// position: fixed;
// left: 50%;
// bottom: 0;
// transform: translateX(-50%);
// top: 0.6rem;
// top: 0;
}
}
.left {
z-index: 10;
.left {
width: 200px;
padding: 20px;
margin-right: 20px;
background: rgba(244, 245, 248, 1);
overflow-y: scroll;
position: fixed;
top: 200px;
left: 90px;
}
padding-left: 10px;
padding-top: 10px;
background: #f4f5f8;
position: absolute;
top: 300px;
left: 85px;
max-height: 400px;
}
.right {
.new-guide-box {
position: absolute;
top: 300px;
right: 205px;
width: 74px;
height: 136px;
background: url('~@/assets/menu/new-bg.png') no-repeat;
background-size: 100% 100%;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
padding-bottom: 0;
}
.guide-text {
width: 25px;
text-align: center;
word-wrap: break-word;
font-size: 20px;
color: #0058e1;
}
.right {
width: 1300px;
height: calc(100% - 20px);
position: absolute;
top: 10px;
left: 300px;
min-height: 600px;
}
.manual {
left: 50%;
transform: translateX(-50%);
}
.left {
width: 200px;
padding-left: 10px;
padding-top: 10px;
background: #f4f5f8;
position: absolute;
top: 300px;
left: 85px;
max-height: 400px;
}
.manual {
cursor: pointer;
z-index: 10;
width: 74px;
height: 136px;
position: fixed;
position: absolute;
top: 200px;
right: 200px;
right: 140px;
background-size: 100% 100%;
background-image: url('../../assets/menu/manual.png');
display: flex;
justify-content: center;
align-items: center;
padding: unset !important;
p {
color: #005be1;
font-size: 20px;
margin-bottom: 0;
width: 20px;
}
}
}
.sidebar {
.sidebar {
right: 0 !important;
}
}
.content {
.newGuide {
background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
background-size: 100%;
}
.content {
right: 16rem !important;
left: 0 !important;
}
}
.img {
.img {
height: 20px;
width: 20px;
margin-right: 8px;
}
}
.doc {
background: url('~@/assets/capabilityCloud/doc.png') no-repeat;
background-size: 100%;
}
.rela {
width: 100%;
height: 100%;
position: relative;
}
.newGuide {
background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
background-size: 100%;
}
.new-menu-box {
.new-menu-box {
height: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.rela {
width: 100%;
height: 100%;
position: relative;
}
}
</style>

4
front/src/views/newHome/components/WorkDynamics.vue
View File

@ -560,7 +560,7 @@
height: 0.24rem;
width: 0.24rem;
background: url('~@/assets/home/shenqing.png') no-repeat;
background-size: cover;
background-size: contain;
background-position: center;
}
@ -568,5 +568,7 @@
height: 0.24rem;
width: 0.24rem;
background: url('~@/assets/home/shangjia.png') no-repeat;
background-size: contain;
background-position: center;
}
</style>

134
front/src/views/personalCenter/components/AbilityApplication.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-07-12 09:42:44
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-08-01 10:49:31
* @LastEditTime: 2022-08-04 10:41:06
* @Description:我的申请 能力申请 查看详情
-->
<template>
@ -52,7 +52,37 @@
<span class="img"></span>
<span>{{ item.name }}</span>
</div>
<div
style="
display: flex;
justify-content: space-between;
align-items: center;
"
>
<div class="oddNumbers">子单号：{{ item.instanceId }}</div>
<div style="display: flex; align-items: center">
<a-button
type="primary"
@click="modify(props.refObj.id, item)"
v-if="item.backToFirst"
>
修改
</a-button>
<a-popconfirm
v-if="!item.ended"
title="是否终止此流程?"
ok-text="是"
cancel-text="否"
@confirm="endThis(item.instanceId)"
@cancel="cancel"
>
<a-button type="primary" danger style="margin-left: 10px">
流程终止
</a-button>
</a-popconfirm>
</div>
</div>
<div class="box" v-if="item.list.length > 0">
<div class="ability" v-for="val in item.list" :key="val.id">
<div
@ -82,7 +112,8 @@
<div class="right">
<div class="ability-top">
<div class="name">
{{ val.name }}
<div class="name">
<span class="channelName">{{ val.name }}</span>
<span class="type">
{{
val.type == '应用资源'
@ -107,6 +138,7 @@
}}
</span>
</div>
</div>
<div></div>
<!-- <div class="btn" v-if="val.type == '组件服务'">技术文档</div> -->
</div>
@ -127,7 +159,7 @@
<div class="right">
<div class="ability-top">
<div class="name">
{{ val.channelName }}
<span class="channelName">{{ val.channelName }}</span>
<span class="type">基础设施</span>
</div>
</div>
@ -155,11 +187,24 @@
</div>
</template>
<script setup>
import { ref, defineProps } from 'vue'
import { ref, defineProps, reactive } from 'vue'
import mybus from '@/myplugins/mybus'
import { message } from 'ant-design-vue'
import { endProcess, getApplyForm } from '@/api/personalCenter.js'
import { useRouter } from 'vue-router'
const router = useRouter()
const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
const props = defineProps({
refObj: { type: Object, default: null },
})
const dept = reactive({})
// eslint-disable-next-line no-undef
if (infrastructure) {
// eslint-disable-next-line no-undef
dept.deptId = infrastructure.deptId
// eslint-disable-next-line no-undef
dept.deptName = infrastructure.deptName
}
const showThis = () => {
window.open(
window.SITE_CONFIG.previewUrl +
@ -169,6 +214,80 @@
}
const showArr = ref([])
console.log(props.refObj, '=====================================')
const endThis = (instanceId) => {
endProcess({ instanceId: instanceId }).then((res) => {
if (res.data.code == 0) {
message.success('流程终止成功！')
mybus.emit('closeModal', { type: '能力申请', index: 0 })
} else {
message.warning('流程终止失败！')
}
})
}
const modify = (id, item) => {
getApplyForm(id).then((res) => {
console.log('修改==============>', res.data.data, item)
if (item.list.length > 0) {
let arr = []
item.list.map((val) => {
arr.push({
delFlag: val.delFlag,
description: val.description,
resourceId: val.id,
resourceName: val.name,
time: val.createDate,
type: val.type,
componentType:
(val.infoList.filter((val) => val.attrType == '组件类型')[0] &&
val.infoList.filter((val) => val.attrType == '组件类型')[0]
.attrValue) ||
'',
})
})
localStorage.setItem(
'applyList',
JSON.stringify([
{
arr: arr,
deptId: item.name,
deptName: item.name,
},
])
)
router.push({
path: '/apply',
query: {
id: id,
taskId: item.instanceId,
},
})
} else if (item.list2.length > 0) {
let arr = [
{
arr: [
{
description: '',
note1: JSON.stringify(item.list2),
resourceId: '1522550195055828996',
resourceName: '摄像头列表',
type: '基础设施',
},
],
deptId: dept.deptId,
deptName: dept.deptName,
},
]
localStorage.setItem('applyList', JSON.stringify(arr))
router.push({
path: '/apply',
query: {
id: id,
taskId: item.instanceId,
},
})
}
})
}
if (props.refObj.resourceApplication) {
showArr.value = []
for (const key in props.refObj.resourceApplication) {
@ -177,6 +296,7 @@
obj.name = key
props.refObj.resourceApplication[key].map((item) => {
obj.instanceId = item.instanceId
obj.backToFirst = item.backToFirst
obj.ended = item.ended
obj.approveStatus = item.approveStatus
if (item.resources.length > 0) {
@ -318,15 +438,21 @@
.name {
width: 6rem;
height: 0.2rem;
display: flex;
.channelName {
max-width: 5rem;
height: 0.2rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-all;
}
.type {
background: #0087ff;
color: #fff;
line-height: 14px;
padding: 2px 10px;
border-radius: 10px;
margin-left: 0.1rem;

10
front/src/views/personalCenter/components/MyApply.vue
View File

@ -304,7 +304,7 @@
<script setup>
// import qs from 'qs'
import { onMounted, reactive, ref } from 'vue'
import { onMounted, reactive, ref, onBeforeUnmount } from 'vue'
import {
getMyProcessInstancePage,
// getTaskHandleDetailInfo,
@ -325,6 +325,7 @@
import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue'
import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
import mybus from '@/myplugins/mybus'
const router = useRouter()
let typeList = ref([
'能力申请',
@ -755,6 +756,13 @@
}
})
}
mybus.on('closeModal', (obj) => {
detailsVisible.value = false
changeType(obj.type, obj.index)
})
onBeforeUnmount(() => {
mybus.off('closeModal')
})
onMounted(() => {
getApplyList()
})

30
front/src/views/personalCenter/components/PutOnTheShelf .vue
View File

@ -2,12 +2,27 @@
* @Author: hisense.liangjunhua
* @Date: 2022-07-12 09:42:44
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-14 16:25:57
* @LastEditTime: 2022-08-02 15:48:15
* @Description:我的申请 能力申请 查看详情
-->
<template>
<div class="top">
<div
style="display: flex; justify-content: space-between; align-items: center"
>
<div class="title">基本信息</div>
<a-popconfirm
v-if="!props.refObj.ended"
title="是否终止此流程?"
ok-text="是"
cancel-text="否"
@confirm="endThis"
@cancel="cancel"
>
<a-button type="primary" danger>流程终止</a-button>
</a-popconfirm>
<div v-else></div>
</div>
<div class="main">
<div>
<p class="item">
@ -29,10 +44,23 @@
</template>
<script setup>
import { ref, defineProps } from 'vue'
import mybus from '@/myplugins/mybus'
import { message } from 'ant-design-vue'
import { endProcess } from '@/api/personalCenter.js'
const props = defineProps({
refObj: { type: Object, default: null },
})
console.log(props.refObj, '=====================================')
const endThis = () => {
endProcess({ instanceId: props.refObj.processInstanceId }).then((res) => {
if (res.data.code == 0) {
message.success('流程终止成功！')
mybus.emit('closeModal', { type: '能力上架', index: 2 })
} else {
message.warning('流程终止失败！')
}
})
}
// if (props.refObj.resourceApplication) {
// showArr.value = []
// for (const key in props.refObj.resourceApplication) {

17
front/src/views/personalCenter/components/addApplication.vue
View File

@ -98,9 +98,24 @@
label="应用领域"
name="detailsField"
style="width: 6.93rem"
:rules="[{ required: true, message: '请选择应用领域' }]"
:rules="[
{
required:
formName.detailsType === '应用资源' ||
formName.detailsType === '组件服务'
? true
: false,
message: '请选择应用领域',
},
]"
>
<a-select
:disabled="
formName.detailsType === '应用资源' ||
formName.detailsType === '组件服务'
? false
: true
"
v-model:value="formName.detailsField"
:options="applicationSceneOpthion"
mode="tags"