修改可研可侦

src/components/ptCxForm_components.vue

@@ -2383,6 +2383,38 @@
                   v-if="scope.row.zhzt == '0'">未追回</span>
           </template>
         </el-table-column>
+        <el-table-column v-if="pageBs == 'queryZw'"
+                         align="center"
+                         width="200"
+                         label="状态">
+          <template slot-scope="scope">
+            <div>
+              <div class="rwgl_s">
+                <span v-if="scope.row.zzhwkbh != ''"
+                      class="s_stop">可研</span>
+                <span v-if="scope.row.xyrZjhm != ''"
+                      class="s_runn">可侦</span>
+              </div>
+
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="pageBs=='queryDna'"
+                         align="center"
+                         width="200"
+                         label="状态">
+          <template slot-scope="scope">
+            <div>
+
+              <div class="rwgl_s">
+                <span v-if="scope.row.bzajXkbh != ''"
+                      class="s_stop">可研</span>
+                <span v-if="scope.row.bzrySfzh != ''"
+                      class="s_runn">可侦</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
       <el-table id="ajzbQuery"
                 v-loading="tableLoading"
@@ -5217,7 +5249,7 @@ export default {
       deep: true,
     },
     "cxFormData.xslx": {
-      handler(val, old) {
+      handler (val, old) {
         debugger;
         if (val != old) {
           this.doQuery("yes");
@@ -5487,4 +5519,18 @@ export default {
 ::v-deep .new-image img {
   width: 100px;
 }
+.rwgl_s span {
+  display: inline-block;
+  padding: 2px 4px;
+  border-radius: 5px;
+}
+.rwgl_s .s_stop {
+  background: #888;
+  color: #000;
+  margin-right: 8px;
+}
+.rwgl_s .s_runn {
+  color: #fff;
+  background: green;
+}
 </style>

src/views/xnpg/DNAbdxx/dnabdxx.vue

 <template>
   <div class="Content">
-    <right-content
-      :pageBs="pageBs"
-      :header="header"
-      :cxFormData="cxFormData"
-      :cxQueryField="cxQueryField"
-      :cxDefaultFormThead="cxDefaultFormThead"
-      :cxUrl="cxUrl"
-      ref="rightContent"
-    ></right-content>
+    <right-content :pageBs="pageBs"
+                   :header="header"
+                   :cxFormData="cxFormData"
+                   :cxQueryField="cxQueryField"
+                   :cxDefaultFormThead="cxDefaultFormThead"
+                   :cxUrl="cxUrl"
+                   ref="rightContent"></right-content>
   </div>
 </template>
 
@@ -21,7 +19,7 @@ export default {
     rightContent,
     SelectTreeDialog,
   },
-  data() {
+  data () {
     return {
       examineInfo: {},
       header: "DNA比中信息", //头部标题 (模块第一个页面需要)
@@ -164,6 +162,7 @@ export default {
           label: "比中时间",
           prop: "bzsj",
         },
+
       ],
       cxUrl: "/xsjsbd/getDnabzList", //列表查询接口
       Menu: [
@@ -179,16 +178,16 @@ export default {
       ],
     };
   },
-  created() {
+  created () {
     // this.$store.commit("user/SET_Menu", this.Menu);
     // this.$store.commit("user/SET_LeftMenu", this.leftMenus);
     // this.$store.commit("user/SET_Header", this.header);
   },
-  mounted() {
+  mounted () {
     // this.hqzd();
   },
   methods: {
-    hqzd() {
+    hqzd () {
       let self = this;
       axios
         .get(`JsonData/${this.lkobj.codeTree}.json`)

src/views/xnpg/zwbdxx/zwbdxx.vue

 <template>
   <div class="Content">
-    <right-content
-      :pageBs="pageBs"
-      :header="header"
-      :cxFormData="cxFormData"
-      :cxQueryField="cxQueryField"
-      :cxDefaultFormThead="cxDefaultFormThead"
-      :cxUrl="cxUrl"
-      ref="rightContent"
-    ></right-content>
+    <right-content :pageBs="pageBs"
+                   :header="header"
+                   :cxFormData="cxFormData"
+                   :cxQueryField="cxQueryField"
+                   :cxDefaultFormThead="cxDefaultFormThead"
+                   :cxUrl="cxUrl"
+                   ref="rightContent"></right-content>
   </div>
 </template>
 
@@ -21,7 +19,7 @@ export default {
     rightContent,
     SelectTreeDialog,
   },
-  data() {
+  data () {
     return {
       examineInfo: {},
       header: "指纹比中信息", //头部标题 (模块第一个页面需要)
@@ -142,6 +140,7 @@ export default {
           label: "比中时间",
           prop: "bzsj",
         },
+
       ],
       cxUrl: "/xsjsbd/getZwbzList", //列表查询接口
       Menu: [
@@ -164,14 +163,14 @@ export default {
       ],
     };
   },
-  created() {
+  created () {
     this.$store.commit("user/SET_Menu", this.Menu);
   },
-  mounted() {
+  mounted () {
     // this.hqzd();
   },
   methods: {
-    hqzd() {
+    hqzd () {
       let self = this;
       axios
         .get(`JsonData/${this.lkobj.codeTree}.json`)

vue.config.js

@@ -58,7 +58,7 @@ module.exports = {
     },
     proxy: {
       "/apialy": {
-        target: "http://192.168.1.110:8762",  //西藏: https://155.1.33.10:20010/   阿里云：http://39.99.155.173:9022
+        target: "http://39.99.155.173:9022",  //西藏: https://155.1.33.10:20010/   阿里云：http://39.99.155.173:9022
         // ws: true, 
         changeOrigin: true,
         secure: false,