Merge remote-tracking branch 'origin/master'

itdmWeb/src/api/api.js

@@ -80,7 +80,7 @@ const delBaojing = (params)=>deleteAction("/itdm/voice/delete",params);
 // 大屏设备维护密码验证
 const confirmPa = (params)=>getAction("/itdmMima/itdmMima/panduan",params);
 // 折线图初始化
-const listGraph = (params)=>getAction("/second/screen/chushihua/{id}",params);
+const listGraph = (params)=>getAction("/second/screen/chushihua",params);
 // 首页数据
 const listBdc = (params)=>getAction("/itdmFirstPage/getFrstPageTaskNum",params);
 // 首页列表

itdmWeb/src/components/menu/Contextmenu.vue

@@ -43,6 +43,9 @@ export default {
   },
   methods: {
     closeMenu (e) {
+      if(e.target.href && e.target.href.indexOf( 'itdmScreen' )>0){
+        window.open(e.target.href, '_blank')
+      }
       if (this.visible === true && ['menuitemicon', 'menuitem'].indexOf(e.target.getAttribute('role')) < 0) {
         this.$emit('update:visible', false)
       }

itdmWeb/src/views/dashboard/Analysis.vue

@@ -3,14 +3,14 @@
     <index-chart v-if="indexStyle==1"></index-chart>
     <index-bdc v-if="indexStyle==2"></index-bdc>
     <index-task v-if="indexStyle==3"></index-task>
-    <div style="width: 100%;text-align: right;margin-top: 20px">
+    <!-- <div style="width: 100%;text-align: right;margin-top: 20px">
       请选择首页样式：
       <a-radio-group v-model="indexStyle">
-        <!-- <a-radio :value="1">统计图表</a-radio>
-        <a-radio :value="2">统计图表2</a-radio> -->
-        <!-- <a-radio :value="3">任务表格</a-radio> -->
+        <a-radio :value="1">统计图表</a-radio>
+        <a-radio :value="2">统计图表2</a-radio>
+        <a-radio :value="3">任务表格</a-radio>
       </a-radio-group>
-    </div>
+    </div> -->
   </div>
 </template>
 

itdmWeb/src/views/dashboard/IndexBdc.vue

@@ -5,7 +5,7 @@
         <div @click="zhengchang()">
           <chart-card :loading="loading" total="所有任务" class="suoyou">
           </chart-card>
-          <span class="recent">[近30天]</span>
+          <!-- <span class="recent">[近30天]</span> -->
           <div class="numRecent">
             <div style="font-size:35px; color: #3293f6;">{{listBdc.totalNum}}</div>
             <div style="font-size:20px; padding-top:10%; padding-left:3px;">项</div>
@@ -16,7 +16,7 @@
         <div @click="zhengchang(0)">
           <chart-card :loading="loading" total="待办" class="daiban">
           </chart-card>
-          <span class="recent2">[近30天]</span>
+          <!-- <span class="recent2">[近30天]</span> -->
           <div class="numRecent">
             <div style="font-size:35px; color: #e91111;">{{listBdc.daibanNum}}</div>
             <div style="font-size:20px; padding-top:10%; padding-left:3px;">项</div>
@@ -27,7 +27,7 @@
         <div @click="zhengchang(1)">
           <chart-card :loading="loading" total="进行中" class="jinxing">
           </chart-card>
-          <span class="recent3">[近30天]</span>
+          <!-- <span class="recent3">[近30天]</span> -->
           <div class="numRecent">
             <div style="font-size:35px; color: #f9c04a;">{{listBdc.jinxingNum}}</div>
             <div style="font-size:20px; padding-top:10%; padding-left:3px;">项</div>
@@ -38,7 +38,7 @@
         <div @click="zhengchang(2)">
           <chart-card :loading="loading" total="已完成" class="wancheng">
           </chart-card>
-          <span class="recent3">[近30天]</span>
+          <!-- <span class="recent3">[近30天]</span> -->
           <div class="numRecent">
             <div style="font-size:35px; color: #18c679;">{{listBdc.wanchengNum}}</div>
             <div style="font-size:20px; padding-top:10%; padding-left:3px;">项</div>

itdmWeb/src/views/module-iTDM/itdmPersonManage/ItdmPersonManageList.vue

@@ -15,21 +15,21 @@
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="所属部门">
-                <a-input placeholder="请输入所属部门" v-model="queryParam.sysOrgCode"></a-input>
-              </a-form-item>
-            </a-col>
+<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--              <a-form-item label="所属部门">-->
+<!--                <a-input placeholder="请输入所属部门" v-model="queryParam.sysOrgCode"></a-input>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="职位">
                 <a-input placeholder="请输入职位" v-model="queryParam.position"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="工作组">
-                <a-input placeholder="请输入工作组" v-model="queryParam.workGroup"></a-input>
-              </a-form-item>
-            </a-col>
+<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--              <a-form-item label="工作组">-->
+<!--                <a-input placeholder="请输入工作组" v-model="queryParam.workGroup"></a-input>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -169,21 +169,21 @@
             align:"center",
             dataIndex: 'sex_dictText'
           },
-          {
-            title:'所属部门',
-            align:"center",
-            dataIndex: 'sysOrgCode'
-          },
+          // {
+          //   title:'所属部门',
+          //   align:"center",
+          //   dataIndex: 'sysOrgCode'
+          // },
           {
             title:'职位',
             align:"center",
             dataIndex: 'position'
           },
-          {
-            title:'工作组',
-            align:"center",
-            dataIndex: 'workGroup'
-          },
+          // {
+          //   title:'工作组',
+          //   align:"center",
+          //   dataIndex: 'workGroup'
+          // },
           {
             title:'手机号',
             align:"center",

itdmWeb/src/views/module-iTDM/itdmScreen/itdmGraph.vue

@@ -27,8 +27,8 @@ export default {
   data() {
     return {
       // websocket
-      path: 'ws://192.168.1.11:8080/itdmServer/itdmWebsocket/itdmSecondServer',
-      // path: 'ws://127.0.0.1:8080/websocket/list',
+      // path: 'ws://192.168.2.244:8080/itdmServer/itdmWebsocket/itdmSecondServer',
+      path: 'ws://127.0.0.1:8080/itdmServer/itdmWebsocket/itdmSecondServer',
       socket: '',
 
       // 通用数据1（电压、进水口出水口温度、水压）

itdmWeb/src/views/module-iTDM/itdmScreen/itdmScreenIndex.vue

@@ -2,9 +2,9 @@
   <div class="bg">
     <!-- 头部 -->
     <div class="header">检测试验监控管理平台</div>
-    <div>
+    <!-- <div>
       <a-button class="fanHui" @click="back">返回</a-button>
-    </div>
+    </div> -->
 
     <div class="l1">
       <div class="leHeader">
@@ -236,8 +236,8 @@ import {delBaojing, confirmPa} from '@/api/api'
     data () {
       return {
         // websocket
-        path: 'ws://192.168.1.11:8080/itdmServer/itdmWebsocket/list2',
-        // path: 'ws://127.0.0.1:8080/websocket/list',
+        // path: 'ws://192.168.2.244:8080/itdmServer/itdmWebsocket/list2',
+        path: 'ws://127.0.0.1:8080/itdmServer/itdmWebsocket/list2',
         socket: '',
 
         // 表头