Skip to content

S
sample-form-platform
Commit 297b616c authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 652c438e fa1d6093
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 122 deletions
sample-form-client-ui/admin/src/App.vue
View file @ 297b616c
...@@ -11,6 +11,29 @@ export default { ...@@ -11,6 +11,29 @@ export default {
return { return {
routeQuery: "", routeQuery: "",
devicenum: "", devicenum: "",
// serveinfo: {
// deviceInfo: {
// enabled: 1,
// productId: 1,
// productName: "排队机",
// siteCode: "",
// siteId: 2,
// siteName: "",
// source: 1,
// },
// rabbmitInfo: {
// downTopicFilter: "/down/00-F1-F5-12-3F-64",
// exchangeName: "phxt.pdj",
// host: "192.168.0.98",
// messageTtl: "86400000",
// password: "admin@2020",
// port: 5672,
// uploadTopicFilter: "/upload/00-F1-F5-12-3F-64",
// username: "taxi_mq",
// virtualHost: "/test",
// },
// serviceInfo: { homeUrl: "", serverUrl: "http://192.168.0.98:8090" },
// },
}; };
}, },
created() { created() {
...@@ -96,25 +119,30 @@ export default { ...@@ -96,25 +119,30 @@ export default {
}); });
return q; return q;
}, },
getInfo(info = {}) {
let { serveinfo, devicenum } = info;
let { deviceInfo, rabbmitInfo, serviceInfo } = serveinfo;
let { serverUrl } = serviceInfo;
let { siteId } = deviceInfo;
this.devicenum = devicenum;
local.setLocal("baseURL", serverUrl);
local.setLocal("siteId", siteId);
local.setLocal("devicenum", this.devicenum);
if (serveinfo) {
// **正式环境请打开下面内容**
rabbmitInfo && this.clientMp(rabbmitInfo);
}
},
loadconfig() { loadconfig() {
this.routeQuery = this.urlGet(); this.routeQuery = this.urlGet();
if (JSON.stringify(this.routeQuery) !== "{}") { if (JSON.stringify(this.routeQuery) !== "{}") {
let serveinfo = this.routeQuery["serveinfo"] this.getInfo(this.routeQuery);
? JSON.parse(this.UrlDecode(this.routeQuery["serveinfo"])) } else if (JSON.stringify(this.$route.query) !== "{}") {
: {}; this.getInfo(this.$route.query);
let serverUrl = } else {
this.routeQuery["serverUrl"] || "http://192.168.0.98:11078"; local.setLocal("baseURL", "http://192.168.0.98:11078");
this.devicenum = this.routeQuery["devicenum"] || "90-2B-34-BF-1B-48"; local.setLocal("siteId", 3);
if (serveinfo) { local.setLocal("devicenum", "90-2B-34-BF-1B-48");
// **正式环境请打开下面内容**
// serveinfo["rabbmitInfo"] && this.clientMp(serveinfo["rabbmitInfo"]);
if (!serveinfo["serviceInfo"]["serverUrl"]) {
serverUrl = "http://192.168.0.98:11078";
}
}
local.setLocal("baseURL", serverUrl);
// this.SET_devicenum(this.devicenum);
// this.getIndexSetinfo();
} }
}, },
}, },
...@@ -123,10 +151,11 @@ export default { ...@@ -123,10 +151,11 @@ export default {
<style lang="less"> <style lang="less">
.app { .app {
width: 1920px !important; width: 100%;
height: 1080px !important; min-height: 100%;
background-color: #f5f5f5; background-color: #f5f5f5;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
display: flex;
} }
:root { :root {
// 标题颜色 // 标题颜色
......
sample-form-client-ui/admin/src/components/MateralsList.vue
View file @ 297b616c
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
> >
<div <div
class="matterDatumList-item flex flexc aic" class="matterDatumList-item flex flexc aic"
v-for="v in matterInfo.matterDatumList" v-for="(v, i) in matterInfo.matterDatumList"
:key="v.id" :key="v.id"
@click="handleWrite" @click="handleCheck(i)"
> >
<div class="pic-box"> <div class="pic-box">
<div class="pic-img-box"> <div class="pic-img-box">
...@@ -81,12 +81,13 @@ export default { ...@@ -81,12 +81,13 @@ export default {
}, },
}, },
methods: { methods: {
handleWrite() { handleCheck(index) {
this.$router.push({ this.$router.push({
path: "/showMaterials", path: "/showMaterials",
query: { query: {
matterName: this.matterInfo.matterName, matterName: this.matterInfo.matterName,
matterId: this.matterInfo.id, matterId: this.matterInfo.id,
index,
}, },
}); });
}, },
......
sample-form-client-ui/admin/src/pages/home/Home.vue
View file @ 297b616c
...@@ -98,12 +98,12 @@ ...@@ -98,12 +98,12 @@
<img v-if="i < 3" :src="checkTopImg(i)" /> <img v-if="i < 3" :src="checkTopImg(i)" />
<span v-else>{{ i + 1 }}.</span> <span v-else>{{ i + 1 }}.</span>
</div> </div>
<p class="flex1" v-ellipsis> <p class="flex1" v-ellipsis @click="checkMaterial(i, v)">
{{ v.materialName }} {{ v.materialName ? v.materialName : v.materiaFullName }}
</p> </p>
</div> </div>
</div> </div>
<div v-else class="tac mt50 empty-text">暂无数据</div> <div v-else class="tac empty-text">暂无数据</div>
</div> </div>
</div> </div>
<div class="right flex flexc aic jcb"> <div class="right flex flexc aic jcb">
...@@ -144,14 +144,14 @@ ...@@ -144,14 +144,14 @@
<img v-if="i < 3" :src="checkTopImg(i)" /> <img v-if="i < 3" :src="checkTopImg(i)" />
<span v-else>{{ i + 1 }}.</span> <span v-else>{{ i + 1 }}.</span>
</div> </div>
<p class="flex1" v-ellipsis> <p class="flex1" v-ellipsis @click="checkMatter(v)">
{{ v.matterName }} {{ v.matterName ? v.matterName : v.matterFullName }}
</p> </p>
</div> </div>
</div> </div>
</vue-seamless-scroll> </vue-seamless-scroll>
</div> </div>
<div v-else class="tac mt50 empty-text">暂无数据</div> <div v-else class="tac empty-text">暂无数据</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -177,12 +177,21 @@ ...@@ -177,12 +177,21 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 材料列表查看 -->
<MateralsList
:matterInfo="matterInfo"
:visible.sync="visible"
></MateralsList>
</div> </div>
</template> </template>
<script> <script>
import { getHomeInfo } from "@/api"; import { getHomeInfo } from "@/api";
import MateralsList from "@/components/MateralsList.vue";
export default { export default {
components: {
MateralsList,
},
data() { data() {
return { return {
search: "", search: "",
...@@ -193,6 +202,8 @@ export default { ...@@ -193,6 +202,8 @@ export default {
homeInfo: {}, // 首页数据 homeInfo: {}, // 首页数据
datumList: [], datumList: [],
matterList: [], matterList: [],
visible: false,
matterInfo: {},
}; };
}, },
computed: { computed: {
...@@ -280,6 +291,21 @@ export default { ...@@ -280,6 +291,21 @@ export default {
handleClose() { handleClose() {
this.search = ""; this.search = "";
}, },
// 查看材料列表
checkMatter(row) {
this.matterInfo = row;
this.visible = true;
},
// 查看材料
checkMaterial(index, row) {
this.$router.push({
path: "/showmaterials",
query: {
matterId: row.matterId,
index,
},
});
},
}, },
}; };
</script> </script>
...@@ -330,7 +356,7 @@ export default { ...@@ -330,7 +356,7 @@ export default {
} }
.home { .home {
width: 100%; width: 100%;
height: 100%; height: auto;
padding-top: 40px; padding-top: 40px;
background-size: 100% 100%; background-size: 100% 100%;
} }
...@@ -558,6 +584,15 @@ export default { ...@@ -558,6 +584,15 @@ export default {
border: 3px solid #ffffff; border: 3px solid #ffffff;
border-radius: 16px; border-radius: 16px;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
position: relative;
.empty-text {
font-size: 18px;
color: #999;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.hot-matter-list { .hot-matter-list {
height: 130px; height: 130px;
padding: 0px 14px; padding: 0px 14px;
......
sample-form-client-ui/admin/src/pages/layouts/Layouts.vue
View file @ 297b616c
...@@ -11,6 +11,6 @@ export default {}; ...@@ -11,6 +11,6 @@ export default {};
<style lang="less" > <style lang="less" >
.layouts { .layouts {
width: 100%; width: 100%;
height: 100%; height: auto;
} }
</style> </style>
\ No newline at end of file
sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue
View file @ 297b616c
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
height: v.height + 'px', height: v.height + 'px',
}" }"
class="preview-img" class="preview-img"
:src="api + v.preViewPath" :src="api + v.samplePath"
/> />
</div> </div>
</div> </div>
...@@ -141,12 +141,13 @@ export default { ...@@ -141,12 +141,13 @@ export default {
let { data } = res.data.data; let { data } = res.data.data;
data.forEach((v) => { data.forEach((v) => {
let image = new Image(); let image = new Image();
image.src = this.api + v.preViewPath; image.src = this.api + v.samplePath;
image.onload = function () { image.onload = function () {
v.height = image.height; v.height = image.height;
}; };
}); });
this.materailsList = data; this.materailsList = data;
this.active = +this.$route.query.index;
}, },
// 放大 // 放大
...@@ -172,7 +173,7 @@ export default { ...@@ -172,7 +173,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.write-page { .write-page {
width: 100%; width: 100%;
min-height: 100%; height: 100%;
background-color: #f5f5f5; background-color: #f5f5f5;
.back-home { .back-home {
font-size: 28px; font-size: 28px;
......
sample-form-client-ui/admin/src/router/index.js
View file @ 297b616c
import Vue from "vue"; import Vue from "vue";
import VueRouter from "vue-router"; import VueRouter from "vue-router";
// import Layouts from "@/pages/layouts/Layouts.vue" import Layouts from "@/pages/layouts/Layouts.vue";
// 解决重复点击同一个路由报错 // 解决重复点击同一个路由报错
const originalPush = VueRouter.prototype.push; const originalPush = VueRouter.prototype.push;
VueRouter.prototype.push = function (location) { VueRouter.prototype.push = function (location) {
...@@ -22,22 +22,46 @@ const routes = [ ...@@ -22,22 +22,46 @@ const routes = [
// 快速查看 // 快速查看
{ {
path: "/matterList", path: "/matterList",
component: () => import("@/pages/showpage/MatterList.vue"), component: Layouts,
children: [
{
path: "",
component: () => import("@/pages/showpage/MatterList.vue"),
},
],
}, },
// 快速搜索 // 快速搜索
{ {
path: "/searchpage", path: "/searchpage",
component: () => import("@/pages/searchpage/SearchPage.vue"), component: Layouts,
children: [
{
path: "",
component: () => import("@/pages/searchpage/SearchPage.vue"),
},
],
}, },
// 事项分类 // 事项分类
{ {
path: "/matterify", path: "/matterify",
component: () => import("@/pages/showpage/MatterIfy.vue"), component: Layouts,
children: [
{
path: "",
component: () => import("@/pages/showpage/MatterIfy.vue"),
},
],
}, },
// 材料展示 // 材料展示
{ {
path: "/showmaterials", path: "/showmaterials",
component: () => import("@/pages/showpage/ShowMaterials.vue"), component: Layouts,
children: [
{
path: "",
component: () => import("@/pages/showpage/ShowMaterials.vue"),
},
],
}, },
]; ];
......
sample-form-manager-ui/admin/src/App.vue
View file @ 297b616c
...@@ -35,7 +35,8 @@ export default { ...@@ -35,7 +35,8 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.app { .app {
width: 1920px; width: 100%;
min-width: 1400px;
min-height: 100%; min-height: 100%;
background-color: #f0f2f5; background-color: #f0f2f5;
display: flex; display: flex;
......
sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue
View file @ 297b616c
...@@ -38,51 +38,18 @@ ...@@ -38,51 +38,18 @@
> >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<!--
<el-form-item label="上传附件" prop="fileUrl">
<el-upload
class="upload-demo"
:action="api + 'sampleform/file/commonupload'"
:on-remove="handleRemoveFileUrl"
:limit="1"
:file-list="fileUrlFileList"
:on-success="OnsuccessfileUrl"
:headers="headers"
:before-upload="beforeUpload"
accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
>
<el-button size="small" type="primary">上传Word文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="上传模板" prop="templatePath">
<el-upload
class="upload-demo"
:action="api + 'sampleform/file/commonupload'"
:on-remove="handleRemoveTemplatePath"
:limit="1"
:file-list="templatePathFileList"
:on-success="OnsuccesstemplatePath"
:headers="headers"
:before-upload="beforeUpload"
accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
>
<el-button size="small" type="primary">上传Word文件</el-button>
</el-upload>
</el-form-item>-->
<el-form-item label="上传样表" prop="samplePath"> <el-form-item label="上传样表" prop="samplePath">
<el-upload <el-upload
class="upload-demo" class="upload-demo"
:action="api + 'sampleform/file/commonupload'" :action="api + 'sampleform/file/commonupload'"
:on-remove="handleRemoveSamplePath" :on-remove="handleRemoveSamplePath"
:limit="1"
:file-list="samplePathFileList" :file-list="samplePathFileList"
:on-success="OnsuccessSamplePath" :on-success="OnsuccessSamplePath"
:headers="headers" :headers="headers"
:before-upload="beforeUpload"
accept="application/vnd.openxmlformats-officedocument.wordprocessingml.document"
> >
<el-button size="small" type="primary">上传Word文件</el-button> <!-- accept="application/vnd.openxmlformats-officedocument.wordprocessingml.document" -->
<span class="tips">提示：请上传.docx格式</span> <el-button size="small" type="primary">上传文件</el-button>
<!-- <span class="tips">提示：请上传.docx格式</span> -->
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -128,19 +95,17 @@ export default { ...@@ -128,19 +95,17 @@ export default {
? local.getLocal("sampleSiteId") ? local.getLocal("sampleSiteId")
: "", : "",
matterNo: "", // 事项编号 matterNo: "", // 事项编号
fileName: "", // 附件名称 // fileName: "", // 附件名称
fileUrl: "", // 附件地址 // fileUrl: "", // 附件地址
samplePath: "", // 样表地址 samplePath: "", // 样表地址
sampleName: "", // 样表名称 sampleName: "", // 样表名称
templatePath: "", // 模板地址 // templatePath: "", // 模板地址
templateName: "", // 模板名称 // templateName: "", // 模板名称
matterName: "", // 事项名称 matterName: "", // 事项名称
deptName: "", // 部门名称 deptName: "", // 部门名称
deptId: "", // 部门id deptId: "", // 部门id
deptCode: "", // 部门编码 deptCode: "", // 部门编码
}, },
fileUrlFileList: [],
templatePathFileList: [],
samplePathFileList: [], samplePathFileList: [],
loading: false, loading: false,
rules: { rules: {
...@@ -183,13 +148,11 @@ export default { ...@@ -183,13 +148,11 @@ export default {
this.loading = true; this.loading = true;
let res = await saveMaterials(this.form); let res = await saveMaterials(this.form);
let { code, msg } = res.data; let { code, msg } = res.data;
this.loading = false;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("addSuccess"); this.$emit("addSuccess");
this.loading = false;
this.handleClose(); this.handleClose();
} else {
this.loading = false;
} }
} }
}); });
...@@ -204,23 +167,10 @@ export default { ...@@ -204,23 +167,10 @@ export default {
this.form.deptName = row.deptName; this.form.deptName = row.deptName;
this.form.deptId = row.deptId; this.form.deptId = row.deptId;
this.form.deptCode = row.deptCode; this.form.deptCode = row.deptCode;
console.log(row);
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
this.form = { ...row }; this.form = { ...row };
this.fileUrlFileList = [
{
name: this.form.fileName,
url: this.form.fileUrl,
},
];
this.templatePathFileList = [
{
name: this.form.templateName,
url: this.form.templatePath,
},
];
this.samplePathFileList = [ this.samplePathFileList = [
{ {
name: this.form.sampleName, name: this.form.sampleName,
...@@ -231,7 +181,7 @@ export default { ...@@ -231,7 +181,7 @@ export default {
// 重置 // 重置
handleRest() { handleRest() {
this.$refs.form.resetFields(); this.$refs.form.resetFields();
this.fileList = []; this.samplePathFileList = [];
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
...@@ -241,35 +191,12 @@ export default { ...@@ -241,35 +191,12 @@ export default {
this.samplePathFileList = []; this.samplePathFileList = [];
this.Visible = false; this.Visible = false;
}, },
// 上传之前
beforeUpload(file) {
console.log(file);
},
// 上传附件
OnsuccessfileUrl(response) {
this.form.fileUrl = response.url;
this.form.fileName = response.fileName;
},
// 上传模板
OnsuccesstemplatePath(response) {
this.form.templatePath = response.url;
this.form.templateName = response.fileName;
},
// 上传样表 // 上传样表
OnsuccessSamplePath(response) { OnsuccessSamplePath(response, file, fileList) {
this.samplePathFileList = fileList.slice(-1);
this.form.samplePath = response.url; this.form.samplePath = response.url;
this.form.sampleName = response.fileName; this.form.sampleName = response.fileName;
}, },
// 删除附件
handleRemoveFileUrl() {
this.form.fileUrl = "";
this.form.fileName = "";
},
// 删除模板
handleRemoveTemplatePath() {
this.form.templatePath = "";
this.form.templateName = "";
},
// 删除样表 // 删除样表
handleRemoveSamplePath() { handleRemoveSamplePath() {
this.form.samplePath = ""; this.form.samplePath = "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment