jonbo 1 year ago
parent
commit
7358140812

+ 2 - 0
.gitignore

@@ -1 +1,3 @@
 node_modules
+vue.config.js
+src/api/mis/common/bmglApi.js

+ 1 - 1
src/api/mis/common/bmglApi.js

@@ -10,7 +10,7 @@ import request from '@/utils/request'
 const ChargeChannel = {
     query(params) {
         return request({
-            url: '/api/codemgt/bmchargechannel/page',
+            url: '/sxbapi/codemgt/bmchargechannel/page',
             method: 'get',
             params
         })

+ 1 - 1
src/utils/request.js

@@ -10,7 +10,7 @@ export const IP ='http://192.168.2.233:10085' //'http://36.138.232.124:10085'
 //export const IP = 'http://221.182.8.141:10085'
 export const NewIp = 'http://58.17.241.6:1212' //不用
 const service = axios.create({
-  baseURL: IP,
+  // baseURL: IP,
   withCredentials: true, // 跨域请求时发送cookiesokies
   timeout: 60000 // 请求超时
 })

+ 89 - 76
src/views/dcSystem/storeManage/storageManage/warehouseManage/index.vue

@@ -7,7 +7,8 @@
           <el-row type="flex" :gutter="10">
             <el-col :span="4">
               <el-select v-model="query.waterDataId" placeholder="所在水厂" size="small" style="width:100%" clearable>
-                <el-option v-for="(item, index) in waterData" :key="index" :label="item.name" :value="item.id"></el-option>
+                <el-option v-for="(item, index) in waterData" :key="index" :label="item.name"
+                  :value="item.id"></el-option>
               </el-select>
             </el-col>
             <el-col :span="4">
@@ -21,27 +22,25 @@
         <el-col :span="4">
           <el-row type="flex" class="row-bg" justify="end">
             <el-button type="primary" size="small" icon="el-icon-plus" @click="add">新 增</el-button>
-            <el-button type="primary" size="small" icon="el-icon-edit" @click="editor" :disabled="disabledBtn1">修 改</el-button>
-             <el-button type="danger" size="small" icon="el-icon-delete"  @click="deleteShelf" :disabled="disabledBtn2">删 除</el-button>
+            <el-button type="primary" size="small" icon="el-icon-edit" @click="editor" :disabled="disabledBtn1">修
+              改</el-button>
+            <el-button type="danger" size="small" icon="el-icon-delete" @click="deleteShelf" :disabled="disabledBtn2">删
+              除</el-button>
           </el-row>
         </el-col>
       </el-row>
     </div>
     <div class="table_width">
-      <table-item 
-      :table-data="list" :column="column" :pagination="true" :pagesize="pagination.size" 
-      :currentpage="pagination.current" :tableheight="tableheight" :border="true" 
-      :multiple="true" :stripe="true" :total="pagination.total"
-        :fixed="false" :isdelete="true"  forId
-        @handleCurrentChange="handleCurrentChange" 
-        @handleSizeChange="handleSizeChange" 
-        @handleSelectionChange="handleSelectionChange"
-        @detail = "detail" 
-        v-loading="loading"/>
+      <table-item :table-data="list" :column="column" :pagination="true" :pagesize="pagination.size"
+        :currentpage="pagination.current" :tableheight="tableheight" :border="true" :multiple="true" :stripe="true"
+        :total="pagination.total" :fixed="false" :isdelete="true" forId @handleCurrentChange="handleCurrentChange"
+        @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange" @detail="detail"
+        v-loading="loading" />
     </div>
 
     <!-- 表单 -->
-    <el-dialog v-if="dialogVisible" v-dialogDrag top="20vh" :title="dialogTitle" :visible.sync="dialogVisible" width="800px" class="dialog">
+    <el-dialog v-if="dialogVisible" v-dialogDrag top="20vh" :title="dialogTitle" :visible.sync="dialogVisible"
+      width="800px" class="dialog">
       <div class="dialog_style">
         <el-form :model="form" label-width="80px" size="small" ref="form" :rules="formRules">
           <el-row>
@@ -49,39 +48,44 @@
               <el-form-item label="所在水厂" prop="waterworksId">
                 <el-select v-model="form.waterworksId" placeholder="请选择所在水厂" style="width:100%" size="small" clearable
                   :disabled="nameEditState">
-                    <el-option v-for="(item, index) in waterData" :key="index" :label="item.name" :value="item.id">
-                    </el-option>
-                  </el-select>
+                  <el-option v-for="(item, index) in waterData" :key="index" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="仓库名称" prop="storeName">
-                <el-input v-model="form.storeName" style="width:100%" placeholder="仓库名称" :disabled="nameEditState"></el-input>
+                <el-input v-model="form.storeName" style="width:100%" placeholder="仓库名称"
+                  :disabled="nameEditState"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="管理员" prop="storeManagerUserName">
-                <el-input v-model="form.storeManagerUserName" style="width:100%" placeholder="仓库管理员" :disabled="personState"></el-input>
+                <el-input v-model="form.storeManagerUserName" style="width:100%" placeholder="仓库管理员"
+                  :disabled="personState"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-            <el-form-item label="仓库作用" prop="storeFunction">
+              <el-form-item label="仓库作用" prop="storeFunction">
                 <el-select v-model="form.storeFunction" placeholder="请选择仓库作用" style="width:100%" size="small" clearable
                   :disabled="nameEditState">
-                    <el-option v-for="(item, index) in warehouseTypes" :key="item.index" :label="item.cname" :value="item.id">
-                    </el-option>
-                  </el-select>
+                  <el-option v-for="(item, index) in warehouseTypes" :key="item.index" :label="item.cname"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
-                <el-input type="textarea" v-model="form.remark" style="width:100%" placeholder="备注" :disabled="nameEditState"></el-input>
+                <el-input type="textarea" v-model="form.remark" style="width:100%" placeholder="备注"
+                  :disabled="nameEditState"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item label="是否启用">
-                <el-switch v-model="form.storeEnable" active-text="是" inactive-text="否" :disabled="nameEditState" @change="changeStatus">
+                <el-switch v-model="form.storeEnable" active-text="是" inactive-text="否" :disabled="nameEditState"
+                  @change="changeStatus">
                 </el-switch>
               </el-form-item>
             </el-col>
@@ -91,14 +95,14 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" size="small" class="throttle" @click="submit()" v-if="!nameEditState">确 定</el-button>
-        <el-button type="primary" size="small" @click="dialogVisible=false">关 闭</el-button>
+        <el-button type="primary" size="small" @click="dialogVisible = false">关 闭</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {getWaterData} from "@/api/dispatch/dispatch";
+import { getWaterData } from "@/api/dispatch/dispatch";
 import { client } from "@/utils/index";
 import TableItem from "@/components/Table";
 import { addInventoryManage, getInventoryManagePage, editInventoryManage, deleteInventoryManage } from "@/api/dcApi/inventoryApi";
@@ -114,35 +118,35 @@ export default {
       // 控制表单显示
       dialogVisible: false,
       // 表单名
-      dialogTitle:"",
+      dialogTitle: "",
       // 仓库类型数据
-      warehouseTypes:[],
+      warehouseTypes: [],
       list: [],
       // 
-      disabledBtn1:true,
-      disabledBtn2:true,
+      disabledBtn1: true,
+      disabledBtn2: true,
       form: {
-        id:"",
-        sotreName:"",
-        waterworksId:"",
-        storeManagerUserName:"",
-        storeFunction:"",
-        remark:"",
-        storeEnable:1,
-        remark:"",
+        id: "",
+        sotreName: "",
+        waterworksId: "",
+        storeManagerUserName: "",
+        storeFunction: "",
+        remark: "",
+        storeEnable: 1,
+        remark: "",
       },
       formRules: {
         waterworksId: [
-        { required: true, message: "请选择水厂", trigger: "change" },
+          { required: true, message: "请选择水厂", trigger: "change" },
         ],
         storeName: [
-        { required: true, message: "请填写仓库名称", trigger: "change" },
+          { required: true, message: "请填写仓库名称", trigger: "change" },
         ],
       },
-      nameEditState:false,
-      personState:true,
+      nameEditState: false,
+      personState: true,
       query: {
-        waterDataId:"",
+        waterDataId: "",
         sotreName: "",
       },
       column: [
@@ -175,12 +179,12 @@ export default {
       // 选中行数据
       multipleSelection: [],
       // 控制表格查询时
-      loading:false,
+      loading: false,
     };
   },
   computed: {
     tableheight() {
-      return client().height - 230 ;
+      return client().height - 230;
     }
   },
   watch: {
@@ -230,13 +234,13 @@ export default {
      */
     getExpertPage() {
       let params = {
-        size : this.pagination.size,
-        current : this.pagination.current
+        size: this.pagination.size,
+        current: this.pagination.current
       };
-      if(this.query.waterDataId != "")
-      Object.assign(params,{waterworksId:this.query.waterDataId});
-      if(this.query.storeName != "")
-      Object.assign(params,{storeName:this.query.storeName});
+      if (this.query.waterDataId != "")
+        Object.assign(params, { waterworksId: this.query.waterDataId });
+      if (this.query.storeName != "")
+        Object.assign(params, { storeName: this.query.storeName });
       this.loading = true;
       getInventoryManagePage(params).then(res => {
         if (res.code == 1) {
@@ -248,22 +252,22 @@ export default {
           // console.log("货架"+JSON.stringify(res));
           this.list = this.list.map((item) => {
             const storeFunctionName = this.warehouseTypes.find(el => { return el.id == item.storeFunction })?.cname;
-                item['storeFunctionName'] = storeFunctionName || '--'
-                return item
+            item['storeFunctionName'] = storeFunctionName || '--'
+            return item
           })
         }
-        else{
+        else {
           this.$message.error("查询失败!");
         }
       })
-      .catch((ex) => {
+        .catch((ex) => {
           this.$message.error("查询失败!");
         })
         .finally(() => {
           this.loading = false;
         });
     },
-    
+
     doQuery() {
       // this.pagination.current = 1;
       this.getExpertPage();
@@ -272,7 +276,7 @@ export default {
     /**
      * 删除仓库
      */
-     deleteShelf() {
+    deleteShelf() {
       const ids = this.multipleSelection.map(item => { return item.id })
       this.$confirm('确定删除仓库?', '提示', {
         confirmButtonText: '确定',
@@ -300,11 +304,11 @@ export default {
       this.$nextTick(() => {
         this.$refs.form.clearValidate()
       });
-      this.form.storeManagerUserName =  this.$store.state.user.realName;
+      this.form.storeManagerUserName = this.$store.state.user.realName;
     },
-        /**
-     * 新增
-     */
+    /**
+ * 新增
+ */
     addExpert() {
       let store = {
         storeEnable: this.form.storeEnable - 0,
@@ -313,7 +317,7 @@ export default {
         storeName: this.form.storeName,
         storeManagerUserId: this.$store.state.user.userId,
         waterworksId: this.form.waterworksId,
-        remark:this.form.remark,
+        remark: this.form.remark,
       };
       addInventoryManage(store).then(res => {
         if (res.code == 1) {
@@ -348,15 +352,15 @@ export default {
     putExpert() {
       // const data = JSON.parse(JSON.stringify(this.form));
       let shelves = {
-        id : this.form.id,
-        storeEnable : this.form.storeEnable - 0,
-        storeFunction : this.form.storeFunction,
-        storeManagerUserName : this.form.storeManagerUserName,
-        storeName : this.form.storeName,
+        id: this.form.id,
+        storeEnable: this.form.storeEnable - 0,
+        storeFunction: this.form.storeFunction,
+        storeManagerUserName: this.form.storeManagerUserName,
+        storeName: this.form.storeName,
         // waterworksName : this.form.waterworksName,
-        waterworksId : this.multipleSelection[0].waterworksId,
-        storeManagerUserId:this.$store.state.user.userId,
-        remark:this.form.remark,
+        waterworksId: this.multipleSelection[0].waterworksId,
+        storeManagerUserId: this.$store.state.user.userId,
+        remark: this.form.remark,
       };
       editInventoryManage(shelves).then(res => {
         if (res.code == 1) {
@@ -393,12 +397,12 @@ export default {
       // console.log("选中行"+JSON.stringify(val));
       this.dialogTitle = '仓库详情信息';
       this.nameEditState = true;
-      this.form = {...val};
+      this.form = { ...val };
       this.form.waterworksId = val.waterworksName;
       this.form.storeFunction = val.storeFunctionName;
-      if(val.storeEnable == 0){
+      if (val.storeEnable == 0) {
         this.form.storeEnable = false;
-      }else{
+      } else {
         this.form.storeEnable = true;
       };
       this.dialogVisible = true;
@@ -406,7 +410,7 @@ export default {
     },
 
     // 改变switch的值
-    changeStatus(val){
+    changeStatus(val) {
       // console.log("状态值"+JSON.stringify(val));
       this.form.storeEnable = val;
     },
@@ -431,41 +435,50 @@ export default {
 <style lang="scss" scoped>
 #register {
   padding: 20px 30px;
+
   .head {
     margin-bottom: 10px;
   }
+
   .dialog_style {
     margin-top: 20px;
     width: 100%;
     overflow: hidden;
+
     /deep/ .el-table {
       text-align: center;
       vertical-align: middle;
     }
   }
-  /deep/ .dialog > div > div:nth-child(2) {
+
+  /deep/ .dialog>div>div:nth-child(2) {
     padding: 10px 20px;
   }
+
   .delete {
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
+
     :nth-child(1) {
       font-size: 50px;
       color: red;
       margin-bottom: 10px;
     }
+
     p {
       font-size: 20px;
     }
   }
 }
+
 .flexs {
   display: flex;
   justify-content: center;
   align-items: center;
 }
+
 .inputTitle {
   display: block;
   height: 40px;

+ 81 - 50
src/views/mis/codingManagement/chargeChannel.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="pageBox">
+        <!-- 主页 -->
         <el-container>
             <el-header height="50px">
                 <el-row>
@@ -25,13 +26,14 @@
                     @handleSelectionChange="handleSelectionChange" @rowDblclick="showDetail" @detail="showDetail" />
             </el-main>
         </el-container>
-        <!-- 表单 -->
+        <!-- 详情页 -->
         <el-dialog v-if="dialogVisible" v-dialogDrag top="20vh" :title="dialogTitle" :visible.sync="dialogVisible"
             width="800px" class="dialog">
-            <tfDetail :report-form="detailForm" :is-look="false" />
+            <tfDetail :detailData="detailData" :editState="editState" />
             <template slot="footer">
-                <el-button size="small" @click="clickCancel()">取消</el-button>
-                <el-button type="primary" size="small" @click="clickSave()">确定</el-button>
+                <el-button type="primary" @click="clickSave()" v-if="!editState">确
+                    定</el-button>
+                <el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
             </template>
         </el-dialog>
     </div>
@@ -47,18 +49,19 @@ export default {
     props: ['data'],
     data() {
         return {
+            /* ----- 主页 ----- */
+            queryParams: {
+                keyword: ''
+            },
             disabledModify: true,
             disabledDelete: true,
             loading: false,// 控制表格查询时
             pageInfo: { current: 1, size: 10, tableTotal: 1 }, // 分页数据
-            dataList: [], // 表格数据
-            selections: [], // 表格选中数据
             columns: [
                 {
                     label: '编码',
                     prop: 'code',
-                    align: 'center',
-                    sortable: true
+                    align: 'center'
                 },
                 {
                     label: '名称',
@@ -76,74 +79,95 @@ export default {
                     align: 'center'
                 },
                 {
-                    label: '公司',
-                    prop: 'companyBranch',
+                    label: '电话',
+                    prop: 'telephone',
                     align: 'center'
                 },
                 {
-                    label: '外部单位',
-                    prop: 'isextunit',
+                    label: '备注',
+                    prop: 'remark',
                     align: 'center'
                 },
                 {
-                    label: '备注',
-                    prop: 'remark',
+                    label: '所属公司',
+                    prop: 'companyBranch',
                     align: 'center'
                 },
                 {
-                    label: '修改人员',
-                    prop: 'mocode',
+                    label: '外部单位',
+                    prop: 'isextunit',
                     align: 'center'
                 },
                 {
-                    label: '修改时间',
+                    label: '修改日期',
                     prop: 'mdate',
                     align: 'center',
                     sortable: true
+                },
+                {
+                    label: '修改人员',
+                    prop: 'mocode',
+                    align: 'center'
                 }
             ],
-            queryParams: {
-                keyword: ''
-            },
+            dataList: [], // 表格数据
+            selectionsData: [], // 表格选中数据
+            selectedRow: {}, //表格选中行
 
-            // 以下为详情页
+            /* ----- 详情页 ----- */
             dialogTitle: '新增',
             dialogVisible: false,
-            isLook: false,
-            detailData: {},
-            detailForm: {
-
+            editState: true,
+            detailData: {
+                code: undefined,
+                name: undefined,
+                yysj: undefined,
+                head: undefined,
+                telephone: undefined,
+                remark: undefined,
+                company_branch: undefined,
+                cdate: undefined,
+                mdate: undefined,
+                mocode: undefined,
+                isextunit: false
             }
         }
     },
-    dialogVisible(newVal, oldVal) {
-        if (!newVal) {
-            this.clearDetailForm()
+    watch: {
+        selectionsData(value) {
+            this.disabledModify = this.selectionsData.length !== 1;
+            this.disabledDelete = this.selectionsData.length == 0;
+        },
+        dialogVisible(newVal, oldVal) {
+            if (!newVal) {
+                this.clearDetailForm()
+            }
         }
     },
     mounted() {
         this.bindList();
     },
     methods: {
-        /* ---------- 方法 ---------- */
+        /* ----- 方法 ----- */
         /**
          * @description 绑定列表
          */
         bindList() {
-            var that = this
             // 追加分页参数
-            const params = that.pageInfo
-            Object.assign(params, this.queryParams);
-            that.dataList = []
+            let params = Object.assign({}, this.pageInfo, this.queryParams);
+            this.dataList = []
             this.loading = true;
+            console.log(params);
+            console.log(this.pageInfo);
+            console.log(this.queryParams);
             ChargeChannel.query(params).then((res) => {
                 if (res.code !== 1) {
-                    that.$message.error('获取信息出错!')
+                    this.$message.error('查询失败!')
                     return
                 }
                 // 数据总数
-                that.pageInfo.tableTotal = res.result.total
-                that.dataList = res.result.records
+                this.pageInfo.tableTotal = res.result.total
+                this.dataList = res.result.records
             }).catch((ex) => {
                 this.$message.error("查询失败!");
             }).finally(() => {
@@ -152,13 +176,13 @@ export default {
         },
         clearDetailForm() {
             // 表单数据
-            for (var key in this.detailForm) {
+            for (var key in this.detailData) {
                 console.log("key值:" + key)
-                this.detailForm[key] = undefined
+                this.detailData[key] = undefined
             }
         },
 
-        /* ---------- dom事件 ---------- */
+        /* ----- dom事件 ----- */
         /**
          * @description 查询
          */
@@ -170,8 +194,14 @@ export default {
          * @description 添加
          */
         clickAdd() {
-            const that = this
-            that.dialogVisible = true // 显示弹窗
+            this.dialogTitle = "新增";
+            this.dialogVisible = true;// 显示弹窗
+            this.editState = false;
+            // this.detailData = this.$options.data().detailData
+            // this.$nextTick(() => {
+            //     this.$refs.detailData.clearValidate()
+            // });
+            // this.detailData.storeManagerUserName = this.$store.state.user.realName;
         },
         /**
          * @description 修改
@@ -204,33 +234,34 @@ export default {
             // })
         },
 
-        /* ---------- 组件事件 ---------- */
+        /* ----- 组件事件 ----- */
         /**
          * @description 改变当前页
          */
-        handleCurrentChange(currentPage) {
-            this.pageInfo.current = currentPage
+        handleCurrentChange(current) {
+            this.pageInfo.current = current
             this.bindList()
         },
         /**
          * @description 分页每页条数
          */
-        handleSizeChange(pageSize) {
-            this.pageInfo.size = pageSize
+        handleSizeChange(size) {
+            this.pageInfo.size = size
             this.bindList()
         },
         /**
          * @description 选择改变
          */
-        handleSelectionChange(val) {
-            debugger
-            this.selections = val
+        handleSelectionChange(rows) {
+            this.selectionsData = rows
         },
         /**
          * @description 显示详情
          */
         showDetail(data) {
-            this.detailData = data
+            this.selectedRow = data;
+            this.editState = false;
+            this.detailData = data;
             this.dialogVisible = true
         }
     }

+ 45 - 191
src/views/mis/codingManagement/components/chargeChannel-form.vue

@@ -1,68 +1,51 @@
 <template>
-  <div style="width: 100%;display: flex; flex-wrap: wrap">
-    <div class="flexLeft">
-      <div class="flexLeftBottom">
-        <div class="flexDiv">
-          <span class="flexTitle">区域级别:</span>
-          <div class="flexInfo">
-            <el-select
-              v-model="reportForm.dmaLevle"
-              :disabled="isLook"
-              size="small"
-              style="width:100%"
-            >
-              <el-option key="1" label="一级分区" value="1" />
-              <el-option key="2" label="二级分区" value="2" />
-              <el-option key="3" label="三级分区" value="3" />
-            </el-select>
-          </div>
-        </div>
-        <div class="flexDiv">
-          <span class="flexTitle">分区漏损评估:</span>
-          <div class="flexInfo">
-            <el-select
-              v-model="reportForm.leakAssessment"
-              :disabled="isLook"
-              size="small"
-              style="width:100%"
-            >
-              <el-option key="0" label="合格" value="0" />
-              <el-option key="1" label="一般" value="1" />
-              <el-option key="2" label="严重" value="2" />
-            </el-select>
-          </div>
-        </div>
-        <div class="flexDiv">
-          <span class="flexTitle">漏损率上限:</span>
-          <div class="flexInfo">
-            <el-input
-              v-model="reportForm.leakUp"
-              :disabled="isLook"
-              size="small"
-              type="number"
-            />
-          </div>
-        </div>
-        <div class="flexDiv">
-          <span class="flexTitle">漏损率下限:</span>
-          <div class="flexInfo">
-            <el-input
-              v-model="reportForm.leakDown"
-              :disabled="isLook"
-              size="small"
-              type="number"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <el-form :model="detailData" label-width="80px" ref="form">
+    <el-descriptions title="" :column="2" border>
+      <el-descriptions-item label="编码">
+        <el-input v-model="detailData.code" style="width:100%" placeholder="" :disabled="editState"></el-input>
+      </el-descriptions-item>
+      <el-descriptions-item label="名称">
+        <el-input v-model="detailData.name" style="width:100%" placeholder="请输入" :disabled="editState"></el-input>
+      </el-descriptions-item>
+      <el-descriptions-item label="营业时间">
+        <el-input v-model="detailData.yysj" style="width:100%" placeholder="请输入" :disabled="editState"></el-input>
+      </el-descriptions-item>
+      <el-descriptions-item label="负责人">
+        <el-input v-model="detailData.head" style="width:100%" placeholder="请输入" :disabled="editState"></el-input>
+      </el-descriptions-item>
+      <el-descriptions-item label="联系电话">
+        <el-input v-model="detailData.telephone" style="width:100%" placeholder="请输入" :disabled="editState"></el-input>
+      </el-descriptions-item>
+      <el-descriptions-item label="所属公司">
+        <el-input v-model="detailData.companyBranch" style="width:100%" placeholder="请输入"
+          :disabled="editState"></el-input>
+      </el-descriptions-item>
+      <el-descriptions-item label="备注">
+        <el-input v-model="detailData.remark" style="width:100%" placeholder="请输入" :disabled="editState"></el-input>
+      </el-descriptions-item>
+      <el-descriptions-item label="外部单位">
+        <el-switch v-model="detailData.isextunit" active-text="是" inactive-text="否" inactive-color="lightgray">
+        </el-switch>
+      </el-descriptions-item>
+      <el-descriptions-item label="操作人员">
+        <el-input v-model="detailData.mocode" style="width:100%" :disabled="editState"></el-input>
+      </el-descriptions-item>
+      <el-descriptions-item label="操作时间">
+        <el-input v-model="detailData.mdate" style="width:100%" :disabled="editState"></el-input>
+      </el-descriptions-item>
+
+    </el-descriptions>
+
+  </el-form>
 </template>
 
 <script>
 export default {
-  name: 'DMAAssessDialog',
-  props: ['reportForm', 'isLook'],
+  name: 'detail',
+  props: {
+    detailData: {},
+    editState: true
+  },
   data() {
     return {
     }
@@ -74,6 +57,7 @@ export default {
   mounted() {
   },
   created() {
+
   },
   destroyed() {
   },
@@ -81,134 +65,4 @@ export default {
   }
 }
 </script>
-<style lang='scss' scoped>
-.el-image{
-  width: 40px;
-}
-.flexLeft{
-   width: 100%;
-   height: 100%;
-   display: flex;
-   flex-direction: column;
-   padding-right: 5px;
-   .flexLeftTop{
-     width: 100%;
-     height: 300px;
-   }
-   .flexLeftBottom{
-    width: 100%;
-    display: flex;
-    margin-top: 5px;
-    justify-content: flex-start;
-    flex-direction:row;
-    flex-wrap: wrap;
-   }
-}
-.flexTitle {
-  min-width: 100px;
-  display: inline-block;
-  text-align: right;
-}
-.flexInfo {
-  display: inline-block;
-  width: calc(100% - 120px);
-}
-.eventTitle{
-  width: 99%;
-  margin-bottom: 5px;
-  width: 100%;
-  height: 40px;
-  border: 1px solid;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.leftBorder{
-  border-left: 6px solid;
-  margin-left: 1px;
-  font-size: medium;
-  font-weight: bold;
-}
-.flexRight{
-   width: 50%;
-   height: 100%;
-   flex-direction:column;
-   padding-left: 5px;
-   .flexRightTop{
-     width: 100%;
-      height: 22vh;
-      margin-top: 5px;
-      overflow: auto;
-     display: flex;
-     flex-direction: row;
-     justify-content: flex-start;
-     flex-wrap: wrap;
-   }
-   .flexRightCenter{
-     width: 100%;
-    //  height: 15%;
-     display: flex;
-     margin-top: 5px;
-     flex-direction: row;
-     justify-content: flex-start;
-     flex-wrap: wrap;
-   }
-   .flexRightBottom{
-     width: 100%;
-    height: 22vh;
-    margin-top: 5px;
-    overflow: auto;
-     display: flex;
-     flex-direction: row;
-     justify-content: flex-start;
-     flex-wrap: wrap;
-     .flexRightBottom_left{
-       width: 60%;
-       float: left;
-     }
-     .flexRightBottom_right{
-      width: 40%;
-       float: right;
-       display: flex;
-       flex-direction: row;
-       .imageDiv{
-         flex-direction: column;
-       }
-     }
-   }
-   .imageDiv{
-     width: 100%;
-     display: flex;
-     flex-direction: row;
-     justify-content: space-around;
-     .image{
-       display: flex;
-       flex-direction: column;
-       align-items: center;
-       justify-content: flex-end;
-     }
-   }
-}
-.flexDiv {
-  width: 50%;
-  min-height: 30px;
-  line-height: 30px;
-  margin-bottom: 5px;
-}
-.flexDivMax {
-  width: 99%;
-  margin-bottom: 10px;
-}
-.colflexS{
-    display: flex;
-    align-items: center;
-    // justify-content: center;
-}
-.el-table__empty-text{
-  margin-top: 30px;
-  line-height:30px;
-}
-.el-table__empty-text .empty-p{
-    margin-top: -7px;
-}
-</style>
+<style lang='scss' scoped></style>

+ 28 - 0
vue.config.js

@@ -62,6 +62,34 @@ module.exports = {
           '^/arcgis/rest': '/arcgis/rest'
         }
       },
+      '/auth/': {
+        target: 'http://192.168.2.233:10085',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/auth/': '/auth/'
+        }
+      },
+      '/base': {
+        target: 'http://192.168.2.233:10085',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/base': '/base'
+        }
+      },
+      '/sxbapi': {
+        target: 'http://192.168.2.85:10209/api',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/sxbapi': ''
+        }
+      },
+      '/hdcapi': {
+        target: 'http://192.168.2.229:10209/api',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/hdcapi': ''
+        }
+      },
     }
     // before: require('./mock/mock-server.js')
   },