浏览代码

替换竖井接口(未修改动态获取参数)

zhangyu 5 年之前
父节点
当前提交
4ed69e9d91

+ 14 - 27
src/api/scan/request.js

@@ -734,51 +734,38 @@ export function delBatchList(param, success) {
 
 //获取竖井类型
 export function getCenoteType(param, success) {
-    let url = `${baseUrl}/datacenter/shaft/queryShaftFuncType?projectId=${param.ProjId}&secret=${param.secret}`
-    let data = param.data
-    http.postJson(url, data, success)
-}
-
-//获取竖井表头信息
-export function getCenoteTableHeader(param, success) {
-    let url = `${baseUrl}/datacenter/shaft/queryDic?projectId=${param.ProjId}&secret=${param.secret}`
-    let data = param.data
-    http.postJson(url, data, success)
+    let url = `${baseUrl}/datacenter/shaft/query-shaft-functype`
+    http.postJson(url, param, success)
 }
 
 //获取竖井表格内容信息
 export function getCenoteTableData(param, success) {
-    let url = `${baseUrl}/datacenter/shaft/queryWithCount?projectId=${param.ProjId}&secret=${param.secret}`
-    let data = param.data
-    http.postJson(url, data, success)
+    let url = `${baseUrl}/datacenter/shaft/query-with-count`
+    http.postJson(url, param, success)
 }
 
 //添加竖井信息
 export function createCenoteTableData(param, success) {
-    let url = `${baseUrl}/datacenter/shaft/batchCreate?projectId=${param.ProjId}&secret=${param.secret}`
-    let data = param.data
-    http.postJson(url, data, success)
+    let url = `${baseUrl}/datacenter/shaft/create`
+    http.postJson(url, param, success)
 }
 
 //修改竖井信息
 export function updataCenoteTableData(param, success) {
-    let url = `${baseUrl}/datacenter/shaft/update?projectId=${param.ProjId}&secret=${param.secret}`
-    let data = param.data
-    http.postJson(url, data, success)
+    let url = `${baseUrl}/datacenter/shaft/update`
+    http.postJson(url, param, success)
 }
 
 //删除竖井信息
 export function deleteCenoteTableData(param, success) {
-    let url = `${baseUrl}/datacenter/shaft/delete?projectId=${param.ProjId}&secret=${param.secret}`
-    let data = param.data
-    http.postJson(url, data, success)
+    let url = `${baseUrl}/datacenter/shaft/delete`
+    http.postJson(url, param, success)
 }
 
 //竖井关联元空间
 export function saveCenoteRelateSpace(param, success) {
-    let url = `${baseUrl}/datacenter/shaft/relateSpace?projectId=${param.ProjId}&secret=${param.secret}`
-    let data = param.data
-    http.postJson(url, data, success)
+    let url = `${baseUrl}/datacenter/shaft/relate-space`
+    http.postJson(url, param, success)
 }
 
 //获取租户表头信息
@@ -879,8 +866,8 @@ export function getPartsAllType(param, success) {
 
 //all - 查询数据字典 --列表表头
 export function getDataDictionary(param, success) {
-    let url = `${baseUrl}/datacenter/data-dictionary/query`;
-    let data = param;
+    let url = `${baseUrl}/datacenter/data-dictionary/project/query?type=${param.type}`;
+    let data = param.data
     http.postJson(url, data, success)
 }
 

+ 6 - 0
src/assets/style/style.scss

@@ -12,6 +12,12 @@
     padding-top: 10px;
 }
 
+.left {
+    text-align: left;
+    background: #fff;
+    padding-top: 10px;
+}
+
 .right-nobg {
     text-align: right;
 }

+ 1 - 5
src/components/ledger/lib/cenoteType.vue

@@ -50,11 +50,7 @@ export default {
     },
     async getData() {
       let param = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: {
-          ProjectId: this.projectId
-        }
+        ProjectId: this.projectId
       }
       await getCenoteType (param, res => {
         var data = res.Content;

+ 6 - 4
src/utils/handsontable/fillterField.js

@@ -1,14 +1,16 @@
 const data = {
-  equipment: {
+  equipment: { //设备
     onlyRead: [],
     edit: []
   },
-  tenant: {
+  tenant: { //租户
     onlyRead: [],
     edit: []
   },
-  shaft: {
+  shaft: { //竖井
     onlyRead: [],
     edit: []
   }
-}
+}
+
+export default data

+ 15 - 12
src/utils/handsontable/notShow.js

@@ -883,9 +883,9 @@ const showTools = {
         let data = arr.map(item => {
             if (onlyRead) { //只读模式
                 if (showType == "Visible" && item.Visible) { //只看要采集的信息
-                    return tools.isUnit(item)
+                    return showTools.isUnit(item)
                 } else if (showType == "all") { //显示全部
-                    return tools.isUnit(item)
+                    return showTools.isUnit(item)
                 } else {
                     return undefined
                 }
@@ -894,14 +894,15 @@ const showTools = {
                     return undefined
                 }
                 if (showType == "Visible" && item.Visible) { //只看要采集的信息
-                    return tools.isUnit(item)
+                    return showTools.isUnit(item)
                 } else if (showType == "all") { //显示全部
-                    return tools.isUnit(item)
+                    return showTools.isUnit(item)
                 } else if (showType == "partInfo" && showTools.isShow(item.InfoPointCode)) { //隐藏部分厂家信息(***需维护不显示列表***)
-                    if (item.FirstName == "控制参数" || item.FirstName == "设定参数" || item.FirstName == "运行参数") {
+                    // if (item.FirstName == "控制参数" || item.FirstName == "设定参数" || item.FirstName == "运行参数") {
+                    if (item.FirstTag == "TechParam") {
                         return undefined
                     } else {
-                        return tools.isUnit(item)
+                        return showTools.isUnit(item)
                     }
                 } else {
                     return undefined
@@ -918,9 +919,9 @@ const showTools = {
         let data = arr.map(item => {
             if (onlyRead) { //只读模式
                 if (showType == "Visible" && item.Visible) { //只看要采集的信息
-                    return tools.textFormat(item, onlyRead)
+                    return showTools.textFormat(item, onlyRead)
                 } else if (showType == "all") { //显示全部
-                    return tools.textFormat(item, onlyRead)
+                    return showTools.textFormat(item, onlyRead)
                 } else {
                     return undefined
                 }
@@ -929,14 +930,15 @@ const showTools = {
                     return undefined
                 }
                 if (showType == "Visible" && item.Visible) { //只看要采集的信息
-                    return tools.inputModeFilter(item)
+                    return showTools.inputModeFilter(item)
                 } else if (showType == "all") { //显示全部
-                    return tools.inputModeFilter(item)
+                    return showTools.inputModeFilter(item)
                 } else if (showType == "partInfo" && showTools.isShow(item.InfoPointCode)) { //隐藏部分厂家信息(***需维护不显示列表***)
-                    if (item.FirstName == "控制参数" || item.FirstName == "设定参数" || item.FirstName == "运行参数") {
+                    // if (item.FirstName == "控制参数" || item.FirstName == "设定参数" || item.FirstName == "运行参数") {
+                    if (item.FirstTag == "TechParam") {
                         return undefined
                     } else {
-                        return tools.inputModeFilter(item)
+                        return showTools.inputModeFilter(item)
                     }
                 } else {
                     return undefined
@@ -1095,6 +1097,7 @@ const showTools = {
     },
     filterUnshow: (onlyRead, type, code) => {
         let falg = true, data = fieldData[type]
+        console.log(fieldData)
         if (onlyRead) {
             data.onlyRead.map(item => {
                 if (item == code) {

+ 10 - 21
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -31,7 +31,7 @@ import text from "@/utils/handsontable/mainText"
 import session from "@/framework/utils/storage"
 
 import handsonTable from "@/components/common/handsontable"
-import { getDataDictionary, getCenoteTableHeader, createCenoteTableData } from "@/api/scan/request"
+import { getDataDictionary, createCenoteTableData } from "@/api/scan/request"
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {
@@ -44,7 +44,7 @@ export default {
       isTableRightShow: false,
       relationids: "",
       onlyRead: false,
-      allMess: true,
+      showType: "all",
       tableHeader: [],
       tableData: session.get("cenoteAddData")? session.get("cenoteAddData").length? session.get("cenoteAddData"): [{}]: [{}],
       copyTableData: []
@@ -67,9 +67,11 @@ export default {
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let param = {
-        PageNumber: 1,
-        PageSize: 500,
-        Filters: `type='Shaft'`
+        data: {
+          PageNumber: 1,
+          PageSize: 500,
+        },
+        type: 'Shaft'
       }
       await getDataDictionary(param, res => {
         this.tableHeader = res.Content
@@ -93,12 +95,7 @@ export default {
         this.$message("创建信息为空,请录入信息后再创建!")
         return
       }
-      const params = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: newData
-      }
-      await createCenoteTableData(params, (res) => {
+      await createCenoteTableData(newData, (res) => {
         this.$message.success("添加成功!")
         session.remove("cenoteAddData")
         this.$router.push({ name: 'cenotelist'})
@@ -143,21 +140,13 @@ export default {
     },
     formatHeaderData(list) {//格式化表头显示的数据
       let arr = tools.copyArr(list)
-      arr.map((item) => {
-        item.Visible = true
-      })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
-      let data = showTools.changeHeader(arr, readArr, this.onlyRead, false, this.allMess)
+      let data = showTools.headerTextFilter(arr, "shaft", this.onlyRead, this.showType)
       // data.unshift("关联的元空间");
       return data;
     },
     formatHeaderType(list) {//格式化表头头映射的数据
       let arr = tools.copyArr(list);
-      arr.map((item) => { //缺少信息点
-        item.Visible = true
-      })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
-      let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
+      let data = showTools.headerTypeFilter(arr, "shaft", this.onlyRead, this.showType)
       // data.unshift({
       //   data: "SpaceCount",
       //   readOnly: this.onlyRead

+ 52 - 54
src/views/ledger/cenotelist/index.vue

@@ -3,9 +3,9 @@
     <div class="search-header">
       <cenote-type @change="changeFloor"></cenote-type>
     </div>
-    <el-row class="right">
-      <span style="float:left;">当前筛选条件下共{{page.total || '--'}}竖井</span>
-      <el-select v-model="onlyRead" @change="getTableHeader" style="width:100px;margin-right:10px;vertical-align:bottom;">
+    <el-row class="left">
+      <span style="float:right;">当前筛选条件下共{{page.total || '--'}}竖井</span>
+      <el-select v-model="onlyRead" @change="getTableHeader" style="width:100px;margin-right:20px;vertical-align:bottom;">
         <el-option
           v-for="item in options"
           :key="item.value"
@@ -13,10 +13,18 @@
           :value="item.value">
         </el-option>
       </el-select>
-      <div v-show="onlyRead" style="width:200px;display:inline-block;text-align:left;color:gray;font-size:12px;">
+      <el-select v-model="showType" @change="initTable" style="width:100px;margin-right:10px;vertical-align:bottom;">
+        <el-option
+          v-for="item in showTypes"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <!-- <div v-show="onlyRead" style="width:200px;display:inline-block;text-align:left;color:gray;font-size:12px;">
         <span>只看要采集的信息</span>
         <el-checkbox v-model="allMess" @change="getTableHeader"></el-checkbox>
-      </div>
+      </div> -->
       <el-button @click="handleCreateTableData">添加竖井</el-button>
       <el-button @click="getTableHeader">刷新</el-button>
       <el-button v-show="!onlyRead" @click="undo">撤销</el-button>
@@ -71,7 +79,7 @@ import text from "@/utils/handsontable/mainText"
 
 import cenoteType from "@/components/ledger/lib/cenoteType";
 import handsonTable from "@/components/common/handsontable";
-import { getDataDictionary, getCenoteTableHeader, getCenoteTableData, updataCenoteTableData, deleteCenoteTableData, saveCenoteRelateSpace } from "@/api/scan/request"
+import { getDataDictionary, getCenoteTableData, updataCenoteTableData, deleteCenoteTableData, saveCenoteRelateSpace } from "@/api/scan/request"
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {
@@ -92,6 +100,7 @@ export default {
         label: '编辑模式'
       }],
       onlyRead: true,
+      showType: "",
       allMess: true,
       tableHeader: [],
       page: {
@@ -110,23 +119,38 @@ export default {
         "projectId",
         "secret",
         "userId"
-    ])
+    ]),
+    showTypes () {
+      return this.onlyRead?
+        [{value: "all", label: '全部'}, {value: "Visible", label: '只看要采集的信息'}]: 
+        [{value: "all", label: '全部'}, {value: "Visible", label: '只看要采集的信息'}, {value: "partInfo", label: '隐藏自动填充的信息点'}]
+    }
   },
   created() {
     this.getTableHeader()
   },
-  // watch: {
-  //     projectId() {
-  //         this.param.ProjId = this.projectId;
-  //     }
-  // },
+  watch: {
+    showTypes: {
+      handler(newName, oldName) {
+        if (newName && newName[0] && newName[0].value) {
+          this.showType = newName[0].value
+        } else {
+          this.showType = ""
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   methods: {
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let param = {
-        PageNumber: 1,
-        PageSize: 500,
-        Filters: `type='Shaft'`
+        data: {
+          PageNumber: 1,
+          PageSize: 500
+        },
+        type: 'Shaft'
       }
       await getDataDictionary(param, res => {
         this.tableHeader = res.Content;
@@ -134,16 +158,11 @@ export default {
       })
     },
     async getTableData() {//获取表格数据
-      let data = {
+      let params = {
         Filters: this.cenoteId? `ProjectId='${this.projectId}';structureInfo.ShaftFuncType='${this.cenoteId}'`: `ProjectId='${this.projectId}'`,
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize
       }
-      const params = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: data
-      }
       await getCenoteTableData(params, (res) => {
         this.tableData = res.Content
         this.copyTableData = tools.deepCopy(res.Content)
@@ -157,17 +176,13 @@ export default {
     // 修改表格内容
     async updateTableData(data, change) {
       let param = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: {
-          Content: [],
-          Projection: []
-        }
+        Content: [],
+        Projection: []
       };
       //生成要修改字段列表
       change.map((item) => {
-        if(item[1] && param.data.Projection.indexOf(item[1]) == -1) {
-          param.data.Projection.push(item[1])
+        if(item[1] && param.Projection.indexOf(item[1]) == -1) {
+          param.Projection.push(item[1])
         }
       })
       //生成对应修改数据
@@ -182,7 +197,7 @@ export default {
         // } else {
         //   item[keyarr[0]] = item[keyarr[0]] != ""? item[keyarr[0]]: null
         // }
-        param.data.Content.push(item);
+        param.Content.push(item);
       })
 
       await updataCenoteTableData(param, (res) => {
@@ -198,15 +213,10 @@ export default {
     },
     //保存元空间关联
     async saveSpaceList() {
-      let data = {
+      let params = {
         ShaftId: this.shaftId,
         SpaceId: this.spaceList
       }
-      const params = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: data
-      }
       await saveCenoteRelateSpace(params, (res) => {
         this.$message.success("关联成功!")
         this.getTableHeader()
@@ -222,13 +232,9 @@ export default {
       if (params.length < 1 || this.tableData > this.copyTableData) {
         return
       }
-      let param = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: []
-      }
+      let param = []
       params.map(item => {
-        param.data.push(item.ShaftID)
+        param.push({ShaftID:item.ShaftID})
       })
       this.$confirm("此操作将删除竖井,是否继续?", "提示", {
         confirmButtonText: '确定',
@@ -289,21 +295,13 @@ export default {
     },
     formatHeaderData(list) {//格式化表头显示的数据
       let arr = tools.copyArr(list)
-      arr.map((item) => {
-        item.Visible = true
-      })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
-      let data = showTools.changeHeader(arr, readArr, this.onlyRead, false, this.allMess)
+      let data = showTools.headerTextFilter(arr, "shaft", this.onlyRead, this.showType)
       data.unshift("关联的元空间");
       return data;
     },
     formatHeaderType(list) {//格式化表头头映射的数据
       let arr = tools.copyArr(list);
-      arr.map((item) => { //缺少信息点
-        item.Visible = true
-      })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
-      let data = showTools.showHeaderTypes(arr, readArr, this.onlyRead, false, this.allMess)
+      let data = showTools.headerTypeFilter(arr, "shaft", this.onlyRead, this.showType)
       data.unshift({
         data: "SpaceCount",
         renderer: tools.num,
@@ -332,8 +330,8 @@ export default {
         afterOnCellMouseDown: this.handleTdClick //鼠标点击
       };
       this.$nextTick(() => {
-        console.log(this.$refs.table);
-        this.tableExample = this.$refs.table.init(settings);
+        console.log(this.$refs.table)
+        this.tableExample = this.$refs.table.init(settings)
       });
     },
     //获取到了正确的信息