| src/api/oa/ipc.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/components/building/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/components/constructionBatch/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/components/manufacturer/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/components/nvr/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/components/nvr/list.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/components/organization/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/construction/ipc/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/construction/nvr/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/oa/ipc.js
@@ -42,3 +42,10 @@ method: 'delete' }) } // 复制上一条ipc export function getCopyIpc() { return request({ url: '/oa/ipc/copy', method: 'get' }) } src/views/components/building/index.vue
@@ -44,6 +44,17 @@ name: '' } }, watch: { 'value': function (v) { if (v) { getBuilding(v).then(response => { this.name = response.data.name; }); }else { this.name = ''; } } }, created() { if (this.value) { getBuilding(this.value).then(response => { src/views/components/constructionBatch/index.vue
@@ -42,6 +42,17 @@ name: '' } }, watch: { 'value': function (v) { if (v) { getConstructionBatch(v).then(response => { this.name = response.data.batch; }); }else { this.name = ''; } } }, created() { if (this.value) { getConstructionBatch(this.value).then(response => { src/views/components/manufacturer/index.vue
@@ -40,6 +40,17 @@ name: '' } }, watch: { 'value': function (v) { if (v) { getManufacturer(v).then(response => { this.name = response.data.name; }); }else { this.name = ''; } } }, created() { if (this.value) { getManufacturer(this.value).then(response => { src/views/components/nvr/index.vue
@@ -45,6 +45,17 @@ name: '' } }, watch: { 'value': function (v) { if (v) { getNvr(v).then(response => { this.name = response.data.deploymentName; }); }else { this.name = ''; } } }, created() { if (this.value) { getNvr(this.value).then(response => { src/views/components/nvr/list.vue
@@ -25,15 +25,15 @@ </template> </el-table-column> <el-table-column label="部署名称" align="center" prop="deploymentName"/> <el-table-column label="通道（路）" align="center" prop="passageway"/> <el-table-column label="通道（路）" align="center" prop="passageway_dictText"/> <el-table-column label="LAN1" align="center" prop="lanOne"/> <el-table-column label="IP" align="center" prop="ipOne"/> <el-table-column label="LAN2" align="center" prop="lanTwo"/> <el-table-column label="IP" align="center" prop="ipTwo"/> <el-table-column label="登录账户" align="center" prop="loginAccount"/> <el-table-column label="硬盘" align="center" prop="hardDisk"/> <el-table-column label="安装位置" align="center" prop="buildingId"/> <el-table-column label="所属单位" align="center" prop="organizationId"/> <el-table-column label="安装位置" align="center" prop="buildingId_dictText"/> <el-table-column label="所属单位" align="center" prop="organizationId_dictText"/> <!-- <el-table-column label="施工批次" align="center" prop="constructionBatchId" />--> <!-- <el-table-column label="序列号" align="center" prop="serialNumber" />--> <!-- <el-table-column label="型号" align="center" prop="model" />--> src/views/components/organization/index.vue
@@ -44,6 +44,17 @@ name: '' } }, watch: { 'value': function (v) { if (v) { getOrganization(v).then(response => { this.name = response.data.name; }); }else { this.name = ''; } } }, created() { if (this.value) { getOrganization(this.value).then(response => { src/views/construction/ipc/index.vue
@@ -35,7 +35,8 @@ size="mini" @click="handleAdd" v-hasPermi="['oa:ipc:add']" >新增</el-button> >新增 </el-button> </el-col> <el-col :span="1.5"> <el-button @@ -46,7 +47,8 @@ :disabled="single" @click="handleUpdate" v-hasPermi="['oa:ipc:edit']" >修改</el-button> >修改 </el-button> </el-col> <el-col :span="1.5"> <el-button @@ -57,7 +59,8 @@ :disabled="multiple" @click="handleDelete" v-hasPermi="['oa:ipc:remove']" >删除</el-button> >删除 </el-button> </el-col> </el-row> @@ -88,7 +91,8 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa:ipc:edit']" >修改</el-button> >修改 </el-button> <el-button size="mini" type="text" @@ -96,7 +100,8 @@ icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:ipc:remove']" >删除</el-button> >删除 </el-button> </template> </el-table-column> </el-table> @@ -110,7 +115,8 @@ /> <!-- 添加或修改ipc设备对话框 --> <el-dialog :title="title" :visible.sync="open" width="700px" :append-to-body="true" :close-on-click-modal="false" :destroy-on-close="true"> <el-dialog :title="title" :visible.sync="open" width="700px" :append-to-body="true" :close-on-click-modal="false" :destroy-on-close="true"> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-row> <el-col :span="9"> @@ -177,6 +183,7 @@ </el-row> </el-form> <div slot="footer" class="dialog-footer"> <el-button :loading="buttonLoading" type="primary" @click="copy">复制上一条信息</el-button> <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> <el-button @click="cancel">取 消</el-button> </div> @@ -185,7 +192,7 @@ </template> <script> import { listIpc, getIpc, delIpc, addIpc, updateIpc } from "@/api/oa/ipc"; import {listIpc, getIpc, delIpc, addIpc, updateIpc, getCopyIpc} from "@/api/oa/ipc"; import building from "../../components/building"; import organization from "../../components/organization"; import constructionBatch from "../../components/constructionBatch"; @@ -278,12 +285,25 @@ constructionBatchId: [ { required: true, message: "施工批次不能为空", trigger: "blur" } ], passageway: [] } }; }, computed: { getNvrId() { return this.form.nvrId } }, watch: { 'schoolId': function () { this.getList() }, getNvrId: function (v) { if (v) { this.rules.passageway = [{required: true, message: "通道不能为空", trigger: "blur"}] } else { this.rules.passageway = [] } } }, created() { @@ -388,6 +408,33 @@ } }); }, copy() { this.buttonLoading = true; getCopyIpc().then(res => { const obj = res.data; // 编辑 if (this.form.id) { obj.id = this.form.id; } // 新增 else { obj.id = undefined; } this.form = this.shallowCopy(obj); this.$modal.msgSuccess("修改成功"); }).finally(() => { this.buttonLoading = false; }); }, shallowCopy(src) { var dst = {}; for (var prop in src) { if (src.hasOwnProperty(prop)) { dst[prop] = src[prop]; } } return dst; }, /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; src/views/construction/nvr/index.vue
@@ -81,15 +81,15 @@ </template> </el-table-column> <el-table-column label="部署名称" align="center" prop="deploymentName"/> <el-table-column label="通道（路）" align="center" prop="passageway"/> <el-table-column label="通道（路）" align="center" prop="passageway_dictText"/> <el-table-column label="LAN1" align="center" prop="lanOne"/> <el-table-column label="IP" align="center" prop="ipOne"/> <el-table-column label="LAN2" align="center" prop="lanTwo"/> <el-table-column label="IP" align="center" prop="ipTwo"/> <el-table-column label="登录账户" align="center" prop="loginAccount"/> <el-table-column label="硬盘" align="center" prop="hardDisk"/> <el-table-column label="安装位置" align="center" prop="buildingId"/> <el-table-column label="所属单位" align="center" prop="organizationId"/> <el-table-column label="安装位置" align="center" prop="buildingId_dictText"/> <el-table-column label="所属单位" align="center" prop="organizationId_dictText"/> <!-- <el-table-column label="施工批次" align="center" prop="constructionBatchId" />--> <!-- <el-table-column label="序列号" align="center" prop="serialNumber" />--> <!-- <el-table-column label="型号" align="center" prop="model" />--> vue.config.js
@@ -33,6 +33,7 @@ proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://101.35.174.42:8082`, target: `http://localhost:8080`, changeOrigin: true, pathRewrite: {
