Merge branch 'dev_xzeq' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq

src/api/xshb/xsbk.js

@@ -58,6 +58,39 @@ export const bkxxChsp = params =>
 export const qxBackBkxx = params =>
   post(`${base.alyIP}/xsbk/qxBackBkxx`, params);
 
-  // 1.2.4.7  撤回审批
+// 1.2.4.7  撤回审批
 export const ckSp = params =>
-post(`${base.alyIP}/xsbk/ckSp`, params);
\ No newline at end of file
+  post(`${base.alyIP}/xsbk/ckSp`, params);
+
+
+// 获取列表查询条件的 模型code **
+export const getAllMxxxType = params =>
+  post(`${base.alyIP}/xsbkmx/getAllMxxxType`, params);
+
+//1.4删除布控模型
+export const deleteMx = params =>
+  post(`${base.alyIP}/xsbkmx/delete`, params);
+
+// 1.1查询所有基本模型
+export const getAllMxxx = params =>
+  post(`${base.alyIP}/xsbkmx/getAllMxxx`, params);
+
+//1.2新增布控模型
+export const save = params =>
+  postform(`${base.alyIP}/xsbkmx/save`, params);
+
+// 1.6查询布控模型详情
+export const one = params =>
+  post(`${base.alyIP}/xsbkmx/one`, params);
+
+// 1.5查询布控模型列表
+export const list = params =>
+  post(`${base.alyIP}/xsbkmx/list`, params);
+
+// 1.3修改布控模型
+export const update = params =>
+  postform(`${base.alyIP}/xsbkmx/update`, params);
+
+// 1.5查询布控模型列表
+export const getBkxxMxByXxzjbh = params =>
+  post(`${base.alyIP}/xsbk/getBkxxMxByXxzjbh`, params);
\ No newline at end of file

src/components/form.vue

@@ -472,8 +472,11 @@
                       :sendId="item.id"
                       :formData="formLabelAlign"
                       :currentItem="item"
+                      @changeAJLB="changeAJLB"
                       @getDialogSeleted="getDialogSeleted"
-                      @getDialogSeletedDw='getDialogSeletedDw'
+                      @getDialogSeletedNl="getDialogSeletedNl"
+                      @getDialogSeletedxxx="getDialogSeletedxxx"
+                      @getDialogSeletedDw="getDialogSeletedDw"
                     />
                   </div>
 
@@ -1153,7 +1156,7 @@ export default {
     ajTq(item) {
       this.$emit("ajtq", item);
     },
-    xzJsr (item) {
+    xzJsr(item) {
       this.$emit("xzJsr", item);
     },
     ajDt(item) {
@@ -1311,7 +1314,13 @@ export default {
                   if (item.type == "lazyCodeTree" || item.type == "codeTree") {
                     if (item.multiple) {
                       let str = `#${self.formLabelAlign[item.id].join("#")}`;
-                      if (item.id == "zljsdwdm" || item.id == "kyxsbshlx" || item.id == "shseSjhylydm") {
+                      if (
+                        item.id == "zljsdwdm" ||
+                        item.id == "kyxsbshlx" ||
+                        item.id == "shseSjhylydm" ||
+                        item.id == "bkmxSyfw" ||
+                        item.id == "bkmxMxCode"
+                      ) {
                         str = self.formLabelAlign[item.id].join(",");
                       }
                       params.append(objStr + item.id, str);
@@ -1331,8 +1340,18 @@ export default {
                     }
                   } else if (item.type == "setValue") {
                     if (item.multiple) {
+                      if (item.id == "mxList") {
+                        debugger;
+                        self.formLabelAlign[item.id].forEach((itemMx, indexMx) => {
+                          params.append(
+                            objStr + item.id + "[" + indexMx + "]",
+                            itemMx
+                          );
+                        });
+                      } else {
                         let str = `#${self.formLabelAlign[item.id].join("#")}`;
                         params.append(objStr + item.id, str);
+                      }
                     } else {
                       if (item.id == "jsrXm") {
                         let arr = item.codeOptions.filter(
@@ -1763,11 +1782,20 @@ export default {
       console.log(this.formLabelAlign);
     },
     getDialogSeleted(label) {
-      //  debugger
+      debugger;
       //   this.unitname = label
       //   console.log('sadasdasdasdasdasda',label);
       this.$emit("getDialogSeletesd", label);
     },
+    changeAJLB(label) {
+      this.$emit("changeAJLB", label);
+    },
+    getDialogSeletedNl(label) {
+      this.$emit("getDialogSeletedNl", label);
+    },
+    getDialogSeletedxxx(label) {
+      this.$emit("getDialogSeletedxxx", label);
+    },
     getDialogSeletedDw(label) {
       this.$emit("getDialogSeletedDw", label);
     },
@@ -2183,31 +2211,30 @@ export default {
       handler(newName, oldName) {
         var self = this;
         debugger;
-        if (newName == '1' && this.pageBs == 'shseXz') {
+        if (newName == "1" && this.pageBs == "shseXz") {
           this.rules["tldlxdm"] = this.$rules.checkEmpty;
           this.rules["zybxxs"] = this.$rules.checkEmpty;
           this.rules["fdcsqk"] = this.$rules.checkEmpty;
           this.rules["tzlxsjq"] = this.$rules.checkEmpty;
-        } else if (newName == '2' && this.pageBs == 'shseXz') {
+        } else if (newName == "2" && this.pageBs == "shseXz") {
           this.rules["whlxdm"] = this.$rules.checkEmpty;
         }
       },
       deep: true,
     },
-    'formLabelAlign.hctype': {
+    "formLabelAlign.hctype": {
       handler(newName, oldName) {
-        debugger
-        if (newName == '1') {
-          this.propFormField[0].data[2].hidden = false
-          this.propFormField[0].data[1].hidden = true
-        } else   if (newName == '2') {
-          this.propFormField[0].data[2].hidden = true
-          this.propFormField[0].data[1].hidden = false
+        debugger;
+        if (newName == "1") {
+          this.propFormField[0].data[2].hidden = false;
+          this.propFormField[0].data[1].hidden = true;
+        } else if (newName == "2") {
+          this.propFormField[0].data[2].hidden = true;
+          this.propFormField[0].data[1].hidden = false;
         }
       },
       deep: true,
     },
-
   },
   computed: {},
 };

src/components/ptCxForm_components.vue

@@ -665,6 +665,7 @@
                   pageBs != 'queryDzrygl' &&
                   pageBs != 'queryWjsdbg' &&
                   pageBs != 'queryGxqkNew' &&
+                  pageBs != 'xsbkMxgl' &&
                   pageBs != 'approvalManage'
                 "
               >
@@ -1908,6 +1909,7 @@
                   pageBs == 'queryShseTh' ||
                   pageBs == 'queryRyhxNew' ||
                   pageBs == 'queryRole' ||
+                  pageBs == 'xsbkMxgl' ||
                   pageBs == 'approvalManage'
                 )
               "
@@ -2124,6 +2126,7 @@
                 pageBs != 'queryMbxx' &&
                 pageBs != 'queryRyhxNew' &&
                 pageBs != 'queryXxtkZdry' &&
+                pageBs != 'xsbkMxgl' &&
                 pageBs != 'approvalManage'
               "
               >删除</span
@@ -4126,6 +4129,14 @@ export default {
           json[i] = self.formData[i]
             ? self.formData[i].join(",")
             : self.formData[i];
+        } else if (
+          this.pageBs == "xsbkMxgl" &&
+          (i == "bkmxSyfw" || i == "bkmxMxCode")
+        ) {
+          // debugger;
+          json[i] = self.formData[i]
+            ? self.formData[i].join(",")
+            : self.formData[i];
         } else if (i != "cxSj") {
           json[i] = self.formData[i];
         } else {

src/components/treeCode_components.vue

@@ -337,6 +337,17 @@ export default {
       } else {
         label = "";
       }
+      if (
+        val == "01" ||
+        val == "02" ||
+        val == "03" ||
+        val == "04" ||
+        val == "05"
+      ) {
+        this.$emit("getDialogSeletedNl", label);
+      } else {
+        this.$emit("getDialogSeletedxxx", label);
+      }
       this.$emit("getDialogSeleted", label);
     },
     clearSeleted() {
@@ -384,10 +395,19 @@ export default {
           thisCodeOptions.forEach((item, index) => {
             label += index == 0 ? "" + item.label : "," + item.label;
           });
+          debugger;
+          if (self.id == "bkmxSyfw") {
+            self.$emit("getDialogSeletedNl", label);
+          } else {
+            this.$emit("getDialogSeletedxxx", label);
+          }
           self.$emit("getDialogSeleted", label);
         } else {
-          debugger
-          if(self.codeTreeConfig.codeType == "CODE_UNIT" || self.codeTreeConfig.codeType == "CODE_SHCE_XXHELX" ){
+          debugger;
+          if (
+            self.codeTreeConfig.codeType == "CODE_UNIT" ||
+            self.codeTreeConfig.codeType == "CODE_SHCE_XXHELX"
+          ) {
             self.$emit("getDialogSeletedDw", thisCodeOptions[0].label);
           }
           self.$emit("getDialogSeleted", thisCodeOptions[0].label);

src/layout/menuLayout.vue

@@ -266,14 +266,14 @@ export default {
       this.$router.push(tab.name);
     },
     handleMenuOpen(key, keyPath) {
-      if(key!=this.$route.name&&key.indexOf("basicServer")==0){
-        this.$router.push("/"+key)
-      }
+      // if(key!=this.$route.name&&key.indexOf("basicServer")==0){
+      //   this.$router.push("/"+key)
+      // }
     },
     handleMenuClose(key, keyPath) {
-      if(key!=this.$route.name&&key.indexOf("basicServer")==0){
-        this.$router.push("/"+key)
-      }
+      // if(key!=this.$route.name&&key.indexOf("basicServer")==0){
+      //   this.$router.push("/"+key)
+      // }
     },
     changeSidebar(index) {
       sessionStorage.setItem("routerPath", index);

src/router/modules/commonServer.js

@@ -8,7 +8,7 @@ const menuLayouts = [
             isAdd: false,
             title: '公共管理服务'
         },
-        component: () => import("@/views/commonServer/basicServer.vue")
+        component: () => import("@/views/commonServer/basicCommonManageServer/basicServer.vue")
     },
     {
         path: "/serviceAuthorization",
@@ -17,7 +17,7 @@ const menuLayouts = [
             isAdd: false,
             title: '服务授权'
         },
-        component: () => import("@/views/commonServer/serviceAuthorization.vue")
+        component: () => import("@/views/commonServer/basicCommonManageServer/serviceAuthorization.vue")
     },
     {
         path: "/serverLogModule",
@@ -26,9 +26,17 @@ const menuLayouts = [
             isAdd: false,
             title: '服务日志'
         },
-        component: () => import("@/views/commonServer/serverLogModule.vue")
+        component: () => import("@/views/commonServer/basicCommonManageServer/serverLogModule.vue")
+    },
+    {
+        path: "/serverInstructionsManage",
+        name: "serverInstructionsManage",
+        meta: {
+            isAdd: false,
+            title: '服务说明管理'
+        },
+        component: () => import("@/views/commonServer/basicCommonManageServer/serverInstructionsManage.vue")
     },
-
     {
         path: "/basicAnlysisServer",
         name: "basicAnlysisServer",

src/router/modules/xshb.js

@@ -50,6 +50,14 @@ const menuLayouts = [
     component: () => import("@/views/xshb/xsbk/xsbksp.vue")
   },
   {
+    path: "/xsbkMxgl",
+    name: "xsbkMxgl",
+    meta: {
+      title: '布控模型管理'
+    },
+    component: () => import("@/views/xshb/xsbk/xsbkMxgl.vue")
+  },
+  {
     path: "/xsbkck",
     name: "xsbkck",
     meta: {
@@ -74,6 +82,22 @@ export default [
     component: () => import("@/views/xshb/xsbk/adjustXsbks.vue")
   },
   {
+    path: "/addBkmx",
+    name: "addBkmx",
+    meta: {
+      title: '布控模型管理'
+    },
+    component: () => import("@/views/xshb/xsbk/addBkmx.vue")
+  },
+  {
+    path: "/detailBkmx",
+    name: "detailBkmx",
+    meta: {
+      title: '布控模型管理详情'
+    },
+    component: () => import("@/views/xshb/xsbk/detailBkmx.vue")
+  },
+  {
     path: "/queryXsbkResult",
     name: "queryXsbkResult",
     meta: {
@@ -82,6 +106,14 @@ export default [
     component: () => import("@/views/xshb/xsbk/queryXsbkResult.vue")
   },
   {
+    path: "/queryXsbkResultNew",
+    name: "queryXsbkResultNew",
+    meta: {
+      title: '我发起的线索布控结果查询'
+    },
+    component: () => import("@/views/xshb/xsbk/queryXsbkResultNew.vue")
+  },
+  {
     path: "/detailXsbks",
     name: "detailXsbks",
     meta: {

src/views/ajzcgzxnpg/ajzcgzxnpg.vue

@@ -456,49 +456,49 @@ export default {
         //     },
         //   ],
         // },
-        // {
-        //   id: "qbxakcltj",
-        //   label: "现场勘查工作效能评估",
-        //   index: "qbxakcltj",
-        //   auth: "M0101",
-        //   className: "iconfont icongongnengfuwu",
-        //   disabled: false,
-        //   hasChildren: true,
-        //   children: [
-        //     {
-        //       id: "qbxakcltj",
-        //       label: "现场勘查工作效能评估",
-        //       index: "qbxakcltj",
-        //       auth: "M0101",
-        //       className: "iconfont iconrizhi",
-        //       disabled: false,
-        //     },
-        //     {
-        //       id: "xczlzl",
-        //       label: "现场资料质量",
-        //       index: "xczlzl",
-        //       auth: "M0102",
-        //       className: "iconfont icongongnengfuwu",
-        //       disabled: false,
-        //     },
-        //     {
-        //       id: "tqhjwzqk",
-        //       label: "提取痕迹物证情况",
-        //       index: "tqhjwzqk",
-        //       auth: "M0103",
-        //       className: "iconfont iconfangwen",
-        //       disabled: false,
-        //     },
-        //     {
-        //       id: "hjwzgzgl",
-        //       label: "痕迹物证规则管理",
-        //       index: "hjwzgzgl",
-        //       auth: "M0103",
-        //       className: "iconfont iconfangwen",
-        //       disabled: false,
-        //     },
-        //   ],
-        // },
+        {
+          id: "qbxakcltj",
+          label: "现场勘查工作效能评估",
+          index: "qbxakcltj",
+          auth: "M0101",
+          className: "iconfont icongongnengfuwu",
+          disabled: false,
+          hasChildren: true,
+          children: [
+            {
+              id: "qbxakcltj",
+              label: "现场勘查工作效能评估",
+              index: "qbxakcltj",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "xczlzl",
+              label: "现场资料质量",
+              index: "xczlzl",
+              auth: "M0102",
+              className: "iconfont icongongnengfuwu",
+              disabled: false,
+            },
+            {
+              id: "tqhjwzqk",
+              label: "提取痕迹物证情况",
+              index: "tqhjwzqk",
+              auth: "M0103",
+              className: "iconfont iconfangwen",
+              disabled: false,
+            },
+            {
+              id: "hjwzgzgl",
+              label: "痕迹物证规则管理",
+              index: "hjwzgzgl",
+              auth: "M0103",
+              className: "iconfont iconfangwen",
+              disabled: false,
+            },
+          ],
+        },
         {
           id: "zdgzxnpg",
           label: "阵地控制工作效能评估",

src/views/commonServer/basicServer.vue → src/views/commonServer/basicCommonManageServer/basicServer.vue

@@ -111,7 +111,7 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="addServerDialog = false">关闭</el-button>
+        <el-button size="small" @click="addServerCancel">关闭</el-button>
         <el-button size="small" type="primary" @click="addServer">确定</el-button>
       </div>
     </el-dialog>
@@ -830,6 +830,7 @@ export default {
     addServerCancel() {
       this.dialogName = "新增服务";
       this.dialogType = "add";
+      this.serverAddData.id = '';
       this.serverAddData.serverName = '';
       this.serverAddData.serverStatus = '1';
       this.serverAddData.serverType = '2';

src/views/commonServer/basicCommonManageServer/serverInstructionsManage.vue

+<template>
+  <div class="Content">
+    <div class="Content paneDiv paneDiv2">
+      <div class="cxtjWrap">
+        <el-row>
+          <el-col :span="24">
+            <span class="flTtitle">查询条件</span>
+          </el-col>
+        </el-row>
+
+        <div class="input-wrapper" style="height: 50px">
+          <el-form ref="form" label-width="90px">
+            <el-col :span="5">
+              <el-form-item label="服务名称：" style="text-align: left;">
+                <el-input v-model="search.serverName" placeholder="请输入服务名称" style="width:100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4">
+              <el-button-group>
+                <el-button size="mini" type="primary" icon="el-icon-search" @click="dataSearch">查询</el-button>
+                <el-button size="mini" icon="el-icon-minus" @click="reset">重置</el-button>
+              </el-button-group>
+            </el-col>
+          </el-form>
+        </div>
+      </div>
+    </div>
+
+    <div class="Content paneDiv paneDiv2">
+      <span class="flTtitle">信息列表</span>
+      <span class="flTotal">共{{ pagination.listTotal }}条信息</span>
+
+      <el-table :data="tableData" v-loading="tableLoading" stripe element-loading-spinner="el-icon-loading">
+        <el-table-column label="序号" type="index" width="75" align="center"></el-table-column>
+        <el-table-column label="服务名称" prop="serverName" align="center"></el-table-column>
+        <el-table-column label="上级服务名称" prop="parentName" align="center"></el-table-column>
+        <el-table-column label="说明文档名称" prop="serverInstructionsName" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" title="点击下载" @click="fileDownLoad(scope.row)">{{ scope.row.fileName }}</el-button>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="说明文档地址" prop="serverInstructionsPath" align="center">
+        </el-table-column>
+
+        <el-table-column label="操作" align="center" width="250">
+          <template slot-scope="scope">
+            <el-button-group>
+              <el-button size="mini" @click="approvalAuthority(scope.$index, scope.row,1)">编辑
+              </el-button>
+              <el-button size="mini" type="primary" @click="approvalAuthority(scope.$index, scope.row,0)">上传
+              </el-button>
+            </el-button-group>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="pagination.currentPage"
+          :page-sizes="pagination.pageSizes"
+          :page-size="pagination.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="pagination.listTotal"
+      >
+      </el-pagination>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {getApprovalList} from "@/api/commonServer.js";
+import axios from "@/utils/http.js";
+import base from "@/api/base";
+
+export default {
+  name: "serverInstructionsManage",
+  data() {
+    return {
+      header: "公共服务管理中心",
+      pageBs: "serverInstructionsManage",
+      tableLoading: false,
+      tableData: [],
+      search: {
+        serverName: '',
+        limit: '10',
+        currentPage: '1'
+      },
+
+      pagination: {
+        listTotal: 0,
+        pageSizes: [10, 15, 20],
+        pageSize: 10,
+        currentPage: 1,
+      },
+      Menu: [
+        {
+          id: "serverInstructionsManage",
+          label: "服务说明管理",
+          index: "serverInstructionsManage",
+          auth: "M0101",
+          className: "iconfont iconrizhi",
+          disabled: false,
+        },
+      ],
+      isPremission: false,
+      isAdmin: false,
+    };
+  },
+  created() {
+    this.$store.commit("user/SET_Menu", this.Menu);
+    this.$store.commit("user/SET_Header", this.header);
+    this.isPremission = JSON.parse(sessionStorage.getItem("userInfo"))
+        .permission.split(",")
+        .findIndex((item) => item == "A0000");
+    this.isAdmin = JSON.parse(sessionStorage.getItem("userInfo")).permission == "admin";
+    this.dataSearch();
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.search.limit = val;
+    },
+    handleCurrentChange(val) {
+      this.pagination.currentPage = val;
+      this.search.currentPage = val;
+      this.dataSearch();
+    },
+
+    dataSearch() {
+      this.tableLoading = true;
+      getApprovalList(this.search).then((res) => {
+
+        if (res.code == 200) {
+          this.pagination.listTotal = res.data.totalCount;
+          this.tableData = res.data.records;
+        }
+        this.tableLoading = false;
+      })
+
+    },
+
+    reset() {
+      this.search.serverName = "";
+      this.search.limit = this.pagination.pageSize;
+      this.search.currentPage = this.pagination.currentPage;
+    },
+
+    approvalAuthority(index, row, status) {
+
+    },
+    fileDownLoad(row) {
+      let formData = new FormData();
+      formData.append("filePath", row.filePath);
+      formData.append("fileName", row.fileName);
+      formData.append("fileType", "approvalFile");
+
+      axios.post(`${base.alyIP}/commonServer/fileDownLoad`, formData, {responseType: "blob"}).then(res => {
+        if (res.size > 0) {
+          let urlData = window.URL.createObjectURL(new Blob([res]));
+          let a = document.createElement('a')
+          if ("download" in a) {
+            a.style.display = 'none'
+            a.href = urlData
+            a.setAttribute('download', row.fileName)
+            document.body.appendChild(a);
+            //点击下载
+            a.click()
+            // 下载完成移除元素
+            document.body.removeChild(a);
+            window.URL.revokeObjectURL(urlData);
+          } else {
+            navigator.msSaveOrOpenBlob(new Blob([res]), row.fileName)
+          }
+        } else {
+          this.$message.error("文件可能已移动至其他位置，下载失败");
+          return;
+        }
+      })
+    }
+  },
+};
+</script>
+<style>
+
+.rightContent .el-input__inner,
+#formCommonPage .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  font-family: inherit;
+}
+
+.el-table__header-wrapper th,
+.el-table__header-wrapper tr {
+  background: #f4f6f7;
+}
+
+.rightContent .el-input__icon,
+#formCommonPage .el-input__icon,
+.el-input__suffix-inner {
+  line-height: 36px;
+}
+
+.rightContent .el-range-separator {
+  position: relative;
+  top: -4px;
+}
+
+.rightContent .el-textarea__inner,
+#formCommonPage .el-textarea__inner {
+  width: 100%;
+  font-family: inherit;
+}
+
+.rightContent .el-range-input,
+#formCommonPage .el-range-input {
+  vertical-align: top;
+}
+
+.rightContent .el-date-editor .el-range__close-icon {
+  margin-top: -4px;
+}
+
+.rightContent .el-form-item__error {
+  left: calc(66% - 27px);
+  top: 12px;
+}
+
+.success-row {
+  background-color: #fbf9f4 !important;
+}
+
+.Content .el-input,
+.Content .el-date-editor--daterange.el-input__inner {
+  width: 100% !important;
+}
+</style>
+<style scoped lang="scss">
+@import "@/assets/styles/rightContent.scss";
+
+.hbyps {
+  width: 64px;
+  height: 24px;
+  margin-right: 10px;
+  background: #ffffff;
+  border: 1px solid #007aff;
+  opacity: 1;
+  border-radius: 4px;
+  text-align: center;
+  align-items: center;
+  display: inline-block;
+  font-size: 12px !important;
+  font-weight: 400 !important;
+  color: #007aff !important;
+  cursor: pointer;
+}
+
+/deep/ .el-dialog {
+  max-height: unset;
+  overflow: auto;
+
+  .el-dialog__body {
+    height: 200px;
+  }
+}
+
+.input-wrapper {
+  .el-input {
+    max-width: 200px;
+    width: 150px;
+  }
+
+  .el-select {
+    max-width: 200px;
+    width: 150px
+  }
+
+  .el-range-editor {
+    width: 250px;
+
+    .el-range-input {
+    }
+
+    .el-range-separator {
+      width: 25px;
+    }
+  }
+
+  .w50 {
+    width: 50px;
+
+    .el-input {
+      width: 50px;
+    }
+  }
+
+  .w100 {
+    width: 100px;
+
+    .el-input {
+      width: 100px;
+    }
+  }
+
+  .w200 {
+    width: 200px;
+
+    .el-input {
+      width: 200px;
+    }
+  }
+
+  .w300 {
+    width: 300px;
+
+    .el-input {
+      width: 300px;
+    }
+  }
+}
+
+</style>

src/views/commonServer/serverLogModule.vue → src/views/commonServer/basicCommonManageServer/serverLogModule.vue

@@ -114,7 +114,7 @@ export default {
   name: "serverLogModule",
   data() {
     return {
-      header: "服务日志",
+      header: "公共服务管理中心",
       pageBs: "serverLogModule",
       tableLoading: false,
       tableData: [],

src/views/commonServer/serviceAuthorization.vue → src/views/commonServer/basicCommonManageServer/serviceAuthorization.vue

@@ -126,7 +126,7 @@ export default {
   name: "serviceAuthorization",
   data() {
     return {
-      header: "服务授权",
+      header: "公共服务管理中心",
       pageBs: "serviceAuthorization",
       tableLoading: false,
       tableData: [],
@@ -216,6 +216,7 @@ export default {
       let formData = new FormData();
       formData.append("filePath", row.filePath);
       formData.append("fileName", row.fileName);
+      formData.append("fileType","approvalFile");
 
       axios.post(`${base.alyIP}/commonServer/fileDownLoad`, formData, {responseType: "blob"}).then(res => {
         if (res.size > 0) {

src/views/xshb/xsbk/adjustXsbks.vue

@@ -20,7 +20,13 @@
 
 <script>
 import formCompontent from "@c/form.vue";
-import { addBkxx, updateBkxx, getBkxxByXxzjbh } from "@/api/xshb/xsbk.js";
+import {
+  addBkxx,
+  updateBkxx,
+  getBkxxByXxzjbh,
+  list,
+  getBkxxMxByXxzjbh,
+} from "@/api/xshb/xsbk.js";
 export default {
   name: "adjustXsbks",
   components: {
@@ -69,7 +75,17 @@ export default {
               placeholder: "请输入",
               col: "2",
             },
-
+            {
+              name: "布控模型:",
+              id: "mxList",
+              type: "setValue",
+              codeOptions: [],
+              prop: "checkEmpty",
+              value: "",
+              placeholder: "请输入",
+              multiple: true,
+              col: "2",
+            },
             {
               name: "布控开始时间:",
               id: "bksjKssj",
@@ -160,9 +176,30 @@ export default {
         },
       ],
       xxzjbh: "", //信息主键编号
+      xxzjbhList: [],
     };
   },
   methods: {
+    listList(bkmxSyfwOld) {
+      list({
+        bkmxSyfw: bkmxSyfwOld,
+      }).then((res) => {
+        if (res.code == 200) {
+          let setValueList = [];
+          res.data.rows.forEach((item) => {
+            setValueList.push({
+              label: item.bkmxName,
+              value: item.xxzjbh,
+            });
+          });
+          this.propFormField[0].data.forEach((itemType) => {
+            if (itemType.type == "setValue" && itemType.id == "mxList") {
+              this.$set(itemType, "codeOptions", setValueList);
+            }
+          });
+        }
+      });
+    },
     //保存修改或新增
     submit(params) {
       console.log(params);
@@ -272,6 +309,15 @@ export default {
     },
     //修改保存
     editSubmit(params, loading) {
+      debugger
+      let isEqualN = JSON.stringify(this.xxzjbhList) === JSON.stringify( this.formLabelAlign.mxList);
+      let sfxgmx = ''
+      if (isEqualN) {
+        sfxgmx = '0'
+      } else {
+        sfxgmx = '1'
+      }
+      params.append("sfxgmx", sfxgmx);
       params.append("xxzjbh", this.xxzjbh);
       updateBkxx(params).then((res) => {
         if (res.success && res.code == 200) {
@@ -304,6 +350,18 @@ export default {
 
       return "";
     },
+    getBkxxMxByXxzjbhList() {
+      getBkxxMxByXxzjbh({
+        xxzjbh: this.xxzjbh,
+      }).then((res) => {
+        if (res.success && res.code == 200) {
+          res.data.rows.forEach((item) => {
+           this.formLabelAlign.mxList.push(item.xxzjbh)
+           this.xxzjbhList.push(item.xxzjbh)
+          });
+        }
+      });
+    },
     //修改前获取详情
     getshuju() {
       var self = this;
@@ -344,6 +402,7 @@ export default {
             });
           }
         });
+        self.getBkxxMxByXxzjbhList()
         self.$forceUpdate();
         setTimeout(() => {
           loading.close();
@@ -352,6 +411,7 @@ export default {
     },
   },
   created() {
+    // this.listList();
     if (this.$route.query.xxzjbh) {
       this.title = "修改我发起的线索布控信息";
       this.xxzjbh = this.$route.query.xxzjbh;
@@ -383,6 +443,15 @@ export default {
       this.$set(this.formLabelAlign, "bkdxHm", jmsrt.bkdxHm);
     }
   },
+  watch: {
+    'formLabelAlign.bkdxLxdm': {
+      handler(newVal,oldVal) {
+        this.listList(newVal)
+        debugger
+      },
+      deep:true
+    }
+  },
 };
 </script>
 

src/views/xshb/xsbk/detailBkmx.vue

+<!--
+ * @Author: your name
+ * @Date: 2021-11-25 14:13:42
+ * @LastEditTime: 2021-11-30 17:57:44
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \founder_vue\src\views\xshb\xshb\detailXsbks.vue
+-->
+<template>
+  <div class="Content" id="xsbkDetail">
+    <right-content
+      :cxQueryField="cxQueryField"
+      :pageObject="pageObject"
+      :pageFooterProps="pageFooterProps"
+      labelWidth="110px"
+      title="布控模板详情"
+    >
+    </right-content>
+  </div>
+</template>
+
+<script>
+import rightContent from "@c/PersonInfor.vue";
+import { one } from "@/api/xshb/xsbk.js";
+export default {
+  name: "detailXsbks",
+  components: {
+    rightContent,
+  },
+  data() {
+    return {
+      cxQueryField: [
+        {
+          title: "", //如果不分小模块就删除title
+          id: 1,
+          objStr: "", //对象中的对应字段
+          data: [
+            // {
+            //   label: "线索编号:",
+            //   prop: "xsbh",
+            //   col: "3",
+            // },
+            {
+              label: "布控模型名称:",
+              prop: "bkmxName",
+              col: "3",
+            },
+            {
+              label: "布控模型描述:",
+              prop: "bkmxMs",
+              col: "10",
+            },
+            {
+              label: "基本模型名称:",
+              prop: "bkmxMxTxt",
+              col: "3",
+            },
+            {
+              label: "适用范围:",
+              prop: "bkmxSyfwTxt",
+              col: "3",
+            },
+        
+          ],
+        },
+      ],
+      pageFooterProps: [],
+      pageObject: {},
+      xxzjbh: "",
+    };
+  },
+  mounted() {},
+  methods: {
+    //获取详情
+    getInfor() {
+      let loading = this.$loading({
+        lock: true,
+        text: "正在加载...",
+        spinner: "el-icon-loading",
+        background: "rgba(255, 255, 255, 0.7)",
+      });
+      one({
+        xxzjbh: this.xxzjbh,
+      }).then((res) => {
+        if (res.success && res.code == 200) {
+          this.pageObject = res.data.bkmx;
+          loading.close();
+        } else {
+          loading.close();
+        }
+      });
+    },
+  },
+  created() {
+    this.xxzjbh = this.$route.query.xxzjbh;
+    this.getInfor();
+  },
+};
+</script>
+<style scoped lang="scss">
+/deep/.rightContent[data-v-527581af] {
+  flex: 1;
+  height: 100%;
+  // width: 100%;
+  margin: 0 auto;
+  overflow-y: auto;
+}
+</style>

src/views/xshb/xsbk/detailXsbks.vue

@@ -21,7 +21,7 @@
 
 <script>
 import rightContent from "@c/PersonInfor.vue";
-import { getBkxxByXxzjbh } from "@/api/xshb/xsbk.js";
+import { getBkxxByXxzjbh, getBkxxMxByXxzjbh } from "@/api/xshb/xsbk.js";
 export default {
   name: "detailXsbks",
   components: {
@@ -181,6 +181,54 @@ export default {
             },
           ],
         },
+        {
+          title: "布控模型详情", //如果不分小模块就删除title
+          id: 4,
+          objStr: "mxList", //对象中的对应字段
+          applyType: "list",
+          data: [
+            {
+              label: "信息主键编号:",
+              prop: "xxzjbh",
+              col: "10",
+            },
+            {
+              label: "模型名称:",
+              prop: "bkmxName",
+              col: "10",
+            },
+            {
+              label: "模型描述:",
+              prop: "bkmxMs",
+              col: "10",
+            },
+            {
+              label: "基本模型:",
+              prop: "bkmxMxTxt",
+              col: "10",
+            },
+            {
+              label: "适用范围:",
+              prop: "bkmxSyfwTxt",
+              col: "10",
+            },
+            {
+              label: "登记单位:",
+              prop: "xxdjdwGajgmc",
+              col: "3",
+            },
+            {
+              label: "登记人员:",
+              prop: "xxdjryXm",
+              col: "3",
+            },
+            {
+              label: "登记时间:",
+              prop: "djsj",
+              col: "3",
+            },
+          ],
+        },
       ],
       pageFooterProps: [],
       pageObject: {},
@@ -201,13 +249,26 @@ export default {
         xxzjbh: this.xxzjbh,
       }).then((res) => {
         if (res.success && res.code == 200) {
+          debugger;
           this.pageObject = res.data.bkxx;
+          this.getBkxxMxByXxzjbhList();
           loading.close();
         } else {
           loading.close();
         }
       });
     },
+    getBkxxMxByXxzjbhList() {
+      getBkxxMxByXxzjbh({
+        xxzjbh: this.xxzjbh,
+      }).then((res) => {
+        if (res.success && res.code == 200) {
+          res.data.rows.forEach((item) => {
+            this.pageObject.mxList.push(item);
+          });
+        }
+      });
+    },
   },
   created() {
     this.xxzjbh = this.$route.query.xxzjbh;

src/views/xshb/xsbk/xsbk.vue

@@ -17,25 +17,19 @@
       </template>
       <template #btnGroup="scope">
         <span
-          v-if="
-            scope.scope.row.bkzt == '01'
-          "
+          v-if="scope.scope.row.bkzt == '01'"
           class="hbyp"
           @click="edit(scope.scope)"
           >修改</span
         >
         <span
-          v-if="
-            scope.scope.row.bkzt == '01'
-          "
+          v-if="scope.scope.row.bkzt == '01'"
           class="hbyp"
           @click="dele(scope.scope)"
           >删除</span
         >
         <span
-          v-if="
-            scope.scope.row.bkzt == '03'
-          "
+          v-if="scope.scope.row.bkzt == '03'"
           class="hbyp"
           @click="toCk(scope.scope)"
           >撤控</span
@@ -54,16 +48,16 @@
         > -->
         <span
           v-if="
-            scope.scope.row.sfybkjg == '1'
+            scope.scope.row.bkzt == '03' ||
+            scope.scope.row.bkzt == '04' ||
+            scope.scope.row.bkzt == '05'
           "
           class="hbyp"
           @click="toJGCX(scope.scope)"
           >结果查询</span
         >
         <span
-          v-if="
-            scope.scope.row.bkzt == '01'
-          "
+          v-if="scope.scope.row.bkzt == '01'"
           class="hbyp"
           @click="tqsp(scope.scope)"
           >提请审批</span
@@ -124,6 +118,7 @@ export default {
         sqrXm: "",
         djsjStart: "",
         djsjEnd: "",
+        queryType: 'myBkxx',
       },
       cxQueryField: [
         {
@@ -259,6 +254,14 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
+        {
+          id: "xsbkMxgl",
+          label: "布控模型管理",
+          index: "xsbkMxgl",
+          auth: "M01",
+          className: "iconfont icongongnengfuwu",
+          hasChildren: false,
+        },
       ],
       selectArr: [],
       ckForm: {
@@ -447,10 +450,11 @@ export default {
     toJGCX(scope) {
       debugger;
       this.$router.pushToTab({
-        path: "/queryXsbkResult",
+        path: "/queryXsbkResultNew",
         query: {
           xxzjbh: scope.row.xxzjbh,
-          type: scope.row.bkdxLxdm,
+          bkdxLxdm: scope.row.bkdxLxdm,
+          bkdxHm: scope.row.bkdxHm,
         },
       });
     },

src/views/xshb/xsbk/xsbkMxgl.vue

+<template>
+  <div class="Content">
+    <right-content
+      :pageBs="pageBs"
+      :header="header"
+      :cxFormData="cxFormData"
+      :cxQueryField="cxQueryField"
+      :cxDefaultFormThead="cxDefaultFormThead"
+      @toInfor="toInfor"
+      :cxUrl="cxUrl"
+      ref="rightContent"
+    >
+      <template #listOperation="scope">
+        <span class="hbyps" @click="add(scope.scope)">
+          <i class="el-icon-plus"></i>新增</span
+        >
+      </template>
+      <template #btnGroup="scope">
+        <span class="hbyp" @click="edit(scope.scope)">修改</span>
+        <span class="hbyp" @click="dele(scope.scope)">删除</span>
+      </template>
+    </right-content>
+  </div>
+</template>
+
+<script>
+import rightContent from "@c/ptCxForm_components.vue";
+import { getAllMxxxType, deleteMx } from "@/api/xshb/xsbk.js";
+export default {
+  name: "xsbk",
+  components: {
+    rightContent,
+  },
+  data() {
+    return {
+      header: "线索布控",
+      pageBs: "xsbkMxgl",
+      cxFormData: {
+        limit: 10,
+        page: 1,
+        bkmxName: "",
+        bkmxMxCode: [],
+        bkmxSyfw: [],
+      },
+      cxQueryField: [
+        {
+          name: "布控模型名称",
+          id: "bkmxName",
+          type: "text",
+          value: "",
+          placeholder: "请输入",
+          col: "3",
+        },
+        {
+          name: "基本模型",
+          id: "bkmxMxCode",
+          type: "codeTreeDialog",
+          value: "",
+          placeholder: "请选择",
+          col: "3",
+          codeOptions: [],
+          multiple: true,
+        },
+        {
+          name: "适用范围",
+          id: "bkmxSyfw",
+          type: "codeTreeDialog",
+          props: [], //字典弹框需要的字段
+          value: "",
+          col: "3",
+          codeOptions: [],
+          codeTree: "CODE_BKLXDM",
+          multiple: true,
+        },
+      ],
+      cxDefaultFormThead: [
+        {
+          label: "信息主键编号",
+          toInfor: true,
+          prop: "xxzjbh",
+          width: "250",
+        },
+
+        {
+          label: "布控模型名称",
+          prop: "bkmxName",
+        },
+        {
+          label: "布控模型描述",
+          prop: "bkmxMs",
+        },
+        {
+          label: "基本模型名称",
+          prop: "bkmxMxTxt",
+        },
+        {
+          label: "适用范围",
+          prop: "bkmxSyfwTxt",
+        },
+      ],
+      cxUrl: "/xsbkmx/list",
+      Menu: [
+        {
+          id: "xsbkMxgl",
+          label: "布控模型管理",
+          index: "xsbkMxgl",
+          auth: "M0101",
+          className: "iconfont iconrizhi",
+          disabled: false,
+        },
+      ],
+    };
+  },
+  created() {
+    this.$store.commit("user/SET_Menu", this.Menu);
+  },
+  methods: {
+    // 获取列表查询条件 模型的code
+    getAllMxxxTypeList() {
+      getAllMxxxType().then((res) => {
+        if (res.code == 200) {
+          let selectlist = [];
+          res.data.rows.forEach((item) => {
+            selectlist.push({
+              label: item.name,
+              id: item.code,
+            });
+          });
+          this.cxQueryField.forEach((itemType) => {
+            if (itemType.type == "codeTreeDialog" && itemType.id == 'bkmxMxCode') {
+              this.$set(itemType, "codeOptions", selectlist );
+            }
+          });
+        }
+      });
+    },
+    /**
+     * @description 新增
+     */
+    add() {
+      this.$router.pushToTab("addBkmx");
+    },
+    /**
+     * @description 详情
+     */
+    toInfor(row) {
+      this.$router.pushToTab({
+        path: "/detailBkmx",
+        query: {
+          xxzjbh: row.xxzjbh,
+        },
+      });
+    },
+    /**
+     * @description 修改
+     */
+    edit(scope) {
+      debugger;
+      this.$router.pushToTab({
+        path: "/addBkmx",
+        query: {
+          xxzjbh: scope.row.xxzjbh,
+        },
+      });
+    },
+    // 删除
+    dele(scope) {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteMx({
+            xxzjbh: scope.row.xxzjbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功",
+              });
+              this.$refs.rightContent.doQuery("yes");
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+  },
+  watch: {},
+  mounted() {
+    this.getAllMxxxTypeList(); // 获取查询条件的 模型code
+  },
+};
+</script>
+<style>
+.el-dialog__body {
+  padding: 10px 15px !important;
+}
+.rightContent .el-input__inner,
+#formCommonPage .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  font-family: inherit;
+}
+.el-table__header-wrapper th,
+.el-table__header-wrapper tr {
+  background: #f4f6f7;
+}
+.rightContent .el-input__icon,
+#formCommonPage .el-input__icon,
+.el-input__suffix-inner {
+  line-height: 36px;
+}
+.rightContent .el-range-separator {
+  position: relative;
+  top: -4px;
+}
+.rightContent .el-textarea__inner,
+#formCommonPage .el-textarea__inner {
+  width: 100%;
+  font-family: inherit;
+}
+.rightContent .el-range-input,
+#formCommonPage .el-range-input {
+  vertical-align: top;
+}
+.rightContent .el-date-editor .el-range__close-icon {
+  margin-top: -4px;
+}
+.rightContent .el-form-item__error {
+  left: calc(66% - 27px);
+  top: 12px;
+}
+.success-row {
+  background-color: #fbf9f4 !important;
+}
+.Content .el-input,
+.Content .el-date-editor--daterange.el-input__inner {
+  width: 100% !important;
+}
+</style>
+<style scoped lang="scss">
+.el-form-item {
+  margin: 15px 0 20px 0;
+}
+.red {
+  color: red;
+}
+.black {
+  color: black;
+}
+@import "@/assets/styles/rightContent.scss";
+.hbyp {
+  font-size: 14px;
+  font-family: Source Han Sans CN;
+  font-weight: 400;
+  line-height: 22px;
+  color: #007aff;
+  margin-right: 16px;
+  cursor: pointer;
+}
+.hbyps {
+  width: 64px;
+  height: 24px;
+  background: #ffffff;
+  border: 1px solid #007aff;
+  opacity: 1;
+  border-radius: 4px;
+  text-align: center;
+  align-items: center;
+  display: inline-block;
+  font-size: 12px !important;
+  font-weight: 400 !important;
+  color: #007aff !important;
+  cursor: pointer;
+}
+</style>