首页显示

backend/src/dashoo.cn/modi_webapi/router/router.go

@@ -88,7 +88,7 @@ func init() {
 		LoginBeforeFunc:  loginFunc,
 		LogoutPath:       "/logout",
 		AuthPaths:        g.SliceStr{"/api"},                                                                               // 这里是按照前缀拦截，拦截/api
-		AuthExcludePaths: g.SliceStr{"/api/class/*", "/api/student/*", "/api/micro/*", "/api/item/*", "/api/itemdetail/*"}, // 不拦截路径
+		AuthExcludePaths: g.SliceStr{"/api/class/*", "/api/student/*", "/api/micro/*", "/api/item/*", "/api/itemdetail/*","/api/information/*","/api/duty/*","/api/course/*","/api/itemdetail/*"}, // 不拦截路径
 	}
 	gfToken.Start()
 }

frontend_web/.env.development

@@ -14,7 +14,8 @@ VUE_APP_API=http://127.0.0.1:8090/api/
 
 # 第二后端API地址
 #VUE_APP_API02=http://39.98.34.197:9915/api/
-VUE_APP_API02=http://127.0.0.1:9635/api/
+VUE_APP_API02=http://192.168.0.252:12002/api/
+#VUE_APP_API02=http://127.0.0.1:9635/api/
 
 # 分模块地址
 VUE_APP_MODULE01=http://localhost:8081/#

frontend_web/src/views/demo/page1/index.vue

@@ -1,9 +1,30 @@
 <template>
   <d2-container>
+
+    <!-- <img class="page_logo"
+           src="./image/logo.png"
+           width="100%"
+           height="115"
+           style="margin:0px"> -->
+    <div class="container1">
+      <el-row style="height:100%">
+        <el-col :span="20">
+          &nbsp;
+        </el-col>
+        <el-col :span="4">
+          <div class="login_bg5x">
+            <a href="/login"
+               alt="logo">
+              <img src="./image/button.png"
+                   class="intelligent1-img" /> </a>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
     <el-row :gutter="15">
-      <el-card>
+      <el-card style="width: 100%">
         <div style="font-size:20px">
-          信息发布
+          公告
         </div>
         <el-table ref="multipleTable"
                   :data="activities"
@@ -45,7 +66,7 @@
             style="margin-top: 10px;">
       <el-card>
         <div style="font-size:20px">
-          课程管理
+          课程表
         </div>
         <template style="padding: 15px;">
           <el-form size="mini"
@@ -150,7 +171,7 @@
             style="margin-top: 10px;">
       <el-card>
         <div style="font-size:20px">
-          值班管理
+          值班表
         </div>
         <template style="padding: 15px;">
           <el-form size="mini"
@@ -454,11 +475,32 @@ export default {
 </script>
 
 <style lang="scss">
-.el-pagination {
-  margin: 1rem 0 2rem;
-  text-align: right;
+.container1 {
+  text-align: center;
+  background: url("./image/backg.png");
+  width: 100%;
+  min-height: 135px;
+  height: 135px;
+  margin: 0 auto;
+  background-size: cover;
+}
+
+.intelligent1-img {
+  width: 120px;
 }
 
+.login_bg5x {
+  margin-top: 65px;
+  margin-right: 40px;
+  // padding-left: 40px;
+  // float: left;
+}
+
+// .el-pagination {
+//   margin: 1rem 0 2rem;
+//   text-align: left;
+// }
+
 .plab {
   font-size: 13px;
   color: #999;

frontend_web/src/views/instrument/components/instrumentadd.vue

@@ -10,7 +10,7 @@
              ref="testlistform">
       <el-row :gutter="20"
               class="donorsaddformcss">
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="设备大类"
                         prop="Classification"
                         label-width="120px">
@@ -26,7 +26,7 @@
             </el-select>
 
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
           <el-form-item label="设备编码"
                         prop="Code"

frontend_web/src/views/instrument/components/instrumentedit.vue

@@ -10,7 +10,7 @@
              ref="testlistform">
       <el-row :gutter="20"
               class="donorsaddformcss">
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="设备大类"
                         prop="Classification"
                         label-width="120px">
@@ -26,7 +26,7 @@
             </el-select>
 
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
           <el-form-item label="设备编码"
                         required

frontend_web/src/views/instrument/index.vue

@@ -13,19 +13,6 @@
                     v-model="search.Name"
                     placeholder="请输入设备名称"></el-input>
         </el-form-item>
-        <el-form-item label="设备大类"
-                      class="sbutton_margin">
-          <el-select style="width:140px;"
-                     v-model="search.classification"
-                     clearable
-                     placeholder="请选择设备大类">
-            <el-option v-for="item in classificationlist"
-                       :key="item.Value"
-                       :label="item.Value"
-                       :value="item.Value">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <!-- <el-form-item label="创建时间" class="sbutton_margin">
           <el-date-picker   style="width: 220px" v-model="CalibrationTime" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束日期"></el-date-picker>
         </el-form-item> -->

frontend_web/src/views/instrument/maintainlog/index.vue

@@ -14,18 +14,6 @@
                     v-model="search.InstrumenName"
                     placeholder="请输入设备名称"></el-input>
         </el-form-item>
-        <el-form-item label="操作类型"
-                      class="sbutton_margin">
-          <el-select v-model="search.OperaTpye"
-                     placeholder="请输入操作类型"
-                     clearable
-                     style="width:140px;">
-            <el-option v-for="item in classificationlist"
-                       :label="item.Value"
-                       :value="item.Value"
-                       :key="item.Value"></el-option>
-          </el-select>
-        </el-form-item>
         <!-- <el-form-item label="操作人">
           <el-input v-model="search.OperaUser"
                     style="width: 165px;"

frontend_web/src/views/sysadmin/item/index.vue

@@ -11,7 +11,7 @@
           <el-input v-model="searchForm.name"
                     placeholder="字典分类名称"
                     style="width: 140px;"
-                    clearable/>
+                    clearable />
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
@@ -41,13 +41,12 @@
     </template>
     <ag-grid-vue class="table ag-theme-balham ag-title-center"
                  style="width: 100%; height: 100%;"
-      id="myGrid"
-      :gridOptions="gridOptions"
-      @gridReady="onGridReady"
-      :rowData="rowData"
-      :columnDefs="columnDefs"
-      rowSelection="multiple"
-      >
+                 id="myGrid"
+                 :gridOptions="gridOptions"
+                 @gridReady="onGridReady"
+                 :rowData="rowData"
+                 :columnDefs="columnDefs"
+                 rowSelection="multiple">
     </ag-grid-vue>
     <template slot="footer">
       <el-pagination style="margin: -10px;"
@@ -145,6 +144,7 @@ export default {
         headerName: '使用分类名',
         field: 'UseItemName',
         valueFormatter (params) {
+          console.log('---params---', params)
           return params.value === 0 ? '否' : '是'
         }
       },
@@ -308,7 +308,6 @@ export default {
 </script>
 
 <style lang="scss">
-
 .el-pagination {
   margin: 1rem 0 2rem;
   text-align: right;
@@ -323,8 +322,8 @@ export default {
   margin-left: 1px;
   padding: 5px 10px 0 0;
 }
-.ag-header-cell-text{
-  text-align: center ;
+.ag-header-cell-text {
+  text-align: center;
   width: 100%;
 }
 </style>