井筒优化

vue/public/appconfig.json

@@ -1,4 +1,5 @@
 {
   "isDev": true,
-  "SSOLoginUrl": "http://www.baidu.com"
+  "SSOLoginUrl": "http://www.baidu.com",
+  "huabeiHost": "http://192.168.0.68:8077/"
 }

vue/src/components/basic/chart/chart-map.vue

@@ -31,6 +31,7 @@
 <script lang="ts">
   import {defineComponent, computed, ref} from 'vue';
   import {get} from '@/api/common';
+  import {getConfig} from "@/utils/config";
 
   export  default defineComponent ({
     props:{
@@ -49,6 +50,10 @@
     setup(props, context){
       console.log("ChartMap setup" , props, context);
       let iframeSrc = ref<string>("http://10.73.178.206:8077/a4gis/index.html");
+      getConfig().then((res: any) => {
+        iframeSrc.value = res.huabeiHost+"a4gis/index.html";
+      })
+
       let iframeRef = ref<any>();   // 和iframe标签的ref绑定
 
       const wellId = computed(() => {

vue/src/utils/config.ts

@@ -7,6 +7,7 @@ const service = axios.create({
 export interface ConfigParams {
   isDev: boolean;
   SSOLoginUrl: string;
+  huabeiHost:string;
 }
 
 export const getConfig = async <ConfigParams>(): Promise<ConfigParams> => {

vue/src/views/system/role/edit.vue

@@ -19,20 +19,13 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="用户类型" :label-col="{span:6}" name="userType" v-bind="validateInfos.userTypeID">
-            <a-select
-              ref="select"
-              v-model:value="dataModel.userTypeID"
-              :options="userTypeList"
-              :field-names="{label:'name',value:'value'}"
-              @change="loadFunctionCodeList"
-            >
-            </a-select>
+          <a-form-item label="角色说明" :label-col="{span:6}" name="description">
+            <a-input v-model:value="dataModel.description" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
-        <a-col :span="12">
+        <!--   <a-col :span="12">
           <a-form-item label="数据范围" :label-col="{span:6}" name="dataRangeID">
             <a-select
               ref="select"
@@ -43,11 +36,18 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="12">
-          <a-form-item label="角色说明" :label-col="{span:6}" name="description">
-            <a-input v-model:value="dataModel.description" placeholder=""/>
-          </a-form-item>
-        </a-col>
+             <a-col :span="12">
+           <a-form-item label="用户类型" :label-col="{span:6}" name="userType" v-bind="validateInfos.userTypeID">
+             <a-select
+               ref="select"
+               v-model:value="dataModel.userTypeID"
+               :options="userTypeList"
+               :field-names="{label:'name',value:'value'}"
+               @change="loadFunctionCodeList"
+             >
+             </a-select>
+           </a-form-item>
+         </a-col>-->
       </a-row>
       <a-divider orientation="left">角色权限</a-divider>
       <a-table :columns="columns" :data-source="treeList" :row-selection="rowSelection"
@@ -129,13 +129,7 @@ export default defineComponent({
         title: '名称',
         dataIndex: 'functionName',
         key: 'functionName',
-      },
-      {
-        title: '数据范围',
-        dataIndex: 'dataRangeID',
-        key: 'dataRangeID',
-        width: '25%',
-      },
+      }
     ];
 
     const rulesRef = reactive({
@@ -144,12 +138,6 @@ export default defineComponent({
           required: true,
           message: '请填写角色名称!',
         }
-      ],
-      userTypeID: [
-        {
-          required: true,
-          message: '请选择用户类型!',
-        }
       ]
     });
 
@@ -162,7 +150,7 @@ export default defineComponent({
       loadData(id);
       loadUserTypeList();
       loadDataRangeList();
-
+      loadFunctionCodeList();
       visible.value = true;
 
     };
@@ -194,8 +182,6 @@ export default defineComponent({
     const loadData = (id: any) => {
       get(id).then((result: any) => {
         dataModel.value = result;
-        if (dataModel.value.userTypeID)
-          loadFunctionCodeList();
       });
     }
 
@@ -212,7 +198,7 @@ export default defineComponent({
     }
 
     const loadFunctionCodeList = () => {
-      getFunctionCodeTreeList(dataModel.value.roleID, dataModel.value.userTypeID).then(data => {
+      getFunctionCodeTreeList(dataModel.value.roleID, "1").then(data => {
         treeList.value =  data;
 
         let rowDataList = treeToList(deepCopy(data));

vue/src/views/system/role/index.vue

@@ -12,19 +12,6 @@
             <a-input v-model:value="searchParamsState.name" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="6">
-          <a-form-item label="用户类型" :label-col="{span:8}" name="userTypeID">
-            <a-select
-              ref="select"
-              v-model:value="searchParamsState.userTypeID"
-              :options="userTypeList"
-              :field-names="{label:'name',value:'value'}"
-              @change="loadData"
-              :allow-clear="true"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
         <a-col :span="6" style="text-align: left">
           <a-button type="primary" html-type="submit" @click="onFinish">查询</a-button>
           <a-button style="margin: 0 8px" @click="() => {formRef.resetFields();loadData()}">重置</a-button>
@@ -93,8 +80,6 @@ export default defineComponent({
         customRender: item => `${searchParamsState.rows * (searchParamsState.page - 1) + item.index + 1}`
       },
       {title: '角色名称', dataIndex: 'name', key: 'name', width: 200},
-      {title: '用户类型', dataIndex: 'userTypeName', key: 'userTypeName', width: 120},
-      {title: '数据范围', dataIndex: 'dataRangeName', key: 'dataRangeName', width: 120},
       {title: '角色说明', dataIndex: 'description', key: 'description',},
       {title: '操作', key: 'operation', fixed: 'right', width: 150, align: "center"},
     ];

vue/src/views/wellinfo/index.vue

@@ -517,6 +517,7 @@ export default defineComponent({
         formState.project_id = ''
         subjectTrees.value.data = Object.assign(subjectTrees.value.organizationTree);
       }
+      loadData();
       getSubjectTree();
     }
     const detail = (well_id) => {
@@ -604,7 +605,7 @@ export default defineComponent({
     }
     const treeOnSelect = function (selected, selectedNodes, node) {
       console.log(selected, selectedNodes, node);
-      if (selectedNodes.node.parent != undefined) {
+      if (selectedNodes.node.parent != undefined||activeTab.value == "1") {
         if (activeTab.value == "1") {
           formState.org_id_a1 = selected.length > 0 ? selectedNodes.node.key : '';
         } else {